Changeset 24cf391a in mainline for uspace/srv/hid/display/output.c

Timestamp:

2019-12-03T10:59:47Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

973efd36

Parents:

79949f3

git-author:

Jiri Svoboda <jiri@…> (2019-11-02 18:59:43)

git-committer:

Jiri Svoboda <jiri@…> (2019-12-03 10:59:47)

Message:

Switch window focus on mouse click

File:

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

uspace/srv/hid/display/output.c

@@ -37 +37 @@
 #include <gfx/context.h>
 #include <guigfx/canvas.h>
+#include <io/kbd_event.h>
+#include <io/pos_event.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +46 @@
 static void (*kbd_ev_handler)(void *, kbd_event_t *);
 static void *kbd_ev_arg;
+static void (*pos_ev_handler)(void *, pos_event_t *);
+static void *pos_ev_arg;
 
 static void on_keyboard_event(widget_t *widget, void *data)
@@ -51 +55 @@
 }
 
+static void on_position_event(widget_t *widget, void *data)
+{
+        pos_ev_handler(pos_ev_arg, (pos_event_t *) data);
+}
+
 errno_t output_init(void (*kbd_event_handler)(void *, kbd_event_t *),
-    void *arg, gfx_context_t **rgc)
+    void *karg, void (*pos_event_handler)(void *, pos_event_t *),
+    void *parg, gfx_context_t **rgc)
 {
         canvas_gc_t *cgc = NULL;
@@ -64 +74 @@
         printf("Init canvas..\n");
         kbd_ev_handler = kbd_event_handler;
-        kbd_ev_arg = arg;
+        kbd_ev_arg = karg;
+
+        pos_ev_handler = pos_event_handler;
+        pos_ev_arg = parg;
 
         window = window_open("comp:0/winreg", NULL,
@@ -96 +109 @@
 
         sig_connect(&canvas->keyboard_event, NULL, on_keyboard_event);
+        sig_connect(&canvas->position_event, NULL, on_position_event);
 
         window_resize(window, 0, 0, vw + 10, vh + 30, WINDOW_PLACEMENT_ANY);