Changes in uspace/srv/hid/compositor/compositor.c [cf02eaf:fbb2d0d] 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;
@@ -335 +337 @@
         }
 
-        list_foreach(viewport_list, link) {
-                viewport_t *vp = list_get_instance(link, viewport_t, link);
+        list_foreach(viewport_list, link, viewport_t, vp) {
                 sysarg_t w_vp, h_vp;
                 surface_get_resolution(vp->surface, &w_vp, &h_vp);
@@ -354 +355 @@
         fibril_mutex_lock(&pointer_list_mtx);
 
-        list_foreach(pointer_list, link) {
-                pointer_t *ptr = list_get_instance(link, pointer_t, link);
+        list_foreach(pointer_list, link, pointer_t, ptr) {
                 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) {
-
+        list_foreach(viewport_list, link, viewport_t, vp) {
                 /* 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);
@@ -446 +444 @@
                         }
 
-                        list_foreach(pointer_list, link) {
-
-                                pointer_t *ptr = list_get_instance(link, pointer_t, link);
+                        list_foreach(pointer_list, link, pointer_t, ptr) {
                                 if (ptr->ghost.surface) {
 
@@ -522 +518 @@
                         }
 
-                        list_foreach(pointer_list, link) {
+                        list_foreach(pointer_list, link, pointer_t, ptr) {
 
                                 /* 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];
@@ -569 +564 @@
 
         /* Notify visualizers about updated regions. */
-        list_foreach(viewport_list, link) {
-                viewport_t *vp = list_get_instance(link, viewport_t, link);
+        list_foreach(viewport_list, link, viewport_t, vp) {
                 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);
@@ -631 +625 @@
 
         fibril_mutex_lock(&pointer_list_mtx);
-        list_foreach(pointer_list, link) {
-                pointer_t *pointer = list_get_instance(link, pointer_t, link);
+        list_foreach(pointer_list, link, pointer_t, pointer) {
                 if (pointer->id == pos_id) {
                         pointer->grab_flags = pointer->pressed ? grab_flags : GF_EMPTY;
@@ -710 +703 @@
 {
         fibril_mutex_lock(&window_list_mtx);
-        window_t *window = NULL;
-        list_foreach(window_list, link) {
-                window = list_get_instance(link, window_t, link);
+
+        list_foreach(window_list, link, window_t, window) {
                 if (window == target) {
                         prodcons_produce(&window->queue, &event->link);
-                }
-        }
-        if (!window) {
-                free(event);
-        }
+                        fibril_mutex_unlock(&window_list_mtx);
+                        return;
+                }
+        }
+
         fibril_mutex_unlock(&window_list_mtx);
+        free(event);
 }
 
@@ -863 +856 @@
         window_t *win = NULL;
         fibril_mutex_lock(&window_list_mtx);
-        list_foreach(window_list, link) {
-                window_t *cur = list_get_instance(link, window_t, link);
+        list_foreach(window_list, link, window_t, cur) {
                 if (cur->in_dsid == service_id || cur->out_dsid == service_id) {
                         win = cur;
@@ -1007 +999 @@
                 /* Close all clients and their windows. */
                 fibril_mutex_lock(&window_list_mtx);
-                list_foreach(window_list, link) {
-                        window_t *win = list_get_instance(link, window_t, link);
+                list_foreach(window_list, link, window_t, win) {
                         window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
                         if (event) {
@@ -1034 +1025 @@
         viewport_t *vp = NULL;
         fibril_mutex_lock(&viewport_list_mtx);
-        list_foreach(viewport_list, link) {
-                viewport_t *cur = list_get_instance(link, viewport_t, link);
+        list_foreach(viewport_list, link, viewport_t, cur) {
                 if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
                         vp = cur;
@@ -1571 +1561 @@
 
         /* Determine the window which the mouse click belongs to. */
-        list_foreach(window_list, link) {
-                win = list_get_instance(link, window_t, link);
+        list_foreach(window_list, link, window_t, cw) {
+                win = cw;
                 if (win->surface) {
                         surface_get_resolution(win->surface, &width, &height);
@@ -2126 +2116 @@
 }
 
+static int discover_viewports(void)
+{
+        /* Create viewports and connect them to visualizers. */
+        category_id_t cat_id;
+        int rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed to get visualizer category.\n", NAME);
+                return -1;
+        }
+        
+        service_id_t *svcs;
+        size_t svcs_cnt = 0;
+        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);
+                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);
+                if (rc == EOK) {
+                        viewport_t *vp = viewport_create(svc_name);
+                        if (vp != NULL) {
+                                list_append(&vp->link, &viewport_list);
+                        }
+                }
+        }
+        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)
 {
@@ -2132 +2176 @@
         
         /* Color of the viewport background. Must be opaque. */
-        bg_color = PIXEL(255, 75, 70, 75);
+        bg_color = PIXEL(255, 69, 51, 103);
         
         /* Register compositor server. */
@@ -2177 +2221 @@
         }
 
-        /* Create viewports and connect them to visualizers. */
-        category_id_t cat_id;
-        rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
+        rc = loc_register_cat_change_cb(category_change_cb);
         if (rc != EOK) {
-                printf("%s: Failed to get visualizer category.\n", NAME);
+                printf("%s: Failed to register category change callback\n", NAME);
                 input_disconnect();
-                return -1;
-        }
-        
-        service_id_t *svcs;
-        size_t svcs_cnt = 0;
-        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);
+                return rc;
+        }       
+
+        rc = discover_viewports();
+        if (rc != EOK) {
                 input_disconnect();
-                return -1;
-        }
-        
-        for (size_t i = 0; i < svcs_cnt; ++i) {
-                char *svc_name;
-                rc = loc_service_get_name(svcs[i], &svc_name);
-                if (rc == EOK) {
-                        viewport_t *vp = viewport_create(svc_name);
-                        if (vp != NULL) {
-                                list_append(&vp->link, &viewport_list);
-                        }
-                }
+                return rc;
         }
         
@@ -2215 +2243 @@
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         
+        
         return EOK;
 }