diff options
author | Matthias Clasen <mclasen@redhat.com> | 2016-02-28 21:29:35 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2016-02-28 21:40:30 -0500 |
commit | ee217dc8236f0d7289f394b9954a9bc188738537 (patch) | |
tree | c4fb5b4b0f167908a9b0bb61b4288c4780f5d803 /gdk/x11 | |
parent | 2ad19c70ce41cf53b9de4606d114f6a13abd9bca (diff) | |
download | gtk+-ee217dc8236f0d7289f394b9954a9bc188738537.tar.gz |
Add and use GDK_CHECK_DEBUG macro
This is following what we've already done in GTK+. It avoids
direct access to _gdk_debug_flags all over the place.
Diffstat (limited to 'gdk/x11')
-rw-r--r-- | gdk/x11/gdkdevice-core-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdevice-xi2.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdevicemanager-core-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 4 | ||||
-rw-r--r-- | gdk/x11/gdkdnd-x11.c | 4 | ||||
-rw-r--r-- | gdk/x11/gdkscreen-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkvisual-x11.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c index 7b8fbd981f..8df9cced6b 100644 --- a/gdk/x11/gdkdevice-core-x11.c +++ b/gdk/x11/gdkdevice-core-x11.c @@ -345,7 +345,7 @@ gdk_x11_device_core_grab (GdkDevice *device, xconfine_to = GDK_WINDOW_XID (confine_to); #ifdef G_ENABLE_DEBUG - if (_gdk_debug_flags & GDK_DEBUG_NOGRABS) + if (GDK_DEBUG_CHECK (NOGRABS)) status = GrabSuccess; else #endif diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index ddeafa4182..cd1849c51e 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -447,7 +447,7 @@ gdk_x11_device_xi2_grab (GdkDevice *device, &mask.mask_len); #ifdef G_ENABLE_DEBUG - if (_gdk_debug_flags & GDK_DEBUG_NOGRABS) + if (GDK_DEBUG_CHECK (NOGRABS)) status = GrabSuccess; else #endif diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c index a16f931332..994d359903 100644 --- a/gdk/x11/gdkdevicemanager-core-x11.c +++ b/gdk/x11/gdkdevicemanager-core-x11.c @@ -179,7 +179,7 @@ translate_key_event (GdkDisplay *display, _gdk_x11_event_translate_keyboard_string (&event->key); #ifdef G_ENABLE_DEBUG - if (_gdk_debug_flags & GDK_DEBUG_EVENTS) + if (GDK_DEBUG_CHECK (EVENTS)) { g_message ("%s:\t\twindow: %ld key: %12s %d", event->type == GDK_KEY_PRESS ? "key press " : "key release", diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index c58c29b9df..64095b20e5 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -590,7 +590,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator, case VisibilityNotify: #ifdef G_ENABLE_DEBUG - if (_gdk_debug_flags & GDK_DEBUG_EVENTS) + if (GDK_DEBUG_CHECK (EVENTS)) switch (xevent->xvisibility.state) { case VisibilityFullyObscured: @@ -1236,7 +1236,7 @@ _gdk_wm_protocols_filter (GdkXEvent *xev, timings->complete = TRUE; #ifdef G_ENABLE_DEBUG - if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0) + if (GDK_DEBUG_CHECK (FRAMES)) _gdk_frame_clock_debug_print_timings (clock, timings); #endif /* G_ENABLE_DEBUG */ } diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index ed923baf1d..eceb8e9b55 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -1500,7 +1500,7 @@ xdnd_read_actions (GdkX11DragContext *context_x11) context_x11->xdnd_have_actions = TRUE; #ifdef G_ENABLE_DEBUG - if (_gdk_debug_flags & GDK_DEBUG_DND) + if (GDK_DEBUG_CHECK (DND)) { GString *action_str = g_string_new (NULL); if (context->actions & GDK_ACTION_MOVE) @@ -1763,7 +1763,7 @@ xdnd_enter_filter (GdkXEvent *xev, } #ifdef G_ENABLE_DEBUG - if (_gdk_debug_flags & GDK_DEBUG_DND) + if (GDK_DEBUG_CHECK (DND)) print_target_list (context->targets); #endif /* G_ENABLE_DEBUG */ diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index b0c3cd6db4..82b8aa2132 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -526,7 +526,7 @@ init_fake_xinerama (GdkScreen *screen) Window win; gint w, h; - if (!(_gdk_debug_flags & GDK_DEBUG_XINERAMA)) + if (!GDK_DEBUG_CHECK (XINERAMA)) return FALSE; /* Fake Xinerama mode by splitting the screen into 4 monitors. diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index e59ebf761e..81479d81f4 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -248,7 +248,7 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) } #ifdef G_ENABLE_DEBUG - if (_gdk_debug_flags & GDK_DEBUG_MISC) + if (GDK_DEBUG_CHECK (MISC)) { static const gchar *const visual_names[] = { diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 91a4e193f1..beb08a5da2 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -407,7 +407,7 @@ gdk_x11_window_end_frame (GdkWindow *window) if (impl->toplevel->current_counter_value % 2 == 1) { #ifdef G_ENABLE_DEBUG - if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0) + if (GDK_DEBUG_CHECK (FRAMES)) { XImage *image = XGetImage (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window), |