Changes in uspace/lib/c/include/io/window.h [62fbb7e:bc4bf97] in mainline

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;
-} signal_event_t;
+} sig_event_t;
 
 typedef struct {
-        sysarg_t offset_x;
-        sysarg_t offset_y;
         sysarg_t width;
         sysarg_t height;
-        window_placement_flags_t placement_flags;
-} resize_event_t;
+} rsz_event_t;
 
 typedef enum {
@@ -98 +69 @@
         kbd_event_t kbd;
         pos_event_t pos;
-        signal_event_t signal;
-        resize_event_t resize;
+        sig_event_t sig;
+        rsz_event_t rsz;
 } window_event_data_t;
 
@@ -108 +79 @@
 } window_event_t;
 
-extern int win_register(async_sess_t *, service_id_t *, service_id_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_get_event(async_sess_t *, window_event_t *);
@@ -114 +95 @@
 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, sysarg_t, sysarg_t,
-    window_placement_flags_t, void *);
+extern int win_resize(async_sess_t *, sysarg_t, sysarg_t, void *);
 extern int win_close(async_sess_t *);
 extern int win_close_request(async_sess_t *);