ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x11: open display ourself if global one is not available (e.g. with SDL)

This commit is contained in:
Brad Parker 2019-02-26 20:23:11 -05:00
parent 0aa9df6acd
commit 211515ece1
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gfx/display_servers/dispserv_x11.c
View File

@ -47,6 +47,7 @@ static char orig_output[256] = {0};
static char old_mode[256] = {0}; static char old_mode[256] = {0};
static char new_mode[256] = {0}; static char new_mode[256] = {0};
static XRRModeInfo crt_rrmode; static XRRModeInfo crt_rrmode;
static bool x11_display_server_using_global_dpy = false;
#endif #endif
typedef struct typedef struct
@ -55,6 +56,30 @@ typedef struct
bool decorations; bool decorations;
} dispserv_x11_t; } dispserv_x11_t;
static Display* x11_display_server_open_display(void)
{
Display *dpy = g_x11_dpy;
if (dpy)
x11_display_server_using_global_dpy = true;
else
{
/* SDL might use X11 but doesn't use g_x11_dpy, so open it manually */
dpy = XOpenDisplay(0);
x11_display_server_using_global_dpy = false;
}
return dpy;
}
static void x11_display_server_close_display(Display *dpy)
{
if (!dpy || x11_display_server_using_global_dpy || dpy == g_x11_dpy)
return;
XCloseDisplay(dpy);
}
static void* x11_display_server_init(void) static void* x11_display_server_init(void)
{ {
dispserv_x11_t *dispserv = (dispserv_x11_t*)calloc(1, sizeof(*dispserv)); dispserv_x11_t *dispserv = (dispserv_x11_t*)calloc(1, sizeof(*dispserv));
@ -461,19 +486,18 @@ static void x11_display_server_set_screen_orientation(enum rotation rotation)
XRRFreeScreenConfigInfo(config); XRRFreeScreenConfigInfo(config);
XCloseDisplay(dpy); XCloseDisplay(dpy);
} }
#endif
#ifdef HAVE_XRANDR
static enum rotation x11_display_server_get_screen_orientation(void) static enum rotation x11_display_server_get_screen_orientation(void)
{ {
int i, j; int i, j;
XRRScreenResources *screen = XRRGetScreenResources(g_x11_dpy, DefaultRootWindow(g_x11_dpy)); Display *dpy = x11_display_server_open_display();
XRRScreenConfiguration *config = XRRGetScreenInfo(g_x11_dpy, DefaultRootWindow(g_x11_dpy)); XRRScreenResources *screen = XRRGetScreenResources(dpy, DefaultRootWindow(dpy));
XRRScreenConfiguration *config = XRRGetScreenInfo(dpy, DefaultRootWindow(dpy));
enum rotation rotation = ORIENTATION_NORMAL; enum rotation rotation = ORIENTATION_NORMAL;
for (i = 0; i < screen->noutput; i++) for (i = 0; i < screen->noutput; i++)
{ {
XRROutputInfo *info = XRRGetOutputInfo(g_x11_dpy, screen, screen->outputs[i]); XRROutputInfo *info = XRRGetOutputInfo(dpy, screen, screen->outputs[i]);
if (info->connection != RR_Connected) if (info->connection != RR_Connected)
{ {
@ -483,7 +507,7 @@ static enum rotation x11_display_server_get_screen_orientation(void)
for (j = 0; j < info->ncrtc; j++) for (j = 0; j < info->ncrtc; j++)
{ {
XRRCrtcInfo *crtc = XRRGetCrtcInfo(g_x11_dpy, screen, screen->crtcs[j]); XRRCrtcInfo *crtc = XRRGetCrtcInfo(dpy, screen, screen->crtcs[j]);
if (crtc->width == 0 || crtc->height == 0) if (crtc->width == 0 || crtc->height == 0)
{ {
@ -517,6 +541,8 @@ static enum rotation x11_display_server_get_screen_orientation(void)
XRRFreeScreenResources(screen); XRRFreeScreenResources(screen);
XRRFreeScreenConfigInfo(config); XRRFreeScreenConfigInfo(config);
x11_display_server_close_display(dpy);
return rotation; return rotation;
} }
#endif #endif