Changeset 353 for trunk/src

Timestamp:

Nov 27, 2009, 1:20:02 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Completely steal the Alt key and other default shortcuts (Alt+F7, Alt+F10 etc) from the system-wide frame accelerator table so that they can be normally processed by Qt applications. The only ones remaining for the system are are Alt+F4, Ctrl+Esc, Alt+Esc.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qkeymapper_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -842 +842 @@
         } else {
             switch(msg) {
+
+            case WM_TRANSLATEACCEL: {
+                if (widget->isWindow()) {
+                    rc = WinDefWindowProc(hwnd, msg, mp1, mp2);
+                    if (rc) {
+                        QMSG &qmsg = *(QMSG*)mp1;
+                        if (qmsg.msg == WM_SYSCOMMAND &&
+                            WinWindowFromID(widget->internalFrameWinId(),
+                                            FID_SYSMENU)) {
+                            switch (SHORT1FROMMP(qmsg.mp1)) {
+                                case SC_CLOSE:
+                                case SC_TASKMANAGER:
+                                    return (MRESULT)TRUE;
+                                default:
+                                    break;
+                            }
+                        }
+                    }
+                }
+                // return FALSE in all other cases to let Qt process keystrokes
+                // that are in the system-wide frame accelerator table.
+                return FALSE;
+            }
 
             case WM_CHAR: { // keyboard event

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -375 +375 @@
         KeyRecord *rec = key_recorder.findKey(chm.scancode, false);
 
+        if (state == Qt::AltModifier) {
+            // Special handling of global PM hotkeys
+            switch (code) {
+                case Qt::Key_Space: {
+                    // show system menu
+                    HWND fId = widget->window()->internalFrameWinId();
+                    HWND sysMenu = WinWindowFromID(fId, FID_SYSMENU);
+                    if (!sysMenu)
+                        break; // no menu for this window
+                    WinPostMsg(sysMenu, MM_STARTMENUMODE,
+                               MPFROM2SHORT(TRUE, FALSE), 0);
+                    return true;
+                }
+                case Qt::Key_F4: {
+                    // we handle this key combination ourselves because not
+                    // all top-level widgets have the system menu
+                    WinPostMsg(widget->window()->internalFrameWinId(),
+                               WM_CLOSE, 0, 0);
+                    return true;
+                }
+                default:
+                    break;
+            }
+        }
+
         // If rec's state doesn't match the current state, something has changed behind our back
         // (Consumed by modal widget is one possibility) So, remove the record from the list