mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GLX) Uses x11_check_window now too

Browse Source
This commit is contained in:
twinaphex 2015-11-19 10:05:54 +01:00
parent ac6813dc7f
commit 5283c4c13c
2 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/common/x11_common.c
View File

@ -392,7 +392,8 @@ void x11_check_window(bool *quit)
switch (event.type)
{
case ClientMessage:
if (event.xclient.window == g_x11_win && (Atom)event.xclient.data.l[0] == g_x11_quit_atom)
if (event.xclient.window == g_x11_win &&
(Atom)event.xclient.data.l[0] == g_x11_quit_atom)
g_x11_quit = true;
break;

47
gfx/drivers_context/glx_ctx.c
View File

@ -247,13 +247,8 @@ void x_input_poll_wheel(void *data, XButtonEvent *event, bool latch);
static void gfx_ctx_glx_check_window(void *data, bool *quit,
bool *resize, unsigned *width, unsigned *height, unsigned frame_count)
{
XEvent event;
driver_t *driver = driver_get_ptr();
gfx_ctx_glx_data_t *glx = (gfx_ctx_glx_data_t*)driver->video_context_data;
unsigned new_width = *width, new_height = *height;
(void)frame_count;
gfx_ctx_glx_get_video_size(data, &new_width, &new_height);
if (new_width != *width || new_height != *height)
@ -263,47 +258,7 @@ static void gfx_ctx_glx_check_window(void *data, bool *quit,
*height = new_height;
}
while (XPending(g_x11_dpy))
{
bool filter;
XNextEvent(g_x11_dpy, &event);
filter = XFilterEvent(&event, g_x11_win);
switch (event.type)
{
case ClientMessage:
if (event.xclient.window == g_x11_win &&
(Atom)event.xclient.data.l[0] == g_x11_quit_atom)
g_x11_quit = true;
break;
case DestroyNotify:
if (event.xdestroywindow.window == g_x11_win)
g_x11_quit = true;
break;
case MapNotify:
if (event.xmap.window == g_x11_win)
g_x11_has_focus = true;
break;
case UnmapNotify:
if (event.xunmap.window == g_x11_win)
g_x11_has_focus = false;
break;
case ButtonPress:
x_input_poll_wheel(driver->input_data, &event.xbutton, true);
break;
case ButtonRelease:
break;
case KeyPress:
case KeyRelease:
x11_handle_key_event(&event, g_x11_xic, filter);
break;
}
}
*quit = g_x11_quit;
x11_check_window(quit);
}
static void gfx_ctx_glx_swap_buffers(void *data)