commit 1e55671

Michael Forney  ·  2013-09-13 00:22:36 +0000 UTC
parent a499465
Style
1 files changed,  +8, -12
+8, -12
 1@@ -92,18 +92,13 @@ static void handle_key(struct swc_seat * seat, uint32_t time, uint32_t key,
 2     }
 3 
 4     /* See if the key press is not handled by the compositor */
 5-    if (!(keyboard->handler && keyboard->handler->key)
 6-        || !keyboard->handler->key(keyboard, time, key, state))
 7+    if ((!keyboard->handler || !keyboard->handler->key
 8+         || !keyboard->handler->key(keyboard, time, key, state))
 9+        && keyboard->focus.resource)
10     {
11-        if (keyboard->focus.resource)
12-        {
13-            serial = wl_display_next_serial(display);
14-            wl_keyboard_send_key(keyboard->focus.resource, serial, time,
15-                                 key, state);
16-
17-            if (state == WL_KEYBOARD_KEY_STATE_PRESSED)
18-                printf("\t-> sent to client\n");
19-        }
20+        serial = wl_display_next_serial(display);
21+        wl_keyboard_send_key(keyboard->focus.resource, serial, time,
22+                             key, state);
23     }
24 
25     /* Update XKB state. Apparently the keycodes are offset by 8 in XKB. */
26@@ -391,9 +386,10 @@ void swc_seat_finish(struct swc_seat * seat)
27     if (seat->capabilities & WL_SEAT_CAPABILITY_POINTER)
28         swc_pointer_finish(&seat->pointer);
29 
30-    free(seat->name);
31     swc_xkb_finish(&seat->xkb);
32 
33+    free(seat->name);
34+
35     wl_list_for_each_safe(entry, tmp, &seat->devices, link)
36     {
37         swc_evdev_device_finish(&entry->device);