RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-04 14:37:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl_platform: avoid direct xlib dependency

Browse source 
some people want to run this without X
This commit is contained in:
notaz 2013-02-08 01:44:00 +02:00
parent 6fd09356f0
commit cceadf4cd4
1 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
gl_platform.c
View file

@ -15,12 +15,19 @@
*/ */
#include <bcm_host.h> #include <bcm_host.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <dlfcn.h>
static Display *x11display; static Display *x11display;
static Window x11window; static Window x11window;
static DISPMANX_DISPLAY_HANDLE_T m_dispmanDisplay; static DISPMANX_DISPLAY_HANDLE_T m_dispmanDisplay;
static EGL_DISPMANX_WINDOW_T m_nativeWindow; static EGL_DISPMANX_WINDOW_T m_nativeWindow;
static void *x11lib;
#define FPTR(f) typeof(f) * p##f
static FPTR(XGetGeometry);
static FPTR(XGetWindowAttributes);
static FPTR(XTranslateCoordinates);
static void get_window_rect(VC_RECT_T *rect) static void get_window_rect(VC_RECT_T *rect)
{ {
XWindowAttributes xattrs_root; XWindowAttributes xattrs_root;
@ -41,14 +48,14 @@ static void get_window_rect(VC_RECT_T *rect)
if (x11display == NULL || x11window == 0) if (x11display == NULL || x11window == 0)
return; // use fullscreen return; // use fullscreen
XGetGeometry(x11display, x11window, &root, &dx, &dy, &dw, &dh, pXGetGeometry(x11display, x11window, &root, &dx, &dy, &dw, &dh,
&dummy, &dummy); &dummy, &dummy);
XGetWindowAttributes(x11display, root, &xattrs_root); pXGetWindowAttributes(x11display, root, &xattrs_root);
if (dw == xattrs_root.width && dh == xattrs_root.height) if (dw == xattrs_root.width && dh == xattrs_root.height)
return; // use fullscreen return; // use fullscreen
XTranslateCoordinates(x11display, x11window, root, pXTranslateCoordinates(x11display, x11window, root,
dx, dy, &dx, &dy, &dummyw); dx, dy, &dx, &dy, &dummyw);
// how to deal with that weird centering thing? // how to deal with that weird centering thing?
@ -87,8 +94,21 @@ static void submit_rect(void)
int gl_platform_init(void **display, void **window, int *quirks) int gl_platform_init(void **display, void **window, int *quirks)
{ {
x11display = *display; x11display = NULL;
x11window = (Window)*window; x11window = 0;
x11lib = dlopen("libX11.so.6", RTLD_LAZY);
if (x11lib != NULL) {
pXGetGeometry = dlsym(x11lib, "XGetGeometry");
pXGetWindowAttributes = dlsym(x11lib, "XGetWindowAttributes");
pXTranslateCoordinates = dlsym(x11lib, "XTranslateCoordinates");
if (pXGetGeometry != NULL && pXGetWindowAttributes != NULL
&& pXTranslateCoordinates != NULL)
{
x11display = *display;
x11window = (Window)*window;
}
}
bcm_host_init(); bcm_host_init();
submit_rect(); submit_rect();
@ -104,6 +124,14 @@ void gl_platform_finish(void)
{ {
vc_dispmanx_display_close(m_dispmanDisplay); vc_dispmanx_display_close(m_dispmanDisplay);
bcm_host_deinit(); bcm_host_deinit();
if (x11lib) {
dlclose(x11lib);
x11lib = NULL;
}
x11display = NULL;
x11window = 0;
} }
#else #else