From ed1a6302c87c6070bbec549ec36c5b56c12a6564 Mon Sep 17 00:00:00 2001 From: ZenWalker Date: Sat, 29 Jul 2017 02:10:08 +0200 Subject: avoid deprecated gdk_display_get_screen --- src/core/frame.c | 3 +-- src/core/screen.c | 4 +--- src/include/tabpopup.h | 1 - src/include/tile-preview.h | 2 +- src/include/ui.h | 3 +-- src/ui/fixedtip.c | 5 ++--- src/ui/fixedtip.h | 3 +-- src/ui/frames.c | 11 +++-------- src/ui/frames.h | 2 +- src/ui/resizepopup.c | 3 +-- src/ui/tabpopup.c | 4 +--- src/ui/tile-preview.c | 4 ++-- src/ui/ui.c | 9 ++++----- 13 files changed, 19 insertions(+), 35 deletions(-) diff --git a/src/core/frame.c b/src/core/frame.c index cabfefcd..17d1bdff 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -104,8 +104,7 @@ meta_window_ensure_frame (MetaWindow *window) frame->rect.x, frame->rect.y, frame->rect.width, - frame->rect.height, - frame->window->screen->number); + frame->rect.height); meta_verbose ("Frame for %s is 0x%lx\n", frame->window->desc, frame->xwindow); attrs.event_mask = EVENT_MASK; diff --git a/src/core/screen.c b/src/core/screen.c index 98ecf4db..28d2febf 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -1399,7 +1399,6 @@ meta_screen_ensure_tab_popup (MetaScreen *screen, } screen->tab_popup = meta_ui_tab_popup_new (entries, - screen->number, len, 5, /* FIXME */ border); @@ -1471,7 +1470,6 @@ meta_screen_ensure_workspace_popup (MetaScreen *screen) } screen->tab_popup = meta_ui_tab_popup_new (entries, - screen->number, len, layout.cols, BORDER_OUTLINE_WORKSPACE); @@ -1492,7 +1490,7 @@ meta_screen_tile_preview_update_timeout (gpointer data) screen->tile_preview_timeout_id = 0; if (!screen->tile_preview) - screen->tile_preview = meta_tile_preview_new (screen->number); + screen->tile_preview = meta_tile_preview_new (); if (window) { diff --git a/src/include/tabpopup.h b/src/include/tabpopup.h index c0466fff..eafe077e 100644 --- a/src/include/tabpopup.h +++ b/src/include/tabpopup.h @@ -56,7 +56,6 @@ struct _MetaTabEntry }; MetaTabPopup* meta_ui_tab_popup_new (const MetaTabEntry *entries, - int screen_number, int entry_count, int width, gboolean outline); diff --git a/src/include/tile-preview.h b/src/include/tile-preview.h index 70ceec9e..5091743c 100644 --- a/src/include/tile-preview.h +++ b/src/include/tile-preview.h @@ -28,7 +28,7 @@ typedef struct _MetaTilePreview MetaTilePreview; -MetaTilePreview *meta_tile_preview_new (int screen_number); +MetaTilePreview *meta_tile_preview_new (void); void meta_tile_preview_free (MetaTilePreview *preview); void meta_tile_preview_show (MetaTilePreview *preview, MetaRectangle *rect, diff --git a/src/include/ui.h b/src/include/ui.h index fc7b6b0a..58225dcb 100644 --- a/src/include/ui.h +++ b/src/include/ui.h @@ -79,8 +79,7 @@ Window meta_ui_create_frame_window (MetaUI *ui, gint x, gint y, gint width, - gint height, - gint screen_no); + gint height); void meta_ui_destroy_frame_window (MetaUI *ui, Window xwindow); void meta_ui_move_resize_frame (MetaUI *ui, diff --git a/src/ui/fixedtip.c b/src/ui/fixedtip.c index 7de93d9b..688f5f1d 100644 --- a/src/ui/fixedtip.c +++ b/src/ui/fixedtip.c @@ -62,8 +62,7 @@ draw_handler (GtkWidget *widget, } void -meta_fixed_tip_show (int screen_number, - int root_x, int root_y, +meta_fixed_tip_show (int root_x, int root_y, const char *markup_text) { gint w; @@ -82,7 +81,7 @@ meta_fixed_tip_show (int screen_number, gtk_style_context_add_class (gtk_widget_get_style_context (tip), GTK_STYLE_CLASS_TOOLTIP); - screen = gdk_display_get_screen (gdk_display_get_default (), screen_number); + screen = gdk_display_get_default_screen (gdk_display_get_default ()); visual = gdk_screen_get_rgba_visual (screen); gtk_window_set_screen (GTK_WINDOW (tip), screen); diff --git a/src/ui/fixedtip.h b/src/ui/fixedtip.h index c108df92..9a7dd78b 100644 --- a/src/ui/fixedtip.h +++ b/src/ui/fixedtip.h @@ -51,8 +51,7 @@ * \param root_y The Y coordinate where the tooltip should appear * \param markup_text Text to display in the tooltip; can contain markup */ -void meta_fixed_tip_show (int screen_number, - int root_x, int root_y, +void meta_fixed_tip_show (int root_x, int root_y, const char *markup_text); /** diff --git a/src/ui/frames.c b/src/ui/frames.c index 2703f448..2cee5192 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -550,12 +550,11 @@ meta_frames_calc_geometry (MetaFrames *frames, } MetaFrames* -meta_frames_new (int screen_number) +meta_frames_new (void) { GdkScreen *screen; - screen = gdk_display_get_screen (gdk_display_get_default (), - screen_number); + screen = gdk_display_get_default_screen (gdk_display_get_default ()); return g_object_new (META_TYPE_FRAMES, "screen", screen, @@ -1155,7 +1154,6 @@ show_tip_now (MetaFrames *frames) MetaFrameGeometry fgeom; GdkRectangle *rect; int dx, dy; - int screen_number; meta_frames_calc_geometry (frames, frame, &fgeom); @@ -1169,10 +1167,7 @@ show_tip_now (MetaFrames *frames) if (meta_ui_get_direction() == META_UI_DIRECTION_RTL) dx += rect->width; - screen_number = gdk_x11_screen_get_screen_number (gtk_widget_get_screen (GTK_WIDGET (frames))); - - meta_fixed_tip_show (screen_number, - rect->x + dx, + meta_fixed_tip_show (rect->x + dx, rect->y + rect->height + 2 + dy, tiptext); } diff --git a/src/ui/frames.h b/src/ui/frames.h index a5d50011..0c7f3a5c 100644 --- a/src/ui/frames.h +++ b/src/ui/frames.h @@ -112,7 +112,7 @@ struct _MetaFramesClass GType meta_frames_get_type (void) G_GNUC_CONST; -MetaFrames *meta_frames_new (int screen_number); +MetaFrames *meta_frames_new (void); void meta_frames_manage_window (MetaFrames *frames, Window xwindow, diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c index a4d9e976..c60fcd65 100644 --- a/src/ui/resizepopup.c +++ b/src/ui/resizepopup.c @@ -78,8 +78,7 @@ ensure_size_window (MetaResizePopup *popup) popup->size_window = gtk_window_new (GTK_WINDOW_POPUP); gtk_window_set_screen (GTK_WINDOW (popup->size_window), - gdk_display_get_screen (gdk_x11_lookup_xdisplay (popup->display), - popup->screen_number)); + gdk_display_get_default_screen (gdk_x11_lookup_xdisplay (popup->display))); /* never shrink the size window */ gtk_window_set_resizable (GTK_WINDOW (popup->size_window), diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c index 8bbf91ef..a9e6d35e 100644 --- a/src/ui/tabpopup.c +++ b/src/ui/tabpopup.c @@ -214,7 +214,6 @@ tab_entry_new (const MetaTabEntry *entry, MetaTabPopup* meta_ui_tab_popup_new (const MetaTabEntry *entries, - int screen_number, int entry_count, int width, gint border) @@ -235,8 +234,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, popup->outline_window = gtk_window_new (GTK_WINDOW_POPUP); - screen = gdk_display_get_screen (gdk_display_get_default (), - screen_number); + screen = gdk_display_get_default_screen (gdk_display_get_default ()); gtk_window_set_screen (GTK_WINDOW (popup->outline_window), screen); diff --git a/src/ui/tile-preview.c b/src/ui/tile-preview.c index 88962467..d99529ff 100644 --- a/src/ui/tile-preview.c +++ b/src/ui/tile-preview.c @@ -124,12 +124,12 @@ on_preview_window_style_set (GtkWidget *widget, } MetaTilePreview * -meta_tile_preview_new (int screen_number) +meta_tile_preview_new (void) { MetaTilePreview *preview; GdkScreen *screen; - screen = gdk_display_get_screen (gdk_display_get_default (), screen_number); + screen = gdk_display_get_default_screen (gdk_display_get_default ()); preview = g_new (MetaTilePreview, 1); diff --git a/src/ui/ui.c b/src/ui/ui.c index 2c1747ff..767f72b3 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -279,7 +279,7 @@ meta_ui_new (Display *xdisplay, g_assert (gdisplay == gdk_display_get_default ()); g_assert (xdisplay == GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); - ui->frames = meta_frames_new (XScreenNumberOfScreen (screen)); + ui->frames = meta_frames_new (); /* This does not actually show any widget. MetaFrames has been hacked so * that showing it doesn't actually do anything. But we need the flags * set for GTK to deliver events properly. */ @@ -321,11 +321,10 @@ meta_ui_create_frame_window (MetaUI *ui, gint x, gint y, gint width, - gint height, - gint screen_no) + gint height) { GdkDisplay *display = gdk_x11_lookup_xdisplay (xdisplay); - GdkScreen *screen = gdk_display_get_screen (display, screen_no); + GdkScreen *screen = gdk_display_get_default_screen (display); GdkWindowAttr attrs; gint attributes_mask; GdkWindow *window; @@ -686,7 +685,7 @@ meta_ui_theme_get_frame_borders (MetaUI *ui, if (!font_desc) { GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay); - GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen)); + GdkScreen *screen = gdk_display_get_default_screen (display); GtkWidgetPath *widget_path; style = gtk_style_context_new (); -- cgit v1.2.1