Changeset 1094

Timestamp:

Sep 29, 1999, 11:31:18 AM (26 years ago)

Author:

dengert

Message:

caret blinking and recreation

Location:

trunk

Files:

• changelog (modified) (1 diff)
• src/user32/caret.cpp (modified) (2 diffs)
• src/user32/pmwindow.cpp (modified) (4 diffs)
• src/user32/timer.cpp (modified) (2 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.258 1999-09-29 09:15:59 sandervl Exp $ */
+ /* $Id: changelog,v 1.259 1999-09-29 09:31:17 dengert Exp $ */
+
+ 99-09-29: Daniela Engert <dani@ngrt.de>
+        - USER32: improved timer handling for caret blinking.
+                  recreate carets on focus change if needed.
 
  99-09-29: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32: Almost completed standard window scrollbars.
-                  Fixed WM_ACTIVATE message, generate WM_ACTIVATEAPP message
-                  when WM_ACTIVATE is received. (instead of WM_SETFOCUS)
-                  NOTE: Still not working correctly. Too many WM_ACTIVATEAPP msgs generated.
-                  Always send Odin window handles from pmwindow.cpp to win32wbase.cpp.
-                  Send WM_CHILDACTIVATE msg to MDI child windows.
-
- 99-09-28: Daniela Engert <dani@ngrt.de>
-        - USER32: CreateCaret fixed
+                  Fixed WM_ACTIVATE message, generate WM_ACTIVATEAPP message
+                  when WM_ACTIVATE is received. (instead of WM_SETFOCUS)
+                  NOTE: Still not working correctly. Too many WM_ACTIVATEAPP msgs generated.
+                  Always send Odin window handles from pmwindow.cpp to win32wbase.cpp.
+                  Send WM_CHILDACTIVATE msg to MDI child windows.
 
  99-09-28: Christoph Bratschi <cbratschi@datacomm.ch>

trunk/src/user32/caret.cpp

@@ -1 @@
-/* $Id: caret.cpp,v 1.3 1999-09-28 18:31:24 dengert Exp $ */
+/* $Id: caret.cpp,v 1.4 1999-09-29 09:31:18 dengert Exp $ */
 
 /*
@@ -262 +262 @@
    CURSORINFO cursorInfo;
 
-   if ((hwndCaret == hwndFocus) &&
+   if ((hwndFocus != 0) && (hwndCaret == hwndFocus) &&
        !WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
    {
+      dprintf(("recreateCaret for %x", hwndFocus));
+
       CreateCaret (hwndCaret, hbmCaret, CaretWidth, CaretHeight);
       SetCaretPos (CaretPosX, CaretPosY);

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.12 1999-09-29 09:16:31 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.13 1999-09-29 09:31:18 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -30 +30 @@
 #include <thread.h>
 #include <wprocess.h>
+#include <caret.h>
 
 HMQ  hmq = 0;                             /* Message queue handle         */
@@ -413 +414 @@
         }
         if((ULONG)mp2 == TRUE) {
-                rc = win32wnd->MsgSetFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
+                HWND hwndFocusWin32 = Win32BaseWindow::OS2ToWin32Handle(hwndFocus);
+                recreateCaret (hwndFocusWin32);
+                rc = win32wnd->MsgSetFocus(hwndFocusWin32);
         }
         else    rc = win32wnd->MsgKillFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
@@ -748 +751 @@
 
     case WM_TIMER:
-        win32wnd->MsgTimer((ULONG)mp1);
+        if (mp2) win32wnd->MsgTimer((ULONG)mp1);
         goto RunDefWndProc;
 

trunk/src/user32/timer.cpp

@@ -1 @@
-/* $Id: timer.cpp,v 1.3 1999-09-26 16:09:04 dengert Exp $ */
+/* $Id: timer.cpp,v 1.4 1999-09-29 09:31:18 dengert Exp $ */
 
 /*
@@ -74 +74 @@
 
     if (i == NB_TIMERS)  /* no matching timer found */
-        return (TRUE);   /* eat message */
+        return (FALSE);  /* forward message */
 
     pMsg->mp1 = MPFROMLONG (pTimer->id);
+    pMsg->mp2 = MPFROMLONG (TRUE);   /* mark for Win32 */
     if (!pTimer->proc)
         return (FALSE);  /* forward message */