Changeset 2c7fdaa in mainline for uspace/lib

Timestamp:

2015-02-18T02:19:30Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1e3375b, c0c38c7c

Parents:

d8bf1d8

Message:

resize only those windows that declare and support resizing capabilities
introduce generic window flags

Location:

uspace/lib

Files:

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

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 *);

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) {

uspace/lib/gui/window.h

@@ -65 +65 @@
  * Allocate all resources for new window and register it in the compositor.
  * If the window is declared as main, its closure causes termination of the
- * whole application. Note that opened window does not have any surface yet. */
-extern window_t *window_open(const char *, bool, bool, const char *);
+ * whole application. Note that opened window does not have any surface yet.
+ */
+extern window_t *window_open(const char *, window_flags_t, const char *);
 
 /**