From 49f41eb54e78e98aedbeae588b54f89931e9cbe0 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Sat, 20 Jul 2019 15:29:12 +0200 Subject: [PATCH 4/5] displays: Use current display Instead of getting the default display again and again. Signed-off-by: Olivier Fourdan --- xfsettingsd/displays.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c index ac990fec..4f138fe3 100644 --- a/xfsettingsd/displays.c +++ b/xfsettingsd/displays.c @@ -239,12 +239,12 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper) if (XRRQueryVersion (helper->xdisplay, &major, &minor) && (major > 1 || (major == 1 && minor >= 2))) { - gdk_x11_display_error_trap_push (gdk_display_get_default ()); + gdk_x11_display_error_trap_push (helper->display); /* get the screen resource */ helper->resources = XRRGetScreenResources (helper->xdisplay, GDK_WINDOW_XID (helper->root_window)); - gdk_display_flush (gdk_display_get_default ()); - err = gdk_x11_display_error_trap_pop (gdk_display_get_default ()); + gdk_display_flush (helper->display); + err = gdk_x11_display_error_trap_pop (helper->display); if (err) { g_critical ("XRRGetScreenResources failed (err: %d). " @@ -375,10 +375,10 @@ xfce_displays_helper_finalize (GObject *object) /* Free the screen resources */ if (helper->resources) { - gdk_x11_display_error_trap_push (gdk_display_get_default ()); + gdk_x11_display_error_trap_push (helper->display); XRRFreeScreenResources (helper->resources); - gdk_display_flush (gdk_display_get_default ()); - if (gdk_x11_display_error_trap_pop (gdk_display_get_default ()) != 0) + gdk_display_flush (helper->display); + if (gdk_x11_display_error_trap_pop (helper->display) != 0) { g_critical ("Failed to free screen resources"); } @@ -401,7 +401,7 @@ xfce_displays_helper_reload (XfceDisplaysHelper *helper) g_ptr_array_unref (helper->outputs); g_ptr_array_unref (helper->crtcs); - gdk_x11_display_error_trap_push (gdk_display_get_default ()); + gdk_x11_display_error_trap_push (helper->display); /* Free the screen resources */ XRRFreeScreenResources (helper->resources); @@ -419,8 +419,8 @@ xfce_displays_helper_reload (XfceDisplaysHelper *helper) helper->resources = XRRGetScreenResources (helper->xdisplay, GDK_WINDOW_XID (helper->root_window)); - gdk_display_flush (gdk_display_get_default ()); - err = gdk_x11_display_error_trap_pop (gdk_display_get_default ()); + gdk_display_flush (helper->display); + err = gdk_x11_display_error_trap_pop (helper->display); if (err) g_critical ("Failed to reload the RandR cache (err: %d).", err); @@ -960,10 +960,10 @@ xfce_displays_helper_list_outputs (XfceDisplaysHelper *helper) outputs = g_ptr_array_new_with_free_func ((GDestroyNotify) xfce_displays_helper_free_output); for (n = 0; n < helper->resources->noutput; ++n) { - gdk_x11_display_error_trap_push (gdk_display_get_default ()); + gdk_x11_display_error_trap_push (helper->display); output_info = XRRGetOutputInfo (helper->xdisplay, helper->resources, helper->resources->outputs[n]); - gdk_display_flush (gdk_display_get_default ()); - err = gdk_x11_display_error_trap_pop (gdk_display_get_default ()); + gdk_display_flush (helper->display); + err = gdk_x11_display_error_trap_pop (helper->display); if (err || !output_info) { g_warning ("Failed to load info for output %lu (err: %d). Skipping.", @@ -1066,10 +1066,10 @@ xfce_displays_helper_list_crtcs (XfceDisplaysHelper *helper) { xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "Detected CRTC %lu.", helper->resources->crtcs[n]); - gdk_x11_display_error_trap_push (gdk_display_get_default ()); + gdk_x11_display_error_trap_push (helper->display); crtc_info = XRRGetCrtcInfo (helper->xdisplay, helper->resources, helper->resources->crtcs[n]); - gdk_display_flush (gdk_display_get_default ()); - err = gdk_x11_display_error_trap_pop (gdk_display_get_default ()); + gdk_display_flush (helper->display); + err = gdk_x11_display_error_trap_pop (helper->display); if (err || !crtc_info) { g_warning ("Failed to load info for CRTC %lu (err: %d). Skipping.", @@ -1407,7 +1407,7 @@ xfce_displays_helper_apply_all (XfceDisplaysHelper *helper) g_ptr_array_foreach (helper->crtcs, (GFunc) xfce_displays_helper_get_topleftmost_pos, helper); g_ptr_array_foreach (helper->crtcs, (GFunc) xfce_displays_helper_normalize_crtc, helper); - gdk_x11_display_error_trap_push (gdk_display_get_default ()); + gdk_x11_display_error_trap_push (helper->display); /* grab server to prevent clients from thinking no output is enabled */ gdk_x11_display_grab (helper->display); @@ -1429,8 +1429,8 @@ xfce_displays_helper_apply_all (XfceDisplaysHelper *helper) /* release the grab, changes are done */ gdk_x11_display_ungrab (helper->display); - gdk_display_flush (gdk_display_get_default ()); - if (gdk_x11_display_error_trap_pop (gdk_display_get_default ()) != 0) + gdk_display_flush (helper->display); + if (gdk_x11_display_error_trap_pop (helper->display) != 0) { g_critical ("Failed to apply display settings"); } -- 2.21.0