Changeset 19852

Timestamp:

03/03/07 18:59:38 (2 years ago)

Author:

patrick

Message:

Added a data member mScreen that serves as an index into the array of
NSScreen objects. The code for setting the value based on the display_system
config elmeent was already in place, but it is commented out pending a
change to that config element that makes it less specific to the X Window
System. For now, it will only be possible to open Cocoa windows on the main
screen (as it was before this change).

Files:

• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowCocoa.h (modified) (1 diff)
• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowCocoa.mm (modified) (4 diffs)

juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowCocoa.h

@@ -133 +133 @@
-   void finishOpen();
-
+   unsigned int mScreen;
-   bool mWindowOpen;    /**< Keeps track of NSWindow open/closed state */
-};

juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowCocoa.mm

@@ -35 +35 @@
-#import <AppKit/NSWindow.h>
-#import <AppKit/NSApplication.h>
+#import <AppKit/NSScreen.h>
-
-#include <vpr/vpr.h>
@@ -116 +117 @@
-   : gadget::InputAreaCocoa()
-   , gadget::Input()
+   , mScreen(0)
-   , mWindowOpen(false)
-{
@@ -198 +200 @@
-      mScreen = disp_sys_elt->getProperty<unsigned int>("pipes", screen_num);
-
+      NSArray* screens = [NSArray screens];
+      if ( mScreen >= [screens count] )
+      {
+         mScreen = 0;
+      }
+
-      vprDEBUG(gadgetDBG_INPUT_MGR, vprDBG_CONFIG_LVL)
-         << "[gadget::InputWindowCocoa] Screen: " << mXDisplayString
@@ -237 +245 @@
-
-      NSRect content_rect = { {mX, mY}, {mWidth, mHeight} };
+
+      // mScreen is already known to be a valid index.
+      NSScreen* screen = [[NSScreen screens] objectAtIndex:mScreen];
+
-      // Creating the window and its view does not open the window. That
-      // happens when the -setContentView: message is delivered to
-waitAnd
+finish
-      mCocoaWindow =
-         [[NSWindow alloc] initWithContentRect:content_rect
-                                     styleMask:style_mask
-                                       backing:NSBackingStoreBuffered
-
+
+
-
-      // Register an observer for NSWindowWillCloseNotification events coming