Changeset 402 for trunk/src

Timestamp:

Jul 27, 1999, 6:14:22 PM (26 years ago)

Author:

cbratschi

Message:

keyboard support and other updates

File:

• trunk/src/user32/new/button.cpp (modified) (13 diffs)

trunk/src/user32/new/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.9 1999-07-24 17:10:24 cbratschi Exp $ */
-/* File: button.c -- Button type widgets
- *
- * Copyright (c) 1999 Christoph Bratschi (ported from WINE)
+/* $Id: button.cpp,v 1.10 1999-07-27 16:14:22 cbratschi Exp $ */
+/* File: button.cpp -- Button type widgets
  *
  * Copyright (C) 1993 Johannes Ruscheinski
  * Copyright (C) 1993 David Metcalfe
  * Copyright (C) 1994 Alexandre Julliard
+ * Copyright (c) 1999 Christoph Bratschi
  */
 
 /* CB: todo
    - update checkboxes.bmp to Win9x style
+     + color and transparent mask
 */
 
@@ -31 +31 @@
 static void OB_Paint(HWND hwnd,HDC hDC,WORD action);
 static void BUTTON_CheckAutoRadioButton(HWND hwnd);
+static LRESULT BUTTON_LButtonDown(HWND hwnd,WPARAM wParam,LPARAM lParam);
 
 #define MAX_BTN_TYPE  12
@@ -88 +89 @@
   switch (dwStyle & 0x0f)
   {
+    case BS_AUTOCHECKBOX:
+    case BS_CHECKBOX:
+     return DLGC_WANTCHARS | DLGC_BUTTON;
+
     case BS_PUSHBUTTON:
-      return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON;
+      return DLGC_UNDEFPUSHBUTTON;
+
     case BS_DEFPUSHBUTTON:
-      return DLGC_BUTTON | DLGC_DEFPUSHBUTTON;
+      return DLGC_DEFPUSHBUTTON;
+
+    case BS_AUTORADIOBUTTON:
     case BS_RADIOBUTTON:
-    case BS_AUTORADIOBUTTON:
-      return DLGC_BUTTON | DLGC_RADIOBUTTON;
+      return DLGC_RADIOBUTTON;
+
+    case BS_GROUPBOX:;
+      return DLGC_STATIC;
+
     default:
       return DLGC_BUTTON;
@@ -119 +130 @@
 
     hbitmapCheckBoxes = NativeLoadBitmap(0,MAKEINTRESOURCEA(OBM_CHECKBOXES));
-    GetObjectA( hbitmapCheckBoxes, sizeof(bmp), &bmp );
-    checkBoxWidth  = bmp.bmWidth / 4;
-    checkBoxHeight = bmp.bmHeight / 3;
+    if (GetObjectA(hbitmapCheckBoxes,sizeof(bmp),&bmp))
+    {
+      checkBoxWidth  = bmp.bmWidth / 4;
+      checkBoxHeight = bmp.bmHeight / 3;
+    } else checkBoxWidth = checkBoxHeight = 0;
   }
   if (style < 0L || style >= MAX_BTN_TYPE) return -1; /* abort */
@@ -160 +173 @@
     (btnPaintFunc[style])(hwnd,hdc,ODA_DRAWENTIRE);
     if(!wParam) EndPaint(hwnd,&ps);
+  }
+
+  return 0;
+}
+
+static LRESULT BUTTON_LButtonDblClk(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+
+  switch(dwStyle & 0x0f)
+  {
+    case BS_RADIOBUTTON:
+    case BS_AUTORADIOBUTTON:
+    case BS_OWNERDRAW:
+      SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID),BN_DOUBLECLICKED),hwnd);
+      break;
+
+    default:
+      BUTTON_LButtonDown(hwnd,wParam,lParam);
+      break;
   }
 
@@ -266 +299 @@
 }
 
+static LRESULT BUTTON_KeyDown(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  if (wParam == VK_SPACE)
+  {
+    SendMessageA(hwnd,BM_SETSTATE,TRUE,0);
+    SetFocus(hwnd);
+    SetCapture(hwnd);
+  }
+
+  return 0;
+}
+
+static LRESULT BUTTON_KeyUp(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  if (wParam == VK_SPACE)
+  {
+    BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
+    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+    DWORD id = GetWindowLongA(hwnd,GWL_ID);
+
+    ReleaseCapture();
+    if (!(infoPtr->state & BUTTON_HIGHLIGHTED)) return 0;
+    SendMessageA(hwnd,BM_SETSTATE,FALSE,0);
+
+    switch(dwStyle & 0x0f)
+    {
+      case BS_AUTOCHECKBOX:
+        SendMessageA(hwnd,BM_SETCHECK,!(infoPtr->state & BUTTON_CHECKED),0);
+        break;
+      case BS_AUTORADIOBUTTON:
+        SendMessageA(hwnd,BM_SETCHECK,TRUE,0);
+        break;
+      case BS_AUTO3STATE:
+        SendMessageA(hwnd,BM_SETCHECK,
+                     (infoPtr->state & BUTTON_3STATE) ? 0 :
+                     ((infoPtr->state & 3)+1),0);
+        break;
+    }
+    SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(id,BN_CLICKED),hwnd);
+  } else if (wParam != VK_TAB) ReleaseCapture();
+
+  return 0;
+}
+
+static LRESULT BUTTON_SysKeyUp(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  if (wParam != VK_TAB) ReleaseCapture();
+
+  return 0;
+}
+
 static LRESULT BUTTON_SetFocus(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
@@ -275 +359 @@
   {
     SendMessageA(hwnd,BM_SETCHECK,1,0);
-  }
+    SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID),BN_CLICKED),hwnd);
+  } else if (style == BS_RADIOBUTTON)
+  {
+    SendMessageA(GetParent(hwnd),WM_COMMAND,MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID),BN_CLICKED),hwnd);
+  }
+
   PAINT_BUTTON(hwnd,style,ODA_FOCUS);
 
@@ -286 +375 @@
   DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
 
-  infoPtr->state &= ~BUTTON_HASFOCUS;
-  PAINT_BUTTON(hwnd,style,ODA_FOCUS);
-  InvalidateRect(hwnd,NULL,TRUE);
+  if (infoPtr->state & BUTTON_HASFOCUS)
+  {
+    infoPtr->state &= ~BUTTON_HASFOCUS;
+    PAINT_BUTTON(hwnd,style,ODA_FOCUS);
+    InvalidateRect(hwnd,NULL,TRUE);
+  }
 
   return 0;
@@ -296 +388 @@
 {
   InvalidateRect(hwnd,NULL,FALSE);
+
+  return 0;
+}
+
+static LRESULT BUTTON_Click(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  RECT rect;
+  LPARAM point;
+
+  GetClientRect(hwnd,&rect);
+  point = MAKELPARAM(rect.right/2,rect.bottom/2);
+  SendMessageA(hwnd,WM_LBUTTONDOWN,0,point);
+  Sleep(100);
+  SendMessageA(hwnd,WM_LBUTTONUP,0,point);
 
   return 0;
@@ -417 +523 @@
       return BUTTON_Paint(hwnd,wParam,lParam);
 
+    case WM_LBUTTONDBLCLK:
+      return BUTTON_LButtonDblClk(hwnd,wParam,lParam);
+
     case WM_LBUTTONDOWN:
-    case WM_LBUTTONDBLCLK:
       return BUTTON_LButtonDown(hwnd,wParam,lParam);
 
@@ -439 +547 @@
       return BUTTON_GetFont(hwnd,wParam,lParam);
 
+    case WM_KEYDOWN:
+      return BUTTON_KeyDown(hwnd,wParam,lParam);
+
+    case WM_KEYUP:
+      return BUTTON_KeyUp(hwnd,wParam,lParam);
+
+    case WM_SYSKEYUP:
+      return BUTTON_SysKeyUp(hwnd,wParam,lParam);
+
     case WM_SETFOCUS:
       return BUTTON_SetFocus(hwnd,wParam,lParam);
@@ -447 +564 @@
     case WM_SYSCOLORCHANGE:
       return BUTTON_SysColorChange(hwnd,wParam,lParam);
+
+    case BM_CLICK:
+      return BUTTON_Click(hwnd,wParam,lParam);
 
     case BM_SETSTYLE:
@@ -910 +1030 @@
 
     ZeroMemory(&wndClass,sizeof(WNDCLASSA));
-    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC;
+    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC | CS_DBLCLKS;
     wndClass.lpfnWndProc   = (WNDPROC)ButtonWndProc;
     wndClass.cbClsExtra    = 0;