GNOME.org
 

[gtkmm] Widget: Add get_modifier_mask().

commit 412431c6a25d6689406b1a83843020aa995ebb70
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Mar 3 19:42:56 2012 +0100

    Widget: Add get_modifier_mask().
    
    * gdk/src/gdk_enums.defs: Regenerate.
    * gdk/src/gdk_signals.defs: Regenerate.
    * gdk/src/types.hg: Add the ModifierIntent enum.
    * tools/m4/convert_gdk.m4: Mention the new enum.
    * gtk/src/widget.hg: Add get_modifier_mask().

 ChangeLog                      |   10 ++
 gdk/src/gdk_enums.defs         |  192 ++++++++++++++++++++++++++++++++++++++--
 gdk/src/gdk_extra_objects.defs |    6 ++
 gdk/src/gdk_signals.defs       |    4 +-
 gdk/src/types.hg               |    1 +
 gtk/src/widget.hg              |    2 +
 tools/m4/convert_gdk.m4        |    1 +
 7 files changed, 205 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 772e4c9..7dc6176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2012-03-03  Murray Cumming  <murrayc murrayc com>
 
+	Widget: Add get_modifier_mask().
+
+	* gdk/src/gdk_enums.defs: Regenerate.
+	* gdk/src/gdk_signals.defs: Regenerate.
+	* gdk/src/types.hg: Add the ModifierIntent enum.
+	* tools/m4/convert_gdk.m4: Mention the new enum.
+	* gtk/src/widget.hg: Add get_modifier_mask().
+
+2012-03-03  Murray Cumming  <murrayc murrayc com>
+
 	Image: Add set_from_resource().
 
 	* gtk/src/image.hg: Wrap gtk_image_set_from_resource().
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index a3fa168..0bb211d 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -199,7 +199,9 @@
 ;;   GDK_SOURCE_PEN,
 ;;   GDK_SOURCE_ERASER,
 ;;   GDK_SOURCE_CURSOR,
-;;   GDK_SOURCE_KEYBOARD
+;;   GDK_SOURCE_KEYBOARD,
+;;   GDK_SOURCE_TOUCHSCREEN,
+;;   GDK_SOURCE_TOUCHPAD
 ;; } GdkInputSource;
 
 (define-enum-extended InputSource
@@ -211,6 +213,8 @@
     '("eraser" "GDK_SOURCE_ERASER" "2")
     '("cursor" "GDK_SOURCE_CURSOR" "3")
     '("keyboard" "GDK_SOURCE_KEYBOARD" "4")
+    '("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "5")
+    '("touchpad" "GDK_SOURCE_TOUCHPAD" "6")
   )
 )
 
@@ -390,6 +394,10 @@
 ;;   GDK_OWNER_CHANGE      = 34,
 ;;   GDK_GRAB_BROKEN       = 35,
 ;;   GDK_DAMAGE            = 36,
+;;   GDK_TOUCH_BEGIN       = 37,
+;;   GDK_TOUCH_UPDATE      = 38,
+;;   GDK_TOUCH_END         = 39,
+;;   GDK_TOUCH_CANCEL      = 40,
 ;;   GDK_EVENT_LAST        /* helper variable for decls */
 ;; } GdkEventType;
 
@@ -434,7 +442,11 @@
     '("owner-change" "GDK_OWNER_CHANGE" "34")
     '("grab-broken" "GDK_GRAB_BROKEN" "35")
     '("damage" "GDK_DAMAGE" "36")
-    '("event-last" "GDK_EVENT_LAST" "37")
+    '("touch-begin" "GDK_TOUCH_BEGIN" "37")
+    '("touch-update" "GDK_TOUCH_UPDATE" "38")
+    '("touch-end" "GDK_TOUCH_END" "39")
+    '("touch-cancel" "GDK_TOUCH_CANCEL" "40")
+    '("event-last" "GDK_EVENT_LAST" "41")
   )
 )
 
@@ -462,7 +474,8 @@
 ;;   GDK_SCROLL_UP,
 ;;   GDK_SCROLL_DOWN,
 ;;   GDK_SCROLL_LEFT,
-;;   GDK_SCROLL_RIGHT
+;;   GDK_SCROLL_RIGHT,
+;;   GDK_SCROLL_SMOOTH
 ;; } GdkScrollDirection;
 
 (define-enum-extended ScrollDirection
@@ -473,6 +486,7 @@
     '("down" "GDK_SCROLL_DOWN" "1")
     '("left" "GDK_SCROLL_LEFT" "2")
     '("right" "GDK_SCROLL_RIGHT" "3")
+    '("smooth" "GDK_SCROLL_SMOOTH" "4")
   )
 )
 
@@ -508,7 +522,10 @@
 ;;   GDK_CROSSING_UNGRAB,
 ;;   GDK_CROSSING_GTK_GRAB,
 ;;   GDK_CROSSING_GTK_UNGRAB,
-;;   GDK_CROSSING_STATE_CHANGED
+;;   GDK_CROSSING_STATE_CHANGED,
+;;   GDK_CROSSING_TOUCH_BEGIN,
+;;   GDK_CROSSING_TOUCH_END,
+;;   GDK_CROSSING_DEVICE_SWITCH
 ;; } GdkCrossingMode;
 
 (define-enum-extended CrossingMode
@@ -521,6 +538,9 @@
     '("gtk-grab" "GDK_CROSSING_GTK_GRAB" "3")
     '("gtk-ungrab" "GDK_CROSSING_GTK_UNGRAB" "4")
     '("state-changed" "GDK_CROSSING_STATE_CHANGED" "5")
+    '("touch-begin" "GDK_CROSSING_TOUCH_BEGIN" "6")
+    '("touch-end" "GDK_CROSSING_TOUCH_END" "7")
+    '("device-switch" "GDK_CROSSING_DEVICE_SWITCH" "8")
   )
 )
 
@@ -549,7 +569,8 @@
 ;;   GDK_WINDOW_STATE_STICKY     = 1 << 3,
 ;;   GDK_WINDOW_STATE_FULLSCREEN = 1 << 4,
 ;;   GDK_WINDOW_STATE_ABOVE      = 1 << 5,
-;;   GDK_WINDOW_STATE_BELOW      = 1 << 6
+;;   GDK_WINDOW_STATE_BELOW      = 1 << 6,
+;;   GDK_WINDOW_STATE_FOCUSED    = 1 << 7
 ;; } GdkWindowState;
 
 (define-flags-extended WindowState
@@ -563,6 +584,7 @@
     '("fullscreen" "GDK_WINDOW_STATE_FULLSCREEN" "1 << 4")
     '("above" "GDK_WINDOW_STATE_ABOVE" "1 << 5")
     '("below" "GDK_WINDOW_STATE_BELOW" "1 << 6")
+    '("focused" "GDK_WINDOW_STATE_FOCUSED" "1 << 7")
   )
 )
 
@@ -602,6 +624,130 @@
   )
 )
 
+;; From gdkinternals.h
+
+;; Original typedef:
+;; typedef enum {
+;;   GDK_COLOR_WRITEABLE = 1 << 0
+;; } GdkColorInfoFlags;
+
+(define-flags-extended ColorInfoFlags
+  (in-module "Gdk")
+  (c-name "GdkColorInfoFlags")
+  (values
+    '("writeable" "GDK_COLOR_WRITEABLE" "1 << 0")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GDK_EVENT_FILTER_REMOVED = 1 << 0
+;; } GdkEventFilterFlags;
+
+(define-flags-extended EventFilterFlags
+  (in-module "Gdk")
+  (c-name "GdkEventFilterFlags")
+  (values
+    '("removed" "GDK_EVENT_FILTER_REMOVED" "1 << 0")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GDK_DEBUG_MISC          = 1 <<  0,
+;;   GDK_DEBUG_EVENTS        = 1 <<  1,
+;;   GDK_DEBUG_DND           = 1 <<  2,
+;;   GDK_DEBUG_XIM           = 1 <<  3,
+;;   GDK_DEBUG_NOGRABS       = 1 <<  4,
+;;   GDK_DEBUG_INPUT         = 1 <<  5,
+;;   GDK_DEBUG_CURSOR        = 1 <<  6,
+;;   GDK_DEBUG_MULTIHEAD     = 1 <<  7,
+;;   GDK_DEBUG_XINERAMA      = 1 <<  8,
+;;   GDK_DEBUG_DRAW          = 1 <<  9,
+;;   GDK_DEBUG_EVENTLOOP     = 1 << 10
+;; } GdkDebugFlag;
+
+(define-flags-extended DebugFlag
+  (in-module "Gdk")
+  (c-name "GdkDebugFlag")
+  (values
+    '("misc" "GDK_DEBUG_MISC" "1 << 0")
+    '("events" "GDK_DEBUG_EVENTS" "1 << 1")
+    '("dnd" "GDK_DEBUG_DND" "1 << 2")
+    '("xim" "GDK_DEBUG_XIM" "1 << 3")
+    '("nograbs" "GDK_DEBUG_NOGRABS" "1 << 4")
+    '("input" "GDK_DEBUG_INPUT" "1 << 5")
+    '("cursor" "GDK_DEBUG_CURSOR" "1 << 6")
+    '("multihead" "GDK_DEBUG_MULTIHEAD" "1 << 7")
+    '("xinerama" "GDK_DEBUG_XINERAMA" "1 << 8")
+    '("draw" "GDK_DEBUG_DRAW" "1 << 9")
+    '("eventloop" "GDK_DEBUG_EVENTLOOP" "1 << 10")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GDK_RENDERING_MODE_SIMILAR = 0,
+;;   GDK_RENDERING_MODE_IMAGE,
+;;   GDK_RENDERING_MODE_RECORDING
+;; } GdkRenderingMode;
+
+(define-enum-extended RenderingMode
+  (in-module "Gdk")
+  (c-name "GdkRenderingMode")
+  (values
+    '("similar" "GDK_RENDERING_MODE_SIMILAR" "0")
+    '("image" "GDK_RENDERING_MODE_IMAGE" "1")
+    '("recording" "GDK_RENDERING_MODE_RECORDING" "2")
+  )
+)
+
+;; Original typedef:
+;; typedef enum 
+;; {
+;;   GDK_ARG_STRING,
+;;   GDK_ARG_INT,
+;;   GDK_ARG_BOOL,
+;;   GDK_ARG_NOBOOL,
+;;   GDK_ARG_CALLBACK
+;; } GdkArgType;
+
+(define-enum-extended ArgType
+  (in-module "Gdk")
+  (c-name "GdkArgType")
+  (values
+    '("string" "GDK_ARG_STRING" "0")
+    '("int" "GDK_ARG_INT" "1")
+    '("bool" "GDK_ARG_BOOL" "2")
+    '("nobool" "GDK_ARG_NOBOOL" "3")
+    '("callback" "GDK_ARG_CALLBACK" "4")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   /* Following flag is set for events on the event queue during
+;;    * translation and cleared afterwards.
+;;    */
+;;   GDK_EVENT_PENDING = 1 << 0,
+;; 
+;;   /* The following flag is set for:
+;;    * 1) touch events emulating pointer events
+;;    * 2) pointer events being emulated by a touch sequence.
+;;    */
+;;   GDK_EVENT_POINTER_EMULATED = 1 << 1
+;; } GdkEventFlags;
+
+(define-flags-extended EventFlags
+  (in-module "Gdk")
+  (c-name "GdkEventFlags")
+  (values
+    '("pending" "GDK_EVENT_PENDING" "1 << 0")
+    '("pointer-emulated" "GDK_EVENT_POINTER_EMULATED" "1 << 1")
+  )
+)
+
 ;; From gdkproperty.h
 
 ;; Original typedef:
@@ -730,6 +876,30 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
+;;   GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR,
+;;   GDK_MODIFIER_INTENT_CONTEXT_MENU,
+;;   GDK_MODIFIER_INTENT_EXTEND_SELECTION,
+;;   GDK_MODIFIER_INTENT_MODIFY_SELECTION,
+;;   GDK_MODIFIER_INTENT_NO_TEXT_INPUT,
+;;   GDK_MODIFIER_INTENT_SHIFT_GROUP
+;; } GdkModifierIntent;
+
+(define-enum-extended ModifierIntent
+  (in-module "Gdk")
+  (c-name "GdkModifierIntent")
+  (values
+    '("primary-accelerator" "GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR" "0")
+    '("context-menu" "GDK_MODIFIER_INTENT_CONTEXT_MENU" "1")
+    '("extend-selection" "GDK_MODIFIER_INTENT_EXTEND_SELECTION" "2")
+    '("modify-selection" "GDK_MODIFIER_INTENT_MODIFY_SELECTION" "3")
+    '("no-text-input" "GDK_MODIFIER_INTENT_NO_TEXT_INPUT" "4")
+    '("shift-group" "GDK_MODIFIER_INTENT_SHIFT_GROUP" "5")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
 ;;   GDK_OK          = 0,
 ;;   GDK_ERROR       = -1,
 ;;   GDK_ERROR_PARAM = -2,
@@ -813,7 +983,9 @@
 ;;   GDK_PROXIMITY_OUT_MASK        = 1 << 19,
 ;;   GDK_SUBSTRUCTURE_MASK         = 1 << 20,
 ;;   GDK_SCROLL_MASK               = 1 << 21,
-;;   GDK_ALL_EVENTS_MASK           = 0x3FFFFE
+;;   GDK_TOUCH_MASK                = 1 << 22,
+;;   GDK_SMOOTH_SCROLL_MASK        = 1 << 23,
+;;   GDK_ALL_EVENTS_MASK           = 0xFFFFFE
 ;; } GdkEventMask;
 
 (define-flags-extended EventMask
@@ -841,7 +1013,9 @@
     '("proximity-out-mask" "GDK_PROXIMITY_OUT_MASK" "1 << 19")
     '("substructure-mask" "GDK_SUBSTRUCTURE_MASK" "1 << 20")
     '("scroll-mask" "GDK_SCROLL_MASK" "1 << 21")
-    '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0x3FFFFE")
+    '("touch-mask" "GDK_TOUCH_MASK" "1 << 22")
+    '("smooth-scroll-mask" "GDK_SMOOTH_SCROLL_MASK" "1 << 23")
+    '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0xFFFFFE")
   )
 )
 
@@ -876,8 +1050,8 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
-;;   GDK_INPUT_OUTPUT,
-;;   GDK_INPUT_ONLY
+;;   GDK_INPUT_OUTPUT, /*< nick=input-output >*/
+;;   GDK_INPUT_ONLY    /*< nick=input-only >*/
 ;; } GdkWindowWindowClass;
 
 (define-enum-extended WindowWindowClass
diff --git a/gdk/src/gdk_extra_objects.defs b/gdk/src/gdk_extra_objects.defs
index aa9ab66..c029236 100644
--- a/gdk/src/gdk_extra_objects.defs
+++ b/gdk/src/gdk_extra_objects.defs
@@ -24,6 +24,12 @@
   (gtype-id "GDK_TYPE_DISPLAY")
 )
 
+(define-object DragContext
+  (in-module "Gdk")
+  (c-name "GdkDragContext")
+  (gtype-id "GDK_TYPE_DRAG_CONTEXT")
+)
+
 (define-object Event
   (in-module "Gdk")
   (c-name "GdkEvent")
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index 0a3378f..964495b 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -153,13 +153,13 @@
 
 ;; From GdkScreen
 
-(define-signal size-changed
+(define-signal composited-changed
   (of-object "GdkScreen")
   (return-type "void")
   (when "last")
 )
 
-(define-signal composited-changed
+(define-signal size-changed
   (of-object "GdkScreen")
   (return-type "void")
   (when "last")
diff --git a/gdk/src/types.hg b/gdk/src/types.hg
index 290b423..ea1f35d 100644
--- a/gdk/src/types.hg
+++ b/gdk/src/types.hg
@@ -60,6 +60,7 @@ class Color;
 
 _WRAP_ENUM(ByteOrder, GdkByteOrder)
 _WRAP_ENUM(ModifierType, GdkModifierType)
+_WRAP_ENUM(ModifierIntent, GdkModifierIntent)
 _WRAP_ENUM(Status, GdkStatus)
 
 typedef GdkGeometry Geometry; //It's not used enough to justify having a wrapper.
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 94c45fb..5e90c56 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -530,6 +530,8 @@ public:
   _WRAP_METHOD(Glib::RefPtr<StyleContext> get_style_context(), gtk_widget_get_style_context, refreturn)
   _WRAP_METHOD(Glib::RefPtr<Gtk::StyleContext> get_style_context() const, gtk_widget_get_style_context, refreturn, constversion)
 
+  _WRAP_METHOD(Gdk::ModifierType get_modifier_mask(Gdk::ModifierIntent intent), gtk_widget_get_modifier_mask)
+
 
   _WRAP_SIGNAL(void show(),"show")
   _WRAP_SIGNAL(void hide(),"hide")
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index 9a3f5e5..1bddc36 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -50,6 +50,7 @@ _CONV_ENUM(Gdk,InterpType)
 _CONV_ENUM(Gdk,JoinStyle)
 _CONV_ENUM(Gdk,LineStyle)
 _CONV_ENUM(Gdk,ModifierType)
+_CONV_ENUM(Gdk,ModifierIntent)
 _CONV_ENUM(Gdk,OverlapType)
 _CONV_ENUM(Gdk,PixbufAlphaMode)
 _CONV_ENUM(Gdk,RgbDither)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]