Changeset 9857 for trunk/src

Timestamp:

Feb 25, 2003, 3:37:05 PM (23 years ago)

Author:

sandervl

Message:

Added support for EM_SETCHARFORMAT (text & background color) & EM_SETBKGNDCOLOR

Location:

trunk/src/riched32

Files:

• makefile (modified) (2 diffs)
• richedit.c (modified) (8 diffs)

trunk/src/riched32/makefile

@@ -1 @@
-# $Id: makefile,v 1.9 2002-11-15 19:34:36 sandervl Exp $
+# $Id: makefile,v 1.10 2003-02-25 14:37:05 sandervl Exp $
 
 #
@@ -40 +40 @@
 $(ODIN32_LIB)/kernel32.lib \
 $(ODIN32_LIB)/user32.lib \
+$(ODIN32_LIB)/gdi32.lib \
 $(ODIN32_LIB)/$(ODINCRT).lib \
 OS2386.LIB \

trunk/src/riched32/richedit.c

@@ -52 +52 @@
                      hwnd, (UINT)wParam, (UINT)lParam)
 
+#ifdef __WIN32OS2__
+#define RICHEDIT_WND_PROP       "RICHEDIT_PROP"
+
+#endif
 
 /***********************************************************************
@@ -110 +114 @@
     LONG style = 0;
 
+#ifdef __WIN32OS2__
+    HWND hwndEdit;
+    HWND hwndParent;
+    char* rtfBuffer;
+    HANDLE hProp = 0;
+    int rtfBufferSize;
+
+    CHARRANGE *cr;
+#else
     static HWND hwndEdit;
     static HWND hwndParent;
@@ -117 +130 @@
     CHARRANGE *cr;
     TRACE("previous hwndEdit: %p hwndParent %p\n",hwndEdit,hwndParent);
+#endif
     hwndEdit = GetWindow(hwnd,GW_CHILD);
     TRACE("uMsg: 0x%x hwnd: %p hwndEdit: %p\n",uMsg,hwnd,hwndEdit);
@@ -143 +157 @@
 
             SetWindowLongA(hwnd,GWL_STYLE, newstyle);
+#ifdef __WIN32OS2__
+          {
+            CHARFORMAT2A *pcf;
+
+            hProp = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT, sizeof(CHARFORMAT2A));
+            SetPropA(hwnd, RICHEDIT_WND_PROP, hProp);
+            pcf = (CHARFORMAT2A *)GlobalLock(hProp);
+            if(pcf) {
+                pcf->cbSize = sizeof(CHARFORMAT2A);
+                GlobalUnlock(hProp);
+            }
+          }
+#endif
             return 0 ;
 
@@ -400 +427 @@
 
     case EM_SETBKGNDCOLOR:
+#ifdef __WIN32OS2__
+{
+            CHARFORMAT2A *pcf;
+
+            hProp = GetPropA(hwnd, RICHEDIT_WND_PROP);
+            pcf = (CHARFORMAT2A *)GlobalLock(hProp);
+            if(pcf) 
+            {
+                pcf->dwMask     |= CFM_BACKCOLOR;
+                pcf->crBackColor = (wParam) ? GetSysColor(COLOR_BACKGROUND) : (COLORREF)lParam;
+
+                //Destroy old brush if present
+                if(pcf->dwReserved) DeleteObject(pcf->dwReserved);
+
+                //Create a brush that we return in WM_CTLCOLORSTATIC
+                pcf->dwReserved  = (DWORD)CreateSolidBrush(pcf->crBackColor);
+ 
+                dprintf(("Set background color to %x brush %x", pcf->crBackColor, pcf->dwReserved));
+
+                GlobalUnlock(hProp);
+            }
+}
+#endif
             DPRINTF_EDIT_MSG32("EM_SETBKGNDCOLOR Ignored");
             return 0;
 
     case EM_SETCHARFORMAT:
+#ifdef __WIN32OS2__
+    {
+            CHARFORMAT2A *pnewcf = (CHARFORMAT2A *)lParam;
+            CHARFORMAT2A *pcf;
+
+            hProp = GetPropA(hwnd, RICHEDIT_WND_PROP);
+            pcf = (CHARFORMAT2A *)GlobalLock(hProp);
+            if(pcf && pnewcf && pnewcf->cbSize >= sizeof(CHARFORMATA)) 
+            {
+                if((pnewcf->dwMask & CFM_COLOR) && !(pnewcf->dwEffects & CFE_AUTOCOLOR)) {
+                    pcf->dwMask     |= CFM_COLOR;
+                    pcf->crTextColor = pnewcf->crTextColor;
+                    dprintf(("Set text color to %x", pcf->crTextColor));
+                }
+                if(pnewcf->cbSize == sizeof(CHARFORMAT2A)) 
+                {
+                    if((pnewcf->dwMask & CFM_BACKCOLOR) && !(pnewcf->dwEffects & CFE_AUTOBACKCOLOR)) 
+                    {
+                        pcf->dwMask     |= CFM_BACKCOLOR;
+                        pcf->crBackColor = pnewcf->crBackColor;
+ 
+                        //Destroy old brush if present
+                        if(pcf->dwReserved) DeleteObject(pcf->dwReserved);
+
+                        //Create a brush that we return in WM_CTLCOLORSTATIC
+                        pcf->dwReserved  = (DWORD)CreateSolidBrush(pcf->crBackColor);
+ 
+                        dprintf(("Set background color to %x brush %x", pcf->crBackColor, pcf->dwReserved));
+                    }
+                }
+            }
+
+            if(pcf) GlobalUnlock(hProp);
+    }
+#else
             DPRINTF_EDIT_MSG32("EM_SETCHARFORMAT Ignored");
+#endif
             return 0;
 
@@ -657 +743 @@
         return DefWindowProcA( hwnd,uMsg,wParam,lParam);
     case WM_DESTROY:
+#ifdef __WIN32OS2__
+    {
+        CHARFORMAT2A *pcf;
+
+        hProp = GetPropA(hwnd, RICHEDIT_WND_PROP);
+        pcf = (CHARFORMAT2A *)GlobalLock(hProp);
+        if(pcf) {
+            //Destroy old brush if present
+            if(pcf->dwReserved) DeleteObject(pcf->dwReserved);
+            GlobalUnlock(hProp);
+        }
+
+        if(hProp) GlobalFree(hProp);
+        RemovePropA(hwnd, RICHEDIT_WND_PROP);
+    }
+#endif
         DPRINTF_EDIT_MSG32("WM_DESTROY Passed to default");
         return DefWindowProcA( hwnd,uMsg,wParam,lParam);
@@ -672 +774 @@
         DPRINTF_EDIT_MSG32("WM_INITIALUPDATE Passed to default");
         return DefWindowProcA( hwnd,uMsg,wParam,lParam); */
+#ifndef __WIN32OS2__
     case WM_CTLCOLOREDIT:
         DPRINTF_EDIT_MSG32("WM_CTLCOLOREDIT Passed to default");
         return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+#endif
     case WM_SETCURSOR:
         DPRINTF_EDIT_MSG32("WM_SETCURSOR Passed to default");
@@ -700 +804 @@
         return DefWindowProcA( hwnd,uMsg,wParam,lParam);
     case WM_CTLCOLORSTATIC:
+#ifdef __WIN32OS2__
+    case WM_CTLCOLOREDIT:
+{
+            CHARFORMAT2A *pcf;
+            HBRUSH hBrush = 0;
+            HDC hdc = (HDC)wParam;
+
+            hProp = GetPropA(hwnd, RICHEDIT_WND_PROP);
+            pcf = (CHARFORMAT2A *)GlobalLock(hProp);
+            if(pcf)
+            {
+                if(pcf->dwMask & CFM_BACKCOLOR) {
+                    SetBkColor(hdc, pcf->crBackColor);
+                    hBrush = pcf->dwReserved;
+                }
+                if(pcf->dwMask & CFM_COLOR) {
+                    SetTextColor(hdc, pcf->crTextColor);
+                }
+            }
+            if(pcf) GlobalUnlock(hProp);
+
+            if(hBrush) return hBrush;          
+}
+#endif
         DPRINTF_EDIT_MSG32("WM_CTLCOLORSTATIC Passed to default");
         return DefWindowProcA( hwnd,uMsg,wParam,lParam);