diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-12-10 21:55:56 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:06:58 -0500 |
| commit | ff8a334725e95fda2e0c500b55955e1cd311bf98 (patch) | |
| tree | 697740661e1c7299caa353ef24164bdfc300fda8 /gdk/gdkdeviceprivate.h | |
| parent | b5df501296e01e406420f89602896d061fc59b6f (diff) | |
| download | gtk+-ff8a334725e95fda2e0c500b55955e1cd311bf98.tar.gz | |
Hide GdkDevice struct
Once its hidden, we can kill the GdkDevicePrivate struct too.
Diffstat (limited to 'gdk/gdkdeviceprivate.h')
| -rw-r--r-- | gdk/gdkdeviceprivate.h | 56 |
1 files changed, 43 insertions, 13 deletions
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index 53536510d8..bf0245a42f 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -20,8 +20,9 @@ #ifndef __GDK_DEVICE_PRIVATE_H__ #define __GDK_DEVICE_PRIVATE_H__ -#include <gdk/gdkdevice.h> -#include <gdk/gdkevents.h> +#include "gdkdevicemanager.h" +#include "gdkdevice.h" +#include "gdkevents.h" G_BEGIN_DECLS @@ -31,21 +32,50 @@ G_BEGIN_DECLS typedef struct _GdkDeviceClass GdkDeviceClass; +typedef struct _GdkDeviceKey GdkDeviceKey; + +struct _GdkDeviceKey +{ + guint keyval; + GdkModifierType modifiers; +}; + +struct _GdkDevice +{ + GObject parent_instance; + + gchar *name; + GdkInputSource source; + GdkInputMode mode; + gboolean has_cursor; + gint num_keys; + GdkDeviceKey *keys; + GdkDeviceManager *manager; + GdkDisplay *display; + /* Paired master for master, + * associated master for slaves + */ + GdkDevice *associated; + GList *slaves; + GdkDeviceType type; + GArray *axes; +}; + struct _GdkDeviceClass { GObjectClass parent_class; - gboolean (* get_history) (GdkDevice *device, - GdkWindow *window, - guint32 start, - guint32 stop, - GdkTimeCoord ***events, - gint *n_events); - - void (* get_state) (GdkDevice *device, - GdkWindow *window, - gdouble *axes, - GdkModifierType *mask); + gboolean (* get_history) (GdkDevice *device, + GdkWindow *window, + guint32 start, + guint32 stop, + GdkTimeCoord ***events, + gint *n_events); + + void (* get_state) (GdkDevice *device, + GdkWindow *window, + gdouble *axes, + GdkModifierType *mask); void (* set_window_cursor) (GdkDevice *device, GdkWindow *window, |