Changeset 593e023 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2014-08-12T17:14:32Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c3bdc92

Parents:

ce3efa0

Message:

allow compositor and console to coexist side-by-side, use the input server as a poor man's seat arbitrator

• kernel console notifies both about the release and grab events
• input server arbitrates the seat selection between kernel console and any number of user space UIs (currently the console server and the compositor server)
• input port yield and reclaim methods have been removed (they are used only on Ski and Niagara, both already need a more generic mechanism for the kernel/user space cooperation)
• console and compositor server keep track of the kernel console via the input arbitration
• move the waiting for a character device from init and terminal widget to getterm

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -56 +56 @@
 #include <loc.h>
 
-#include <event.h>
 #include <io/keycode.h>
 #include <io/mode.h>
 #include <io/visualizer.h>
 #include <io/window.h>
+#include <io/console.h>
 
 #include <transform.h>
@@ -144 +144 @@
 /** 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);
@@ -151 +154 @@
 
 static input_ev_ops_t input_ev_ops = {
+        .active = comp_active,
+        .deactive = comp_deactive,
         .key = comp_key_press,
         .move = comp_mouse_move,
@@ -156 +161 @@
         .button = comp_mouse_button
 };
-
-static void input_disconnect(void);
 
 static pointer_t *input_pointer(input_t *input)
@@ -567 +570 @@
 
         /* Notify visualizers about updated regions. */
-        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);
+        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);
+                }
         }
         
@@ -1074 +1079 @@
 }
 
+#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)
 {
@@ -1082 +1111 @@
         viewport_destroy(vp);
         
-        /* 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);
-        }
+        fibril_mutex_unlock(&viewport_list_mtx);
+        
+        async_answer_0(iid, EOK);
+        
+        comp_restrict_pointers();
+        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
 }
 
@@ -1780 +1787 @@
 }
 
+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)
@@ -2068 +2089 @@
                 fibril_mutex_unlock(&viewport_list_mtx);
         } else if (kconsole_switch) {
-                __SYSCALL0(SYS_DEBUG_CONSOLE);
+                if (console_kcon())
+                        active = false;
         } else {
                 window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
@@ -2137 +2159 @@
 }
 
-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)
-{
+static void discover_viewports(void)
+{
+        fibril_mutex_lock(&discovery_mtx);
+        
         /* 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;
-        }
+        if (rc != EOK)
+                goto ret;
         
         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);  
+        if (rc != EOK)
+                goto ret;
+        
+        fibril_mutex_lock(&viewport_list_mtx);
         for (size_t i = 0; i < svcs_cnt; ++i) {
                 bool exists = false;
@@ -2179 +2194 @@
         fibril_mutex_unlock(&viewport_list_mtx);
         
-        /* TODO damage only newly added viewports */
-        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
-        return EOK;
+        if (!list_empty(&viewport_list))
+                input_activate(input);
+        
+ret:
+        fibril_mutex_unlock(&discovery_mtx);
 }
 
 static void category_change_cb(void)
 {
-        fibril_mutex_lock(&discovery_mtx);
         discover_viewports();
-        fibril_mutex_unlock(&discovery_mtx);
 }
 
@@ -2206 +2221 @@
                 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));
         }
         
@@ -2248 +2255 @@
                 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;
-        }
+        }
+        
+        discover_viewports();
         
         comp_restrict_pointers();