Changeset 593e023 in mainline for uspace/lib/c/generic/io/input.c

Timestamp:

2014-08-12T17:14:32Z (10 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/lib/c/generic/io/input.c (modified) (3 diffs)

uspace/lib/c/generic/io/input.c

@@ -80 +80 @@
 }
 
-int input_yield(input_t *input)
+int input_activate(input_t *input)
 {
         async_exch_t *exch = async_exchange_begin(input->sess);
-        int rc = async_req_0_0(exch, INPUT_YIELD);
+        int rc = async_req_0_0(exch, INPUT_ACTIVATE);
         async_exchange_end(exch);
         
@@ -89 +89 @@
 }
 
-int input_reclaim(input_t *input)
-{
-        async_exch_t *exch = async_exchange_begin(input->sess);
-
-        int rc = async_req_0_0(exch, INPUT_RECLAIM);
-        async_exchange_end(exch);
-
-        return rc;
+static void input_ev_active(input_t *input, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        int rc = input->ev_ops->active(input);
+        async_answer_0(callid, rc);
+}
+
+static void input_ev_deactive(input_t *input, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        int rc = input->ev_ops->deactive(input);
+        async_answer_0(callid, rc);
 }
 
@@ -177 +181 @@
 
                 switch (IPC_GET_IMETHOD(call)) {
+                case INPUT_EVENT_ACTIVE:
+                        input_ev_active(input, callid, &call);
+                        break;
+                case INPUT_EVENT_DEACTIVE:
+                        input_ev_deactive(input, callid, &call);
+                        break;
                 case INPUT_EVENT_KEY:
                         input_ev_key(input, callid, &call);