swc

commit 9d4ba7fd73bc3a0b32d1fe859d0bd19af525a6f6
parent b076b2d79ddd8717e952b4bf62dea652a38cec10
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 25 Feb 2014 19:42:51 -0800

pointer, keyboard: Use display global

Diffstat:
M
libswc/keyboard.c
 | 
19
+++++--------------
M
libswc/pointer.c
 | 
12
++----------

2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/libswc/keyboard.c b/libswc/keyboard.c
@@ -27,6 +27,7 @@
 
 #include "swc.h"
 #include "compositor.h"
+#include "internal.h"
 #include "keyboard.h"
 #include "util.h"
 
@@ -36,16 +37,11 @@
 static void enter(struct input_focus_handler * handler,
                   struct wl_resource * resource, struct compositor_view * view)
 {
-    struct keyboard * keyboard;
-    struct wl_client * client;
-    struct wl_display * display;
+    struct keyboard * keyboard
+        = CONTAINER_OF(handler, typeof(*keyboard), focus_handler);
     uint32_t serial;
 
-    keyboard = CONTAINER_OF(handler, typeof(*keyboard), focus_handler);
-    client = wl_resource_get_client(resource);
-    display = wl_client_get_display(client);
-    serial = wl_display_next_serial(display);
-
+    serial = wl_display_next_serial(swc.display);
     wl_keyboard_send_enter(resource, serial, view->surface->resource,
                            &keyboard->client_handler.keys);
 }
@@ -53,14 +49,9 @@ static void enter(struct input_focus_handler * handler,
 static void leave(struct input_focus_handler * handler,
                   struct wl_resource * resource, struct compositor_view * view)
 {
-    struct wl_client * client;
-    struct wl_display * display;
     uint32_t serial;
 
-    client = wl_resource_get_client(resource);
-    display = wl_client_get_display(client);
-    serial = wl_display_next_serial(display);
-
+    serial = wl_display_next_serial(swc.display);
     wl_keyboard_send_leave(resource, serial, view->surface->resource);
 }
 
diff --git a/libswc/pointer.c b/libswc/pointer.c
@@ -38,15 +38,11 @@ static void enter(struct input_focus_handler * handler,
                   struct wl_resource * resource, struct compositor_view * view)
 {
     struct pointer * pointer;
-    struct wl_client * client;
-    struct wl_display * display;
     uint32_t serial;
     wl_fixed_t surface_x, surface_y;
 
     pointer = CONTAINER_OF(handler, typeof(*pointer), focus_handler);
-    client = wl_resource_get_client(resource);
-    display = wl_client_get_display(client);
-    serial = wl_display_next_serial(display);
+    serial = wl_display_next_serial(swc.display);
 
     surface_x = pointer->x - wl_fixed_from_int(view->base.geometry.x);
     surface_y = pointer->y - wl_fixed_from_int(view->base.geometry.y);
@@ -58,13 +54,9 @@ static void enter(struct input_focus_handler * handler,
 static void leave(struct input_focus_handler * handler,
                   struct wl_resource * resource, struct compositor_view * view)
 {
-    struct wl_client * client;
-    struct wl_display * display;
     uint32_t serial;
 
-    client = wl_resource_get_client(resource);
-    display = wl_client_get_display(client);
-    serial = wl_display_next_serial(display);
+    serial = wl_display_next_serial(swc.display);
 
     wl_pointer_send_leave(resource, serial, view->surface->resource);
 }