Changeset 3731d31 in mainline

Timestamp:

2013-09-12T14:52:58Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

b11f6fb

Parents:

6e75f2d (diff), f9f45e7 (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 RFB (VNC) server

Files:

• .bzrignore (modified) (1 diff)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/lib/c/generic/net/socket_client.c (modified) (1 diff)
• uspace/lib/c/include/net/socket.h (modified) (1 diff)
• uspace/srv/hid/compositor/compositor.c (modified) (4 diffs)
• uspace/srv/hid/rfb/Makefile (added)
• uspace/srv/hid/rfb/main.c (added)
• uspace/srv/hid/rfb/rfb.c (added)
• uspace/srv/hid/rfb/rfb.h (added)

.bzrignore

@@ -265 +265 @@
 uspace/app/corecfg/corecfg
 uspace/dist/app/corecfg
+uspace/dist/srv/rfb
+uspace/srv/hid/rfb/rfb

boot/Makefile.common

@@ -112 +112 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
+        $(USPACE_PATH)/srv/hid/rfb/rfb \
         $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
         $(USPACE_PATH)/srv/net/ethip/ethip \

uspace/Makefile

@@ -121 +121 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hid/rfb \
         drv/audio/sb16 \
         drv/infrastructure/root \

uspace/lib/c/generic/net/socket_client.c

@@ -923 +923 @@
  *                      message.
  */
-int send(int socket_id, void *data, size_t datalength, int flags)
+int send(int socket_id, const void *data, size_t datalength, int flags)
 {
         /* Without the address */

uspace/lib/c/include/net/socket.h

@@ -57 +57 @@
 extern int connect(int, const struct sockaddr *, socklen_t);
 extern int closesocket(int);
-extern int send(int, void *, size_t, int);
+extern int send(int, const void *, size_t, int);
 extern int sendto(int, const void *, size_t, int, const struct sockaddr *,
     socklen_t);

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;
@@ -2114 +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)
 {
@@ -2165 +2221 @@
         }
 
-        /* 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 get visualizer category.\n", NAME);
+                printf("%s: Failed to register category change callback\n", NAME);
                 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) {
-                printf("%s: Failed to get visualizer category services.\n", NAME);
+                return rc;
+        }       
+
+        rc = discover_viewports();
+        if (rc != EOK) {
                 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);
-                        }
-                }
+                return rc;
         }
         
@@ -2203 +2243 @@
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         
+        
         return EOK;
 }