From 2fa46bcef819fbe5307f27e5bc3ae3bdf70c4be4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 5 Feb 2016 13:36:18 +0100 Subject: [PATCH] Cleanups --- gfx/common/x11_common.c | 32 ++++++++++++++++++-------------- gfx/common/x11_common.h | 7 +++++-- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c index 4456ca2cf0..87b1051299 100644 --- a/gfx/common/x11_common.c +++ b/gfx/common/x11_common.c @@ -112,14 +112,15 @@ void x11_move_window(Display *dpy, Window win, int x, int y, XA_INIT(_NET_MOVERESIZE_WINDOW); - xev.xclient.type = ClientMessage; - xev.xclient.send_event = True; + xev.xclient.type = ClientMessage; + xev.xclient.send_event = True; xev.xclient.message_type = XA_NET_MOVERESIZE_WINDOW; - xev.xclient.window = win; - xev.xclient.format = 32; - xev.xclient.data.l[0] = (1 << MOVERESIZE_X_SHIFT) | (1 << MOVERESIZE_Y_SHIFT); - xev.xclient.data.l[1] = x; - xev.xclient.data.l[2] = y; + xev.xclient.window = win; + xev.xclient.format = 32; + xev.xclient.data.l[0] = (1 << MOVERESIZE_X_SHIFT) + | (1 << MOVERESIZE_Y_SHIFT); + xev.xclient.data.l[1] = x; + xev.xclient.data.l[2] = y; XSendEvent(dpy, DefaultRootWindow(dpy), False, SubstructureRedirectMask | SubstructureNotifyMask, @@ -160,11 +161,11 @@ static bool get_video_mode(Display *dpy, unsigned width, unsigned height, XF86VidModeModeInfo *mode, XF86VidModeModeInfo *desktop_mode) { float refresh_mod; - int i, num_modes = 0; - bool ret = false; - float minimum_fps_diff = 0.0f; + int i, num_modes = 0; + bool ret = false; + float minimum_fps_diff = 0.0f; XF86VidModeModeInfo **modes = NULL; - settings_t *settings = config_get_ptr(); + settings_t *settings = config_get_ptr(); XF86VidModeGetAllModeLines(dpy, DefaultScreen(dpy), &num_modes, &modes); @@ -548,7 +549,8 @@ void x11_update_window_title(void *data) bool x11_input_ctx_new(bool true_full) { - if (!x11_create_input_context(g_x11_dpy, g_x11_win, &g_x11_xim, &g_x11_xic)) + if (!x11_create_input_context(g_x11_dpy, g_x11_win, + &g_x11_xim, &g_x11_xic)) return false; video_driver_display_type_set(RARCH_DISPLAY_X11); @@ -583,7 +585,8 @@ void x11_colormap_destroy(void) void x11_install_quit_atom(void) { - g_x11_quit_atom = XInternAtom(g_x11_dpy, "WM_DELETE_WINDOW", False); + g_x11_quit_atom = XInternAtom(g_x11_dpy, + "WM_DELETE_WINDOW", False); if (g_x11_quit_atom) XSetWMProtocols(g_x11_dpy, g_x11_win, &g_x11_quit_atom, 1); } @@ -606,7 +609,8 @@ void x11_save_last_used_monitor(Window win) int x = 0, y = 0; XGetWindowAttributes(g_x11_dpy, g_x11_win, &target); - XTranslateCoordinates(g_x11_dpy, g_x11_win, DefaultRootWindow(g_x11_dpy), + XTranslateCoordinates(g_x11_dpy, g_x11_win, + DefaultRootWindow(g_x11_dpy), target.x, target.y, &x, &y, &child); g_x11_screen = x11_get_xinerama_monitor(g_x11_dpy, x, y, diff --git a/gfx/common/x11_common.h b/gfx/common/x11_common.h index 9db915250d..ceaa40a0c9 100644 --- a/gfx/common/x11_common.h +++ b/gfx/common/x11_common.h @@ -44,9 +44,12 @@ void x11_save_last_used_monitor(Window win); void x11_show_mouse(Display *dpy, Window win, bool state); void x11_windowed_fullscreen(Display *dpy, Window win); void x11_suspend_screensaver(Window win); -bool x11_enter_fullscreen(Display *dpy, unsigned width, unsigned height, XF86VidModeModeInfo *desktop_mode); +bool x11_enter_fullscreen(Display *dpy, unsigned width, + unsigned height, XF86VidModeModeInfo *desktop_mode); + void x11_exit_fullscreen(Display *dpy, XF86VidModeModeInfo *desktop_mode); -void x11_move_window(Display *dpy, Window win, int x, int y, unsigned width, unsigned height); +void x11_move_window(Display *dpy, Window win, + int x, int y, unsigned width, unsigned height); /* Set icon, class, default stuff. */ void x11_set_window_attr(Display *dpy, Window win);