Merge branch 'release/1.10.x'

direct/src/tkwidgets/Valuator.py

@@ -8,6 +8,7 @@ from . import WidgetPropertiesDialog
 import Pmw
 from direct.directtools.DirectUtil import getTkColorString
 from panda3d.core import Vec4
+import sys
 
 if sys.version_info >= (3, 0):
     from tkinter.colorchooser import askcolor

panda/src/windisplay/winGraphicsWindow.cxx

@@ -434,26 +434,8 @@ set_properties_now(WindowProperties &properties) {
         break;
 
       case WindowProperties::M_confined:
-        {
+        if (confine_cursor()) {
-          RECT clip;
+          _properties.set_mouse_mode(WindowProperties::M_confined);
-
-          if (!GetWindowRect(_hWnd, &clip)) {
-            windisplay_cat.warning()
-                << "GetWindowRect() failed in set_properties_now.  Cannot confine cursor.\n";
-          } else {
-            windisplay_cat.info()
-                    << "ClipCursor() to " << clip.left << "," << clip.top << " to "
-                    << clip.right << "," << clip.bottom << endl;
-
-            GetClipCursor(&_mouse_unconfined_cliprect);
-            if (!ClipCursor(&clip)) {
-              windisplay_cat.warning()
-                      << "ClipCursor() failed in set_properties_now.  Ignoring.\n";
-            } else {
-              _properties.set_mouse_mode(WindowProperties::M_confined);
-              windisplay_cat.info() << "Confining cursor to window\n";
-            }
-          }
         }
         break;
       }
@@ -776,6 +758,12 @@ do_reshape_request(int x_origin, int y_origin, bool has_origin,
                  view_rect.bottom - view_rect.top,
                  flags);
 
+    // If we are in confined mode, we must update the clip region.
+    if (_properties.has_mouse_mode() &&
+        _properties.get_mouse_mode() == WindowProperties::M_confined) {
+      confine_cursor();
+    }
+
     handle_reshape();
     return true;
   }
@@ -948,6 +936,12 @@ do_windowed_switch() {
                metrics.width, metrics.height,
                SWP_FRAMECHANGED | SWP_SHOWWINDOW);
 
+  // If we had a confined cursor, we must reconfine it now.
+  if (_properties.has_mouse_mode() &&
+      _properties.get_mouse_mode() == WindowProperties::M_confined) {
+    confine_cursor();
+  }
+
   return true;
 }
 
@@ -1313,6 +1307,31 @@ track_mouse_leaving(HWND hwnd) {
   _tracking_mouse_leaving = true;
 }
 
+/**
+ * Confines the mouse cursor to the window.
+ */
+bool WinGraphicsWindow::
+confine_cursor() {
+  RECT clip;
+  if (!GetWindowRect(_hWnd, &clip)) {
+    windisplay_cat.warning()
+      << "GetWindowRect() failed, cannot confine cursor.\n";
+    return false;
+  } else {
+    windisplay_cat.info()
+      << "ClipCursor() to " << clip.left << "," << clip.top << " to "
+      << clip.right << "," << clip.bottom << endl;
+
+    if (!ClipCursor(&clip)) {
+      windisplay_cat.warning()
+        << "Failed to confine cursor to window.\n";
+      return false;
+    } else {
+      return true;
+    }
+  }
+}
+
 /**
  * Attempts to set this window as the "focus" window, so that keyboard events
  * come here.
@@ -1486,6 +1505,14 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
             SetWindowPos(_hWnd, HWND_TOP, 0,0,0,0, SWP_NOMOVE | SWP_NOSENDCHANGING | SWP_NOSIZE | SWP_NOOWNERZORDER);
             fullscreen_restored(properties);
           }
+
+        // If we had a confined cursor, we must reconfine it upon activation.
+        if (_properties.has_mouse_mode() &&
+            _properties.get_mouse_mode() == WindowProperties::M_confined) {
+          if (!confine_cursor()) {
+            properties.set_mouse_mode(WindowProperties::M_absolute);
+          }
+        }
       }
     else
       {
@@ -1520,7 +1547,16 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     break;
 
   case WM_EXITSIZEMOVE:
-    // handle_reshape();
+    if (windisplay_cat.is_debug()) {
+      windisplay_cat.debug()
+        << "WM_EXITSIZEMOVE: " << hwnd << ", " << wparam << "\n";
+    }
+
+    // If we had a confined cursor, we must reconfine it upon a resize.
+    if (_properties.has_mouse_mode() &&
+        _properties.get_mouse_mode() == WindowProperties::M_confined) {
+      confine_cursor();
+    }
     break;
 
   case WM_WINDOWPOSCHANGED:

panda/src/windisplay/winGraphicsWindow.h

@@ -134,7 +134,7 @@ private:
   void initialize_input_devices();
   void handle_raw_input(HRAWINPUT hraw);
   void track_mouse_leaving(HWND hwnd);
-
+  bool confine_cursor();
   void set_focus();
 
   static void process_1_event();