isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 13:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: Use the default GdkDisplay / GdkScreen

Browse Source 
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.
This commit is contained in:
Jasper St. Pierre 2014-04-06 17:30:58 -04:00
parent 4122257bce
commit 1a78515606
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/screen.c
View File

@ -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;

12
src/ui/ui.c
View File

@ -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

3
src/ui/ui.h
View File

@ -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,