Skip to content

Commit abaa88e

Browse files
yetistraveit65
yetist
authored andcommitted
Fixed some gdk deprecations
1 parent ce87b58 commit abaa88e

File tree

4 files changed

+32
-19
lines changed

4 files changed

+32
-19
lines changed

src/gs-fade.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ xf86_whack_gamma (int screen,
174174
{
175175
Bool status;
176176
struct GSGammaInfo *gamma_info;
177+
GdkDisplay *display;
177178

178179
gamma_info = screen_priv->info;
179180

@@ -243,7 +244,8 @@ xf86_whack_gamma (int screen,
243244
# endif /* !HAVE_XF86VMODE_GAMMA_RAMP */
244245
}
245246

246-
gdk_flush ();
247+
display = gdk_display_get_default ();
248+
gdk_display_flush (display);
247249

248250
return status;
249251
}

src/gs-grab-x11.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ gs_grab_release (GSGrab *grab, gboolean flush)
259259
/* FIXME: is it right to enable this? */
260260
xorg_lock_smasher_set_active (grab, TRUE);
261261

262-
gdk_display_sync (gdk_display_get_default ());
263-
gdk_flush ();
262+
gdk_display_sync (display);
263+
gdk_display_flush (display);
264264
}
265265
}
266266

@@ -345,13 +345,13 @@ gs_grab_nuke_focus (GdkDisplay *display)
345345

346346
gs_debug ("Nuking focus");
347347

348-
gdk_error_trap_push ();
348+
gdk_x11_display_error_trap_push (display);
349349

350350
XGetInputFocus (GDK_DISPLAY_XDISPLAY (display), &focus, &rev);
351351
XSetInputFocus (GDK_DISPLAY_XDISPLAY (display), None,
352352
RevertToNone, CurrentTime);
353353

354-
gdk_error_trap_pop_ignored ();
354+
gdk_x11_display_error_trap_pop_ignored (display);
355355
}
356356

357357
gboolean
@@ -461,7 +461,7 @@ gs_grab_move_to_window (GSGrab *grab,
461461
{
462462
result = gs_grab_move (grab, window, display,
463463
no_pointer_grab, hide_cursor);
464-
gdk_flush ();
464+
gdk_display_flush (display);
465465
}
466466
}
467467

src/gs-manager.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ manager_maybe_grab_window (GSManager *manager,
11741174
gdk_device_get_position (device, NULL, &x, &y);
11751175
monitor = gdk_display_get_monitor_at_point (display, x, y);
11761176

1177-
gdk_flush ();
1177+
gdk_display_flush (display);
11781178
grabbed = FALSE;
11791179
if (gs_window_get_display (window) == display &&
11801180
gs_window_get_monitor (window) == monitor)
@@ -1638,7 +1638,7 @@ on_screen_monitors_changed (GdkScreen *screen,
16381638
gs_manager_request_unlock (manager);
16391639
}
16401640

1641-
gdk_flush ();
1641+
gdk_display_flush (display);
16421642
gdk_x11_ungrab_server ();
16431643
}
16441644
}

src/gs-window-x11.c

+22-11
Original file line numberDiff line numberDiff line change
@@ -232,16 +232,19 @@ static void
232232
widget_clear_all_children (GtkWidget *widget)
233233
{
234234
GdkWindow *w;
235+
GdkDisplay *display;
235236

236237
gs_debug ("Clearing all child windows");
238+
display = gtk_widget_get_display (widget);
237239

238-
gdk_error_trap_push ();
240+
gdk_x11_display_error_trap_push (display);
239241

240242
w = gtk_widget_get_window (widget);
241243

242244
clear_children (GDK_WINDOW_XID (w));
243245

244-
gdk_error_trap_pop_ignored ();
246+
gdk_x11_display_error_trap_pop_ignored (display);
247+
245248
}
246249

247250
void
@@ -267,6 +270,7 @@ gs_window_set_background_surface (GSWindow *window,
267270
void
268271
gs_window_clear (GSWindow *window)
269272
{
273+
GdkDisplay *display;
270274
g_return_if_fail (GS_IS_WINDOW (window));
271275

272276
gs_debug ("Clearing widgets");
@@ -285,7 +289,8 @@ gs_window_clear (GSWindow *window)
285289
widget_clear_all_children (window->priv->drawing_area);
286290
}
287291

288-
gdk_flush ();
292+
display = gtk_widget_get_display (GTK_WIDGET(window));
293+
gdk_display_flush (display);
289294
}
290295

291296
static cairo_region_t *
@@ -764,16 +769,19 @@ select_popup_events (void)
764769
{
765770
XWindowAttributes attr;
766771
unsigned long events;
772+
GdkDisplay *display;
767773

768-
gdk_error_trap_push ();
774+
display = gdk_display_get_default ();
775+
776+
gdk_x11_display_error_trap_push (display);
769777

770778
memset (&attr, 0, sizeof (attr));
771-
XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_ROOT_WINDOW (), &attr);
779+
XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (display), GDK_ROOT_WINDOW (), &attr);
772780

773781
events = SubstructureNotifyMask | attr.your_event_mask;
774-
XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_ROOT_WINDOW (), events);
782+
XSelectInput (GDK_DISPLAY_XDISPLAY (display), GDK_ROOT_WINDOW (), events);
775783

776-
gdk_error_trap_pop_ignored ();
784+
gdk_x11_display_error_trap_pop_ignored (display);
777785
}
778786

779787
static void
@@ -782,15 +790,18 @@ window_select_shape_events (GSWindow *window)
782790
#ifdef HAVE_SHAPE_EXT
783791
unsigned long events;
784792
int shape_error_base;
793+
GdkDisplay *display;
794+
795+
display = gtk_widget_get_display (GTK_WIDGET(window));
785796

786-
gdk_error_trap_push ();
797+
gdk_x11_display_error_trap_push (display);
787798

788-
if (XShapeQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &window->priv->shape_event_base, &shape_error_base)) {
799+
if (XShapeQueryExtension (GDK_DISPLAY_XDISPLAY (display), &window->priv->shape_event_base, &shape_error_base)) {
789800
events = ShapeNotifyMask;
790-
XShapeSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))), events);
801+
XShapeSelectInput (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))), events);
791802
}
792803

793-
gdk_error_trap_pop_ignored ();
804+
gdk_x11_display_error_trap_pop_ignored (display);
794805
#endif
795806
}
796807

0 commit comments

Comments
 (0)