Changes in uspace/srv/hid/compositor/compositor.c [523b17a:2f6ad06] in mainline

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -55 +55 @@
 #include <async.h>
 #include <loc.h>
+#include <task.h>
 
 #include <io/keycode.h>
@@ -470 +471 @@
                                                 /* FIXME: Ghost is currently drawn based on the bounding
                                                  * rectangle of the window, which is sufficient as long
-                                                 * as the windows can be rotated only by 90 degrees.
+                                                 * as the windows can be rotated only by 90 degrees. 
                                                  * For ghost to be compatible with arbitrary-angle
                                                  * rotation, it should be drawn as four lines adjusted
@@ -896 +897 @@
         ipc_call_t call;
         ipc_callid_t callid;
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*icall);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG2(*icall);
 
         /* Allocate resources for new window and register it to the location service. */
@@ -909 +910 @@
                         if (!win) {
                                 async_answer_2(callid, ENOMEM, 0, 0);
-                                fibril_mutex_unlock(&window_list_mtx);
                                 return;
                         }
@@ -928 +928 @@
                                 window_destroy(win);
                                 async_answer_2(callid, EINVAL, 0, 0);
-                                fibril_mutex_unlock(&window_list_mtx);
                                 return;
                         }
@@ -936 +935 @@
                                 window_destroy(win);
                                 async_answer_2(callid, EINVAL, 0, 0);
-                                fibril_mutex_unlock(&window_list_mtx);
                                 return;
                         }
@@ -1055 +1053 @@
 
         /* Create surface with respect to the retrieved mode. */
-        surface_t *new_surface = surface_create(new_mode.screen_width,
+        surface_t *new_surface = surface_create(new_mode.screen_width, 
             new_mode.screen_height, NULL, SURFACE_FLAG_SHARED);
         if (!new_surface) {
@@ -1178 +1176 @@
         async_sess_t *sess;
 
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
+        sess = loc_service_connect(sid, INTERFACE_DDF, 0);
         if (sess == NULL) {
                 printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
@@ -1185 +1183 @@
 
         async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_connect_to_me(exch, sid, 0, 0, vsl_notifications, NULL);
+        
+        port_id_t port;
+        rc = async_create_callback_port(exch, INTERFACE_VISUALIZER_CB, 0, 0,
+            vsl_notifications, NULL, &port);
+        
         async_exchange_end(exch);
 
@@ -2148 +2150 @@
         }
 
-        sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
+        sess = loc_service_connect(dsid, INTERFACE_INPUT, 0);
         if (sess == NULL) {
                 printf("%s: Unable to connect to input service %s\n", NAME,
@@ -2243 +2245 @@
         
         /* Register compositor server. */
-        async_set_client_connection(client_connection);
+        async_set_fallback_port_handler(client_connection, NULL);
         
         int rc = loc_server_register(NAME);