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

comparison dwt/widgets/Display.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	a8fed3e56433

comparison

equal deleted inserted replaced

-:ab60f3309436
+:36f5cb12e1a2
 import dwt.graphics.Point;
 import dwt.graphics.RGB;
 import dwt.graphics.Rectangle;
 import dwt.graphics.Resource;
 import dwt.internal.ImageList;
+import dwt.internal.Library;
 import dwt.internal.win32.OS;
 import dwt.widgets.Control;
+import dwt.widgets.Dialog;
 import dwt.widgets.Tray;
 import dwt.widgets.Event;
 import dwt.widgets.EventTable;
 import dwt.widgets.Menu;
 import dwt.widgets.MenuItem;
 * public API. 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 accessed from application code.
 * </p>
 */
-public MSG msg;
+public MSG* msg;
 /* Windows and Events */
 Event [] eventQueue;
 //Callback windowCallback;
 //int windowProc_;
 static const String WindowName = "SWT_Window"; //$NON-NLS-1$
 static const String WindowShadowName = "SWT_WindowShadow"; //$NON-NLS-1$
 EventTable eventTable, filterTable;
 /* Widget Table */
+int freeSlot;
 int [] indexTable;
 Control lastControl, lastGetControl;
-int freeSlot;
 HANDLE lastHwnd;
 HWND lastGetHwnd;
 Control [] controlTable;
 static const int GROW_SIZE = 1024;
 private static /+const+/ int SWT_OBJECT_INDEX;
 /* Filter Hook */
 //Callback msgFilterCallback;
 //int msgFilterProc_,
 HHOOK filterHook;
-MSG hookMsg;
+bool runDragDrop = true, dragCancelled = false;
-bool runDragDrop = true;
+MSG* hookMsg;
 /* Idle Hook */
 //Callback foregroundIdleCallback;
 //int foregroundIdleProc_;
 HHOOK idleHook;
 static const String AWT_WINDOW_CLASS = "SunAwtWindow";
 static const short [] ACCENTS = [ cast(short) '~', '`', '\'', '^', '"'];
 /* Sync/Async Widget Communication */
 Synchronizer synchronizer;
-bool runMessages = true, runMessagesInIdle = false;
+bool runMessages = true, runMessagesInIdle = false, runMessagesInMessageProc = true;
 static const String RUN_MESSAGES_IN_IDLE_KEY = "org.eclipse.swt.internal.win32.runMessagesInIdle"; //$NON-NLS-1$
+static final String RUN_MESSAGES_IN_MESSAGE_PROC_KEY = "dwt.internal.win32.runMessagesInMessageProc"; //$NON-NLS-1$
 Thread thread;
 /* Display Shutdown */
 Runnable [] disposeList;
 /* System Tray */
 Tray tray;
 int nextTrayId;
 /* Timers */
-int [] timerIds;
+int /*long*/ [] timerIds;
 Runnable [] timerList;
-int nextTimerId = SETTINGS_ID + 1;
+int /*long*/ nextTimerId = SETTINGS_ID + 1;
 static const int SETTINGS_ID = 100;
 static const int SETTINGS_DELAY = 2000;
 /* Keyboard and Mouse */
-RECT clickRect;
+RECT* clickRect;
 int clickCount, lastTime, lastButton;
 HWND lastClickHwnd;
+int scrollRemainder;
 int lastKey, lastAscii, lastMouse;
 bool lastVirtual, lastNull, lastDead;
 ubyte [256] keyboard;
 bool accelKeyHit, mnemonicKeyHit;
 bool lockActiveWindow, captureChanged, xMouse;
 /* Sort Indicators */
 Image upArrow, downArrow;
 /* Table */
 char [] tableBuffer;
+NMHDR* hdr;
+NMLVDISPINFO* plvfi;
+HWND hwndParent;
+int columnCount;
+bool [] columnVisible;
+/* Resize and move recursion */
+int resizeCount;
+static final int RESIZE_LIMIT = 4;
 /* Display Data */
 Object data;
 String [] keys;
 Object [] values;
 dwt.widgets.Monitor.Monitor[] monitors = null;
 int monitorCount = 0;
 /* Modality */
 Shell [] modalShells;
-Shell modalDialogShell;
+Dialog modalDialog;
 static bool TrimEnabled = false;
 /* Private DWT Window Messages */
 static const int SWT_GETACCELCOUNT  = OS.WM_APP;
 static const int SWT_GETACCEL       = OS.WM_APP + 1;
 static const int SWT_TRAYICONMSG    = OS.WM_APP + 4;
 static const int SWT_NULL           = OS.WM_APP + 5;
 static const int SWT_RUNASYNC       = OS.WM_APP + 6;
 static int SWT_TASKBARCREATED;
 static int SWT_RESTORECARET;
+static int DI_GETDRAGIMAGE;
 /* Workaround for Adobe Reader 7.0 */
 int hitCount;
 /* Package Name */
 *
 * @param data the device data
 */
 public this (DeviceData data) {
 static_this();
+msg = new MSG();
+hookMsg = new MSG();
 super (data);
 synchronizer = new Synchronizer (this);
 cursors = new Cursor [DWT.CURSOR_HAND + 1];
 }
 controlTable = newControlTable;
 }
 static if (USE_PROPERTY) {
 OS.SetProp (handle, cast(wchar*)SWT_OBJECT_INDEX, cast(void*) freeSlot + 1);
 } else {
-OS.SetWindowLong (handle, OS.GWL_USERDATA, freeSlot + 1);
+OS.SetWindowLongPtr (handle, OS.GWLP_USERDATA, freeSlot + 1);
 }
 int oldSlot = freeSlot;
 freeSlot = indexTable [oldSlot];
 indexTable [oldSlot] = -2;
 controlTable [oldSlot] = control;
 * </ul>
 *
 * @see #syncExec
 */
 public void asyncExec (Runnable runnable) {
-if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+synchronized (Device.classinfo) {
-synchronizer.asyncExec (runnable);
+if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+synchronizer.asyncExec (runnable);
+}
 }
 /**
 * Causes the system hardware to emit a short sound
 * (if it supports this capability).
 if (thread is null) error (DWT.ERROR_WIDGET_DISPOSED);
 if (thread !is Thread.getThis ()) error (DWT.ERROR_THREAD_INVALID_ACCESS);
 if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
 }
-static synchronized void checkDisplay (Thread thread, bool multiple) {
+static void checkDisplay (Thread thread, bool multiple) {
-for (int i=0; i<Displays.length; i++) {
+synchronized (Device.classinfo) {
-if (Displays [i] !is null) {
+for (int i=0; i<Displays.length; i++) {
-if (!multiple) DWT.error (DWT.ERROR_NOT_IMPLEMENTED, null, " [multiple displays]");
+if (Displays [i] !is null) {
-if (Displays [i].thread is thread) DWT.error (DWT.ERROR_THREAD_INVALID_ACCESS);
+if (!multiple) DWT.error (DWT.ERROR_NOT_IMPLEMENTED, null, " [multiple displays]"); //$NON-NLS-1$
+if (Displays [i].thread is thread) DWT.error (DWT.ERROR_THREAD_INVALID_ACCESS);
+}
 }
 }
 }
 void clearModal (Shell shell) {
 bmiHeader.biPlanes = 1;
 bmiHeader.biBitCount = cast(short)32;
 bmiHeader.biCompression = OS.BI_RGB;
 byte [] bmi = new byte [BITMAPINFOHEADER.sizeof];
 bmi[ 0 .. BITMAPINFOHEADER.sizeof ] = (cast(byte*)&bmiHeader)[ 0 .. BITMAPINFOHEADER.sizeof ];
-int[1] pBits;
+void* pBits;
-auto memDib = OS.CreateDIBSection (null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS, pBits.ptr, null, 0);
+auto memDib = OS.CreateDIBSection (null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS, &pBits, null, 0);
 if (memDib is null) DWT.error (DWT.ERROR_NO_HANDLES);
 auto oldMemBitmap = OS.SelectObject (memHdc, memDib);
 BITMAP dibBM;
 OS.GetObject (memDib, BITMAP.sizeof, &dibBM);
 int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight;
 break;
 default:
 }
 }
 }
-byte [] srcData = (cast(byte*)pBits [0])[ 0 .. sizeInBytes].dup;
+byte [] srcData = (cast(byte*)pBits)[ 0 .. sizeInBytes].dup;
 if (hMask !is null) {
 OS.SelectObject(srcHdc, hMask);
 for (int y = 0, dp = 0; y < imgHeight; ++y) {
 for (int x = 0; x < imgWidth; ++x) {
 if (OS.GetPixel(srcHdc, x, y) !is 0) {
 srcData [dp + 3] = cast(byte)0xFF;
 dp += 4;
 }
 }
 }
-(cast(byte*)pBits [0])[ 0 .. sizeInBytes] = srcData[];
+(cast(byte*)pBits)[ 0 .. sizeInBytes] = srcData[];
 OS.SelectObject (srcHdc, oldSrcBitmap);
 OS.SelectObject (memHdc, oldMemBitmap);
 OS.DeleteObject (srcHdc);
 OS.DeleteObject (memHdc);
 OS.ReleaseDC (null, hDC);
 bmiHeader.biHeight = -imgHeight;
 bmiHeader.biPlanes = 1;
 bmiHeader.biBitCount = cast(short)32;
 bmiHeader.biCompression = OS.BI_RGB;
 byte [] bmi = (cast(byte*)&bmiHeader)[ 0 .. BITMAPINFOHEADER.sizeof];
-int [1] pBits;
+void* pBits;
-auto memDib = OS.CreateDIBSection (null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS, pBits.ptr, null, 0);
+auto memDib = OS.CreateDIBSection (null, cast(BITMAPINFO*)bmi.ptr, OS.DIB_RGB_COLORS, &pBits, null, 0);
 if (memDib is null) DWT.error (DWT.ERROR_NO_HANDLES);
 auto oldMemBitmap = OS.SelectObject (memHdc, memDib);
 BITMAP dibBM;
 OS.GetObject (memDib, BITMAP.sizeof, &dibBM);
 int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight;
 OS.SelectObject (srcHdc, oldSrcBitmap);
 OS.SelectObject (memHdc, oldMemBitmap);
 OS.DeleteObject (srcHdc);
 OS.DeleteObject (memHdc);
 OS.ReleaseDC (null, hDC);
-byte [] srcData = (cast(byte*)pBits[0])[ 0 .. sizeInBytes ].dup;
+byte [] srcData = (cast(byte*)pBits)[ 0 .. sizeInBytes ].dup;
 if (alpha !is -1) {
 for (int y = 0, dp = 0; y < imgHeight; ++y) {
 for (int x = 0; x < imgWidth; ++x) {
 srcData [dp + 3] = cast(byte)alpha;
 dp += 4;
 }
 dp += 4;
 }
 }
 }
-(cast(byte*)pBits[0])[ 0 .. sizeInBytes ] = srcData[];
+(cast(byte*)pBits)[ 0 .. sizeInBytes ] = srcData[];
 return memDib;
 }
 static Image createIcon (Image image) {
 static_this();
 hMask = hMask2;
 }
 return hMask;
 }
-static synchronized void deregister (Display display) {
+static void deregister (Display display) {
-static_this();
+synchronized (Device.classinfo) {
 for (int i=0; i<Displays.length; i++) {
 if (display is Displays [i]) Displays [i] = null;
+}
 }
 }
 /**
 * Destroys the device in the operating system and releases
 *
 * @since 3.1
 */
 public Widget findWidget (HANDLE handle, int id) {
 checkDevice ();
+//TODO - should ids be long
 Control control = getControl (handle);
 return control !is null ? control.findItem (cast(HANDLE) id) : null;
 }
 /**
 *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 *
 * @since 3.3
 */
-public Widget findWidget (Widget widget, int id) {
+public Widget findWidget (Widget widget, int /*long*/ id) {
 checkDevice ();
+//TODO - should ids be long
 if (cast(Control)widget) {
 return findWidget ((cast(Control) widget).handle, id);
 }
 return null;
 }
 auto d = Display.getCurrent();
 return d.foregroundIdleProc( code, wParam, lParam );
 }
 int foregroundIdleProc (int code, int wParam, int lParam) {
-if (runMessages) {
+if (code >= 0) {
-if (code >= 0) {
+if (runMessages && getMessageCount () !is 0) {
-if (getMessageCount () !is 0) {
+if (runMessagesInIdle) {
-if (runMessagesInIdle) {
+if (runMessagesInMessageProc) {
 OS.PostMessage (hwndMessage, SWT_RUNASYNC, 0, 0);
+} else {
+runAsyncMessages (false);
 }
-wakeThread ();
+}
-}
+wakeThread ();
 }
 }
 return OS.CallNextHookEx (idleHook, code, wParam, lParam);
 }
 * for the display.
 *
 * @param thread the user-interface thread
 * @return the display for the given thread
 */
-public static synchronized Display findDisplay (Thread thread) {
+public static Display findDisplay (Thread thread) {
 static_this();
-for (int i=0; i<Displays.length; i++) {
+synchronized (Device.classinfo) {
-Display display = Displays [i];
+for (int i=0; i<Displays.length; i++) {
-if (display !is null && display.thread is thread) {
+Display display = Displays [i];
-return display;
+if (display !is null && display.thread is thread) {
-}
+return display;
 }
-return null;
+}
+return null;
+}
 }
 /**
 * Returns the currently active <code>Shell</code>, or null
 * if no shell belonging to the currently running application
 Control control = findControl (OS.GetActiveWindow ());
 return control !is null ? control.getShell () : null;
 }
 /**
-* Returns a rectangle describing the receiver's size and location.
+* Returns a rectangle describing the receiver's size and location. Note that
+* on multi-monitor systems the origin can be negative.
 *
 * @return the bounding rectangle
 *
 * @exception DWTException <ul>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * the user-interface thread for, or null if the currently
 * running thread is not a user-interface thread for any display.
 *
 * @return the current display
 */
-public static synchronized Display getCurrent () {
+public static Display getCurrent () {
 static_this();
 return findDisplay (Thread.getThis ());
 }
 int getClickCount (int type, int button, HWND hwnd, int lParam) {
 switch (type) {
 case DWT.MouseDown:
 int doubleClick = OS.GetDoubleClickTime ();
-//if (clickRect is null) clickRect = new RECT ();
+if (clickRect is null) clickRect = new RECT ();
 int deltaTime = Math.abs (lastTime - getLastEventTime ());
 POINT pt;
-pt.x = cast(short) (lParam & 0xFFFF);
+OS.POINTSTOPOINT (pt, lParam);
-pt.y = cast(short) (lParam >> 16);
+if (lastClickHwnd is hwnd && lastButton is button && (deltaTime <= doubleClick) && OS.PtInRect (clickRect, pt)) {
-if (lastClickHwnd is hwnd && lastButton is button && (deltaTime <= doubleClick) && OS.PtInRect (&clickRect, pt)) {
 clickCount++;
 } else {
 clickCount = 1;
 }
 //FALL THROUGH
 lastButton = button;
 lastClickHwnd = hwnd;
 lastTime = getLastEventTime ();
 int xInset = OS.GetSystemMetrics (OS.SM_CXDOUBLECLK) / 2;
 int yInset = OS.GetSystemMetrics (OS.SM_CYDOUBLECLK) / 2;
-int x = cast(short) (lParam & 0xFFFF), y = cast(short) (lParam >> 16);
+int x = OS.GET_X_LPARAM (lParam), y = OS.GET_Y_LPARAM (lParam);
-OS.SetRect (&clickRect, x - xInset, y - yInset, x + xInset, y + yInset);
+OS.SetRect (clickRect, x - xInset, y - yInset, x + xInset, y + yInset);
 //FALL THROUGH
 case DWT.MouseUp:
 return clickCount;
 default:
 }
 }
 int index;
 static if (USE_PROPERTY) {
 index = cast(int) OS.GetProp (handle, cast(wchar*)SWT_OBJECT_INDEX) - 1;
 } else {
-index = OS.GetWindowLong (handle, OS.GWL_USERDATA) - 1;
+index = OS.GetWindowLongPtr (handle, OS.GWLP_USERDATA) - 1;
 }
 if (0 <= index && index < controlTable.length) {
 Control control = controlTable [index];
 /*
 * Because GWL_USERDATA can be used by native widgets that
 * thread that invokes this method its user-interface thread)
 * if it did not already exist.
 *
 * @return the default display
 */
-public static synchronized Display getDefault () {
+public static Display getDefault () {
 static_this();
-if (Default is null) Default = new Display ();
+synchronized (Device.classinfo) {
-return Default;
+if (Default is null) Default = new Display ();
+return Default;
+}
 }
 //PORTING_TODO
 /+static bool isValidClass (Class clazz) {
 String name = clazz.getName ();
 public Object getData (String key) {
 checkDevice ();
 if (key is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (key ==/*eq*/RUN_MESSAGES_IN_IDLE_KEY) {
 return new ValueWrapperBool(runMessagesInIdle);
+}
+if (key.equals (RUN_MESSAGES_IN_MESSAGE_PROC_KEY)) {
+return new Boolean (runMessagesInMessageProc);
 }
 if (keys.length is 0) return null;
 for (int i=0; i<keys.length; i++) {
 if (keys [i] ==/*eq*/key) return values [i];
 }
 if (shell !is null) return shell;
 }
 return null;
 }
-Shell getModalDialogShell () {
+Dialog getModalDialog () {
-if (modalDialogShell !is null && modalDialogShell.isDisposed ()) modalDialogShell = null;
+return modalDialog;
-return modalDialogShell;
 }
 /**
 * Returns an array of monitors attached to the device.
 *
 hInstance,
 null);
 //embeddedCallback = new Callback (this, "embeddedProc", 4); //$NON-NLS-1$
 //embeddedProc_ = embeddedCallback.getAddress ();
 //if (embeddedProc_ is 0) error (DWT.ERROR_NO_MORE_CALLBACKS);
-OS.SetWindowLong (embeddedHwnd, OS.GWL_WNDPROC, cast(int) &embeddedFunc);
+OS.SetWindowLongPtr (embeddedHwnd, OS.GWLP_WNDPROC, cast(LONG_PTR) &embeddedFunc);
 }
-if (code >= 0 && wParam !is OS.PM_NOREMOVE) {
+if (code >= 0 && (wParam & OS.PM_REMOVE) !is 0) {
 MSG* msg = cast(MSG*)lParam;
 switch (msg.message) {
 case OS.WM_KEYDOWN:
 case OS.WM_KEYUP:
 case OS.WM_SYSKEYDOWN:
 }
 return null;
 }
 /**
+* Gets the synchronizer used by the display.
+*
+* @return the receiver's synchronizer
+*
+* @exception DWTException <ul>
+*    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+*    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+* </ul>
+*
+* @since 3.4
+*/
+public Synchronizer getSynchronizer () {
+checkDevice ();
+return synchronizer;
+}
+/**
 * Returns the thread that has invoked <code>syncExec</code>
 * or null if no such runnable is currently being invoked by
 * the user-interface thread.
 * <p>
 * Note: If a runnable invoked by asyncExec is currently
 * @exception DWTException <ul>
 *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public Thread getSyncThread () {
-if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+synchronized (Device.classinfo) {
-return synchronizer.syncThread;
+if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+return synchronizer.syncThread;
+}
 }
 /**
 * Returns the matching standard color for the given
 * constant, which should be one of the color constants
 * @exception DWTException <ul>
 *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public Thread getThread () {
-if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+synchronized (Device.classinfo) {
-return thread;
+if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+return thread;
+}
 }
 HTHEME hButtonTheme () {
 if (hButtonTheme_ !is null) return hButtonTheme_;
 return hButtonTheme_ = OS.OpenThemeData (hwndMessage, BUTTON.ptr);
 data.layout = (data.style & DWT.RIGHT_TO_LEFT) !is 0 ? OS.LAYOUT_RTL : 0;
 } else {
 data.style |= DWT.LEFT_TO_RIGHT;
 }
 data.device = this;
-data.hFont = getSystemFont ().handle;
+data.font = getSystemFont ();
 }
 return hDC;
 }
 /**
 WNDCLASS lpWndClass;
 lpWndClass.hInstance = hInstance;
 lpWndClass.lpfnWndProc = &windowProcFunc;
 lpWndClass.style = OS.CS_BYTEALIGNWINDOW | OS.CS_DBLCLKS;
 lpWndClass.hCursor = OS.LoadCursor (null, cast(wchar*)OS.IDC_ARROW);
+//DWT_TODO: Check if this can be disabled for DWT
+/+
+/*
+* Set the default icon for the window class to IDI_APPLICATION.
+* This is not necessary for native Windows applications but
+* versions of Java starting at JDK 1.6 set the icon in the
+* executable instead of leaving the default.
+*/
+if (!OS.IsWinCE && Library.JAVA_VERSION >= Library.JAVA_VERSION (1, 6, 0)) {
+TCHAR[] lpszFile = NewTCHARs (0, OS.MAX_PATH);
+while (OS.GetModuleFileName (0, lpszFile.ptr, lpszFile.length) is lpszFile.length) {
+lpszFile = NewTCHARs (0, lpszFile.length + OS.MAX_PATH);
+}
+if (OS.ExtractIconEx (lpszFile.ptr, -1, null, null, 1) !is 0) {
+String fileName = TCHARzToStr( lpszFile.ptr );
+if (fileName.endsWith ("java.exe") || fileName.endsWith ("javaw.exe")) { //$NON-NLS-1$ //$NON-NLS-2$
+lpWndClass.hIcon = OS.LoadIcon (0, OS.IDI_APPLICATION);
+}
+}
+}
++/
 int byteCount = windowClass_.length * TCHAR.sizeof;
 lpWndClass.lpszClassName = cast(TCHAR*) OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
 OS.MoveMemory (lpWndClass.lpszClassName, windowClass_.ptr, byteCount);
 OS.RegisterClass (&lpWndClass);
 OS.HeapFree (hHeap, 0, lpWndClass.lpszClassName);
 /* Register the DWT drop shadow window class */
-if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) lpWndClass.style |= OS.CS_DROPSHADOW;
+if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
+lpWndClass.style |= OS.CS_DROPSHADOW;
+}
 byteCount = windowShadowClass.length * TCHAR.sizeof;
 lpWndClass.lpszClassName = cast(TCHAR*) OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
 OS.MoveMemory (lpWndClass.lpszClassName, windowShadowClass.ptr, byteCount);
 OS.RegisterClass (&lpWndClass);
 OS.HeapFree (hHeap, 0, lpWndClass.lpszClassName);
 hInstance,
 null);
 //messageCallback = new Callback (this, "messageProc", 4); //$NON-NLS-1$
 //messageProc_ = messageCallback.getAddress ();
 //if (messageProc_ is 0) error (DWT.ERROR_NO_MORE_CALLBACKS);
-OS.SetWindowLong (hwndMessage, OS.GWL_WNDPROC, cast(int) &messageProcFunc);
+OS.SetWindowLongPtr (hwndMessage, OS.GWLP_WNDPROC, cast(LONG_PTR) &messageProcFunc);
 /* Create the filter hook */
 static if (!OS.IsWinCE) {
 //msgFilterCallback = new Callback (this, "msgFilterProc", 3); //$NON-NLS-1$
 //msgFilterProc_ = msgFilterCallback.getAddress ();
 }
 /* Register custom messages message */
 SWT_TASKBARCREATED = OS.RegisterWindowMessage (StrToTCHARz ( "TaskbarCreated" ));
 SWT_RESTORECARET = OS.RegisterWindowMessage (StrToTCHARz ( "SWT_RESTORECARET"));
+DI_GETDRAGIMAGE = OS.RegisterWindowMessage (StrToTCHARz ( "ShellGetDragImage")); //$NON-NLS-1$
 /* Initialize OLE */
 static if (!OS.IsWinCE) OS.OleInitialize (null);
 /* Initialize buffered painting */
 * NOTE: If the modal shell is disabled for any
 * reason, it should not be brought to the front.
 */
 if (wParam !is 0) {
 if (!isXMouseActive ()) {
-if (modalDialogShell !is null && modalDialogShell.isDisposed ()) modalDialogShell = null;
+auto hwndActive = OS.GetActiveWindow ();
-Shell modal = modalDialogShell !is null ? modalDialogShell : getModalShell ();
+if (hwndActive !is null && OS.IsWindowEnabled (hwndActive)) break;
-if (modal !is null) {
+Shell modal = modalDialog !is null ? modalDialog.parent : getModalShell ();
+if (modal !is null && !modal.isDisposed ()) {
 auto hwndModal = modal.handle;
 if (OS.IsWindowEnabled (hwndModal)) {
 modal.bringToTop ();
 if (modal.isDisposed ()) break;
 }
 /*
 * When the session is ending, no DWT program can continue
 * to run.  In order to avoid running code after the display
 * has been disposed, exit from Java.
 */
-System.exit (0);
+/* This code is intentionally commented */
+//              System.exit (0);
 }
 break;
 }
 case OS.WM_QUERYENDSESSION: {
 Event event = new Event ();
 sendEvent (DWT.Close, event);
 if (!event.doit) return 0;
 break;
 }
+case OS.WM_DWMCOLORIZATIONCOLORCHANGED: {
+OS.SetTimer (hwndMessage, SETTINGS_ID, SETTINGS_DELAY, null);
+break;
+}
 case OS.WM_SETTINGCHANGE: {
+if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
+OS.SetTimer (hwndMessage, SETTINGS_ID, SETTINGS_DELAY, null);
+break;
+}
 switch (wParam) {
 case 0:
 case 1:
 case OS.SPI_SETHIGHCONTRAST:
 OS.SetTimer (hwndMessage, SETTINGS_ID, SETTINGS_DELAY, null);
 }
 int msgFilterProc (int code, int wParam, int lParam) {
 switch (code) {
 case OS.MSGF_COMMCTRL_BEGINDRAG: {
-if (!runDragDrop) {
+if (!runDragDrop && !dragCancelled) {
-hookMsg = *cast(MSG*)lParam;
+*hookMsg = *cast(MSG*)lParam;
 if (hookMsg.message is OS.WM_MOUSEMOVE) {
+dragCancelled = true;
 OS.SendMessage (hookMsg.hwnd, OS.WM_CANCELMODE, 0, 0);
 }
 }
 break;
 }
 case OS.MSGF_MESSAGEBOX:
 case OS.MSGF_NEXTWINDOW:
 case OS.MSGF_SCROLLBAR:
 case OS.MSGF_SIZE: {
 if (runMessages) {
-hookMsg = *cast(MSG*)lParam;
+*hookMsg = *cast(MSG*)lParam;
 if (hookMsg.message is OS.WM_NULL) {
 MSG msg;
 int flags = OS.PM_NOREMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE;
 if (!OS.PeekMessage (&msg, null, 0, 0, flags)) {
 if (runAsyncMessages (false)) wakeThread ();
 *
 * @since 3.0
 *
 */
 public bool post (Event event) {
-if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+synchronized (Device.classinfo) {
-if (event is null) error (DWT.ERROR_NULL_ARGUMENT);
+if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
-int type = event.type;
+if (event is null) error (DWT.ERROR_NULL_ARGUMENT);
-switch (type){
+int type = event.type;
-case DWT.KeyDown:
+switch (type){
-case DWT.KeyUp: {
+case DWT.KeyDown:
+case DWT.KeyUp: {
 KEYBDINPUT inputs;
 inputs.wVk = cast(short) untranslateKey (event.keyCode);
 if (inputs.wVk is 0) {
 char key = event.character;
 switch (key) {
 case DWT.BS: inputs.wVk = cast(short) OS.VK_BACK; break;
 case DWT.CR: inputs.wVk = cast(short) OS.VK_RETURN; break;
 case DWT.DEL: inputs.wVk = cast(short) OS.VK_DELETE; break;
 case DWT.ESC: inputs.wVk = cast(short) OS.VK_ESCAPE; break;
 case DWT.TAB: inputs.wVk = cast(short) OS.VK_TAB; break;
 /*
 * Since there is no LF key on the keyboard, do not attempt
 * to map LF to CR or attempt to post an LF key.
 */
-//                  case DWT.LF: inputs.wVk = cast(short) OS.VK_RETURN; break;
+//                      case DWT.LF: inputs.wVk = cast(short) OS.VK_RETURN; break;
 case DWT.LF: return false;
 default: {
 static if (OS.IsWinCE) {
 inputs.wVk = cast(int)OS.CharUpper (cast(wchar*) key);
 } else {
 inputs.wVk = OS.VkKeyScan (cast(short) wcsToMbcs (key, 0));
 if (inputs.wVk is -1) return false;
 inputs.wVk &= 0xFF;
+}
 }
 }
 }
-}
+inputs.dwFlags = type is DWT.KeyUp ? OS.KEYEVENTF_KEYUP : 0;
-inputs.dwFlags = type is DWT.KeyUp ? OS.KEYEVENTF_KEYUP : 0;
 auto hHeap = OS.GetProcessHeap ();
 auto pInputs = cast(INPUT*) OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof);
 pInputs.type = OS.INPUT_KEYBOARD;
-pInputs.ki = inputs;
+//TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit
-//OS.MoveMemory (pInputs + 4, inputs, KEYBDINPUT.sizeof);
+pInputs.ki = inputs;
-bool result = OS.SendInput (1, pInputs, INPUT.sizeof) !is 0;
+//OS.MoveMemory (pInputs + 4, inputs, KEYBDINPUT.sizeof);
-OS.HeapFree (hHeap, 0, pInputs);
+bool result = OS.SendInput (1, pInputs, INPUT.sizeof) !is 0;
-return result;
+OS.HeapFree (hHeap, 0, pInputs);
-}
+return result;
-case DWT.MouseDown:
+}
-case DWT.MouseMove:
+case DWT.MouseDown:
-case DWT.MouseUp:
+case DWT.MouseMove:
-case DWT.MouseWheel: {
+case DWT.MouseUp:
-MOUSEINPUT inputs;
+case DWT.MouseWheel: {
-if (type is DWT.MouseMove){
+MOUSEINPUT inputs;
-inputs.dwFlags = OS.MOUSEEVENTF_MOVE | OS.MOUSEEVENTF_ABSOLUTE;
+if (type is DWT.MouseMove){
-int x= 0, y = 0, width = 0, height = 0;
+inputs.dwFlags = OS.MOUSEEVENTF_MOVE | OS.MOUSEEVENTF_ABSOLUTE;
-if (OS.WIN32_VERSION >= OS.VERSION (5, 0)) {
+int x= 0, y = 0, width = 0, height = 0;
-inputs.dwFlags |= OS.MOUSEEVENTF_VIRTUALDESK;
+if (OS.WIN32_VERSION >= OS.VERSION (5, 0)) {
-x = OS.GetSystemMetrics (OS.SM_XVIRTUALSCREEN);
+inputs.dwFlags |= OS.MOUSEEVENTF_VIRTUALDESK;
-y = OS.GetSystemMetrics (OS.SM_YVIRTUALSCREEN);
+x = OS.GetSystemMetrics (OS.SM_XVIRTUALSCREEN);
-width = OS.GetSystemMetrics (OS.SM_CXVIRTUALSCREEN);
+y = OS.GetSystemMetrics (OS.SM_YVIRTUALSCREEN);
-height = OS.GetSystemMetrics (OS.SM_CYVIRTUALSCREEN);
+width = OS.GetSystemMetrics (OS.SM_CXVIRTUALSCREEN);
+height = OS.GetSystemMetrics (OS.SM_CYVIRTUALSCREEN);
+} else {
+width = OS.GetSystemMetrics (OS.SM_CXSCREEN);
+height = OS.GetSystemMetrics (OS.SM_CYSCREEN);
+}
+inputs.dx = ((event.x - x) * 65535 + width - 2) / (width - 1);
+inputs.dy = ((event.y - y) * 65535 + height - 2) / (height - 1);
 } else {
-width = OS.GetSystemMetrics (OS.SM_CXSCREEN);
+if (type is DWT.MouseWheel) {
-height = OS.GetSystemMetrics (OS.SM_CYSCREEN);
+if (OS.WIN32_VERSION < OS.VERSION (5, 0)) return false;
-}
+inputs.dwFlags = OS.MOUSEEVENTF_WHEEL;
-inputs.dx = ((event.x - x) * 65535 + width - 2) / (width - 1);
+switch (event.detail) {
-inputs.dy = ((event.y - y) * 65535 + height - 2) / (height - 1);
+case DWT.SCROLL_PAGE:
-} else {
+inputs.mouseData = event.count * OS.WHEEL_DELTA;
-if (type is DWT.MouseWheel) {
+break;
-if (OS.WIN32_VERSION < OS.VERSION (5, 0)) return false;
+case DWT.SCROLL_LINE:
-inputs.dwFlags = OS.MOUSEEVENTF_WHEEL;
+int value;
-switch (event.detail) {
+OS.SystemParametersInfo (OS.SPI_GETWHEELSCROLLLINES, 0, &value, 0);
-case DWT.SCROLL_PAGE:
+inputs.mouseData = event.count * OS.WHEEL_DELTA / value;
-inputs.mouseData = event.count * OS.WHEEL_DELTA;
+break;
-break;
+default: return false;
-case DWT.SCROLL_LINE:
-int value;
-OS.SystemParametersInfo (OS.SPI_GETWHEELSCROLLLINES, 0, &value, 0);
-inputs.mouseData = event.count * OS.WHEEL_DELTA / value;
-break;
-default: return false;
-}
-} else {
-switch (event.button) {
-case 1: inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_LEFTDOWN : OS.MOUSEEVENTF_LEFTUP; break;
-case 2: inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_MIDDLEDOWN : OS.MOUSEEVENTF_MIDDLEUP; break;
-case 3: inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_RIGHTDOWN : OS.MOUSEEVENTF_RIGHTUP; break;
-case 4: {
-if (OS.WIN32_VERSION < OS.VERSION (5, 0)) return false;
-inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_XDOWN : OS.MOUSEEVENTF_XUP;
-inputs.mouseData = OS.XBUTTON1;
-break;
 }
-case 5: {
+} else {
-if (OS.WIN32_VERSION < OS.VERSION (5, 0)) return false;
+switch (event.button) {
-inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_XDOWN : OS.MOUSEEVENTF_XUP;
+case 1: inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_LEFTDOWN : OS.MOUSEEVENTF_LEFTUP; break;
-inputs.mouseData = OS.XBUTTON2;
+case 2: inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_MIDDLEDOWN : OS.MOUSEEVENTF_MIDDLEUP; break;
-break;
+case 3: inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_RIGHTDOWN : OS.MOUSEEVENTF_RIGHTUP; break;
+case 4: {
+if (OS.WIN32_VERSION < OS.VERSION (5, 0)) return false;
+inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_XDOWN : OS.MOUSEEVENTF_XUP;
+inputs.mouseData = OS.XBUTTON1;
+break;
+}
+case 5: {
+if (OS.WIN32_VERSION < OS.VERSION (5, 0)) return false;
+inputs.dwFlags = type is DWT.MouseDown ? OS.MOUSEEVENTF_XDOWN : OS.MOUSEEVENTF_XUP;
+inputs.mouseData = OS.XBUTTON2;
+break;
+}
+default: return false;
 }
-default: return false;
 }
 }
-}
+auto hHeap = OS.GetProcessHeap ();
-auto hHeap = OS.GetProcessHeap ();
+auto pInputs = cast(INPUT*) OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof);
-auto pInputs = cast(INPUT*) OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof);
+pInputs.type = OS.INPUT_MOUSE;
-pInputs.type = OS.INPUT_MOUSE;
+//TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit
-//OS.MoveMemory(pInputs, [OS.INPUT_MOUSE], 4);
+pInputs.mi = inputs;
-pInputs.mi = inputs;
+bool result = OS.SendInput (1, pInputs, INPUT.sizeof) !is 0;
-//OS.MoveMemory (pInputs + 4, inputs, MOUSEINPUT.sizeof);
+OS.HeapFree (hHeap, 0, pInputs);
-bool result = OS.SendInput (1, pInputs, INPUT.sizeof) !is 0;
+return result;
-OS.HeapFree (hHeap, 0, pInputs);
+}
-return result;
-}
 default:
 }
 return false;
+}
 }
 void postEvent (Event event) {
 /*
 * Place the event at the end of the event queue.
 public bool readAndDispatch () {
 checkDevice ();
 lpStartupInfo = null;
 drawMenuBars ();
 runPopups ();
-if (OS.PeekMessage (&msg, null, 0, 0, OS.PM_REMOVE)) {
+if (OS.PeekMessage (msg, null, 0, 0, OS.PM_REMOVE)) {
-if (!filterMessage (&msg)) {
+if (!filterMessage (msg)) {
-OS.TranslateMessage (&msg);
+OS.TranslateMessage (msg);
-OS.DispatchMessage (&msg);
+OS.DispatchMessage (msg);
 }
 runDeferredEvents ();
 return true;
 }
 return runMessages && runAsyncMessages (false);
 }
-static synchronized void register (Display display) {
+static void register (Display display) {
 static_this();
-for (int i=0; i<Displays.length; i++) {
+synchronized (Device.classinfo) {
-if (Displays [i] is null) {
+for (int i=0; i<Displays.length; i++) {
-Displays [i] = display;
+if (Displays [i] is null) {
-return;
+Displays [i] = display;
-}
+return;
 }
-Display [] newDisplays = new Display [Displays.length + 4];
+}
-System.arraycopy (Displays, 0, newDisplays, 0, Displays.length);
+Display [] newDisplays = new Display [Displays.length + 4];
-newDisplays [Displays.length] = display;
+System.arraycopy (Displays, 0, newDisplays, 0, Displays.length);
-Displays = newDisplays;
+newDisplays [Displays.length] = display;
+Displays = newDisplays;
+}
 }
 /**
 * Releases any internal resources back to the operating
 * system and clears all fields except the device handle.
 OS.BufferedPaintUnInit ();
 }
 /* Release references */
 thread = null;
-//msg = null;
+msg = null;
+hookMsg = null;
 //keyboard = null;
-modalDialogShell = null;
+modalDialog = null;
 modalShells = null;
 data = null;
 keys = null;
 values = null;
 bars = popups = null;
 indexTable = null;
+timerIds = null;
 controlTable = null;
 lastControl = lastGetControl = lastHittestControl = null;
 imageList = toolImageList = toolHotImageList = toolDisabledImageList = null;
+timerList = null;
+tableBuffer = null;
+columnVisible = null;
+eventTable = filterTable = null;
+items = null;
+clickRect = null;
+hdr = null;
+plvfi = null;
+/* Release handles */
+threadId = 0;
 }
 void releaseImageList (ImageList list) {
 int i = 0;
 int length_ = imageList.length;
 Control control = null;
 int index;
 static if (USE_PROPERTY) {
 index = cast(int)OS.RemoveProp (handle, cast(wchar*)SWT_OBJECT_INDEX) - 1;
 } else {
-index = OS.GetWindowLong (handle, OS.GWL_USERDATA) - 1;
+index = OS.GetWindowLongPtr (handle, OS.GWLP_USERDATA) - 1;
+OS.SetWindowLongPtr (handle, OS.GWLP_USERDATA, 0);
 }
 if (0 <= index && index < controlTable.length) {
 control = controlTable [index];
 controlTable [index] = null;
 indexTable [index] = freeSlot;
 freeSlot = index;
-if (!USE_PROPERTY) {
-OS.SetWindowLong (handle, OS.GWL_USERDATA, 0);
-}
 }
 return control;
 }
 void removeMenuItem (MenuItem item) {
 shell.layout (true, true);
 }
 }
 }
-bool runTimer (int id) {
+bool runTimer (int /*long*/ id) {
 if (timerList !is null && timerIds !is null) {
 int index = 0;
 while (index <timerIds.length) {
 if (timerIds [index] is id) {
 OS.KillTimer (hwndMessage, timerIds [index]);
 if (key ==/*eq*/RUN_MESSAGES_IN_IDLE_KEY) {
 auto data = cast(ValueWrapperBool) value;
 runMessagesInIdle = data !is null && data.value;
 return;
 }
+if (key.equals (RUN_MESSAGES_IN_MESSAGE_PROC_KEY)) {
+Boolean data = cast(Boolean) value;
+runMessagesInMessageProc = data !is null && data.booleanValue ();
+return;
+}
 /* Remove the key/value pair */
 if (value is null) {
 if (keys is null) return;
 int index = 0;
 */
 public static void setAppName (String name) {
 /* Do nothing */
 }
-void setModalDialogShell (Shell modalDailog) {
+void setModalDialog (Dialog modalDailog) {
-if (modalDialogShell !is null && modalDialogShell.isDisposed ()) modalDialogShell = null;
+this.modalDialog = modalDailog;
-this.modalDialogShell = modalDailog;
 Shell [] shells = getShells ();
 for (int i=0; i<shells.length; i++) shells [i].updateModal ();
 }
 void setModalShell (Shell shell) {
 * </ul>
 */
 public void setSynchronizer (Synchronizer synchronizer) {
 checkDevice ();
 if (synchronizer is null) error (DWT.ERROR_NULL_ARGUMENT);
-if (this.synchronizer !is null) {
+if (synchronizer is this.synchronizer) return;
-this.synchronizer.runAsyncMessages(true);
+Synchronizer oldSynchronizer;
-}
+synchronized (Device.classinfo) {
-this.synchronizer = synchronizer;
+oldSynchronizer = this.synchronizer;
+this.synchronizer = synchronizer;
+}
+if (oldSynchronizer !is null) {
+oldSynchronizer.runAsyncMessages(true);
+}
 }
 int shiftedKey (int key) {
 static if (OS.IsWinCE) return 0;
 * </ul>
 *
 * @see #asyncExec
 */
 public void syncExec (Runnable runnable) {
-if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+Synchronizer synchronizer;
+synchronized (Device.classinfo) {
+if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+synchronizer = this.synchronizer;
+}
 synchronizer.syncExec (runnable);
 }
 /**
 * Causes the <code>run()</code> method of the runnable to
 public void timerExec (int milliseconds, Runnable runnable) {
 checkDevice ();
 if (runnable is null) error (DWT.ERROR_NULL_ARGUMENT);
 assert( runnable );
 if (timerList is null) timerList = new Runnable [4];
-if (timerIds is null) timerIds = new int [4];
+if (timerIds is null) timerIds = new int /*long*/ [4];
 int index = 0;
 while (index < timerList.length) {
 if (timerList [index] is runnable) break;
 index++;
 }
-int timerId = 0;
+int /*long*/ timerId = 0;
 if (index !is timerList.length) {
 timerId = timerIds [index];
 if (milliseconds < 0) {
 OS.KillTimer (hwndMessage, timerId);
 timerList [index] = null;
 timerId = nextTimerId++;
 if (index is timerList.length) {
 Runnable [] newTimerList = new Runnable [timerList.length + 4];
 SimpleType!(Runnable).arraycopy (timerList, 0, newTimerList, 0, timerList.length);
 timerList = newTimerList;
-int [] newTimerIds = new int [timerIds.length + 4];
+int /*long*/ [] newTimerIds = new int /*long*/ [timerIds.length + 4];
 System.arraycopy (timerIds, 0, newTimerIds, 0, timerIds.length);
 timerIds = newTimerIds;
 }
 }
 int newTimerID = OS.SetTimer (hwndMessage, timerId, milliseconds, null);
 * </ul>
 *
 * @see #sleep
 */
 public void wake () {
-if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+synchronized (Device.classinfo) {
-if (thread is Thread.getThis ()) return;
+if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
-wakeThread ();
+if (thread is Thread.getThis ()) return;
+wakeThread ();
+}
 }
 void wakeThread () {
 static if (OS.IsWinCE) {
 OS.PostMessage (hwndMessage, OS.WM_NULL, 0, 0);
 int windowProc(){
 return cast(int)&windowProcFunc;
 }
 int windowProc (HWND hwnd, uint msg, uint wParam, int lParam) {
+/*
+* Feature in Windows.  On Vista only, it is faster to
+* compute and answer the data for the visible columns
+* of a table when scrolling, rather than just return
+* the data for each column when asked.
+*/
+if (columnVisible !is null) {
+if (msg is OS.WM_NOTIFY && hwndParent is hwnd) {
+OS.MoveMemory (hdr, lParam, NMHDR.sizeof);
+switch (hdr.code) {
+case OS.LVN_GETDISPINFOA:
+case OS.LVN_GETDISPINFOW: {
+OS.MoveMemory (plvfi, lParam, NMLVDISPINFO.sizeof);
+if (0 <= plvfi.item.iSubItem && plvfi.item.iSubItem < columnCount) {
+if (!columnVisible [plvfi.item.iSubItem]) return 0;
+}
+break;
+}
+}
+}
+}
 /*
 * Bug in Adobe Reader 7.0.  For some reason, when Adobe
 * Reader 7.0 is deactivated from within Internet Explorer,
 * it sends thousands of consecutive WM_NCHITTEST messages
 * to the control that is under the cursor.  It seems that
 }
 int index;
 static if (USE_PROPERTY) {
 index = cast(int)OS.GetProp (hwnd, cast(wchar*)SWT_OBJECT_INDEX) - 1;
 } else {
-index = OS.GetWindowLong (hwnd, OS.GWL_USERDATA) - 1;
+index = OS.GetWindowLongPtr (hwnd, OS.GWLP_USERDATA) - 1;
 }
 if (0 <= index && index < controlTable.length) {
 Control control = controlTable [index];
 if (control !is null) {
 lastHwnd = hwnd;

Mercurial > projects > dwt-win

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