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

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• uspace/lib/c/include/io/window.h (modified) (3 diffs)

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

@@ -36 +36 @@
 #define LIBC_IO_WINDOW_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #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 {
@@ -71 +58 @@
         ET_POSITION_EVENT,
         ET_SIGNAL_EVENT,
+        ET_WINDOW_FOCUS,
+        ET_WINDOW_UNFOCUS,
         ET_WINDOW_RESIZE,
         ET_WINDOW_REFRESH,
@@ -100 +89 @@
 } window_grab_flags_t;
 
-extern int win_register(async_sess_t *, service_id_t *, service_id_t *);
+extern int win_register(async_sess_t *, service_id_t *, service_id_t *, sysarg_t, sysarg_t);
 
 extern int win_get_event(async_sess_t *, window_event_t *);