Changeset 1e3375b in mainline

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

Location:

uspace

Files:

• app/barber/barber.c (modified) (1 diff)
• app/fontviewer/fontviewer.c (modified) (1 diff)
• app/vdemo/vdemo.c (modified) (1 diff)
• app/viewer/viewer.c (modified) (1 diff)
• app/vlaunch/vlaunch.c (modified) (1 diff)
• app/vterm/vterm.c (modified) (1 diff)
• lib/c/generic/io/window.c (modified) (1 diff)
• lib/c/include/io/window.h (modified) (2 diffs)
• lib/gui/window.c (modified) (3 diffs)
• lib/gui/window.h (modified) (1 diff)
• srv/hid/compositor/compositor.c (modified) (4 diffs)

uspace/app/barber/barber.c

@@ -308 +308 @@
         
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1], true, true, "barber");
+        window_t *main_window = window_open(argv[1],
+            WINDOW_MAIN | WINDOW_DECORATED, "barber");
         if (!main_window) {
                 printf("Cannot open main window.\n");

uspace/app/fontviewer/fontviewer.c

@@ -260 +260 @@
         }
         
-        main_window = window_open(argv[1], true, false, "fontviewer");
+        main_window = window_open(argv[1], WINDOW_MAIN, "fontviewer");
         if (!main_window) {
                 printf("Cannot open main window.\n");

uspace/app/vdemo/vdemo.c

@@ -110 +110 @@
 {
         if (argc >= 2) {
-                window_t *main_window = window_open(argv[1], true, true, "vdemo");
+                window_t *main_window = window_open(argv[1],
+                    WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vdemo");
                 if (!main_window) {
                         printf("Cannot open main window.\n");

uspace/app/viewer/viewer.c

@@ -167 +167 @@
         }
         
-        main_window = window_open(argv[1], true, false, "viewer");
+        main_window = window_open(argv[1], WINDOW_MAIN, "viewer");
         if (!main_window) {
                 printf("Cannot open main window.\n");

uspace/app/vlaunch/vlaunch.c

@@ -114 +114 @@
         
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1], true, true, "vlaunch");
+        window_t *main_window = window_open(argv[1],
+            WINDOW_MAIN | WINDOW_DECORATED | WINDOW_RESIZEABLE, "vlaunch");
         if (!main_window) {
                 printf("Cannot open main window.\n");

uspace/app/vterm/vterm.c

@@ -49 +49 @@
         }
         
-        window_t *main_window = window_open(argv[1], true, true, "vterm");
+        window_t *main_window = window_open(argv[1],
+            WINDOW_MAIN | WINDOW_DECORATED, "vterm");
         if (!main_window) {
                 printf("%s: Cannot open main window.\n", NAME);

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

uspace/srv/hid/compositor/compositor.c

@@ -90 +90 @@
         link_t link;
         atomic_t ref_cnt;
+        window_flags_t flags;
         service_id_t in_dsid;
         service_id_t out_dsid;
@@ -635 +636 @@
         sysarg_t pos_id = IPC_GET_ARG1(*icall);
         sysarg_t grab_flags = IPC_GET_ARG2(*icall);
+        
+        /*
+         * Filter out resize grab flags if the window
+         * is not resizeable.
+         */
+        if ((win->flags & WINDOW_RESIZEABLE) != WINDOW_RESIZEABLE)
+                grab_flags &= ~(GF_RESIZE_X | GF_RESIZE_Y);
 
         fibril_mutex_lock(&pointer_list_mtx);
@@ -903 +911 @@
                                 return;
                         }
+                        
+                        win->flags = IPC_GET_ARG1(call);
 
                         char name_in[LOC_NAME_MAXLEN + 1];
@@ -1885 +1895 @@
                 fibril_mutex_lock(&window_list_mtx);
                 window_t *win = (window_t *) list_first(&window_list);
-                if (win && win->surface) {
+                if ((win) && (win->surface) && (win->flags & WINDOW_RESIZEABLE)) {
                         window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
                         if (event == NULL) {