Changes in uspace/srv/hid/compositor/compositor.c [00ddb40:62fbb7e] in mainline

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -55 +55 @@
 #include <async.h>
 #include <loc.h>
-
+#include <devman.h>
+
+#include <event.h>
+#include <device/graph_dev.h>
 #include <io/keycode.h>
 #include <io/mode.h>
 #include <io/visualizer.h>
 #include <io/window.h>
-#include <io/console.h>
 
 #include <transform.h>
@@ -84 +86 @@
 static sysarg_t coord_origin;
 static pixel_t bg_color;
-static filter_t filter = filter_bilinear;
-static unsigned int filter_index = 1;
 
 typedef struct {
@@ -146 +146 @@
 /** Input server proxy */
 static input_t *input;
-static bool active = false;
-
-static int comp_active(input_t *);
-static int comp_deactive(input_t *);
+
 static int comp_key_press(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
 static int comp_mouse_move(input_t *, int, int);
@@ -156 +153 @@
 
 static input_ev_ops_t input_ev_ops = {
-        .active = comp_active,
-        .deactive = comp_deactive,
         .key = comp_key_press,
         .move = comp_mouse_move,
@@ -163 +158 @@
         .button = comp_mouse_button
 };
+
+static void input_disconnect(void);
 
 static pointer_t *input_pointer(input_t *input)
@@ -235 +232 @@
 static void window_destroy(window_t *win)
 {
-        if ((win) && (atomic_get(&win->ref_cnt) == 0)) {
+        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);
@@ -241 +238 @@
                         free(event);
                 }
-                
-                if (win->surface)
+
+                if (win->surface) {
                         surface_destroy(win->surface);
-                
+                }
                 free(win);
         }
@@ -256 +253 @@
         transform_invert(&win_trans);
         transform_apply_affine(&win_trans, &x, &y);
-        
-        /*
-         * Since client coordinate origin is (0, 0), it is necessary to check
+
+        /* Since client coordinate origin is (0, 0), it is necessary to check
          * coordinates to avoid underflow. Moreover, it is convenient to also
          * check against provided upper limits to determine whether the converted
-         * coordinates are within the client window.
-         */
-        if ((x < 0) || (y < 0))
+         * coordinates are within the client window.  */
+        if (x < 0 || y < 0) {
                 return false;
-        
-        (*x_out) = (sysarg_t) (x + 0.5);
-        (*y_out) = (sysarg_t) (y + 0.5);
-        
-        if (((*x_out) >= x_lim) || ((*y_out) >= y_lim))
-                return false;
-        
-        return true;
+        } else {
+                (*x_out) = (sysarg_t) (x + 0.5);
+                (*y_out) = (sysarg_t) (y + 0.5);
+
+                if ((*x_out) >= x_lim || (*y_out) >= y_lim) {
+                        return false;
+                } else {
+                        return true;
+                }
+        }
 }
 
@@ -282 +279 @@
         transform_apply_affine(&win_trans, &x, &y);
         
-        /*
-         * It is assumed that compositor coordinate origin is chosen in such way,
-         * that underflow/overflow here would be unlikely.
-         */
+        /* It is assumed that compositor coordinate origin is chosen in such way,
+         * that underflow/overflow here would be unlikely. */
         (*x_out) = (sysarg_t) (x + 0.5);
         (*y_out) = (sysarg_t) (y + 0.5);
@@ -410 +405 @@
 
                         source_init(&source);
-                        source_set_filter(&source, filter);
+                        source_set_filter(&source, filter_nearest);
                         drawctx_init(&context, vp->surface);
                         drawctx_set_compose(&context, compose_over);
@@ -443 +438 @@
                                         transform_translate(&transform, -pos.x, -pos.y);
 
-                                        source_set_transform(&source, transform);
-                                        source_set_texture(&source, win->surface,
-                                            PIXELMAP_EXTEND_TRANSPARENT_SIDES);
+                                        source_set_transform(&source, transform);                               
+                                        source_set_texture(&source, win->surface, false);
                                         source_set_alpha(&source, PIXEL(win->opacity, 0, 0, 0));
 
@@ -573 +567 @@
 
         /* Notify visualizers about updated regions. */
-        if (active) {
-                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);
-                        surface_reset_damaged_region(vp->surface);
-                        visualizer_update_damaged_region(vp->sess,
-                            x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp, 0, 0);
-                }
-        }
-        
+        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);
+                surface_reset_damaged_region(vp->surface);
+                visualizer_update_damaged_region(
+                    vp->sess, x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp, 0, 0);
+        }
+
         fibril_mutex_unlock(&viewport_list_mtx);
 }
@@ -598 +590 @@
                 return;
         }
-        
         int rc = async_data_read_finalize(callid, event, len);
         if (rc != EOK) {
@@ -605 +596 @@
                 return;
         }
-        
         async_answer_0(iid, EOK);
+        
         free(event);
 }
@@ -617 +608 @@
         double height = IPC_GET_ARG4(*icall);
 
-        if ((width == 0) || (height == 0)) {
+        if (width == 0 || height == 0) {
                 comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         } else {
@@ -674 +665 @@
         transform_identity(&transform);
         temp = transform;
-        transform_product(&transform, &temp, &translate);
+        transform_multiply(&transform, &temp, &translate);
         temp = transform;
-        transform_product(&transform, &temp, &rotate);
+        transform_multiply(&transform, &temp, &rotate);
         temp = transform;
-        transform_product(&transform, &temp, &scale);
+        transform_multiply(&transform, &temp, &scale);
         
         win->transform = transform;
@@ -866 +857 @@
 
         comp_damage(x, y, width, height);
+
         async_answer_0(iid, EOK);
 }
@@ -871 +863 @@
 static void comp_window_close_request(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
 {
-        window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
+    window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
         if (event == NULL) {
                 async_answer_0(iid, ENOMEM);
@@ -1011 +1003 @@
                                 break;
                         case WINDOW_CLOSE:
-                                /*
-                                 * Postpone the closing until the phone is hung up to cover
-                                 * the case when the client is killed abruptly.
-                                 */
+                                /* 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;
@@ -1029 +1019 @@
 static void comp_mode_change(viewport_t *vp, ipc_callid_t iid, ipc_call_t *icall)
 {
+        int rc;
         sysarg_t mode_idx = IPC_GET_ARG2(*icall);
         fibril_mutex_lock(&viewport_list_mtx);
@@ -1034 +1025 @@
         /* Retrieve the mode that shall be set. */
         vslmode_t new_mode;
-        int rc = visualizer_get_mode(vp->sess, &new_mode, mode_idx);
+        rc = visualizer_get_mode(vp->sess, &new_mode, mode_idx);
         if (rc != EOK) {
                 fibril_mutex_unlock(&viewport_list_mtx);
@@ -1052 +1043 @@
         /* Try to set the mode and share out the surface. */
         rc = visualizer_set_mode(vp->sess,
-            new_mode.index, new_mode.version, surface_direct_access(new_surface));
+                new_mode.index, new_mode.version, surface_direct_access(new_surface));
         if (rc != EOK) {
                 surface_destroy(new_surface);
@@ -1082 +1073 @@
 }
 
-#if 0
-static void comp_shutdown(void)
-{
-        loc_service_unregister(winreg_id);
-        input_disconnect();
-        
-        /* Close all clients and their windows. */
-        fibril_mutex_lock(&window_list_mtx);
-        list_foreach(window_list, link, window_t, win) {
-                window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
-                if (event) {
-                        link_initialize(&event->link);
-                        event->type = WINDOW_CLOSE;
-                        prodcons_produce(&win->queue, &event->link);
-                }
-        }
-        fibril_mutex_unlock(&window_list_mtx);
-        
-        async_answer_0(iid, EOK);
-        
-        /* All fibrils of the compositor will terminate soon. */
-}
-#endif
-
 static void comp_visualizer_disconnect(viewport_t *vp, ipc_callid_t iid, ipc_call_t *icall)
 {
         /* Release viewport resources. */
         fibril_mutex_lock(&viewport_list_mtx);
-        
         list_remove(&vp->link);
         viewport_destroy(vp);
-        
-        fibril_mutex_unlock(&viewport_list_mtx);
-        
-        async_answer_0(iid, EOK);
-        
-        comp_restrict_pointers();
-        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
+
+        /* Terminate compositor if there are no more viewports. */
+        if (list_empty(&viewport_list)) {
+                fibril_mutex_unlock(&viewport_list_mtx);
+                loc_service_unregister(winreg_id);
+                input_disconnect();
+
+                /* Close all clients and their windows. */
+                fibril_mutex_lock(&window_list_mtx);
+                list_foreach(window_list, link, window_t, win) {
+                        window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
+                        if (event) {
+                                link_initialize(&event->link);
+                                event->type = WINDOW_CLOSE;
+                                prodcons_produce(&win->queue, &event->link);
+                        }
+                }
+                fibril_mutex_unlock(&window_list_mtx);
+
+                async_answer_0(iid, EOK);
+
+                /* All fibrils of the compositor will terminate soon. */
+        } else {
+                fibril_mutex_unlock(&viewport_list_mtx);
+                async_answer_0(iid, EOK);
+
+                comp_restrict_pointers();
+                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
+        }
 }
 
@@ -1134 +1122 @@
         fibril_mutex_unlock(&viewport_list_mtx);
 
-        if (!vp)
+        if (!vp) {
                 return;
+        }
 
         /* Ignore parameters, the connection is already opened. */
@@ -1160 +1149 @@
 }
 
-static async_sess_t *vsl_connect(service_id_t sid, const char *svc)
+static async_sess_t *vsl_connect(const char *svc)
 {
         int rc;
         async_sess_t *sess;
-
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
-        if (sess == NULL) {
-                printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
+        service_id_t dsid;
+        devman_handle_t handle;
+
+        rc = loc_service_get_id(svc, &dsid, 0);
+        if (rc != EOK) {
                 return NULL;
         }
 
+        rc = devman_fun_sid_to_handle(dsid, &handle);
+        if (rc == EOK) {
+                sess = devman_device_connect(EXCHANGE_SERIALIZE, handle, 0);
+                if (sess == NULL) {
+                        printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
+                        return NULL;
+                }
+                rc = graph_dev_connect(sess);
+                if (rc != EOK) {
+                        return NULL;
+                }
+        } else if (rc == ENOENT) {
+                sess = loc_service_connect(EXCHANGE_SERIALIZE, dsid, 0);
+                if (sess == NULL) {
+                        printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
+                        return NULL;
+                }
+        } else {
+                return NULL;
+        }
+
         async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_connect_to_me(exch, sid, 0, 0, vsl_notifications, NULL);
+        rc = async_connect_to_me(exch, dsid, 0, 0, vsl_notifications, NULL);
         async_exchange_end(exch);
 
@@ -1185 +1196 @@
 }
 
-static viewport_t *viewport_create(service_id_t sid)
+static viewport_t *viewport_create(const char *vsl_name)
 {
         int rc;
-        char *vsl_name = NULL;
-        viewport_t *vp = NULL;
-        bool claimed = false;
-
-        rc = loc_service_get_name(sid, &vsl_name);
-        if (rc != EOK)
-                goto error;
-
-        vp = (viewport_t *) calloc(1, sizeof(viewport_t));
-        if (!vp)
-                goto error;
+
+        viewport_t *vp = (viewport_t *) malloc(sizeof(viewport_t));
+        if (!vp) {
+                return NULL;
+        }
 
         link_initialize(&vp->link);
@@ -1205 +1210 @@
 
         /* Establish output bidirectional connection. */
-        vp->dsid = sid;
-        vp->sess = vsl_connect(sid, vsl_name);
-        if (vp->sess == NULL)
-                goto error;
+        vp->sess = vsl_connect(vsl_name);
+        rc = loc_service_get_id(vsl_name, &vp->dsid, 0);
+        if (vp->sess == NULL || rc != EOK) {
+                free(vp);
+                return NULL;
+        }
 
         /* Claim the given visualizer. */
         rc = visualizer_claim(vp->sess, 0);
         if (rc != EOK) {
+                async_hangup(vp->sess);
+                free(vp);
                 printf("%s: Unable to claim visualizer (%s)\n", NAME, str_error(rc));
-                goto error;
-        }
-
-        claimed = true;
+                return NULL;
+        }
 
         /* Retrieve the default mode. */
         rc = visualizer_get_default_mode(vp->sess, &vp->mode);
         if (rc != EOK) {
+                visualizer_yield(vp->sess);
+                async_hangup(vp->sess);
+                free(vp);
                 printf("%s: Unable to retrieve mode (%s)\n", NAME, str_error(rc));
-                goto error;
+                return NULL;
         }
 
@@ -1230 +1240 @@
             NULL, SURFACE_FLAG_SHARED);
         if (vp->surface == NULL) {
+                visualizer_yield(vp->sess);
+                async_hangup(vp->sess);
+                free(vp);
                 printf("%s: Unable to create surface (%s)\n", NAME, str_error(rc));
-                goto error;
+                return NULL;
         }
 
         /* Try to set the mode and share out the surface. */
         rc = visualizer_set_mode(vp->sess,
-            vp->mode.index, vp->mode.version, surface_direct_access(vp->surface));
+                vp->mode.index, vp->mode.version, surface_direct_access(vp->surface));
         if (rc != EOK) {
+                visualizer_yield(vp->sess);
+                surface_destroy(vp->surface);
+                async_hangup(vp->sess);
+                free(vp);
                 printf("%s: Unable to set mode (%s)\n", NAME, str_error(rc));
-                goto error;
+                return NULL;
         }
 
         return vp;
-error:
-        if (claimed)
-                visualizer_yield(vp->sess);
-        
-        if (vp->sess != NULL)
-                async_hangup(vp->sess);
-        
-        free(vp);
-        free(vsl_name);
-        return NULL;
 }
 
@@ -1790 +1797 @@
 }
 
-static int comp_active(input_t *input)
-{
-        active = true;
-        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
-        
-        return EOK;
-}
-
-static int comp_deactive(input_t *input)
-{
-        active = false;
-        return EOK;
-}
-
 static int comp_key_press(input_t *input, kbd_event_type_t type, keycode_t key,
     keymod_t mods, wchar_t c)
@@ -1821 +1814 @@
             key == KC_O || key == KC_P);
         bool kconsole_switch = (mods & KM_ALT) && (key == KC_M);
-        bool filter_switch = (mods & KM_ALT) && (key == KC_Y);
-
-        bool key_filter = (type == KEY_RELEASE) && (win_transform || win_resize ||
+
+        bool filter = (type == KEY_RELEASE) && (win_transform || win_resize ||
             win_opacity || win_close || win_switch || viewport_move ||
-            viewport_change || kconsole_switch || filter_switch);
-
-        if (key_filter) {
+            viewport_change || kconsole_switch);
+
+        if (filter) {
                 /* no-op */
         } else if (win_transform) {
@@ -1847 +1839 @@
                                 break;
                         case KC_Q:
-                                win->angle += 0.1;
+                                win->angle += (PI / 2);
                                 break;
                         case KC_E:
-                                win->angle -= 0.1;
+                                win->angle += -(PI / 2);
                                 break;
                         case KC_R:
@@ -2093 +2085 @@
                 fibril_mutex_unlock(&viewport_list_mtx);
         } else if (kconsole_switch) {
-                if (console_kcon())
-                        active = false;
-        } else if (filter_switch) {
-                filter_index++;
-                if (filter_index > 1)
-                        filter_index = 0;
-                if (filter_index == 0) {
-                        filter = filter_nearest;
-                }
-                else {
-                        filter = filter_bilinear;
-                }
-                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
+                __SYSCALL0(SYS_DEBUG_ACTIVATE_CONSOLE);
         } else {
                 window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
@@ -2174 +2154 @@
 }
 
-static void discover_viewports(void)
-{
-        fibril_mutex_lock(&discovery_mtx);
-        
+static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
+{
+        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
+}
+
+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)
-                goto ret;
+        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)
-                goto ret;
-        
-        fibril_mutex_lock(&viewport_list_mtx);
+        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;
@@ -2203 +2190 @@
                         continue;
                 
-                viewport_t *vp = viewport_create(svcs[i]);
-                if (vp != NULL)
-                        list_append(&vp->link, &viewport_list);
+                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);
         
-        if (!list_empty(&viewport_list))
-                input_activate(input);
-        
-ret:
+        /* 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 void category_change_cb(void)
-{
-        discover_viewports();
 }
 
@@ -2231 +2223 @@
         /* 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));
         }
         
@@ -2257 +2256 @@
                 return -1;
         }
-        
+
         /* Establish input bidirectional connection. */
         rc = input_connect(input_svc);
@@ -2264 +2263 @@
                 return rc;
         }
-        
+
         rc = loc_register_cat_change_cb(category_change_cb);
         if (rc != EOK) {
@@ -2270 +2269 @@
                 input_disconnect();
                 return rc;
-        }
-        
-        discover_viewports();
-        
+        }       
+
+        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;