diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2014-05-27 11:42:35 +0200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2014-06-17 13:45:30 +1200 |
commit | b73b191e08757fdeba14c0d2d1f6ccf9e77953a9 (patch) | |
tree | dcd3c9056d65d93c65a141c895d2ecc37473abc0 | |
parent | 40207471d58246465c4bd3f6f7e539ad818b199b (diff) | |
download | gtk+-b73b191e08757fdeba14c0d2d1f6ccf9e77953a9.tar.gz |
Get menus working (sort of)
-rw-r--r-- | gdk/mir/gdkmirpointer.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gdk/mir/gdkmirpointer.c b/gdk/mir/gdkmirpointer.c index 9db4d9bcf0..3b4fcc966d 100644 --- a/gdk/mir/gdkmirpointer.c +++ b/gdk/mir/gdkmirpointer.c @@ -19,6 +19,7 @@ #include "gdkdeviceprivate.h" #include "gdkscreen.h" +#include "gdkwindow.h" typedef struct GdkMirPointer GdkMirPointer; typedef struct GdkMirPointerClass GdkMirPointerClass; @@ -101,16 +102,16 @@ gdk_mir_pointer_get_state (GdkDevice *device, gdouble *axes, GdkModifierType *mask) { - g_printerr ("gdk_mir_pointer_get_state\n"); + //g_printerr ("gdk_mir_pointer_get_state\n"); GdkMirPointer *p = GDK_MIR_POINTER (device); + gdouble x, y; + gdk_window_get_device_position_double (window, device, &x, &y, mask); if (axes) { axes[0] = p->x; axes[1] = p->y; } - if (mask) - *mask = p->modifier_mask; } static void @@ -118,7 +119,7 @@ gdk_mir_pointer_set_window_cursor (GdkDevice *device, GdkWindow *window, GdkCursor *cursor) { - g_printerr ("gdk_mir_pointer_set_window_cursor\n"); + //g_printerr ("gdk_mir_pointer_set_window_cursor\n"); /* Mir doesn't support cursors */ } @@ -128,7 +129,7 @@ gdk_mir_pointer_warp (GdkDevice *device, gdouble x, gdouble y) { - g_printerr ("gdk_mir_pointer_warp\n"); + //g_printerr ("gdk_mir_pointer_warp\n"); /* Mir doesn't support warping */ } @@ -143,7 +144,7 @@ gdk_mir_pointer_query_state (GdkDevice *device, gdouble *win_y, GdkModifierType *mask) { - g_printerr ("gdk_mir_pointer_query_state\n"); + //g_printerr ("gdk_mir_pointer_query_state\n"); GdkMirPointer *p = GDK_MIR_POINTER (device); if (root_window) |