projects/dwt-win: dwt/widgets/Widget.d comparison

comparison dwt/widgets/Widget.d @ 213:36f5cb12e1a2

Update to SWT 3.4M7

author	Frank Benoit <benoit@tionex.de>
date	Sat, 17 May 2008 17:34:28 +0200
parents	ab60f3309436
children	387fe83aa839

comparison

equal deleted inserted replaced

-:ab60f3309436
+:36f5cb12e1a2
 /* More global widget state flags */
 static const int TRACK_MOUSE    = 1<<13;
 static const int FOREIGN_HANDLE = 1<<14;
 static const int DRAG_DETECT    = 1<<15;
+/* Move and resize state flags */
+static final int MOVE_OCCURRED      = 1<<16;
+static final int MOVE_DEFERRED      = 1<<17;
+static final int RESIZE_OCCURRED    = 1<<18;
+static final int RESIZE_DEFERRED    = 1<<19;
+/* Ignore WM_CHANGEUISTATE */
+static final int IGNORE_WM_CHANGEUISTATE = 1<<20;
 /* Default size for widgets */
 static const int DEFAULT_WIDTH  = 64;
 static const int DEFAULT_HEIGHT = 64;
 /* Check and initialize the Common Controls DLL */
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 *
 * @see Listener
 * @see DWT
+* @see #getListeners(int)
 * @see #removeListener(int, Listener)
 * @see #notifyListeners
 */
 public void addListener (int eventType, Listener listener) {
 checkWidget();
 * </ul>
 */
 void checkWidget () {
 Display display = this.display;
 if (display is null) error (DWT.ERROR_WIDGET_DISPOSED);
-if (display.thread !is Thread.getThis ()) error (DWT.ERROR_THREAD_INVALID_ACCESS);
+if (display.thread !is Thread.getThis ()) {
+/*
+* Bug in IBM JVM 1.6.  For some reason, under
+* conditions that are yet to be full understood,
+* Thread.currentThread() is either returning null
+* or a different instance from the one that was
+* saved when the Display was created.  This is
+* possibly a JIT problem because modifying this
+* method to print logging information when the
+* error happens seems to fix the problem.  The
+* fix is to use operating system calls to verify
+* that the current thread is not the Display thread.
+*
+* NOTE: Despite the fact that Thread.currentThread()
+* is used in other places, the failure has only been
+* observed here.
+*/
+if (display.threadId !is OS.GetCurrentThreadId ()) {
+error (DWT.ERROR_THREAD_INVALID_ACCESS);
+}
+}
 if ((state & DISPOSED) !is 0) error (DWT.ERROR_WIDGET_DISPOSED);
 }
 /**
 * Destroys the widget in the operating system and releases
 Widget findItem (HANDLE id) {
 return null;
 }
 char [] fixMnemonic (String string) {
-char [] buffer = string.dup;
+return fixMnemonic (string, false);
+}
+char [] fixMnemonic (String string, bool spaces) {
+char [] buffer = string ~ '\0';
 int i = 0, j = 0;
 while (i < buffer.length) {
 if (buffer [i] is '&') {
 if (i + 1 < buffer.length && buffer [i + 1] is '&') {
-buffer [j++] = ' ';
+if (spaces) buffer [j] = ' ';
+j++;
 i++;
 }
 i++;
 } else {
 buffer [j++] = buffer [i++];
 Display display = this.display;
 if (display is null) error (DWT.ERROR_WIDGET_DISPOSED);
 return display;
 }
+/**
+* Returns an array of listeners who will be notified when an event
+* of the given type occurs. The event type is one of the event constants
+* defined in class <code>DWT</code>.
+*
+* @param eventType the type of event to listen for
+* @return an array of listeners that will be notified when the event occurs
+*
+* @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>
+*
+* @see Listener
+* @see DWT
+* @see #addListener(int, Listener)
+* @see #removeListener(int, Listener)
+* @see #notifyListeners
+*
+* @since 3.4
+*/
+public Listener[] getListeners (int eventType) {
+checkWidget();
+if (eventTable is null) return new Listener[0];
+return eventTable.getListeners(eventType);
+}
 Menu getMenu () {
 return null;
 }
 /**
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 *
 * @see DWT
 * @see #addListener
+* @see #getListeners(int)
 * @see #removeListener(int, Listener)
 */
 public void notifyListeners (int eventType, Event event) {
 checkWidget();
 if (event is null) event = new Event ();
 * </ul>
 *
 * @see Listener
 * @see DWT
 * @see #addListener
+* @see #getListeners(int)
 * @see #notifyListeners
 */
 public void removeListener (int eventType, Listener listener) {
 checkWidget();
 if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
 } else {
 display.postEvent (event);
 }
 }
-bool sendKeyEvent (int type, int msg, int wParam, int lParam) {
+bool sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam) {
 Event event = new Event ();
 if (!setKeyState (event, type, wParam, lParam)) return true;
 return sendKeyEvent (type, msg, wParam, lParam, event);
 }
-bool sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) {
+bool sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) {
 sendEvent (type, event);
 if (isDisposed ()) return false;
 return event.doit;
 }
 if (!hooks (type) && !filters (type)) return true;
 Event event = new Event ();
 event.button = button;
 event.detail = detail;
 event.count = count;
-event.x = cast(short) (lParam & 0xFFFF);
+event.x = OS.GET_X_LPARAM (lParam);
-event.y = cast(short) (lParam >> 16);
+event.y = OS.GET_Y_LPARAM (lParam);
 setInputState (event, type);
 mapEvent (hwnd, event);
 if (send) {
 sendEvent (type, event);
 if (isDisposed ()) return false;
 if (OS.GetKeyState (OS.VK_SHIFT) < 0) event.stateMask |= DWT.SHIFT;
 if (OS.GetKeyState (OS.VK_CONTROL) < 0) event.stateMask |= DWT.CONTROL;
 if (OS.GetKeyState (OS.VK_LBUTTON) < 0) event.stateMask |= DWT.BUTTON1;
 if (OS.GetKeyState (OS.VK_MBUTTON) < 0) event.stateMask |= DWT.BUTTON2;
 if (OS.GetKeyState (OS.VK_RBUTTON) < 0) event.stateMask |= DWT.BUTTON3;
-if (OS.GetKeyState (OS.VK_XBUTTON1) < 0) event.stateMask |= DWT.BUTTON4;
+if (display.xMouse) {
-if (OS.GetKeyState (OS.VK_XBUTTON2) < 0) event.stateMask |= DWT.BUTTON5;
+if (OS.GetKeyState (OS.VK_XBUTTON1) < 0) event.stateMask |= DWT.BUTTON4;
+if (OS.GetKeyState (OS.VK_XBUTTON2) < 0) event.stateMask |= DWT.BUTTON5;
+}
 switch (type) {
 case DWT.MouseDown:
 case DWT.MouseDoubleClick:
 if (event.button is 1) event.stateMask &= ~DWT.BUTTON1;
 if (event.button is 2) event.stateMask &= ~DWT.BUTTON2;
 default:
 }
 return true;
 }
-bool setKeyState (Event event, int type, int wParam, int lParam) {
+bool setKeyState (Event event, int type, int /*long*/ wParam, int /*long*/ lParam) {
 /*
 * Feature in Windows.  When the user presses Ctrl+Backspace
 * or Ctrl+Enter, Windows sends a WM_CHAR with Delete (0x7F)
 * and '\n' instead of '\b' and '\r'.  This is the correct
 * mouse was released in the client area.
 */
 int x = 0, y = 0;
 if (lParam !is -1) {
 POINT pt;
-x = pt.x = cast(short) (lParam & 0xFFFF);
+OS.POINTSTOPOINT (pt, lParam);
-y = pt.y = cast(short) (lParam >> 16);
+x = pt.x;
-OS.ScreenToClient (hwnd, &pt);
+y = pt.y;
 RECT rect;
 OS.GetClientRect (hwnd, &rect);
 if (!OS.PtInRect (&rect, pt)) return null;
 } else {
 int pos = OS.GetMessagePos ();
-x = cast(short) (pos & 0xFFFF);
+x = OS.GET_X_LPARAM (pos);
-y = cast(short) (pos >> 16);
+y = OS.GET_Y_LPARAM (pos);
 }
 /* Show the menu */
 return showMenu (x, y) ? LRESULT.ZERO : null;
 }
 case OS.VK_ESCAPE: mapKey = DWT.ESC; break;
 case OS.VK_TAB: mapKey = DWT.TAB; break;
 default:
 }
 } else {
-mapKey = OS.MapVirtualKey (wParam, 2);
+/*
+* Feature in Windows.  For numbers in Marathi and Bengali,
+* MapVirtualKey() returns the localized number instead of
+* the ASCII equivalent.  For example, MapVirtualKey()
+* maps VK_1 on the Marathi keyboard to \u2407, which is
+* a valid Unicode Marathi '1' character, but not ASCII.
+* The fix is to test for VK_0 to VK_9 and map these
+* explicitly.
+*
+* NOTE: VK_0 to VK_9 are the same as ASCII.
+*/
+if ('0' <= wParam && wParam <= '9') {
+mapKey = wParam;
+} else {
+mapKey = OS.MapVirtualKey (wParam, 2);
+}
 }
 /*
 * Bug in Windows 95 and NT.  When the user types an accent key such
 * as ^ to get an accented character on a German keyboard, the accent
 display.lastVirtual = display.lastNull = display.lastDead = false;
 return result;
 }
 LRESULT wmKillFocus (HWND hwnd, int wParam, int lParam) {
+display.scrollRemainder = 0;
 int code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam);
 sendFocusEvent (DWT.FocusOut);
 // widget could be disposed at this point
 /*
 }
 LRESULT wmLButtonDown (HWND hwnd, int wParam, int lParam) {
 Display display = this.display;
 LRESULT result = null;
-int x = cast(short) (lParam & 0xFFFF);
+int x = OS.GET_X_LPARAM (lParam);
-int y = cast(short) (lParam >> 16);
+int y = OS.GET_Y_LPARAM (lParam);
 bool [] consume = null, detect = null;
 bool dragging = false, mouseDown = true;
 int count = display.getClickCount (DWT.MouseDown, 1, hwnd, lParam);
 if (count is 1 && (state & DRAG_DETECT) !is 0 && hooks (DWT.DragDetect)) {
 static if (!OS.IsWinCE) {
 * causing mouse capture to become stuck.  The fix is to test
 * for the extra buttons only when they exist.
 */
 int mask = OS.MK_LBUTTON | OS.MK_MBUTTON | OS.MK_RBUTTON;
 if (display.xMouse) mask |= OS.MK_XBUTTON1 | OS.MK_XBUTTON2;
-if (((wParam & 0xFFFF) & mask) is 0) {
+if ((wParam & mask) is 0) {
 if (OS.GetCapture () is hwnd) OS.ReleaseCapture ();
 }
 return result;
 }
 * causing mouse capture to become stuck.  The fix is to test
 * for the extra buttons only when they exist.
 */
 int mask = OS.MK_LBUTTON | OS.MK_MBUTTON | OS.MK_RBUTTON;
 if (display.xMouse) mask |= OS.MK_XBUTTON1 | OS.MK_XBUTTON2;
-if (((wParam & 0xFFFF) & mask) is 0) {
+if ((wParam & mask) is 0) {
 if (OS.GetCapture () is hwnd) OS.ReleaseCapture ();
 }
 return result;
 }
 LRESULT wmMouseLeave (HWND hwnd, int wParam, int lParam) {
 if (!hooks (DWT.MouseExit) && !filters (DWT.MouseExit)) return null;
 int pos = OS.GetMessagePos ();
 POINT pt;
-pt.x = cast(short) (pos & 0xFFFF);
+OS.POINTSTOPOINT (pt, pos);
-pt.y = cast(short) (pos >> 16);
 OS.ScreenToClient (hwnd, &pt);
-lParam = (pt.x & 0xFFFF) | ((pt.y << 16) & 0xFFFF0000);
+lParam = OS.MAKELPARAM (pt.x, pt.y);
 if (!sendMouseEvent (DWT.MouseExit, 0, hwnd, OS.WM_MOUSELEAVE, wParam, lParam)) {
 return LRESULT.ZERO;
 }
 return null;
 }
 display.captureChanged = false;
 return result;
 }
 LRESULT wmMouseWheel (HWND hwnd, int wParam, int lParam) {
+int delta = OS.GET_WHEEL_DELTA_WPARAM (wParam);
+int linesToScroll;
+int detail;
+OS.SystemParametersInfo (OS.SPI_GETWHEELSCROLLLINES, 0, &linesToScroll, 0);
+if (linesToScroll is OS.WHEEL_PAGESCROLL) {
+detail = DWT.SCROLL_PAGE;
+} else {
+detail = DWT.SCROLL_LINE;
+delta *= linesToScroll;
+}
+/* Check if the delta and the remainder have the same direction (sign) */
+if ((delta ^ display.scrollRemainder) >= 0) delta += display.scrollRemainder;
+display.scrollRemainder = delta % OS.WHEEL_DELTA;
 if (!hooks (DWT.MouseWheel) && !filters (DWT.MouseWheel)) return null;
-int delta = wParam >> 16;
+int count = delta / OS.WHEEL_DELTA;
-int value;
-int count, detail;
-OS.SystemParametersInfo (OS.SPI_GETWHEELSCROLLLINES, 0, &value, 0);
-if (value is OS.WHEEL_PAGESCROLL) {
-detail = DWT.SCROLL_PAGE;
-count = delta / OS.WHEEL_DELTA;
-} else {
-detail = DWT.SCROLL_LINE;
-count = value * delta / OS.WHEEL_DELTA;
-}
 POINT pt;
-pt.x = cast(short) (lParam & 0xFFFF);
+OS.POINTSTOPOINT (pt, lParam);
-pt.y = cast(short) (lParam >> 16);
 OS.ScreenToClient (hwnd, &pt);
-lParam = (pt.x & 0xFFFF) | ((pt.y << 16) & 0xFFFF0000);
+lParam = OS.MAKELPARAM (pt.x, pt.y);
 if (!sendMouseEvent (DWT.MouseWheel, 0, count, detail, true, hwnd, OS.WM_MOUSEWHEEL, wParam, lParam)) {
 return LRESULT.ZERO;
 }
 return null;
 }
-LRESULT wmPaint (HWND hwnd, int wParam, int lParam) {
+LRESULT wmNCPaint (HWND hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+return null;
+}
+LRESULT wmPaint (HWND hwnd, int /*long*/ wParam, int /*long*/ lParam) {
 /* Exit early - don't draw the background */
 if (!hooks (DWT.Paint) && !filters (DWT.Paint)) {
 return null;
 }
 /* Issue a paint event */
-int result = 0;
+int /*long*/ result = 0;
 static if (OS.IsWinCE) {
 RECT rect;
 OS.GetUpdateRect (hwnd, &rect, false);
 result = callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam);
 /*
 */
 if ((lParam & OS.PRF_NONCLIENT) !is 0) {
 if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
 int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
 if ((bits & OS.WS_EX_CLIENTEDGE) !is 0) {
-int code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam);
+int /*long*/ code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam);
 RECT rect;
 OS.GetWindowRect (hwnd, &rect);
 rect.right -= rect.left;
 rect.bottom -= rect.top;
 rect.left = rect.top = 0;
 * causing mouse capture to become stuck.  The fix is to test
 * for the extra buttons only when they exist.
 */
 int mask = OS.MK_LBUTTON | OS.MK_MBUTTON | OS.MK_RBUTTON;
 if (display.xMouse) mask |= OS.MK_XBUTTON1 | OS.MK_XBUTTON2;
-if (((wParam & 0xFFFF) & mask) is 0) {
+if ((wParam & mask) is 0) {
 if (OS.GetCapture () is hwnd) OS.ReleaseCapture ();
 }
 return result;
 }
 LRESULT wmSetFocus (HWND hwnd, int wParam, int lParam) {
-int code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam);
+int /*long*/ code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam);
 sendFocusEvent (DWT.FocusIn);
 // widget could be disposed at this point
 /*
 * It is possible (but unlikely), that application
 }
 /* Call the window proc to determine whether it is a system key or mnemonic */
 bool oldKeyHit = display.mnemonicKeyHit;
 display.mnemonicKeyHit = true;
-int result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam);
+int /*long*/ result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam);
 bool consumed = false;
 if (!display.mnemonicKeyHit) {
 consumed = !sendKeyEvent (DWT.KeyDown, OS.WM_SYSCHAR, wParam, lParam);
 // widget could be disposed at this point
 }
 * fix is to send a mouse down event.
 */
 LRESULT result = null;
 Display display = this.display;
 display.captureChanged = false;
-int button = (wParam >> 16 is OS.XBUTTON1) ? 4 : 5;
+int button = OS.HIWORD (wParam) is OS.XBUTTON1 ? 4 : 5;
 sendMouseEvent (DWT.MouseDown, button, hwnd, OS.WM_XBUTTONDOWN, wParam, lParam);
 if (sendMouseEvent (DWT.MouseDoubleClick, button, hwnd, OS.WM_XBUTTONDBLCLK, wParam, lParam)) {
 result = new LRESULT (callWindowProc (hwnd, OS.WM_XBUTTONDBLCLK, wParam, lParam));
 } else {
 result = LRESULT.ZERO;
 LRESULT wmXButtonDown (HWND hwnd, int wParam, int lParam) {
 LRESULT result = null;
 Display display = this.display;
 display.captureChanged = false;
 display.xMouse = true;
-int button = (wParam >> 16 is OS.XBUTTON1) ? 4 : 5;
+int button = OS.HIWORD (wParam) is OS.XBUTTON1 ? 4 : 5;
 if (sendMouseEvent (DWT.MouseDown, button, hwnd, OS.WM_XBUTTONDOWN, wParam, lParam)) {
 result = new LRESULT (callWindowProc (hwnd, OS.WM_XBUTTONDOWN, wParam, lParam));
 } else {
 result = LRESULT.ZERO;
 }
 }
 LRESULT wmXButtonUp (HWND hwnd, int wParam, int lParam) {
 Display display = this.display;
 LRESULT result = null;
-int button = (wParam >> 16 is OS.XBUTTON1) ? 4 : 5;
+int button = OS.HIWORD (wParam) is OS.XBUTTON1 ? 4 : 5;
 if (sendMouseEvent (DWT.MouseUp, button, hwnd, OS.WM_XBUTTONUP, wParam, lParam)) {
 result = new LRESULT (callWindowProc (hwnd, OS.WM_XBUTTONUP, wParam, lParam));
 } else {
 result = LRESULT.ZERO;
 }
 * causing mouse capture to become stuck.  The fix is to test
 * for the extra buttons only when they exist.
 */
 int mask = OS.MK_LBUTTON | OS.MK_MBUTTON | OS.MK_RBUTTON;
 if (display.xMouse) mask |= OS.MK_XBUTTON1 | OS.MK_XBUTTON2;
-if (((wParam & 0xFFFF) & mask) is 0) {
+if ((wParam & mask) is 0) {
 if (OS.GetCapture () is hwnd) OS.ReleaseCapture ();
 }
 return result;
 }
 }

Mercurial > projects > dwt-win

comparison dwt/widgets/Widget.d @ 213:36f5cb12e1a2