Changeset aa2b32c in mainline for uspace/lib/c/include/io/window.h

Timestamp:

2013-04-29T12:44:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a269d05

Parents:

06b0211b (diff), 9e7898e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/include/io/window.h (modified) (1 diff)

uspace/lib/c/include/io/window.h

@@ -40 +40 @@
 #include <async.h>
 #include <loc.h>
-#include <io/console.h>
-
-typedef enum {
-        POS_UPDATE,
-        POS_PRESS,
-        POS_RELEASE
-} pos_event_type_t;
-
-typedef struct {
-        sysarg_t pos_id;
-        pos_event_type_t type;
-        sysarg_t btn_num;
-        sysarg_t hpos;
-        sysarg_t vpos;
-} pos_event_t;
+#include <io/kbd_event.h>
+#include <io/pos_event.h>
 
 typedef struct {