Changes in uspace/srv/hid/compositor/compositor.c [fbb2d0d:3b98311] in mainline

File:

• uspace/srv/hid/compositor/compositor.c (modified) (17 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -143 +143 @@
 static LIST_INITIALIZE(viewport_list);
 
-static FIBRIL_MUTEX_INITIALIZE(discovery_mtx);
-
 /** Input server proxy */
 static input_t *input;
@@ -337 +335 @@
         }
 
-        list_foreach(viewport_list, link, viewport_t, vp) {
+        list_foreach(viewport_list, link) {
+                viewport_t *vp = list_get_instance(link, viewport_t, link);
                 sysarg_t w_vp, h_vp;
                 surface_get_resolution(vp->surface, &w_vp, &h_vp);
@@ -355 +354 @@
         fibril_mutex_lock(&pointer_list_mtx);
 
-        list_foreach(pointer_list, link, pointer_t, ptr) {
+        list_foreach(pointer_list, link) {
+                pointer_t *ptr = list_get_instance(link, pointer_t, link);
                 ptr->pos.x = ptr->pos.x > viewport_bound_rect.x ? ptr->pos.x : viewport_bound_rect.x;
                 ptr->pos.y = ptr->pos.y > viewport_bound_rect.y ? ptr->pos.y : viewport_bound_rect.y;
@@ -374 +374 @@
         fibril_mutex_lock(&pointer_list_mtx);
 
-        list_foreach(viewport_list, link, viewport_t, vp) {
+        list_foreach(viewport_list, link) {
+
                 /* Determine what part of the viewport must be updated. */
+                viewport_t *vp = list_get_instance(link, viewport_t, link);
                 sysarg_t x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp;
                 surface_get_resolution(vp->surface, &w_dmg_vp, &h_dmg_vp);
@@ -444 +446 @@
                         }
 
-                        list_foreach(pointer_list, link, pointer_t, ptr) {
+                        list_foreach(pointer_list, link) {
+
+                                pointer_t *ptr = list_get_instance(link, pointer_t, link);
                                 if (ptr->ghost.surface) {
 
@@ -518 +522 @@
                         }
 
-                        list_foreach(pointer_list, link, pointer_t, ptr) {
+                        list_foreach(pointer_list, link) {
 
                                 /* Determine what part of the pointer intersects with the
                                  * updated area of the current viewport. */
+                                pointer_t *ptr = list_get_instance(link, pointer_t, link);
                                 sysarg_t x_dmg_ptr, y_dmg_ptr, w_dmg_ptr, h_dmg_ptr;
                                 surface_t *sf_ptr = ptr->cursor.states[ptr->state];
@@ -564 +569 @@
 
         /* Notify visualizers about updated regions. */
-        list_foreach(viewport_list, link, viewport_t, vp) {
+        list_foreach(viewport_list, link) {
+                viewport_t *vp = list_get_instance(link, viewport_t, link);
                 sysarg_t x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp;
                 surface_get_damaged_region(vp->surface, &x_dmg_vp, &y_dmg_vp, &w_dmg_vp, &h_dmg_vp);
@@ -625 +631 @@
 
         fibril_mutex_lock(&pointer_list_mtx);
-        list_foreach(pointer_list, link, pointer_t, pointer) {
+        list_foreach(pointer_list, link) {
+                pointer_t *pointer = list_get_instance(link, pointer_t, link);
                 if (pointer->id == pos_id) {
                         pointer->grab_flags = pointer->pressed ? grab_flags : GF_EMPTY;
@@ -703 +710 @@
 {
         fibril_mutex_lock(&window_list_mtx);
-
-        list_foreach(window_list, link, window_t, window) {
+        window_t *window = NULL;
+        list_foreach(window_list, link) {
+                window = list_get_instance(link, window_t, link);
                 if (window == target) {
                         prodcons_produce(&window->queue, &event->link);
-                        fibril_mutex_unlock(&window_list_mtx);
-                        return;
-                }
-        }
-
+                }
+        }
+        if (!window) {
+                free(event);
+        }
         fibril_mutex_unlock(&window_list_mtx);
-        free(event);
 }
 
@@ -856 +863 @@
         window_t *win = NULL;
         fibril_mutex_lock(&window_list_mtx);
-        list_foreach(window_list, link, window_t, cur) {
+        list_foreach(window_list, link) {
+                window_t *cur = list_get_instance(link, window_t, link);
                 if (cur->in_dsid == service_id || cur->out_dsid == service_id) {
                         win = cur;
@@ -999 +1007 @@
                 /* Close all clients and their windows. */
                 fibril_mutex_lock(&window_list_mtx);
-                list_foreach(window_list, link, window_t, win) {
+                list_foreach(window_list, link) {
+                        window_t *win = list_get_instance(link, window_t, link);
                         window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
                         if (event) {
@@ -1025 +1034 @@
         viewport_t *vp = NULL;
         fibril_mutex_lock(&viewport_list_mtx);
-        list_foreach(viewport_list, link, viewport_t, cur) {
+        list_foreach(viewport_list, link) {
+                viewport_t *cur = list_get_instance(link, viewport_t, link);
                 if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
                         vp = cur;
@@ -1561 +1571 @@
 
         /* Determine the window which the mouse click belongs to. */
-        list_foreach(window_list, link, window_t, cw) {
-                win = cw;
+        list_foreach(window_list, link) {
+                win = list_get_instance(link, window_t, link);
                 if (win->surface) {
                         surface_get_resolution(win->surface, &width, &height);
@@ -2116 +2126 @@
 }
 
-static int discover_viewports(void)
-{
+static int compositor_srv_init(char *input_svc, char *name)
+{
+        /* Coordinates of the central pixel. */
+        coord_origin = UINT32_MAX / 4;
+        
+        /* Color of the viewport background. Must be opaque. */
+        bg_color = PIXEL(255, 75, 70, 75);
+        
+        /* Register compositor server. */
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Unable to register server (%s)\n", NAME, str_error(rc));
+                return -1;
+        }
+        
+        /* Register interrupt handler to switch back from kconsole. */
+        async_set_interrupt_received(interrupt_received);
+        rc = event_subscribe(EVENT_KCONSOLE, 0);
+        if (rc != EOK) {
+                printf("%s: Failed to register kconsole notifications (%s)\n",
+                    NAME, str_error(rc));
+        }
+        
+        server_name = name;
+        
+        char svc[LOC_NAME_MAXLEN + 1];
+        snprintf(svc, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, server_name);
+        
+        service_id_t service_id;
+        rc = loc_service_register(svc, &service_id);
+        if (rc != EOK) {
+                printf("%s: Unable to register service %s\n", NAME, svc);
+                return rc;
+        }
+        
+        /* Prepare window registrator (entrypoint for clients). */
+        char winreg[LOC_NAME_MAXLEN + 1];
+        snprintf(winreg, LOC_NAME_MAXLEN, "%s%s/winreg", NAMESPACE, server_name);
+        if (loc_service_register(winreg, &winreg_id) != EOK) {
+                printf("%s: Unable to register service %s\n", NAME, winreg);
+                return -1;
+        }
+
+        /* Establish input bidirectional connection. */
+        rc = input_connect(input_svc);
+        if (rc != EOK)
+                return rc;
+
         /* Create viewports and connect them to visualizers. */
         category_id_t cat_id;
-        int rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
+        rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                printf("%s: Failed to get visualizer category.\n", NAME);
+                input_disconnect();
                 return -1;
         }
@@ -2130 +2187 @@
         rc = loc_category_get_svcs(cat_id, &svcs, &svcs_cnt);
         if (rc != EOK || svcs_cnt == 0) {
-                printf("%s: Failed to get visualizer category services.\n", NAME);
+                input_disconnect();
                 return -1;
         }
-
-        fibril_mutex_lock(&viewport_list_mtx);  
+        
         for (size_t i = 0; i < svcs_cnt; ++i) {
-                bool exists = false;
-                list_foreach(viewport_list, link, viewport_t, vp) {
-                        if (vp->dsid == svcs[i]) {
-                                exists = true;
-                                break;
-                        }
-                }
-                
-                if (exists)
-                        continue;
-                
                 char *svc_name;
                 rc = loc_service_get_name(svcs[i], &svc_name);
@@ -2156 +2201 @@
                 }
         }
-        fibril_mutex_unlock(&viewport_list_mtx);
-        
-        /* TODO damage only newly added viewports */
-        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
-        return EOK;
-}
-
-static void category_change_cb(void)
-{
-        fibril_mutex_lock(&discovery_mtx);
-        discover_viewports();
-        fibril_mutex_unlock(&discovery_mtx);
-}
-
-static int compositor_srv_init(char *input_svc, char *name)
-{
-        /* Coordinates of the central pixel. */
-        coord_origin = UINT32_MAX / 4;
-        
-        /* Color of the viewport background. Must be opaque. */
-        bg_color = PIXEL(255, 69, 51, 103);
-        
-        /* Register compositor server. */
-        async_set_client_connection(client_connection);
-        int rc = loc_server_register(NAME);
-        if (rc != EOK) {
-                printf("%s: Unable to register server (%s)\n", NAME, str_error(rc));
-                return -1;
-        }
-        
-        /* Register interrupt handler to switch back from kconsole. */
-        async_set_interrupt_received(interrupt_received);
-        rc = event_subscribe(EVENT_KCONSOLE, 0);
-        if (rc != EOK) {
-                printf("%s: Failed to register kconsole notifications (%s)\n",
-                    NAME, str_error(rc));
-        }
-        
-        server_name = name;
-        
-        char svc[LOC_NAME_MAXLEN + 1];
-        snprintf(svc, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, server_name);
-        
-        service_id_t service_id;
-        rc = loc_service_register(svc, &service_id);
-        if (rc != EOK) {
-                printf("%s: Unable to register service %s\n", NAME, svc);
-                return rc;
-        }
-        
-        /* Prepare window registrator (entrypoint for clients). */
-        char winreg[LOC_NAME_MAXLEN + 1];
-        snprintf(winreg, LOC_NAME_MAXLEN, "%s%s/winreg", NAMESPACE, server_name);
-        if (loc_service_register(winreg, &winreg_id) != EOK) {
-                printf("%s: Unable to register service %s\n", NAME, winreg);
-                return -1;
-        }
-
-        /* Establish input bidirectional connection. */
-        rc = input_connect(input_svc);
-        if (rc != EOK) {
-                printf("%s: Failed to connect to input service.\n", NAME);
-                return rc;
-        }
-
-        rc = loc_register_cat_change_cb(category_change_cb);
-        if (rc != EOK) {
-                printf("%s: Failed to register category change callback\n", NAME);
-                input_disconnect();
-                return rc;
-        }       
-
-        rc = discover_viewports();
-        if (rc != EOK) {
-                input_disconnect();
-                return rc;
-        }
         
         if (list_empty(&viewport_list)) {
-                printf("%s: Failed to get viewports.\n", NAME);
                 input_disconnect();
                 return -1;
@@ -2242 +2209 @@
         comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
-        
         
         return EOK;