Changeset dd0c8a0 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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;
@@ -138 +139 @@
 } 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 */
@@ -215 +219 @@
 
         link_initialize(&win->link);
+        atomic_set(&win->ref_cnt, 0);
         prodcons_initialize(&win->queue);
         transform_identity(&win->transform);
@@ -232 +237 @@
 static void window_destroy(window_t *win)
 {
-        if (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->surface) {
                         surface_destroy(win->surface);
@@ -310 +321 @@
 }
 
+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)
@@ -317 +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);
@@ -389 +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) {
 
@@ -465 +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];
@@ -512 +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);
@@ -574 +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;
@@ -653 +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);
 }
 
@@ -693 +743 @@
         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);
         }
 
@@ -706 +767 @@
         }
 
-        /* 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);
 
@@ -803 +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;
@@ -813 +865 @@
 
         if (win) {
+                atomic_inc(&win->ref_cnt);
                 async_answer_0(iid, EOK);
         } else {
@@ -825 +878 @@
 
                         if (!IPC_GET_IMETHOD(call)) {
-                                async_answer_0(callid, EINVAL);
+                                async_answer_0(callid, EOK);
+                                atomic_dec(&win->ref_cnt);
+                                window_destroy(win);
                                 return;
                         }
@@ -842 +897 @@
 
                         if (!IPC_GET_IMETHOD(call)) {
-                                async_answer_0(callid, EINVAL);
+                                comp_window_close(win, callid, &call);
+                                atomic_dec(&win->ref_cnt);
+                                window_destroy(win);
                                 return;
                         }
@@ -857 +914 @@
                                 break;
                         case WINDOW_CLOSE:
-                                comp_window_close(win, callid, &call);
+                                /* Postpone the closing until the phone is hung up to cover
+                                 * the case when the client is killed abruptly. */
+                                async_answer_0(callid, EOK);
                                 break;
                         case WINDOW_CLOSE_REQUEST:
@@ -911 +970 @@
         async_answer_0(iid, EOK);
 
+        comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
 }
@@ -939 +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) {
@@ -956 +1015 @@
                 fibril_mutex_unlock(&viewport_list_mtx);
                 async_answer_0(iid, EOK);
+
+                comp_restrict_pointers();
+                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         }
 }
@@ -963 +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;
@@ -1391 +1452 @@
         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;
@@ -1488 +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);
@@ -1910 +1983 @@
                         fibril_mutex_unlock(&viewport_list_mtx);
 
+                        comp_restrict_pointers();
                         comp_damage(x, y, width, height);
                 } else {
@@ -2042 +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)
 {
@@ -2048 +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. */
@@ -2088 +2216 @@
         /* Establish input bidirectional connection. */
         rc = input_connect(input_svc);
-        if (rc != EOK)
+        if (rc != EOK) {
+                printf("%s: Failed to connect to input service.\n", NAME);
                 return rc;
-
-        /* 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 register category change callback\n", NAME);
+                input_disconnect();
+                return rc;
+        }       
+
+        rc = discover_viewports();
         if (rc != EOK) {
                 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) {
+                return rc;
+        }
+        
+        if (list_empty(&viewport_list)) {
+                printf("%s: Failed to get viewports.\n", NAME);
                 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);
-                        }
-                }
-        }
-        
-        if (list_empty(&viewport_list)) {
-                input_disconnect();
-                return -1;
-        }
-        
+
+        comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
+        
         
         return EOK;