Updated Translation

[~andy/gtk] / gdk / gdktypes.h

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index ba78b047254782535fd6eaeeeec2a126f90dabfc..648bb40e3967075f5a6c80b91b6b23b94fdb4d8d 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -51,17 +51,12 @@
 #include <gdkconfig.h>
 
 /* some common magic values */
-#define GDK_NONE            0L
 #define GDK_CURRENT_TIME     0L
 #define GDK_PARENT_RELATIVE  1L
 
-/* special deviceid for core pointer events */
-#define GDK_CORE_POINTER 0xfedc
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 /* Type definitions for the basic structures.
@@ -69,6 +64,7 @@ extern "C" {
 typedef struct _GdkPoint             GdkPoint;
 typedef struct _GdkRectangle         GdkRectangle;
 typedef struct _GdkSegment           GdkSegment;
+typedef struct _GdkSpan                      GdkSpan;
 
 /*
  * Note that on some platforms the wchar_t type
@@ -76,7 +72,14 @@ typedef struct _GdkSegment         GdkSegment;
  * on Win32, wchar_t is unsigned short.
  */
 typedef guint32                            GdkWChar;
-typedef gulong                     GdkAtom;
+
+typedef struct _GdkAtom            *GdkAtom;
+
+#define GDK_ATOM_TO_POINTER(atom) (atom)
+#define GDK_POINTER_TO_ATOM(ptr)  ((GdkAtom)(ptr))
+
+#define _GDK_MAKE_ATOM(val) ((GdkAtom)GUINT_TO_POINTER(val))
+#define GDK_NONE            _GDK_MAKE_ATOM (0)
 
 #ifdef GDK_NATIVE_WINDOW_POINTER
 typedef gpointer GdkNativeWindow;
@@ -99,6 +102,8 @@ typedef struct _GdkDrawable           GdkDrawable;
 typedef struct _GdkDrawable           GdkBitmap;
 typedef struct _GdkDrawable           GdkPixmap;
 typedef struct _GdkDrawable           GdkWindow;
+typedef struct _GdkDisplay           GdkDisplay;
+typedef struct _GdkScreen            GdkScreen;
 
 typedef enum
 {
@@ -123,10 +128,18 @@ typedef enum
   GDK_BUTTON3_MASK  = 1 << 10,
   GDK_BUTTON4_MASK  = 1 << 11,
   GDK_BUTTON5_MASK  = 1 << 12,
-  /* The next few modifiers are used by XKB, so we skip to the end
+
+  /* The next few modifiers are used by XKB, so we skip to the end.
+   * Bits 15 - 25 are currently unused. Bit 29 is used internally.
    */
-  GDK_RELEASE_MASK  = 1 << 31,
-  GDK_MODIFIER_MASK = GDK_RELEASE_MASK | 0x1fff
+  
+  GDK_SUPER_MASK    = 1 << 26,
+  GDK_HYPER_MASK    = 1 << 27,
+  GDK_META_MASK     = 1 << 28,
+  
+  GDK_RELEASE_MASK  = 1 << 30,
+
+  GDK_MODIFIER_MASK = 0x5c001fff
 } GdkModifierType;
 
 typedef enum
@@ -186,9 +199,14 @@ struct _GdkSegment
   gint y2;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+struct _GdkSpan
+{
+  gint x;
+  gint y;
+  gint width;
+};
+
+G_END_DECLS
 
 
 #endif /* __GDK_TYPES_H__ */