[Xfce4-commits] [xfce/xfwm4] 01/03: display: Add convenient display functions

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   l   i   v   i   e   r       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfwm4.

commit 84926d2868b19c60831b319249226e1448ff0227
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Apr 4 21:27:09 2018 +0200

    display: Add convenient display functions
    
    This adds:
      myDisplayErrorTrapPush()
      myDisplayErrorTrapPop()
      myDisplayErrorTrapPopIgnored()
      myDisplayBeep()
      myDisplayGetKeymap()
    
    Se we don't have to check for gtk+ version all over the place.
---
 src/display.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/display.h |  5 +++++
 2 files changed, 58 insertions(+)

diff --git a/src/display.c b/src/display.c
index 0b1de7e..95e2e8c 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1020,3 +1020,56 @@ myDisplayTestXrender (DisplayInfo *display, gdouble min_time)
     return FALSE;
 #endif /* HAVE_RENDER */
 }
+
+void
+myDisplayErrorTrapPush (DisplayInfo *display_info)
+{
+#if GTK_CHECK_VERSION(3, 22, 0)
+    gdk_x11_display_error_trap_push (display_info->gdisplay);
+#else
+    gdk_error_trap_push ();
+#endif
+}
+
+gint
+myDisplayErrorTrapPop (DisplayInfo *display_info)
+{
+#if GTK_CHECK_VERSION(3, 22, 0)
+    gdk_display_flush (display_info->gdisplay);
+    return gdk_x11_display_error_trap_pop (display_info->gdisplay);
+#else
+    gdk_flush ();
+    return gdk_error_trap_pop ();
+#endif
+}
+
+void
+myDisplayErrorTrapPopIgnored (DisplayInfo *display_info)
+{
+#if GTK_CHECK_VERSION(3, 22, 0)
+    gdk_x11_display_error_trap_pop_ignored (display_info->gdisplay);
+#else
+    gdk_error_trap_pop_ignored ();
+#endif
+}
+
+void
+myDisplayBeep (DisplayInfo *display_info)
+{
+#if GTK_CHECK_VERSION(3, 22, 0)
+    gdk_display_beep (display_info->gdisplay);;
+#else
+    gdk_beep ();
+#endif
+}
+
+GdkKeymap *
+myDisplayGetKeymap (DisplayInfo *display_info)
+{
+#if GTK_CHECK_VERSION(3, 22, 0)
+    return gdk_keymap_get_for_display (display_info->gdisplay);
+#else
+    return gdk_keymap_get_default ();
+#endif
+}
+
diff --git a/src/display.h b/src/display.h
index 37c2086..1d5354a 100644
--- a/src/display.h
+++ b/src/display.h
@@ -421,5 +421,10 @@ void                     myDisplayUpdateLastUserTime            (DisplayInfo *,
                                                                  guint32);
 gboolean                 myDisplayTestXrender                   (DisplayInfo *,
                                                                  gdouble);
+void                     myDisplayErrorTrapPush                 (DisplayInfo *);
+gint                     myDisplayErrorTrapPop                  (DisplayInfo *);
+void                     myDisplayErrorTrapPopIgnored           (DisplayInfo *);
+void                     myDisplayBeep                          (DisplayInfo *);
+GdkKeymap               *myDisplayGetKeymap                     (DisplayInfo *);
 
 #endif /* INC_DISPLAY_H */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.