Changeset 11612

Timestamp:

Sep 23, 1999, 5:50:21 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

tags/trunk

Files:

• include/win/hotkey.h (modified) (2 diffs)
• src/comctl32/hotkey.c (modified) (12 diffs)

tags/trunk/include/win/hotkey.h ¶

@@ -1 @@
-/* $Id: hotkey.h,v 1.3 1999-09-19 13:26:47 cbratschi Exp $ */
+/* $Id: hotkey.h,v 1.4 1999-09-23 15:49:57 cbratschi Exp $ */
 
 /*
@@ -21 +21 @@
     INT   fwModInv;
     POINT cursorPos;
+    BYTE  bfModsDown;
 } HOTKEY_INFO;
 

tags/trunk/src/comctl32/hotkey.c ¶

@@ -1 @@
-/* $Id: hotkey.c,v 1.7 1999-09-20 15:59:27 cbratschi Exp $ */
+/* $Id: hotkey.c,v 1.8 1999-09-23 15:50:21 cbratschi Exp $ */
 /*
  * Hotkey control
@@ -7 +7 @@
  * Copyright 1999 Christoph Bratschi
  *
- * NOTES
- *   Development in progress.
- *
- * TODO:
- *   - keyboard messages
+ * Status: Development in progress
+ * Version: 5.00
  */
 
@@ -24 +21 @@
 HOTKEY_Refresh(HWND hwnd)
 {
-  InvalidateRect(hwnd,NULL,FALSE);
+  RECT rect;
+
+  GetClientRect(hwnd,&rect);
+  InflateRect(&rect,-2,-2);
+  InvalidateRect(hwnd,&rect,FALSE);
 }
 
@@ -87 +88 @@
 HOTKEY_Char(HWND hwnd,WPARAM wParam,LPARAM lParam,BOOL sysKey)
 {
- //CB:
+  HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(hwnd);
+
+  if (wParam != infoPtr->bVKHotKey)
+  {
+    infoPtr->bVKHotKey = wParam & 0xFF;
+    infoPtr->bfMods = HOTKEY_Check(infoPtr,infoPtr->bfMods);
+    HOTKEY_Refresh(hwnd);
+  }
+
   return 0;
 }
@@ -112 +121 @@
     infoPtr->cursorPos.x = 3;
     infoPtr->cursorPos.y = 3;
+    infoPtr->bfModsDown = 0;
 
     /* get default font height */
@@ -144 +154 @@
     if (!hBrush) hBrush = (HBRUSH)GetStockObject(WHITE_BRUSH);
     GetClientRect(hwnd,&rc);
+    HideCaret(hwnd);
     FillRect((HDC)wParam,&rc,hBrush);
+    ShowCaret(hwnd);
 
     return -1;
@@ -163 +175 @@
 {
   HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd);
-  INT newMods = sysKey ? HOTKEYF_ALT:0;
-
+  INT newMods = (sysKey ? HOTKEYF_ALT:0) | infoPtr->bfModsDown;
+  INT newKey = (infoPtr->bfModsDown == 0) ? 0:infoPtr->bVKHotKey;
+
+  if (sysKey) infoPtr->bfModsDown |= HOTKEYF_ALT;
   switch (wParam)
   {
@@ -177 +191 @@
     case VK_SHIFT:
          newMods |= HOTKEYF_SHIFT;
+         infoPtr->bfModsDown |= HOTKEYF_SHIFT;
          break;
 
     case VK_CONTROL:
          newMods |= HOTKEYF_CONTROL;
+         infoPtr->bfModsDown |= HOTKEYF_CONTROL;
+         break;
+
+    default:
+         //CB:
+         break;
+    }
+
+    newMods = HOTKEY_Check(infoPtr,newMods);
+    if (infoPtr->bfMods != newMods)
+    {
+      infoPtr->bVKHotKey = newKey;
+      infoPtr->bfMods = newMods;
+      HOTKEY_Refresh(hwnd);
+    }
+
+    return 0;
+}
+
+
+static LRESULT
+HOTKEY_KeyUp (HWND hwnd, WPARAM wParam, LPARAM lParam,BOOL sysKey)
+{
+  HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd);
+  INT newMods = infoPtr->bfModsDown;
+
+  if (sysKey)
+  {
+    newMods &= ~HOTKEYF_ALT;
+    infoPtr->bfModsDown &= ~HOTKEYF_ALT;
+  }
+  switch (wParam)
+  {
+    case VK_RETURN:
+    case VK_TAB:
+    case VK_SPACE:
+    case VK_DELETE:
+    case VK_ESCAPE:
+    case VK_BACK:
+         return DefWindowProcA (hwnd,sysKey ? WM_SYSKEYDOWN:WM_KEYDOWN, wParam, lParam);
+
+    case VK_SHIFT:
+         newMods &= ~HOTKEYF_SHIFT;
+         infoPtr->bfModsDown &= ~HOTKEYF_SHIFT;
+         break;
+
+    case VK_CONTROL:
+         newMods &= ~HOTKEYF_CONTROL;
+         infoPtr->bfModsDown &= ~HOTKEYF_CONTROL;
          break;
 
@@ -187 +251 @@
     }
 
-    infoPtr->bfMods = newMods;
-    HOTKEY_Refresh(hwnd);
-
-    return TRUE;
-}
-
-
-static LRESULT
-HOTKEY_KeyUp (HWND hwnd, WPARAM wParam, LPARAM lParam,BOOL sysKey)
-{
-  HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd);
-
-//    FIXME (hotkey, " %d\n", wParam);
-
-  return 0;
+    newMods = HOTKEY_Check(infoPtr,newMods);
+    if (infoPtr->bfMods != newMods)
+    {
+      infoPtr->bfMods = newMods;
+      HOTKEY_Refresh(hwnd);
+    }
+
+    return 0;
 }
 
@@ -210 +267 @@
     HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd);
 
+    infoPtr->bfModsDown = 0;
     infoPtr->bFocus = FALSE;
-    DestroyCaret ();
+    DestroyCaret();
 
     return 0;
@@ -220 +278 @@
 HOTKEY_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-/*    HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd); */
-
     SetFocus (hwnd);
 
@@ -271 +327 @@
     char2[1] = 0;
     strcat(text,char2);
-  }
+  } else if (infoPtr->bfModsDown) strcat(text,"+");
   if(infoPtr->hFont) oldFont = SelectObject(hdc,infoPtr->hFont);
   SetBkMode(hdc,TRANSPARENT);