Ticket #4721: app_server_flags_4721.patch

src/servers/app/Window.cpp

@@ -781 +781 @@
     int32 modifiers = _ExtractModifiers(message);
     bool inBorderRegion = fBorderRegion.Contains(where);
     bool windowModifier = (fFlags & B_NO_SERVER_SIDE_WINDOW_MODIFIERS) == 0
-        && (~modifiers & (B_COMMAND_KEY | B_CONTROL_KEY)) == 0;
+                            && (modifiers & (B_COMMAND_KEY | B_CONTROL_KEY
+                                            | B_OPTION_KEY | B_SHIFT_KEY))
+                                        == B_COMMAND_KEY | B_CONTROL_KEY;
 
-    // default action is to drag the Window
-    if (windowModifier || inBorderRegion) {
-        // clicking Window visible area
-
-        click_type action = DEC_NONE;
+    // get special action if any (drag, resize etc)
+    click_type action = DEC_NONE;
+    
+    if (inBorderRegion || windowModifier) {
+        // clicking window title bar/borders, or windowModifier keys are down
         int32 buttons = _ExtractButtons(message);
 
         if (inBorderRegion && fDecorator != NULL)
@@ -803 +805 @@
         // non-floating window doesn't have focus
         if (!IsFocus() && !IsFloating() && action != DEC_MOVETOBACK
             && action != DEC_RESIZE && action != DEC_SLIDETAB)
-            action = DEC_DRAG;
+            action = (fFlags & B_NOT_MOVABLE) ? DEC_NONE : DEC_DRAG;
+    }
+    
+    // let clicks caught by windowModifier through to window if no special
+    // action would take place anyway, e.g. if window is not movable.
+    if (inBorderRegion || (windowModifier && action != DEC_NONE)) {
 
         // set decorator internals
         switch (action) {
@@ -1530 +1537 @@
 }
 
 
-/*! Returns wether or not a window is in the workspace list with the
+/*! Returns whether or not a window is in the workspace list with the
     specified \a index.
 */
 bool
@@ -1847 +1854 @@
 /*static*/ uint32
 Window::ValidWindowFlags()
 {
-    return B_NOT_MOVABLE | B_NOT_CLOSABLE | B_NOT_ZOOMABLE
-        | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE
-        | B_NOT_H_RESIZABLE | B_NOT_V_RESIZABLE
-        | B_AVOID_FRONT | B_AVOID_FOCUS
-        | B_WILL_ACCEPT_FIRST_CLICK | B_OUTLINE_RESIZE
-        | B_NO_WORKSPACE_ACTIVATION
-        | B_NOT_ANCHORED_ON_ACTIVATE
-        | B_ASYNCHRONOUS_CONTROLS
-        | B_QUIT_ON_WINDOW_CLOSE
-        | B_SAME_POSITION_IN_ALL_WORKSPACES
-        | kWindowScreenFlag;
+    return (B_VALID_WINDOW_FLAGS | kWindowScreenFlag);
 }
 
 

headers/os/interface/Window.h

@@ -32 +32 @@
     B_FLOATING_WINDOW                   = 21
 };
 
+// must update app_server's IsValidLook() when changing
 enum window_look {
     B_BORDERED_WINDOW_LOOK              = 20,
     B_NO_BORDER_WINDOW_LOOK             = 19,
@@ -41 +42 @@
     B_FLOATING_WINDOW_LOOK              = 7
 };
 
+// must update app_server's IsValidFeel() when changing
 enum window_feel {
     B_NORMAL_WINDOW_FEEL                = 0,
     B_MODAL_SUBSET_WINDOW_FEEL          = 2,
@@ -78 +80 @@
     B_CLOSE_ON_ESCAPE                   = 0x00800000,
     B_NO_SERVER_SIDE_WINDOW_MODIFIERS   = 0x00000200
 };
+// combination of all flags from above
+#define B_VALID_WINDOW_FLAGS    (B_NOT_MOVABLE | B_NOT_CLOSABLE | \
+                                 B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | \
+                                 B_NOT_RESIZABLE | B_NOT_H_RESIZABLE | \
+                                 B_NOT_V_RESIZABLE | B_AVOID_FRONT | \
+                                 B_AVOID_FOCUS | B_WILL_ACCEPT_FIRST_CLICK | \
+                                 B_OUTLINE_RESIZE | B_NO_WORKSPACE_ACTIVATION | \
+                                 B_NOT_ANCHORED_ON_ACTIVATE | B_ASYNCHRONOUS_CONTROLS | \
+                                 B_QUIT_ON_WINDOW_CLOSE | B_SAME_POSITION_IN_ALL_WORKSPACES | \
+                                 B_AUTO_UPDATE_SIZE_LIMITS | \
+                                 B_CLOSE_ON_ESCAPE | \
+                                 B_NO_SERVER_SIDE_WINDOW_MODIFIERS)
 
 #define B_CURRENT_WORKSPACE             0
 #define B_ALL_WORKSPACES                0xffffffff