projects/dwt-mac: dwt/widgets/Shell.d comparison

comparison dwt/widgets/Shell.d @ 45:d8635bb48c7c

Merge with SWT 3.5

author	Jacob Carlborg <doob@me.com>
date	Mon, 01 Dec 2008 17:07:00 +0100
parents	642f460a0908
children	cfa563df4fdd

comparison

equal deleted inserted replaced

-:ca5e494f2bbf
+:d8635bb48c7c
 /*******************************************************************************
-* Copyright (c) 2000, 2007 IBM Corporation and others.
+* Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *
 * Port to the D programming language:
-*     Jacob Carlborg <jacob.carlborg@gmail.com>
+*     Jacob Carlborg <doob@me.com>
 *******************************************************************************/
 module dwt.widgets.Shell;
 import dwt.DWT;
 import dwt.DWTException;
 import dwt.graphics.Cursor;
 import dwt.graphics.GC;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 import dwt.graphics.Region;
-import dwt.internal.cocoa.NSEvent;
+import dwt.internal.Callback;
+import dwt.internal.cocoa.NSApplication;
+import dwt.internal.cocoa.NSBezierPath;
+import dwt.internal.cocoa.NSColor;
+import dwt.internal.cocoa.NSGraphicsContext;
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRect;
+import dwt.internal.cocoa.NSScreen;
 import dwt.internal.cocoa.NSScrollView;
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.NSView;
 import dwt.internal.cocoa.NSWindow;
 import dwt.internal.cocoa.OS;
 import dwt.internal.cocoa.SWTWindow;
 import dwt.internal.cocoa.SWTWindowDelegate;
+import dwt.internal.cocoa.id;
 import dwt.dwthelper.utils;
 import dwt.internal.cocoa.NSInteger;
 import objc = dwt.internal.objc.runtime;
 import dwt.widgets.Composite;
 * IMPORTANT: This class is not intended to be subclassed.
 * </p>
 *
 * @see Decorations
 * @see DWT
+* @see <a href="http://www.eclipse.org/swt/snippets/#shell">Shell snippets</a>
+* @see <a href="http://www.eclipse.org/swt/examples.php">DWT Example: ControlExample</a>
+* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
 */
 public class Shell : Decorations {
 NSWindow window;
 SWTWindowDelegate windowDelegate;
+NSBezierPath regionPath;
 bool opened, moved, resized, fullScreen;
 //  bool resized, moved, drawing, reshape, update, deferDispose, active, disposed, opened, fullScreen;
 Control lastActive;
-Region region;
 Rectangle normalBounds;
 static int DEFAULT_CLIENT_WIDTH = -1;
 static int DEFAULT_CLIENT_HEIGHT = -1;
 */
 public this (Shell parent, int style) {
 this (parent !is null ? parent.display : null, parent, style, null, false);
 }
-public static Shell internal_new (Display display, objc.id handle) {
+/**
+* Invokes platform specific functionality to allocate a new shell
+* that is not embedded.
+* <p>
+* <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+* API for <code>Shell</code>. It is marked public only so that it
+* can be shared within the packages provided by DWT. It is not
+* available on all platforms, and should never be called from
+* application code.
+* </p>
+*
+* @param display the display for the shell
+* @param handle the handle for the shell
+* @return a new shell object containing the specified display and handle
+*
+* @since 3.3
+*/
 return new Shell (display, null, DWT.NO_TRIM, handle, false);
+}
+/**
+* Invokes platform specific functionality to allocate a new shell
+* that is 'embedded'.  In this case, the handle represents an NSView
+* that acts as an embedded DWT Shell in an AWT Canvas.
+* <p>
+* <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+* API for <code>Shell</code>. It is marked public only so that it
+* can be shared within the packages provided by DWT. It is not
+* available on all platforms, and should never be called from
+* application code.
+* </p>
+*
+* @param display the display for the shell
+* @param handle the handle for the shell
+* @return a new shell object containing the specified display and handle
+*
+* @since 3.5
+*/
+public static Shell cocoa_new (Display display, int /*long*/ handle) {
+return new Shell (display, null, DWT.NO_TRIM, handle, true);
 }
 static int checkStyle (int style) {
 style = Decorations.checkStyle (style);
 style &= ~DWT.TRANSPARENT;
 if ((style & DWT.APPLICATION_MODAL) !is 0) return bits | DWT.APPLICATION_MODAL;
 if ((style & DWT.PRIMARY_MODAL) !is 0) return bits | DWT.PRIMARY_MODAL;
 return bits;
 }
+bool accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+// The content view of a shell is always ignored.
+if (id is view.id) return true;
+return super.accessibilityIsIgnored(id, sel);
+}
 /**
 * Adds the listener to the collection of listeners who will
 * be notified when operations are performed on the receiver,
 * by sending the listener one of the messages defined in the
 * <code>ShellListener</code> interface.
 } else {
 setActive ();
 }
 }
+bool canBecomeKeyWindow (int /*long*/ id, int /*long*/ sel) {
+if (window.styleMask () is OS.NSBorderlessWindowMask) return true;
+return super.canBecomeKeyWindow (id, sel);
+}
 void checkOpen () {
 if (!opened) resized = false;
+}
+void clearLevel() {
+window.setLevel(0);
 }
 /**
 * Requests that the window manager close the receiver in
 * the same way it would be closed when the user clicks on
 NSRect rect = NSRect ();
 rect.x = trim.x;
 rect.y = trim.y;
 rect.width = trim.width;
 rect.height = trim.height;
-rect = NSWindow.static_frameRectForContentRect_styleMask_(rect, window.styleMask());
+NSWindow myWindow = (window !is null ? window : view.window());
-return new Rectangle (cast(int)rect.x, cast(int)rect.y, cast(int)rect.width, cast(int)rect.height);
+rect = myWindow.frameRectForContentRect(rect);
 }
 void createHandle () {
-state |= CANVAS;// | GRAB | HIDDEN;
+state |= HIDDEN;
-if (window !is null) {
+if (window is null) {
-view = window.contentView();
+window = (NSWindow) new SWTWindow ().alloc ();
-return;
-} else {
-SWTWindow swtWindow = cast(SWTWindow) (new SWTWindow ()).alloc ();
-swtWindow.setTag(jniRef);
-window = cast(NSWindow)swtWindow;
-NSRect rect = NSRect();
-dwt.widgets.Monitor.Monitor monitor = getMonitor ();
-Rectangle clientArea = monitor.getClientArea ();
-rect.width = clientArea.width * 5 / 8;
-rect.height = clientArea.height * 5 / 8;
 NSUInteger styleMask = NSBorderlessWindowMask;
 if ((style & DWT.NO_TRIM) is 0) {
-styleMask = OS.NSTitledWindowMask;
+if ((style & DWT.TITLE) !is 0) styleMask |= OS.NSTitledWindowMask;
 if ((style & DWT.CLOSE) !is 0) styleMask |= NSClosableWindowMask;
 if ((style & DWT.MIN) !is 0) styleMask |= NSMiniaturizableWindowMask;
 if ((style & DWT.MAX) !is 0) styleMask |= NSResizableWindowMask;
 if ((style & DWT.RESIZE) !is 0) styleMask |= NSResizableWindowMask;
 }
-window = window.initWithContentRect_styleMask_backing_defer_(rect, styleMask, NSBackingStoreBuffered, false);
+NSScreen screen = null;
-display.cascade = window.cascadeTopLeftFromPoint(display.cascade);
+NSScreen primaryScreen = new NSScreen(NSScreen.screens().objectAtIndex(0));
+if (parent !is null) screen = parent.getShell().window.screen();
+if (screen is null) screen = primaryScreen;
+window = window.initWithContentRect(new NSRect(), styleMask, OS.NSBackingStoreBuffered, false, screen);
+if ((style & (DWT.NO_TRIM | DWT.BORDER | DWT.SHELL_TRIM)) is 0) {
+window.setHasShadow (true);
+}
+display.cascadeWindow(window, screen);
+NSRect screenFrame = screen.frame();
+float /*double*/ width = screenFrame.width * 5 / 8, height = screenFrame.height * 5 / 8;;
+NSRect frame = window.frame();
+NSRect primaryFrame = primaryScreen.frame();
+frame.y = primaryFrame.height - ((primaryFrame.height - (frame.y + frame.height)) + height);
+frame.width = width;
+frame.height = height;
+window.setFrame(frame, false);
 if ((style & DWT.ON_TOP) !is 0) {
-window.setLevel(OS.NSFloatingWindowLevel);
+window.setLevel(OS.NSStatusWindowLevel);
 }
-}
+super.createHandle ();
+topView ().setHidden (true);
-(cast(Composite)this).createHandle (null);
+} else {
+//      OS.object_setClass (window.id, OS.objc_getClass("SWTWindow"));
-window.setContentView (topView());
+state &= ~HIDDEN;
-windowDelegate = cast(SWTWindowDelegate)(new SWTWindowDelegate()).alloc().init();
+//TODO - get the content of the foreign window instead of creating it
-windowDelegate.setTag(jniRef);
+super.createHandle ();
+style |= DWT.NO_BACKGROUND;
+}
+window.setAcceptsMouseMovedEvents(true);
+windowDelegate = (SWTWindowDelegate)new SWTWindowDelegate().alloc().init();
 window.setDelegate(windowDelegate);
+window.disableCursorRects();
+id id = window.fieldEditor (true, null);
+if (id !is null) {
+OS.object_setClass (id.id, OS.objc_getClass ("SWTEditorView"));
+}
+}
+/*
+* Feature in Cocoa.  An NSWindow that is the child window of another NSWindow
+* will track the movement of its parent window. The work around is to adjust
+* the window's level.
+*/
+void fixLevel() {
+Shell topShell = this;
+while (topShell.parent !is null) {
+if (topShell.parent !is null) topShell = (Shell) topShell.parent;
+}
+Shell[] shells = display.getShells ();
+for (int i = 0; i < shells.length; i++) {
+Shell shell = shells [i];
+if ((shell.style & DWT.ON_TOP) is 0) {
+int level = 0;
+Shell pShell = shell;
+while (pShell.parent !is null) {
+pShell = (Shell) pShell.parent;
+level++;
+}
+int newLevel = pShell is topShell ? level : 0;
+newLevel = Math.min (newLevel, OS.NSModalPanelWindowLevel - 1);
+shell.window.setLevel (newLevel);
+}
+}
+}
+void deregister () {
+super.deregister ();
+if (window !is null) display.removeWidget (window);
+if (windowDelegate !is null) display.removeWidget (windowDelegate);
 }
 void destroyWidget () {
 NSWindow window = this.window;
+Display display = this.display;
 releaseHandle ();
-if (window !is null) window.close();
+if (window !is null) {
+window.close();
+}
+//If another shell is not going to become active, clear the menu bar.
+if (!display.isDisposed () && display.getShells ().length is 0) {
+display.setMenuBar (null);
+}
+}
+void drawWidget (int /*long*/ id, NSRect rect) {
+if (regionPath !is null && background is null) {
+NSGraphicsContext context = NSGraphicsContext.currentContext();
+context.saveGraphicsState();
+NSColor.windowBackgroundColor().setFill();
+NSBezierPath.fillRect(rect);
+context.restoreGraphicsState();
+}
+super.drawWidget (id, rect);
 }
 Control findBackgroundControl () {
 return background !is null || backgroundImage !is null ? this : null;
 }
 return cursor;
 }
 void fixShell (Shell newShell, Control control) {
 if (this is newShell) return;
-//  if (control is lastActive) setActiveControl (null);
+if (control is lastActive) setActiveControl (null);
-}
-void flagsChanged(objc.id theEvent) {
-Display display = this.display;
-NSEvent nsEvent = new NSEvent(theEvent);
-NSUInteger modifiers = nsEvent.modifierFlags();
-int lastModifiers = display.lastModifiers;
-//  int chord = OS.GetCurrentEventButtonState ();
-int type = DWT.KeyUp;
-if ((modifiers & OS.NSAlphaShiftKeyMask) !is 0 && (lastModifiers & OS.NSAlphaShiftKeyMask) is 0) type = DWT.KeyDown;
-if ((modifiers & OS.NSAlternateKeyMask) !is 0 && (lastModifiers & OS.NSAlternateKeyMask) is 0) type = DWT.KeyDown;
-if ((modifiers & OS.NSShiftKeyMask) !is 0 && (lastModifiers & OS.NSShiftKeyMask) is 0) type = DWT.KeyDown;
-if ((modifiers & OS.NSControlKeyMask) !is 0 && (lastModifiers & OS.NSControlKeyMask) is 0) type = DWT.KeyDown;
-if ((modifiers & OS.NSCommandKeyMask) !is 0 && (lastModifiers & OS.NSCommandKeyMask) is 0) type = DWT.KeyDown;
-Control target = display.getFocusControl();
-if (type is DWT.KeyUp && (modifiers & OS.NSAlphaShiftKeyMask) is 0 && (lastModifiers & OS.NSAlphaShiftKeyMask) !is 0) {
-if (target !is null) {
-Event event = new Event ();
-event.keyCode = DWT.CAPS_LOCK;
-//      setInputState (event, DWT.KeyDown, chord, modifiers);
-(cast(Widget)target).sendKeyEvent (DWT.KeyDown, event);
-}
-}
-Event event = new Event ();
-//  setInputState (event, type, chord, modifiers);
-if (event.keyCode is 0 && event.character is 0) return;
-bool result = (cast(Widget)this).sendKeyEvent (type, event);
-if (type is DWT.KeyDown && (modifiers & OS.NSAlphaShiftKeyMask) !is 0 && (lastModifiers & OS.NSAlphaShiftKeyMask) is 0) {
-if (target !is null) {
-event = new Event ();
-event.keyCode = DWT.CAPS_LOCK;
-//      setInputState (event, DWT.KeyUp, chord, modifiers);
-(cast(Widget)target).sendKeyEvent (DWT.KeyUp, event);
-}
-}
-display.lastModifiers = modifiers;
 }
 /**
 * If the receiver is visible, moves it to the top of the
 * drawing order for the display on which it was created
 * @see Shell#open
 * @see Shell#setActive
 */
 public void forceActive () {
 checkWidget ();
-if (!isVisible ()) return;
+if (!isVisible()) return;
-//  OS.SelectWindow (shellHandle);
+if (window is null) return;
-//  OS.SetFrontProcessWithOptions (new int [] {0, OS.kCurrentProcess}, OS.kSetFrontProcessFrontWindowOnly);
+window.makeKeyAndOrderFront (null);
-}
+NSApplication application = NSApplication.sharedApplication ();
+application.activateIgnoringOtherApps (true);
+}
+/**
+* Returns the receiver's alpha value. The alpha value
+* is between 0 (transparent) and 255 (opaque).
+*
+* @return the alpha value
+*
+* @exception DWTException <ul>
+*    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+*    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+* </ul>
+*
+* @since 3.4
+*/
 public int getAlpha () {
 checkWidget ();
-return cast(int)(window.alphaValue() * 255);
+// TODO: Should we support embedded frame alpha?
+if (window is null) return 255;
 }
 public Rectangle getBounds () {
 checkWidget();
-NSRect frame = window.frame ();
+NSRect frame = (window is null ? view.frame() : window.frame());
-return new Rectangle (cast(int)frame.x, cast(int) frame.y, cast(int) frame.width, cast(int) frame.height);
+GCFloat y = display.getPrimaryFrame().height - cast(int)(frame.y + frame.height);
+return new Rectangle (cast(int)frame.x, cast(int)y, cast(int)frame.width, cast(int)frame.height);
 }
 public Rectangle getClientArea () {
 checkWidget();
 //TODO why super implementation fails
-NSRect rect = window.contentRectForFrameRect_(window.frame());
+if (window is null) {
-int width = cast(int)rect.width, height = cast(int)rect.height;
+// In embedded frames, the whole view is the client area.
+NSRect rect = view.frame();
+int width = (int)rect.width, height = (int)rect.height;
+return new Rectangle (0, 0, width, height);
+}
+NSRect rect = window.contentRectForFrameRect(window.frame());
 if (scrollView !is null) {
 NSSize size = NSSize();
 size.width = width;
 size.height = height;
 size = NSScrollView.contentSizeForFrameSize(size, (style & DWT.H_SCROLL) !is 0, (style & DWT.V_SCROLL) !is 0, NSNoBorder);
 height = cast(int)size.height;
 }
 return new Rectangle (0, 0, width, height);
 }
-int getDrawCount (int control) {
+NSBezierPath getClipping() {
-if (!isTrimHandle (control)) return drawCount;
+return regionPath;
-return 0;
+}
-}
+/**
+* Returns <code>true</code> if the receiver is currently
+* in fullscreen state, and false otherwise.
+* <p>
+*
+* @return the fullscreen state
+*
+* @exception DWTException <ul>
+*    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+*    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+* </ul>
+*
+* @since 3.4
+*/
 public bool getFullScreen () {
 checkWidget();
 return fullScreen;
 }
 return DWT.NONE;
 }
 public Point getLocation () {
 checkWidget();
-NSRect frame = window.frame ();
+// TODO: frame is relative to superview. What does getLocation mean in the embedded case?
-return new Point (cast(int) frame.x, cast(int) frame.y);
+NSRect frame = (window !is null ? window.frame() : view.frame());
+float /*double*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
+return new Point ((int)frame.x, (int)y);
 }
 public bool getMaximized () {
 checkWidget();
 //NOT DONE
 return !fullScreen && super.getMaximized ();
+}
+Shell getModalShell () {
+Shell shell = null;
+Shell [] modalShells = display.modalShells;
+if (modalShells !is null) {
+int bits = DWT.APPLICATION_MODAL | DWT.SYSTEM_MODAL;
+int index = modalShells.length;
+while (--index >= 0) {
+Shell modal = modalShells [index];
+if (modal !is null) {
+if ((modal.style & bits) !is 0) {
+Control control = this;
+while (control !is null) {
+if (control is modal) break;
+control = control.parent;
+}
+if (control !is modal) return modal;
+break;
+}
+if ((modal.style & DWT.PRIMARY_MODAL) !is 0) {
+if (shell is null) shell = getShell ();
+if (modal.parent is shell) return modal;
+}
+}
+}
+}
+return null;
 }
 public bool getMinimized () {
 checkWidget();
 if (!getVisible ()) return super.getMinimized ();
 return result;
 }
 public Point getSize () {
 checkWidget();
-NSRect frame = window.frame ();
+NSRect frame = (window !is null ? window.frame() : view.frame());
 return new Point (cast(int) frame.width, cast(int) frame.height);
+}
+float getThemeAlpha () {
+return 1;
 }
 bool hasBorder () {
 return false;
 }
-void helpRequested(int theEvent) {
+void helpRequested(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
 Control control = display.getFocusControl();
 while (control !is null) {
 if (control.hooks (DWT.Help)) {
 control.postEvent (DWT.Help);
 break;
 public bool isVisible () {
 checkWidget();
 return getVisible ();
 }
+bool makeFirstResponder (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+if (display.focusControl is null) display.focusControl = display.getFocusControl ();
+bool result = super.makeFirstResponder(id, sel, notification);
+if (result) {
+Control newFocus = display.getFocusControl ();
+if (newFocus !is null && newFocus !is display.focusControl) {
+Control oldFocus = display.focusControl;
+display.focusControl = newFocus;
+if (oldFocus !is null && !oldFocus.isDisposed ()) oldFocus.sendFocusEvent (DWT.FocusOut, false);
+if (newFocus !is null && !newFocus.isDisposed ()) newFocus.sendFocusEvent (DWT.FocusIn, false);
+}
+}
+return result;
+}
 /**
 * Moves the receiver to the top of the drawing order for
 * the display on which it was created (so that all other
 * shells on that display, which are not the receiver's
 * children will be drawn behind it), marks it visible,
 * @see Shell#setActive
 * @see Shell#forceActive
 */
 public void open () {
 checkWidget();
+int mask = DWT.PRIMARY_MODAL | DWT.APPLICATION_MODAL | DWT.SYSTEM_MODAL;
+if ((style & mask) !is 0) {
+display.setModalShell (this);
+} else {
+updateModal ();
+}
 setWindowVisible (true, true);
 if (isDisposed ()) return;
 //  if (active) {
 if (!restoreFocus () && !traverseGroup (true)) setFocus ();
 //  }
 //  }
 //  return true;
 return false;
 }
+void register () {
+super.register ();
+if (window !is null) display.addWidget (window, this);
+if (windowDelegate !is null) display.addWidget (windowDelegate, this);
+}
 void releaseChildren (bool destroy) {
 Shell [] shells = getShells ();
 for (int i=0; i<shells.length; i++) {
 Shell shell = shells [i];
 if (shell !is null && !shell.isDisposed ()) {
 }
 super.releaseChildren (destroy);
 }
 void releaseHandle () {
-window.setDelegate(null);
+if (window !is null) window.setDelegate(null);
 if (windowDelegate !is null) windowDelegate.release();
 windowDelegate = null;
 super.releaseHandle ();
 window = null;
 }
 /* Do nothing */
 }
 void releaseWidget () {
 super.releaseWidget ();
+display.clearModal (this);
 //  disposed = true;
 lastActive = null;
+if (regionPath !is null) regionPath.release();
+regionPath = null;
 }
 /**
 * Removes the listener from the collection of listeners who will
 * be notified when operations are performed on the receiver.
 * @see Decorations#setDefaultButton(Button)
 * @see Shell#open
 * @see Shell#setActive
 */
 public void setActive () {
+if (window is null) return;
 checkWidget ();
-if (!isVisible ()) return;
+if (!isVisible()) return;
-//  OS.SelectWindow (shellHandle);
+window.makeKeyAndOrderFront (null);
 }
 void setActiveControl (Control control) {
 if (control !is null && control.isDisposed ()) control = null;
 if (lastActive !is null && lastActive.isDisposed ()) lastActive = null;
 activate [i].sendEvent (DWT.Activate);
 }
 }
 }
+/**
+* Sets the receiver's alpha value which must be
+* between 0 (transparent) and 255 (opaque).
+* <p>
+* This operation requires the operating system's advanced
+* widgets subsystem which may not be available on some
+* platforms.
+* </p>
+* @param alpha the alpha value
+*
+* @exception DWTException <ul>
+*    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+*    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+* </ul>
+*
+* @since 3.4
+*/
 public void setAlpha (int alpha) {
+if (window is null) return;
 checkWidget ();
 alpha &= 0xFF;
 window.setAlphaValue (alpha / 255f);
 }
-int setBounds (int x, int y, int width, int height, bool move, bool resize) {
+void setBounds (int x, int y, int width, int height, bool move, bool resize) {
-//  if (fullScreen) setFullScreen (false);
+// Embedded Shells are not resizable.
-if (move && resize) {
+if (window is null) return;
-NSRect rect = NSRect ();
+if (fullScreen) setFullScreen (false);
-rect.x = x;
+int screenHeight = (int) display.getPrimaryFrame().height;
-//TODO - get the screen for the point
+NSRect frame = window.frame();
-int screenHeight = cast(int) window.screen().frame().height;
+if (!move) {
-rect.y = screenHeight - y;
+x = (int)frame.x;
-rect.width = width;
+y = screenHeight - (int)(frame.y + frame.height);
-rect.height = height;
+}
-window.setFrame_display_(rect, false);
+if (!resize) {
-} else {
+width = (int)frame.width;
-if (move) {
+height = (int)frame.height;
-NSPoint point = NSPoint();
+}
-point.x = x;
+frame.x = x;
-//TODO - get the screen for the point
+frame.y = screenHeight - (int)(y + height);
-int screenHeight = cast(int) window.screen().frame().height;
+frame.width = width;
-point.y = screenHeight - y;
+frame.height = height;
-window.setFrameTopLeftPoint (point);
+window.setFrame(frame, false);
-} else {
-if (resize) {
-NSRect rect = window.frame();
-rect.width = width;
-rect.height = height;
-window.setFrame_display_(rect, false);
-}
-}
-}
-return 0;
 }
 public void setEnabled (bool enabled) {
 checkWidget();
 if (((state & DISABLED) is 0) is enabled) return;
 //  if (enabled && OS.IsWindowActive (shellHandle)) {
 //      if (!restoreFocus ()) traverseGroup (false);
 //  }
 }
+/**
+* Sets the full screen state of the receiver.
+* If the argument is <code>true</code> causes the receiver
+* to switch to the full screen state, and if the argument is
+* <code>false</code> and the receiver was previously switched
+* into full screen state, causes the receiver to switch back
+* to either the maximmized or normal states.
+* <p>
+* Note: The result of intermixing calls to <code>setFullScreen(true)</code>,
+* <code>setMaximized(true)</code> and <code>setMinimized(true)</code> will
+* vary by platform. Typically, the behavior will match the platform user's
+* expectations, but not always. This should be avoided if possible.
+* </p>
+*
+* @param fullScreen the new fullscreen state
+*
+* @exception DWTException <ul>
+*    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+*    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+* </ul>
+*
+* @since 3.4
+*/
 public void setFullScreen (bool fullScreen) {
 checkWidget ();
 this.fullScreen = fullScreen;
 //  if (fullScreen) {
 //      normalBounds = getBounds ();
 *
 */
 public void setRegion (Region region) {
 checkWidget ();
 if ((style & DWT.NO_TRIM) is 0) return;
+if (window is null) return;
 if (region !is null && region.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
-//  if (region is null) {
+this.region = region;
-//      rgnRect = null;
+if (regionPath !is null) regionPath.release();
-//  } else {
+regionPath = getPath(region);
-//      if (rgnRect is null) {
+if (region !is null) {
-//          rgnRect = new Rect ();
+window.setBackgroundColor(NSColor.clearColor());
-//          OS.GetWindowBounds (shellHandle, cast(short) OS.kWindowStructureRgn, rgnRect);
+window.setOpaque(false);
-//          OS.SetRect (rgnRect, cast(short) 0, cast(short) 0, cast(short) (rgnRect.right - rgnRect.left), cast(short) (rgnRect.bottom - rgnRect.top));
+} else {
-//      }
+window.setBackgroundColor(NSColor.windowBackgroundColor());
-//  }
+window.setOpaque(true);
-//  this.region = region;
+}
-//  /*
+window.contentView().setNeedsDisplay(true);
-//  * Bug in the Macintosh.  Calling ReshapeCustomWindow() from a
+}
-//  * kEventWindowDrawContent handler originating from ShowWindow()
-//  * will deadlock.  The fix is to detected this case and only call
+NSBezierPath getPath(Region region) {
-//  * ReshapeCustomWindow() after the default handler is done.
+if (region is null) return null;
-//  */
+Callback callback = new Callback(this, "regionToRects", 4);
-//  if (drawing) {
+if (callback.getAddress() is 0) DWT.error(DWT.ERROR_NO_MORE_CALLBACKS);
-//      reshape = true;
+NSBezierPath path = NSBezierPath.bezierPath();
-//  } else {
+path.retain();
-//      OS.ReshapeCustomWindow (shellHandle);
+OS.QDRegionToRects(region.handle, OS.kQDParseRegionFromTopLeft, callback.getAddress(), path.id);
-//      redrawWidget (handle, true);
+callback.dispose();
-//  }
+if (path.isEmpty()) path.appendBezierPathWithRect(new NSRect());
+return path;
+}
+int /*long*/ regionToRects(int /*long*/ message, int /*long*/ rgn, int /*long*/ r, int /*long*/ path) {
+NSPoint pt = new NSPoint();
+short[] rect = new short[4];
+if (message is OS.kQDRegionToRectsMsgParse) {
+OS.memmove(rect, r, rect.length * 2);
+pt.x = rect[1];
+pt.y = rect[0];
+OS.objc_msgSend(path, OS.sel_moveToPoint_, pt);
+pt.x = rect[3];
+OS.objc_msgSend(path, OS.sel_lineToPoint_, pt);
+pt.x = rect[3];
+pt.y = rect[2];
+OS.objc_msgSend(path, OS.sel_lineToPoint_, pt);
+pt.x = rect[1];
+OS.objc_msgSend(path, OS.sel_lineToPoint_, pt);
+OS.objc_msgSend(path, OS.sel_closePath);
+}
+return 0;
 }
 public void setText (String str) {
 checkWidget();
 if (str is null) error (DWT.ERROR_NULL_ARGUMENT);
-super.setText (str);
+if (window is null) return;
 NSString nsStr = NSString.stringWith(str);
 window.setTitle(nsStr);
-//  str.release();
 }
 public void setVisible (bool visible) {
 checkWidget();
-setWindowVisible (visible, false);
+int mask = DWT.PRIMARY_MODAL | DWT.APPLICATION_MODAL | DWT.SYSTEM_MODAL;
+if ((style & mask) !is 0) {
+if (visible) {
+display.setModalShell (this);
+} else {
+display.clearModal (this);
+}
+} else {
+updateModal ();
+}
+if (window is null) {
+super.setVisible(visible);
+} else {
+setWindowVisible (visible, false);
+}
 }
 void setWindowVisible (bool visible, bool key) {
-if (window.isVisible() is visible) return;
+if (visible) {
+if ((state & HIDDEN) is 0) return;
+state &= ~HIDDEN;
+} else {
+if ((state & HIDDEN) !is 0) return;
+state |= HIDDEN;
+}
+if (window !is null && (window.isVisible() is visible)) return;
 if (visible) {
 sendEvent (DWT.Show);
 if (isDisposed ()) return;
+topView ().setHidden (false);
 if (key) {
 window.makeKeyAndOrderFront (null);
 } else {
 window.orderFront (null);
 }
 updateLayout (false);
 }
 }
 } else {
 window.orderOut (null);
+topView ().setHidden (true);
 sendEvent (DWT.Hide);
 }
 }
 void setZOrder () {
-//  if (scrolledHandle !is 0) OS.HIViewAddSubview (scrolledHandle, handle);
+if (scrollView !is null) scrollView.setDocumentView (view);
+if (window is null) return;
+window.setContentView (scrollView !is null ? scrollView : view);
 }
 void setZOrder (Control control, bool above) {
 //  if (above) {
 //      //NOT DONE - move one window above another
 bool traverseEscape () {
 if (parent is null) return false;
 if (!isVisible () || !isEnabled ()) return false;
 close ();
 return true;
+}
+void updateModal () {
+// do nothing
 }
 void updateSystemUIMode () {
 if (!getMonitor ().equals (display.getPrimaryMonitor ())) return;
 bool isActive = false;
 //  } else {
 //      OS.SetSystemUIMode (OS.kUIModeNormal, 0);
 //  }
 }
-void windowDidBecomeKey(int notification) {
+void windowDidBecomeKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
-super.windowDidBecomeKey(notification);
+super.windowDidBecomeKey(id, sel, notification);
 Display display = this.display;
 display.setMenuBar (menuBar);
 sendEvent (DWT.Activate);
+fixLevel();
 //  if (!isDisposed ()) {
 //      if (!restoreFocus () && !traverseGroup (true)) setFocus ();
 //  }
 }
-void windowDidMove(int notification) {
+void windowDidMove(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
 moved = true;
 sendEvent(DWT.Move);
 }
-void windowDidResize(int notification) {
+void windowDidResize(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
 resized = true;
 sendEvent (DWT.Resize);
 if (isDisposed ()) return;
 if (layout_ !is null) {
 markLayout (false, false);
 updateLayout (false);
 }
 }
-void windowDidResignKey(int notification) {
+void windowDidResignKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
-super.windowDidResignKey(notification);
+super.windowDidResignKey(id, sel, notification);
-Display display = this.display;
+//  Display display = this.display;
 sendEvent (DWT.Deactivate);
 if (isDisposed ()) return;
 //  saveFocus ();
 //  if (savedFocus !is null) {
 //      /*
 //      display.ignoreFocus = true;
 //      OS.ClearKeyboardFocus (shellHandle);
 //      display.ignoreFocus = false;
 //      if (!savedFocus.isDisposed ()) savedFocus.sendFocusEvent (DWT.FocusOut, false);
 //  }
-display.setMenuBar (null);
+}
-}
+bool windowShouldClose(int /*long*/ id, int /*long*/ sel, int /*long*/ window) {
-bool windowShouldClose(int window) {
 closeWidget ();
 return false;
 }
-void windowWillClose(int notification) {
+}
-}
-void windowSendEvent(objc.id ID, objc.id event) {
-NSEvent nsEvent = new NSEvent(event);
-NSEventType type = nsEvent.type();
-if (type is OS.NSKeyDown || type is OS.NSKeyUp) {
-Control eventTarget = display.getFocusControl();
-if (eventTarget !is null) {
-if (type is OS.NSKeyDown) {
-bool[] consume = new bool[1];
-short key = nsEvent.keyCode();
-if (eventTarget.translateTraversal(key, nsEvent, consume)) return;
-if (consume[0]) return;
-if (eventTarget.isDisposed()) return;
-}
-if (!eventTarget.sendKeyEvent(nsEvent, type is OS.NSKeyDown ? DWT.KeyDown : DWT.KeyUp)) return;
-}
-}
-super.windowSendEvent(ID, event);
-}
-}

Mercurial > projects > dwt-mac

comparison dwt/widgets/Shell.d @ 45:d8635bb48c7c