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

File:

• uspace/srv/hid/compositor/compositor.c (modified) (20 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);
@@ -217 +215 @@
 
         link_initialize(&win->link);
-        atomic_set(&win->ref_cnt, 0);
         prodcons_initialize(&win->queue);
         transform_identity(&win->transform);
@@ -235 +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);
@@ -319 +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 = list_get_instance(link, viewport_t, link);
-                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 = 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;
-                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)
@@ -752 +695 @@
         }
 
-        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);
-        }
-
         /* Calculate damage. */
         sysarg_t x = 0;
@@ -774 +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);
 
@@ -873 +813 @@
 
         if (win) {
-                atomic_inc(&win->ref_cnt);
                 async_answer_0(iid, EOK);
         } else {
@@ -886 +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;
                         }
@@ -905 +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;
                         }
@@ -922 +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:
@@ -978 +911 @@
         async_answer_0(iid, EOK);
 
-        comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
 }
@@ -1024 +956 @@
                 fibril_mutex_unlock(&viewport_list_mtx);
                 async_answer_0(iid, EOK);
-
-                comp_restrict_pointers();
-                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         }
 }
@@ -1462 +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;
@@ -1993 +1910 @@
                         fibril_mutex_unlock(&viewport_list_mtx);
 
-                        comp_restrict_pointers();
                         comp_damage(x, y, width, height);
                 } else {
@@ -2046 +1962 @@
                 }
                 list_prepend(&blue_win->link, &window_list);
-                
+
+                window_t *helenos_win = window_create(0, 0);
+                helenos_win->surface = decode_tga((void *) helenos_tga, helenos_tga_size, 0);
+                list_prepend(&helenos_win->link, &window_list);
+
                 window_t *nameic_win = window_create(0, 0);
                 nameic_win->surface = decode_tga((void *) nameic_tga, nameic_tga_size, 0);
@@ -2172 +2092 @@
         /* 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. */
@@ -2179 +2101 @@
         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;
@@ -2187 +2110 @@
         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;
@@ -2203 +2127 @@
         
         if (list_empty(&viewport_list)) {
+                printf("%s: Failed to get view ports.\n", NAME);
                 input_disconnect();
                 return -1;
         }
-
-        comp_restrict_pointers();
+        
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);