Changeset 111d2d6 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2012-08-17T17:05:06Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

01e397ac

Parents:

ad78054

Message:

Factor out input protocol client code.

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -49 +49 @@
 #include <adt/prodcons.h>
 #include <adt/list.h>
+#include <io/input.h>
 #include <ipc/graph.h>
-#include <ipc/input.h>
 #include <ipc/window.h>
 
@@ -143 +143 @@
 static LIST_INITIALIZE(viewport_list);
 
-static async_sess_t *input_sess;
+/** Input server proxy */
+static input_t *input;
+
+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);
+static int comp_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
+static int comp_mouse_button(input_t *, int, int);
+
+static input_ev_ops_t input_ev_ops = {
+        .key = comp_key_press,
+        .move = comp_mouse_move,
+        .abs_move = comp_abs_move,
+        .button = comp_mouse_button
+};
+
+static void input_disconnect(void);
+
+
+static pointer_t *input_pointer(input_t *input)
+{
+        return input->user;
+}
 
 static pointer_t *pointer_create()
@@ -759 +780 @@
                 fibril_mutex_unlock(&viewport_list_mtx);
                 loc_service_unregister(winreg_id);
-                async_hangup(input_sess);
+                input_disconnect();
 
                 /* Close all clients and their windows. */
@@ -1055 +1076 @@
 }
 
-static void comp_mouse_move(pointer_t *pointer, ipc_callid_t iid, ipc_call_t *icall)
-{
-        int dx = (int) IPC_GET_ARG1(*icall);
-        int dy = (int) IPC_GET_ARG2(*icall);
+static int comp_abs_move(input_t *input, unsigned x , unsigned y,
+    unsigned max_x, unsigned max_y)
+{
+        /* XXX TODO */
+        return EOK;
+}
+
+static int comp_mouse_move(input_t *input, int dx, int dy)
+{
+        pointer_t *pointer = input_pointer(input);
 
         /* Update pointer position. */
@@ -1118 +1145 @@
         }
 
-        async_answer_0(iid, EOK);
-}
-
-static void comp_mouse_button(pointer_t *pointer, ipc_callid_t iid, ipc_call_t *icall)
-{
-        sysarg_t btn_num = IPC_GET_ARG1(*icall);
-        bool pressed = (bool) IPC_GET_ARG2(*icall);
-
-        if (pressed) {
+        return EOK;
+}
+
+static int comp_mouse_button(input_t *input, int bnum, int bpress)
+{
+        pointer_t *pointer = input_pointer(input);
+
+        if (bpress) {
                 pointer->btn_hpos = pointer->hpos;
                 pointer->btn_vpos = pointer->vpos;
-                pointer->btn_num = btn_num;
+                pointer->btn_num = bnum;
                 pointer->pressed = true;
 
@@ -1137 +1163 @@
                 if (!win || !win->surface) {
                         fibril_mutex_unlock(&window_list_mtx);
-                        async_answer_0(iid, EOK);
-                        return;
+                        return EOK;
                 }
                 sysarg_t x, y, width, height;
@@ -1154 +1179 @@
                                 event->data.pos.pos_id = pointer->id;
                                 event->data.pos.type = POS_PRESS;
-                                event->data.pos.btn_num = btn_num;
+                                event->data.pos.btn_num = bnum;
                                 event->data.pos.hpos = x;
                                 event->data.pos.vpos = y;
                                 comp_post_event(event);
                         } else {
-                                async_answer_0(iid, ENOMEM);
-                                return;
-                        }
-                }
-        } else if (pointer->pressed && pointer->btn_num == btn_num) {
+                                return ENOMEM;
+                        }
+                }
+        } else if (pointer->pressed && pointer->btn_num == (unsigned)bnum) {
                 pointer->pressed = false;
 
@@ -1191 +1215 @@
                         pointer->grab_flags = GF_EMPTY;
                         fibril_mutex_unlock(&window_list_mtx);
-                        async_answer_0(iid, EOK);
-                        return;
+                        return EOK;
                 }
 
@@ -1257 +1280 @@
                                 event->data.pos.pos_id = pointer->id;
                                 event->data.pos.type = POS_RELEASE;
-                                event->data.pos.btn_num = btn_num;
+                                event->data.pos.btn_num = bnum;
                                 event->data.pos.hpos = point_x;
                                 event->data.pos.vpos = point_y;
@@ -1263 +1286 @@
                         pointer->grab_flags = GF_EMPTY;
                         
-                } else if (within_client && (pointer->grab_flags == GF_EMPTY) && (btn_num == 1)) {
+                } else if (within_client && (pointer->grab_flags == GF_EMPTY) && (bnum == 1)) {
 
                         /* Bring the window to the foreground. */
@@ -1286 +1309 @@
         }
 
-        async_answer_0(iid, EOK);
-}
-
-static void comp_key_press(ipc_callid_t iid, ipc_call_t *icall)
-{
-        kbd_event_type_t type = IPC_GET_ARG1(*icall);
-        keycode_t key = IPC_GET_ARG2(*icall);
-        keymod_t mods = IPC_GET_ARG3(*icall);
-        wchar_t c = IPC_GET_ARG4(*icall);
-
+        return EOK;
+}
+
+static int comp_key_press(input_t *input, kbd_event_type_t type, keycode_t key,
+    keymod_t mods, wchar_t c)
+{
         bool win_transform = (mods & KM_ALT) && (
             key == KC_W || key == KC_S || key == KC_A || key == KC_D ||
@@ -1378 +1397 @@
                         if (event == NULL) {
                                 fibril_mutex_unlock(&window_list_mtx);
-                                async_answer_0(iid, ENOMEM);
-                                return;
+                                return ENOMEM;
                         }
 
@@ -1448 +1466 @@
         } else if (win_close) {
                 window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
-                if (event == NULL) {
-                        async_answer_0(iid, ENOMEM);
-                        return;
-                }
+                if (event == NULL)
+                        return ENOMEM;
 
                 link_initialize(&event->link);
@@ -1594 +1610 @@
         } else {
                 window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
-                if (event == NULL) {
-                        async_answer_0(iid, ENOMEM);
-                        return;
-                }
+                if (event == NULL)
+                        return ENOMEM;
 
                 link_initialize(&event->link);
@@ -1609 +1623 @@
         }
 
-        async_answer_0(iid, EOK);
-}
-
-static void input_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
+        return EOK;
+}
+
+static int input_connect(const char *svc)
+{
+        async_sess_t *sess;
+        service_id_t dsid;
+
+        int rc = loc_service_get_id(svc, &dsid, 0);
+        if (rc != EOK) {
+                printf("%s: Input service %s not found\n", NAME, svc);
+                return rc;
+        }
+
+        sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
+        if (sess == NULL) {
+                printf("%s: Unable to connect to input service %s\n", NAME,
+                    svc);
+                return EIO;
+        }
+
         fibril_mutex_lock(&pointer_list_mtx);
         pointer_t *pointer = pointer_create();
@@ -1622 +1652 @@
         fibril_mutex_unlock(&pointer_list_mtx);
 
-        /* Ignore parameters, the connection is already opened. */
-        while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-
-                if (!IPC_GET_IMETHOD(call)) {
-                        fibril_mutex_lock(&pointer_list_mtx);
-                        if (pointer != NULL) {
-                                list_remove(&pointer->link);
-                                pointer_destroy(pointer);
-                        }
-                        fibril_mutex_unlock(&pointer_list_mtx);
-                        async_hangup(input_sess);
-                        return;
-                }
-
-                switch (IPC_GET_IMETHOD(call)) {
-                case INPUT_EVENT_KEY:
-                        comp_key_press(callid, &call);
-                        break;
-                case INPUT_EVENT_MOVE:
-                        comp_mouse_move(pointer, callid, &call);
-                        break;
-                case INPUT_EVENT_BUTTON:
-                        comp_mouse_button(pointer, callid, &call);
-                        break;
-                default:
-                        async_answer_0(callid, EINVAL);
-                }
-        }
-}
-
-static async_sess_t *input_connect(const char *svc)
-{
-        async_sess_t *sess;
-        service_id_t dsid;
-
-        int rc = loc_service_get_id(svc, &dsid, 0);
-        if (rc == EOK) {
-                sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
-                if (sess == NULL) {
-                        printf("%s: Unable to connect to input service %s\n", NAME, svc);
-                        return NULL;
-                }
-        } else
-                return NULL;
-
-        async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_connect_to_me(exch, 0, 0, 0, input_events, NULL);
-        async_exchange_end(exch);
-
+        if (pointer == NULL) {
+                printf("%s: Cannot create pointer.\n", NAME);
+                async_hangup(sess);
+                return ENOMEM;
+        }
+
+        rc = input_open(sess, &input_ev_ops, pointer, &input);
         if (rc != EOK) {
                 async_hangup(sess);
-                printf("%s: Unable to create callback connection to service %s (%s)\n",
+                printf("%s: Unable to communicate with service %s (%s)\n",
                     NAME, svc, str_error(rc));
-                return NULL;
-        }
-
-        return sess;
+                return rc;
+        }
+
+        return EOK;
+}
+
+static void input_disconnect(void)
+{
+        pointer_t *pointer = input->user;
+        input_close(input);
+        pointer_destroy(pointer);
 }
 
@@ -1733 +1726 @@
 
         /* Establish input bidirectional connection. */
-        input_sess = input_connect(input_svc);
-        if (input_sess == NULL) {
-                return -1;
-        }
+        rc = input_connect(input_svc);
+        if (rc != EOK)
+                return rc;
 
         /* Create viewports and connect them to visualizers. */
@@ -1742 +1734 @@
         rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                async_hangup(input_sess);
+                input_disconnect();
                 return -1;
         }
@@ -1750 +1742 @@
         rc = loc_category_get_svcs(cat_id, &svcs, &svcs_cnt);
         if (rc != EOK || svcs_cnt == 0) {
-                async_hangup(input_sess);
+                input_disconnect();
                 return -1;
         }
@@ -1766 +1758 @@
         
         if (list_empty(&viewport_list)) {
-                async_hangup(input_sess);
+                input_disconnect();
                 return -1;
         }