mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(x11_common.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-01-10 21:54:48 +01:00
parent a153d600e4
commit 34d5f609f7
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gfx/common/x11_common.c
View File

@ -283,14 +283,11 @@ void x11_set_window_attr(Display *dpy, Window win)
static void xdg_screensaver_inhibit(Window wnd) static void xdg_screensaver_inhibit(Window wnd)
{ {
int ret; int ret;
char cmd[64]; char cmd[64];
cmd[0] = '\0'; cmd[0] = '\0';
if (!xdg_screensaver_available)
return;
RARCH_LOG("Suspending screensaver (X11, xdg-screensaver).\n"); RARCH_LOG("Suspending screensaver (X11, xdg-screensaver).\n");
snprintf(cmd, sizeof(cmd), "xdg-screensaver suspend 0x%x", (int)wnd); snprintf(cmd, sizeof(cmd), "xdg-screensaver suspend 0x%x", (int)wnd);
@ -314,7 +311,8 @@ void x11_suspend_screensaver_xdg_screensaver(Window wnd, bool enable)
if (!enable) if (!enable)
return; return;
xdg_screensaver_inhibit(wnd); if (xdg_screensaver_available)
xdg_screensaver_inhibit(wnd);
} }
void x11_suspend_screensaver(Window wnd, bool enable) void x11_suspend_screensaver(Window wnd, bool enable)
@ -419,10 +417,10 @@ static XineramaScreenInfo *x11_query_screens(Display *dpy, int *num_screens)
bool x11_get_xinerama_coord(Display *dpy, int screen, bool x11_get_xinerama_coord(Display *dpy, int screen,
int *x, int *y, unsigned *w, unsigned *h) int *x, int *y, unsigned *w, unsigned *h)
{ {
int i, num_screens = 0; int i, num_screens = 0;
bool ret = false; bool ret = false;
XineramaScreenInfo *info = x11_query_screens(dpy, &num_screens); XineramaScreenInfo *info = x11_query_screens(dpy, &num_screens);
RARCH_LOG("[X11]: Xinerama screens: %d.\n", num_screens); RARCH_LOG("[X11]: Xinerama screens: %d.\n", num_screens);
for (i = 0; i < num_screens; i++) for (i = 0; i < num_screens; i++)
@ -486,8 +484,7 @@ bool x11_create_input_context(Display *dpy, Window win, XIM *xim, XIC *xic)
x11_destroy_input_context(xim, xic); x11_destroy_input_context(xim, xic);
g_x11_has_focus = true; g_x11_has_focus = true;
*xim = XOpenIM(dpy, NULL, NULL, NULL);
*xim = XOpenIM(dpy, NULL, NULL, NULL);
if (!*xim) if (!*xim)
{ {
@ -559,10 +556,9 @@ bool x11_get_metrics(void *data,
bool x11_alive(void *data) bool x11_alive(void *data)
{ {
XEvent event;
while (XPending(g_x11_dpy)) while (XPending(g_x11_dpy))
{ {
XEvent event;
bool filter = false; bool filter = false;
/* Can get events from older windows. Check this. */ /* Can get events from older windows. Check this. */
@ -662,14 +658,14 @@ void x11_get_video_size(void *data, unsigned *width, unsigned *height)
if (!g_x11_dpy || g_x11_win == None) if (!g_x11_dpy || g_x11_win == None)
{ {
Display *dpy = (Display*)XOpenDisplay(NULL); Display *dpy = (Display*)XOpenDisplay(NULL);
*width = 0; *width = 0;
*height = 0; *height = 0;
if (dpy) if (dpy)
{ {
int screen = DefaultScreen(dpy); int screen = DefaultScreen(dpy);
*width = DisplayWidth(dpy, screen); *width = DisplayWidth(dpy, screen);
*height = DisplayHeight(dpy, screen); *height = DisplayHeight(dpy, screen);
XCloseDisplay(dpy); XCloseDisplay(dpy);
} }
} }