Changeset f7fb2b21 in mainline for uspace/lib/display/include

Timestamp:

2020-02-10T19:01:42Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b43edabe

Parents:

287688f2

Message:

Propagate position event to display clients

Location:

uspace/lib/display/include/types

Files:

• display.h (modified) (2 diffs)
• display/event.h (modified) (1 diff)

uspace/lib/display/include/types/display.h

@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <io/kbd_event.h>
+#include <io/pos_event.h>
 #include <stdint.h>
 
@@ -58 +59 @@
 typedef struct {
         void (*kbd_event)(void *, kbd_event_t *);
+        void (*pos_event)(void *, pos_event_t *);
 } display_wnd_cb_t;
 

uspace/lib/display/include/types/display/event.h

@@ -37 +37 @@
 
 #include <io/kbd_event.h>
+#include <io/pos_event.h>
+
+typedef enum {
+        wev_kbd,
+        wev_pos
+} display_wnd_ev_type_t;
 
 typedef struct {
-        kbd_event_t kbd_event;
+        display_wnd_ev_type_t etype;
+        union {
+                kbd_event_t kbd;
+                pos_event_t pos;
+        } ev;
 } display_wnd_ev_t;