From 1a78515606a112717cf9d66cf0c357150b7253fe Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 6 Apr 2014 17:30:58 -0400 Subject: [PATCH] ui: Use the default GdkDisplay / GdkScreen These are the values we always use anyway, and it allows us to seal off MetaUI further and have them on their own X connection. --- src/core/screen.c | 3 +-- src/ui/ui.c | 12 ++++-------- src/ui/ui.h | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/core/screen.c b/src/core/screen.c index d2c05b07a..de4dcb72f 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -757,8 +757,7 @@ meta_screen_new (MetaDisplay *display, screen->keys_grabbed = FALSE; meta_screen_grab_keys (screen); - screen->ui = meta_ui_new (screen->display->xdisplay, - screen->xscreen); + screen->ui = meta_ui_new (); screen->tile_preview_timeout_id = 0; diff --git a/src/ui/ui.c b/src/ui/ui.c index e2e3cabaa..b609f9b1d 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -233,20 +233,16 @@ ui_filter_func (GdkXEvent *xevent, } MetaUI* -meta_ui_new (Display *xdisplay, - Screen *screen) +meta_ui_new (void) { - GdkDisplay *gdisplay; MetaUI *ui; - gdisplay = gdk_x11_lookup_xdisplay (xdisplay); - g_assert (gdisplay == gdk_display_get_default ()); - ui = g_new0 (MetaUI, 1); - ui->display = gdisplay; - ui->screen = gdk_display_get_screen (gdisplay, XScreenNumberOfScreen (screen)); + ui->display = gdk_display_get_default (); + ui->screen = gdk_screen_get_default (); ui->frames = meta_frames_new (gdk_screen_get_number (ui->screen)); + /* GTK+ needs the frame-sync protocol to work in order to properly * handle style changes. This means that the dummy widget we create * to get the style for title bars actually needs to be mapped diff --git a/src/ui/ui.h b/src/ui/ui.h index 4599d6100..5f8f41582 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -44,8 +44,7 @@ void meta_ui_init (void); Display* meta_ui_get_display (void); -MetaUI* meta_ui_new (Display *xdisplay, - Screen *screen); +MetaUI* meta_ui_new (void); void meta_ui_free (MetaUI *ui); void meta_ui_theme_get_frame_borders (MetaUI *ui,