commit cae8594

Michael Forney  ·  2014-02-07 11:59:50 +0000 UTC
parent 9ce1388
Style
1 files changed,  +3, -12
+3, -12
 1@@ -125,38 +125,29 @@ static void handle_view_event(struct wl_listener * listener, void * data)
 2     struct swc_event * event = data;
 3     struct swc_view_event_data * event_data = event->data;
 4     struct swc_view * view = event_data->view;
 5+    struct screen * screen;
 6 
 7     switch (event->type)
 8     {
 9         case SWC_VIEW_EVENT_MOVED:
10-        {
11-            struct screen * screen;
12-
13             wl_list_for_each(screen, &swc.screens, link)
14             {
15                 swc_view_move(&screen->planes.cursor.view,
16                               view->geometry.x, view->geometry.y);
17             }
18             break;
19-        }
20         case SWC_VIEW_EVENT_SCREENS_CHANGED:
21-        {
22-            struct screen * screen;
23-            uint32_t entered = event_data->screens_changed.entered,
24-                     left = event_data->screens_changed.left;
25-
26             wl_list_for_each(screen, &swc.screens, link)
27             {
28-                if (entered & screen_mask(screen))
29+                if (event_data->screens_changed.entered & screen_mask(screen))
30                 {
31                     swc_view_attach(&screen->planes.cursor.view,
32                                     pointer->cursor.buffer);
33                 }
34-                else if (left & screen_mask(screen))
35+                else if (event_data->screens_changed.left & screen_mask(screen))
36                     swc_view_attach(&screen->planes.cursor.view, NULL);
37             }
38             break;
39-        }
40     }
41 }
42