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

Timestamp:

2014-01-17T23:12:10Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (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 libdrv-cleanup branch (includes mainline changes)

File:

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

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

@@ -43 +43 @@
 #include <io/pos_event.h>
 
+typedef enum {
+        GF_EMPTY = 0,
+        GF_MOVE_X = 1,
+        GF_MOVE_Y = 2,
+        GF_RESIZE_X = 4,
+        GF_RESIZE_Y = 8,
+        GF_SCALE_X = 16,
+        GF_SCALE_Y = 32
+} window_grab_flags_t;
+
+typedef enum {
+        WINDOW_PLACEMENT_ANY = 0,
+        WINDOW_PLACEMENT_CENTER_X = 1,
+        WINDOW_PLACEMENT_CENTER_Y = 2,
+        WINDOW_PLACEMENT_CENTER =
+            WINDOW_PLACEMENT_CENTER_X | WINDOW_PLACEMENT_CENTER_Y,
+        WINDOW_PLACEMENT_LEFT = 4,
+        WINDOW_PLACEMENT_RIGHT = 8,
+        WINDOW_PLACEMENT_TOP = 16,
+        WINDOW_PLACEMENT_BOTTOM = 32,
+        WINDOW_PLACEMENT_ABSOLUTE_X = 64,
+        WINDOW_PLACEMENT_ABSOLUTE_Y = 128,
+        WINDOW_PLACEMENT_ABSOLUTE =
+            WINDOW_PLACEMENT_ABSOLUTE_X | WINDOW_PLACEMENT_ABSOLUTE_Y
+} window_placement_flags_t;
+
 typedef struct {
         sysarg_t object;
         sysarg_t slot;
         sysarg_t argument;
-} sig_event_t;
+} signal_event_t;
 
 typedef struct {
+        sysarg_t offset_x;
+        sysarg_t offset_y;
         sysarg_t width;
         sysarg_t height;
-} rsz_event_t;
+        window_placement_flags_t placement_flags;
+} resize_event_t;
 
 typedef enum {
@@ -69 +98 @@
         kbd_event_t kbd;
         pos_event_t pos;
-        sig_event_t sig;
-        rsz_event_t rsz;
+        signal_event_t signal;
+        resize_event_t resize;
 } window_event_data_t;
 
@@ -79 +108 @@
 } window_event_t;
 
-typedef enum {
-        GF_EMPTY = 0,
-        GF_MOVE_X = 1,
-        GF_MOVE_Y = 2,
-        GF_RESIZE_X = 4,
-        GF_RESIZE_Y = 8,
-        GF_SCALE_X = 16,
-        GF_SCALE_Y = 32
-} window_grab_flags_t;
-
-extern int win_register(async_sess_t *, service_id_t *, service_id_t *, sysarg_t, sysarg_t);
+extern int win_register(async_sess_t *, service_id_t *, service_id_t *);
 
 extern int win_get_event(async_sess_t *, window_event_t *);
@@ -95 +114 @@
 extern int win_damage(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
 extern int win_grab(async_sess_t *, sysarg_t, sysarg_t);
-extern int win_resize(async_sess_t *, sysarg_t, sysarg_t, void *);
+extern int win_resize(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    window_placement_flags_t, void *);
 extern int win_close(async_sess_t *);
 extern int win_close_request(async_sess_t *);