Changeset 1e3375b in mainline for uspace/lib/c

Timestamp:

2015-03-10T23:36:53Z (11 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

acb8766e

Parents:

1619faa (diff), 2c7fdaa (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 from mainline

Location:

uspace/lib/c

Files:

• generic/io/window.c (modified) (1 diff)
• include/io/window.h (modified) (2 diffs)

uspace/lib/c/generic/io/window.c

@@ -40 +40 @@
 #include <stdio.h>
 
-int win_register(async_sess_t *sess, service_id_t *in, service_id_t *out)
+int win_register(async_sess_t *sess, window_flags_t flags, service_id_t *in,
+    service_id_t *out)
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        int ret = async_req_0_2(exch, WINDOW_REGISTER, in, out);
+        int ret = async_req_1_2(exch, WINDOW_REGISTER, flags, in, out);
         async_exchange_end(exch);
         

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

@@ -42 +42 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+
+typedef enum {
+        WINDOW_MAIN = 1,
+        WINDOW_DECORATED = 2,
+        WINDOW_RESIZEABLE = 4
+} window_flags_t;
 
 typedef enum {
@@ -108 +114 @@
 } window_event_t;
 
-extern int win_register(async_sess_t *, service_id_t *, service_id_t *);
+extern int win_register(async_sess_t *, window_flags_t, service_id_t *,
+    service_id_t *);
 
 extern int win_get_event(async_sess_t *, window_event_t *);