Changes in uspace/srv/hid/compositor/compositor.c [f9f45e7:feeac0d] in mainline

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -143 +143 @@
 static LIST_INITIALIZE(viewport_list);
 
-static FIBRIL_MUTEX_INITIALIZE(discovery_mtx);
-
 /** Input server proxy */
 static input_t *input;
@@ -2116 +2114 @@
 }
 
-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) {
+                printf("%s: Failed to connect to input service.\n", NAME);
+                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;
         }
@@ -2131 +2179 @@
         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 +2193 @@
                 }
         }
-        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, 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) {
-                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)) {
@@ -2243 +2203 @@
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         
-        
         return EOK;
 }