mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-10 12:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create x11_input_ctx_new/x11_input_ctx_destroy

Browse Source
This commit is contained in:
twinaphex 2015-11-19 11:27:41 +01:00
parent 56e5d0bf3e
commit ce2b973beb
5 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/common/x11_common.c
View File

@ -536,3 +536,15 @@ void x11_update_window_title(void *data)
if (settings->fps_show) if (settings->fps_show)
rarch_main_msg_queue_push(buf_fps, 1, 1, false); rarch_main_msg_queue_push(buf_fps, 1, 1, false);
} }
bool x11_input_ctx_new(void)
{
if (!x11_create_input_context(g_x11_dpy, g_x11_win, &g_x11_xim, &g_x11_xic))
return false;
return true;
}
void x11_input_ctx_destroy(void)
{
x11_destroy_input_context(&g_x11_xim, &g_x11_xic);
}

4
gfx/common/x11_common.h
View File

@ -83,5 +83,9 @@ bool x11_connect(void);
void x11_update_window_title(void *data); void x11_update_window_title(void *data);
bool x11_input_ctx_new(void);
void x11_input_ctx_destroy(void);
#endif #endif

5
gfx/drivers/xvideo.c
View File

@ -576,7 +576,7 @@ static void *xv_init(const video_info_t *video,
init_yuv_tables(xv); init_yuv_tables(xv);
xv_init_font(xv, settings->video.font_path, settings->video.font_size); xv_init_font(xv, settings->video.font_path, settings->video.font_size);
if (!x11_create_input_context(g_x11_dpy, g_x11_win, &g_x11_xim, &g_x11_xic)) if (!x11_input_ctx_new())
goto error; goto error;
XGetWindowAttributes(g_x11_dpy, g_x11_win, &target); XGetWindowAttributes(g_x11_dpy, g_x11_win, &target);
@ -819,7 +819,8 @@ static void xv_free(void *data)
if (!xv) if (!xv)
return; return;
x11_destroy_input_context(&g_x11_xim, &g_x11_xic); x11_input_ctx_destroy();
XShmDetach(g_x11_dpy, &xv->shminfo); XShmDetach(g_x11_dpy, &xv->shminfo);
shmdt(xv->shminfo.shmaddr); shmdt(xv->shminfo.shmaddr);
shmctl(xv->shminfo.shmid, IPC_RMID, NULL); shmctl(xv->shminfo.shmid, IPC_RMID, NULL);

4
gfx/drivers_context/glx_ctx.c
View File

@ -83,7 +83,7 @@ static void ctx_glx_destroy_resources(gfx_ctx_glx_data_t *glx)
if (!glx) if (!glx)
return; return;
x11_destroy_input_context(&g_x11_xim, &g_x11_xic); x11_input_ctx_destroy();
if (g_x11_dpy && glx->g_ctx) if (g_x11_dpy && glx->g_ctx)
{ {
@ -518,7 +518,7 @@ static bool gfx_ctx_glx_set_video_mode(void *data,
XFree(vi); XFree(vi);
if (!x11_create_input_context(g_x11_dpy, g_x11_win, &g_x11_xim, &g_x11_xic)) if (!x11_input_ctx_new())
goto error; goto error;
driver->display_type = RARCH_DISPLAY_X11; driver->display_type = RARCH_DISPLAY_X11;

4
gfx/drivers_context/xegl_ctx.c
View File

@ -468,7 +468,7 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
XFree(vi); XFree(vi);
g_inited = true; g_inited = true;
if (!x11_create_input_context(g_x11_dpy, g_x11_win, &g_x11_xim, &g_x11_xic)) if (!x11_input_ctx_new())
goto error; goto error;
driver->display_type = RARCH_DISPLAY_X11; driver->display_type = RARCH_DISPLAY_X11;
@ -490,7 +490,7 @@ static void gfx_ctx_xegl_destroy(void *data)
{ {
(void)data; (void)data;
x11_destroy_input_context(&g_x11_xim, &g_x11_xic); x11_input_ctx_destroy();
if (g_egl_dpy) if (g_egl_dpy)
{ {