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

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -90 +90 @@
 typedef struct {
         link_t link;
-        atomic_t ref_cnt;
         service_id_t in_dsid;
         service_id_t out_dsid;
@@ -139 +138 @@
 } viewport_t;
 
-static desktop_rect_t viewport_bound_rect;
 static FIBRIL_MUTEX_INITIALIZE(viewport_list_mtx);
 static LIST_INITIALIZE(viewport_list);
-
-static FIBRIL_MUTEX_INITIALIZE(discovery_mtx);
 
 /** Input server proxy */
@@ -219 +215 @@
 
         link_initialize(&win->link);
-        atomic_set(&win->ref_cnt, 0);
         prodcons_initialize(&win->queue);
         transform_identity(&win->transform);
@@ -237 +232 @@
 static void window_destroy(window_t *win)
 {
-        if (win && atomic_get(&win->ref_cnt) == 0) {
-                while (!list_empty(&win->queue.list)) {
-                        window_event_t *event = (window_event_t *) list_first(&win->queue.list);
-                        list_remove(&event->link);
-                        free(event);
-                }
-
+        if (win) {
                 if (win->surface) {
                         surface_destroy(win->surface);
@@ -321 +310 @@
 }
 
-static void comp_restrict_pointers(void)
-{
-        fibril_mutex_lock(&viewport_list_mtx);
-
-        sysarg_t x_res = coord_origin;
-        sysarg_t y_res = coord_origin;
-        sysarg_t w_res = 0;
-        sysarg_t h_res = 0;
-
-        if (!list_empty(&viewport_list)) {
-                viewport_t *vp = (viewport_t *) list_first(&viewport_list);
-                x_res = vp->pos.x;
-                y_res = vp->pos.y;
-                surface_get_resolution(vp->surface, &w_res, &h_res);
-        }
-
-        list_foreach(viewport_list, link, viewport_t, vp) {
-                sysarg_t w_vp, h_vp;
-                surface_get_resolution(vp->surface, &w_vp, &h_vp);
-                rectangle_union(
-                    x_res, y_res, w_res, h_res,
-                    vp->pos.x, vp->pos.y, w_vp, h_vp,
-                    &x_res, &y_res, &w_res, &h_res);
-        }
-
-        viewport_bound_rect.x = x_res;
-        viewport_bound_rect.y = y_res;
-        viewport_bound_rect.w = w_res;
-        viewport_bound_rect.h = h_res;
-
-        fibril_mutex_unlock(&viewport_list_mtx);
-
-        fibril_mutex_lock(&pointer_list_mtx);
-
-        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;
-                ptr->pos.x = ptr->pos.x < viewport_bound_rect.x + viewport_bound_rect.w ?
-                    ptr->pos.x : viewport_bound_rect.x + viewport_bound_rect.w;
-                ptr->pos.y = ptr->pos.y < viewport_bound_rect.y + viewport_bound_rect.h ?
-                    ptr->pos.y : viewport_bound_rect.y + viewport_bound_rect.h;
-        }
-
-        fibril_mutex_unlock(&pointer_list_mtx);
-}
-
 static void comp_damage(sysarg_t x_dmg_glob, sysarg_t y_dmg_glob,
     sysarg_t w_dmg_glob, sysarg_t h_dmg_glob)
@@ -374 +317 @@
         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 +389 @@
                         }
 
-                        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 +465 @@
                         }
 
-                        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 +512 @@
 
         /* 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 +574 @@
 
         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 +653 @@
 {
         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);
 }
 
@@ -743 +693 @@
         if (event_focus && win_focus) {
                 comp_post_event_win(event_focus, win_focus);
-        }
-
-        loc_service_unregister(win->in_dsid);
-        loc_service_unregister(win->out_dsid);
-
-        /* In case the client was killed, input fibril of the window might be
-         * still blocked on the condition within comp_window_get_event. */
-        window_event_t *event_dummy = (window_event_t *) malloc(sizeof(window_event_t));
-        if (event_dummy) {
-                link_initialize(&event_dummy->link);
-                prodcons_produce(&win->queue, &event_dummy->link);
         }
 
@@ -767 +706 @@
         }
 
+        /* Release window resources. */
+        loc_service_unregister(win->in_dsid);
+        loc_service_unregister(win->out_dsid);
+        while (!list_empty(&win->queue.list)) {
+                list_remove(list_first(&win->queue.list));
+        }
+        window_destroy(win);
+
         comp_damage(x, y, width, height);
 
@@ -856 +803 @@
         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;
@@ -865 +813 @@
 
         if (win) {
-                atomic_inc(&win->ref_cnt);
                 async_answer_0(iid, EOK);
         } else {
@@ -878 +825 @@
 
                         if (!IPC_GET_IMETHOD(call)) {
-                                async_answer_0(callid, EOK);
-                                atomic_dec(&win->ref_cnt);
-                                window_destroy(win);
+                                async_answer_0(callid, EINVAL);
                                 return;
                         }
@@ -897 +842 @@
 
                         if (!IPC_GET_IMETHOD(call)) {
-                                comp_window_close(win, callid, &call);
-                                atomic_dec(&win->ref_cnt);
-                                window_destroy(win);
+                                async_answer_0(callid, EINVAL);
                                 return;
                         }
@@ -914 +857 @@
                                 break;
                         case WINDOW_CLOSE:
-                                /* Postpone the closing until the phone is hung up to cover
-                                 * the case when the client is killed abruptly. */
-                                async_answer_0(callid, EOK);
+                                comp_window_close(win, callid, &call);
                                 break;
                         case WINDOW_CLOSE_REQUEST:
@@ -970 +911 @@
         async_answer_0(iid, EOK);
 
-        comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
 }
@@ -999 +939 @@
                 /* 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) {
@@ -1015 +956 @@
                 fibril_mutex_unlock(&viewport_list_mtx);
                 async_answer_0(iid, EOK);
-
-                comp_restrict_pointers();
-                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         }
 }
@@ -1025 +963 @@
         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;
@@ -1452 +1391 @@
         surface_get_resolution(pointer->cursor.states[pointer->state], 
              &cursor_width, &cursor_height);
-        if (pointer->pos.x + dx < viewport_bound_rect.x) {
-                dx = -1 * (pointer->pos.x - viewport_bound_rect.x);
-        }
-        if (pointer->pos.y + dy < viewport_bound_rect.y) {
-                dy = -1 * (pointer->pos.y - viewport_bound_rect.y);
-        }
-        if (pointer->pos.x + dx > viewport_bound_rect.x + viewport_bound_rect.w) {
-                dx = (viewport_bound_rect.x + viewport_bound_rect.w - pointer->pos.x);
-        }
-        if (pointer->pos.y + dy > viewport_bound_rect.y + viewport_bound_rect.h) {
-                dy = (viewport_bound_rect.y + viewport_bound_rect.h - pointer->pos.y);
-        }
         pointer->pos.x += dx;
         pointer->pos.y += dy;
@@ -1561 +1488 @@
 
         /* 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);
@@ -1983 +1910 @@
                         fibril_mutex_unlock(&viewport_list_mtx);
 
-                        comp_restrict_pointers();
                         comp_damage(x, y, width, height);
                 } else {
@@ -2116 +2042 @@
 }
 
-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 +2103 @@
         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 +2117 @@
                 }
         }
-        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;
         }
-
-        comp_restrict_pointers();
+        
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
-        
         
         return EOK;