Changeset 1849 for trunk/src/user32/edit.cpp

Timestamp:

Nov 26, 1999, 6:06:09 PM (26 years ago)

Author:

cbratschi

Message:

map rect, WM_ERASEBKGND and other fixes

File:

• trunk/src/user32/edit.cpp (modified) (17 diffs)

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.17 1999-11-24 18:21:36 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.18 1999-11-26 17:06:06 cbratschi Exp $ */
 /*
  *      Edit control
@@ -20 +20 @@
 
 /* CB: todo
+  - WM_MOUSEMOVE: vert lines invalidate bug
   - EN_UPDATE: send before update
   - EN_CHANGE: send after update -> WM_PAINT isn't the right place
   - EN_HSCROLL/EN_VSCROLL: send before update
-  - still problems with caret
   - WS_BORDER -> bug in Win32BaseWindow::SetWindowLong
-  - clipping bug(s)
   - many messages, styles, notifications
 */
@@ -229 +228 @@
 static LRESULT  EDIT_WM_LButtonDown(HWND hwnd, EDITSTATE *es, DWORD keys, INT x, INT y);
 static LRESULT  EDIT_WM_LButtonUp(HWND hwnd, EDITSTATE *es, DWORD keys, INT x, INT y);
+static LRESULT  EDIT_WM_CaptureChanged(HWND hwnd,EDITSTATE *es);
 static LRESULT  EDIT_WM_MouseMove(HWND hwnd, EDITSTATE *es, DWORD keys, INT x, INT y);
 static LRESULT  EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTA cs);
@@ -671 +671 @@
                 //DPRINTF_EDIT_MSG32("WM_LBUTTONUP");
                 result = EDIT_WM_LButtonUp(hwnd, es, (DWORD)wParam, SLOWORD(lParam), SHIWORD(lParam));
+                break;
+
+        case WM_CAPTURECHANGED:
+                result = EDIT_WM_CaptureChanged(hwnd,es);
                 break;
 
@@ -1014 +1018 @@
 {
         INT line_index =  EDIT_EM_LineIndex(hwnd, es, line);
-
+//CB: fix
         if (es->style & ES_MULTILINE)
                 rc->top = es->format_rect.top + (line - es->y_offset) * es->line_height;
@@ -1089 +1093 @@
         if (IntersectRect(&rc, &line_rect, &es->format_rect))
         {
-          if (es->flags & EF_FOCUSED) HideCaret(hwnd);
+          HideCaret(hwnd);
           InvalidateRect(hwnd, &rc, FALSE);
-          if (es->flags & EF_FOCUSED) ShowCaret(hwnd);
+          ShowCaret(hwnd);
         }
 }
@@ -1132 +1136 @@
         GetClientRect(hwnd, &rc1);
         IntersectRect(&rcWnd, &rc1, &es->format_rect);
-        if (es->flags & EF_FOCUSED) HideCaret(hwnd);
+        HideCaret(hwnd);
         if (sl == el) {
                 EDIT_GetLineRect(hwnd, es, sl, sc, ec, &rcLine);
@@ -1156 +1160 @@
                         InvalidateRect(hwnd, &rcUpdate, FALSE);
         }
-        if (es->flags & EF_FOCUSED) ShowCaret(hwnd);
+        ShowCaret(hwnd);
 }
 
@@ -2087 +2091 @@
                 GetClientRect(hwnd, &rc1);
                 IntersectRect(&rc, &rc1, &es->format_rect);
-                rc.top--; //CB: top line not moved/refreshed
+
                 ScrollWindowEx(hwnd, -dx, dy,
                                 NULL, &rc, (HRGN)NULL, NULL, SW_INVALIDATE);
@@ -2851 +2855 @@
 
         GetClientRect(hwnd, &rc);
-        IntersectClipRect(dc, rc.left, rc.top, rc.right, rc.bottom);
+        IntersectClipRect(dc, rc.left, rc.top, rc.right, rc.bottom); CB:
         GetClipBox(dc, &rc);
         /*
@@ -2876 +2880 @@
     return 0;
 
-  //SvL: Bugfix: +1
   len = min(count, lstrlenA(es->text)+1); // determine length
   lstrcpynA(text, es->text, len);       // copy as much as possible
@@ -3262 +3265 @@
 static LRESULT EDIT_WM_LButtonUp(HWND hwnd, EDITSTATE *es, DWORD keys, INT x, INT y)
 {
-        if (es->bCaptureState && GetCapture() == hwnd) {
-                KillTimer(hwnd, 0);
-                ReleaseCapture();
-        }
-        es->bCaptureState = FALSE;
-
-        return 0;
-}
-
+  if (es->bCaptureState)
+  {
+    KillTimer(hwnd,0);
+    ReleaseCapture();
+  }
+  es->bCaptureState = FALSE;
+
+  return 0;
+}
+
+static LRESULT EDIT_WM_CaptureChanged(HWND hwnd,EDITSTATE *es)
+{
+  if (es->bCaptureState) KillTimer(hwnd,0);
+  es->bCaptureState = FALSE;
+
+  return 0;
+}
 
 /*********************************************************************
@@ -3283 +3294 @@
         INT prex, prey;
 
-        if (GetCapture() != hwnd)
-                return 1; //SvL: Bugfix
+        if (!es->bCaptureState) return 0;
 
         /*
@@ -3401 +3411 @@
   if (es->flags & EF_UPDATE) EDIT_NOTIFY_PARENT(hwnd, EN_UPDATE);
 
-  if (es->flags & EF_FOCUSED) HideCaret(hwnd);
+  HideCaret(hwnd);
 
   if (eraseBkGnd)
@@ -3473 +3483 @@
     EDIT_SetCaretPos(hwnd, es, es->selection_end,es->flags & EF_AFTER_WRAP);
 
-  if (es->flags & EF_FOCUSED) ShowCaret(hwnd);
+  ShowCaret(hwnd);
 
   //CB: replace
@@ -3490 +3500 @@
 
   //CB: original controls redraws many times, cache drawing
-  if (es->flags & EF_FOCUSED) HideCaret(hwnd);
+  HideCaret(hwnd);
   GetClientRect(hwnd,&rect);
   hdc = GetDC(hwnd);
@@ -3503 +3513 @@
   DeleteDC(hdcCompatible);
   ReleaseDC(hwnd,hdc);
-  if (es->flags & EF_FOCUSED) ShowCaret(hwnd);
+  ShowCaret(hwnd);
 }