Changeset 1e3375b in mainline for uspace/lib/gui/window.c

Timestamp:

2015-03-10T23:36:53Z (9 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

File:

• uspace/lib/gui/window.c (modified) (3 diffs)

uspace/lib/gui/window.c

@@ -591 +591 @@
 }
 
-window_t *window_open(const char *winreg, bool is_main, bool is_decorated,
+window_t *window_open(const char *winreg, window_flags_t flags,
     const char *caption)
 {
@@ -598 +598 @@
                 return NULL;
         
-        win->is_main = is_main;
-        win->is_decorated = is_decorated;
+        win->is_main = flags & WINDOW_MAIN;
+        win->is_decorated = flags & WINDOW_DECORATED;
         win->is_focused = true;
         prodcons_initialize(&win->events);
@@ -632 +632 @@
         service_id_t in_dsid;
         service_id_t out_dsid;
-        rc = win_register(reg_sess, &in_dsid, &out_dsid);
+        rc = win_register(reg_sess, flags, &in_dsid, &out_dsid);
         async_hangup(reg_sess);
         if (rc != EOK) {