Changeset 1e3375b in mainline for uspace/srv/hid/compositor/compositor.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/srv/hid/compositor/compositor.c (modified) (4 diffs)

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