hg/stx-libview: comparison WinWorkstation.st

equal deleted inserted replaced

-:0d33cf3ae07f
+:c181846c6f5a
 static struct queuedEvent *eventQueueHead = (struct queuedEvent *)0;
 static struct queuedEvent *eventQueueTail = (struct queuedEvent *)0;
 static int eventsendcount = 0;
 static int eventempfcount = 0;
+/*
+* remember the last background-paint brush
+* will be reused by next bg-paint, if it needs
+* the same color. Otherwise, the next bg-erase
+* will destroy this brush.
+*/
 #ifdef CACHE_LAST_WM_PAINT_BRUSH
 static HBRUSH wm_paint_brush = (HBRUSH) 0;
-static HWND   wm_paint_brush_hwnd = (HWND) 0;
 static HWND   wm_paint_brush_clr = (HWND) 0;
 #endif
+static HWND lastPos_win = 0;
+static int lastPos_w;
+static int lastPos_h;
+static int lastPos_x;
+static int lastPos_y;
 %}
 ! !
 !WinWorkstation primitiveFunctions!
 #else
 # define _DeleteObject(o,lnr)  DeleteObject(o)
 #endif
+static int
+_DeleteBrush(br, lineNr)
+HBRUSH br;
+{
+int r;
+if ((br != __whiteBrush)
+&& (br != __blackBrush)) {
+	r = DeleteObject(br);
+	if (r == 0)
+	    fprintf(stderr, "WinWorkstation: ERROR in DeleteBrush %x [%d]\n", br, lineNr);
+	return r;
+}
+return 1;
+}
+static int
+_DeletePen(p, lineNr)
+HPEN p;
+{
+int r;
+if ((p != __whitePen)
+&& (p != __blackPen)) {
+	r = DeleteObject(p);
+	if (r == 0)
+	    fprintf(stderr, "WinWorkstation: ERROR in DeletePen %x [%d]\n", p, lineNr);
+	return r;
+}
+return 1;
+}
 static struct gcData *
 newGcData() {
 struct gcData *gcData = (struct gcData *)malloc(sizeof(struct gcData));
 if (! gcData) {
 if (__gcData__->hPen) {           \
 	if (__gcData__->save_hPen) {  \
 	    SelectObject(__gcData__->_hDC, __gcData__->save_hPen); \
 	    __gcData__->save_hPen = 0;   \
 	} \
-	if ((__gcData__->hPen != __blackPen) \
+	_DeletePen(__gcData__->hPen, __LINE__); \
-	 && (__gcData__->hPen != __whitePen)) { \
-	    _DeleteObject(__gcData__->hPen, __LINE__); \
-	} \
 	__gcData__->hPen = 0; \
 }
 #else
 # define FLUSH_CACHED_PEN(x)    /* */
 #endif
 if (__gcData__->hBrush) {           \
 	if (__gcData__->save_hBrush) {  \
 	    SelectObject(__gcData__->_hDC, __gcData__->save_hBrush); \
 	    __gcData__->save_hBrush = 0;   \
 	} \
-	if ((__gcData__->hBrush != __blackBrush) \
+	_DeleteBrush(__gcData__->hBrush, __LINE__); \
-	 && (__gcData__->hBrush != __whiteBrush)) { \
-	    _DeleteObject(__gcData__->hBrush, __LINE__); \
-	} \
 	__gcData__->hBrush = 0; \
 }
 #else
 # define FLUSH_CACHED_BRUSH(x)    /* */
 #endif
 }
 gcData->_hDC = 0;
 #ifdef CACHE_LAST_PEN
 if (gcData->hPen) {
-	if ((gcData->hPen != __blackPen)
+	_DeletePen(gcData->hPen, __LINE__);
-	 && (gcData->hPen != __whitePen)) {
-	    _DeleteObject(gcData->hPen, __LINE__);
-	}
 	gcData->hPen = 0;
 }
 #endif
 #ifdef CACHE_LAST_BRUSH
 if (gcData->hBrush) {
-	if ((gcData->hBrush != __blackBrush)
+	_DeleteBrush(gcData->hBrush, __LINE__);
-	 && (gcData->hBrush != __whiteBrush)) {
-	    _DeleteObject(gcData->hBrush, __LINE__);
-	}
 	gcData->hBrush = 0;
 }
 #endif
 #ifdef CACHE_LAST_DC
 if (lastGcData == gcData) {
 hBrush = gcData->hBrush;
 if (gcData->save_hBrush) {
 	SelectObject(hDC, gcData->save_hBrush);
 	gcData->save_hBrush = NULL;
 }
-if ((hBrush != __blackBrush) && (hBrush != __whiteBrush)) {
+_DeleteBrush(hBrush, __LINE__);
-	_DeleteObject(hBrush, __LINE__);
-}
 gcData->hBrush = 0;
 }
 #endif
 static HPEN
 if (gcData->save_hPen) {
 	SelectObject(hDC, gcData->save_hPen);
 	gcData->save_hPen = NULL;
 }
 hPen = gcData->hPen;
-if ((hPen != __blackPen) && (hPen != __whitePen)) {
+_DeletePen(hPen, __LINE__);
-	_DeleteObject(hPen, __LINE__);
-}
 gcData->hPen = 0;
 }
 #endif /* CACHE_LAST_PEN */
 static int
 	    {
 		HBRUSH br;
 		if (br = GetWindow_viewBgBrush(hWnd)) {
 		    SetWindow_viewBgBrush(hWnd, 0);
-		    _DeleteObject(br, __LINE__);
+		    _DeleteBrush(br, __LINE__);
 		}
 	    }
 	    if (! DestroyWindow(hWnd)) {
 		DPRINTF(("DestroyWindow ERROR\n"));
 	    }
 		{
 		    HBRUSH br;
 		    if (br = GetWindow_viewBgBrush(hWnd)) {
 			SetWindow_viewBgBrush(hWnd, 0);
-			_DeleteObject(br, __LINE__);
+			_DeleteBrush(br, __LINE__);
 		    }
 		}
 		if (! DestroyWindow(hWnd)) {
 		    DPRINTF(("DestroyWindow ERROR\n"));
 		}
 			n = (char*) malloc(200);
 			GetClassName(hWnd,n,200);
 		    }
 		    /* free all resources */
 		    /*if (GetWindow_bgBrush(hWnd))
-		     *    _DeleteObject(GetWindow_bgBrush(hWnd), __LINE__);
+		     *    _DeleteBrush(GetWindow_bgBrush(hWnd), __LINE__);
 		     */
 		    /* freeing now done in other thread */
 		    //free(GETLOCALWINDOWINFOPTR(hWnd));
 		}
 #endif
 			enqEvent(ENQ_AT_END, 0, hWnd, __WM_ICONIFIED, 0, 0, 0, 0, 0);
 		    }
 		    if (!(wp->flags & SWP_NOSIZE)
 		     || !(wp->flags & SWP_NOMOVE)) {
 			enqEvent(ENQ_AT_END, 0, hWnd, message, wParam, x, y, w, h);
+			/*
+			 * remember the current
+			 * window and size;
+			 * This allows the backend to ignore
+			 * intermediate events.
+			 */
+			lastPos_win = 0;
+			lastPos_w = w;
+			lastPos_h = h;
+			lastPos_x = x;
+			lastPos_y = y;
+			lastPos_win = hWnd;
 		    }
 		}
 #ifdef MAKES_GUI_PAINTER_START_SLOW
 		*pDefault = 0;
 #endif
 			    if (wm_paint_brush
 			     && (wm_paint_brush_clr == bgClr)) {
 				br = wm_paint_brush;
 			    } else {
 				if (wm_paint_brush) {
-				    if ((wm_paint_brush != __whiteBrush)
+				    _DeleteBrush(wm_paint_brush, __LINE__);
-				     && (wm_paint_brush != __blackBrush)) {
-					_DeleteObject(wm_paint_brush, __LINE__);
-				    }
 				}
 				if (bgClr == WhitePixel) {
 				    br = __whiteBrush;
 				} else if (bgClr == BlackPixel) {
 				    br = __blackBrush;
 #  else
 			    br = CreateSolidBrush(bgClr);
 #  endif
 			}
 			if (br) {
-			    // printf("erase %d %d %d %d\n",rec.left,rec.top,rec.right,rec.bottom);
 			    SelectClipRgn(dc, 0);
 			    FillRect(dc, &upd, br);
 #  ifndef CACHE_LAST_WM_PAINT_BRUSH
 			    if (isSolidColorBrush) {
-				if ((br != __whiteBrush) && (br != __blackBrush)) {
+				_DeleteBrush(br, __LINE__);
-				    _DeleteObject(br, __LINE__);
-				}
 			    }
 #  endif
 			}
 			ReleaseDC(hWnd, dc);
 # endif
-			enqEvent(ENQ_AT_END, ExposureMask, hWnd, message, wParam, upd.left, upd.top, upd.right-upd.left+1, upd.bottom-upd.top+1);
+			enqEvent(ENQ_AT_END, ExposureMask, hWnd, message, wParam,
+				 upd.left,
+				 upd.top,
+				 upd.right - upd.left + 1,
+				 upd.bottom - upd.top + 1);
 		    }
 		}
 	    } else {
 # ifdef THIS_MAKES_GUI_PAINTER_START_SLOW
 		*pDefault = 0;
 	    return 0;
 	    break;
 	case WM_SIZE:
 	    EVENT_PRINTF(("WM_SIZE\n"));
-#if 0
-	    switch(wParam) {
-		case SIZE_RESTORED:
-		case SIZE_MAXIMIZED:
-		    GetClientRect(hWnd, (LPRECT) &upd);
-		    if (GetWindow_eventMask(hWnd) & ExposureMask)
-			enqEvent(ENQ_AT_END, ExposureMask, hWnd, WM_PAINT, wParam, upd.left, upd.top, upd.right-upd.left+1, upd.bottom-upd.top+1);
-		    DPRINTF(("WM_SIZE %x w %d h %d\n",hWnd,LOWORD(lParam),HIWORD(lParam)));
-		    break;
-	    }
-#endif
 	    *pDefault = 0;
 	    return 0;
 	    break;
 	case WM_DROPFILES:
 	    EVENT_PRINTF(("WM_NCMBUTTONDOWN\n"));
 	    break;
 	case WM_NCMBUTTONUP:
 	    EVENT_PRINTF(("WM_NCMBUTTONUP\n"));
+	    break;
+	case WM_NCLBUTTONDBLCLK:
+	    EVENT_PRINTF(("WM_NCLBUTTONDBLCLK\n"));
+	    break;
+	case WM_NCRBUTTONDBLCLK:
+	    EVENT_PRINTF(("WM_NCRBUTTONDBLCLK\n"));
+	    break;
+	case WM_NCMBUTTONDBLCLK:
+	    EVENT_PRINTF(("WM_NCMBUTTONDBLCLK\n"));
 	    break;
 	case WM_SETTEXT:
 	    EVENT_PRINTF(("WM_SETTEXT\n"));
 	    break;
 "setup standard color names (X-color names)"
 StandardColorValues := Dictionary new.
 #(
-	(240 248 255)   'alice blue'
+	(240 248 255)   'aliceblue'
-	(240 248 255)   'AliceBlue'
+	(250 235 215)   'antiquewhite'
-	(250 235 215)   'antique white'
-	(250 235 215)   'AntiqueWhite'
 	(255 239 219)   'AntiqueWhite1'
 	(238 223 204)   'AntiqueWhite2'
 	(205 192 176)   'AntiqueWhite3'
 	(139 131 120)   'AntiqueWhite4'
 	(127 255 212)   'aquamarine'
 	(255 228 196)   'bisque1'
 	(238 213 183)   'bisque2'
 	(205 183 158)   'bisque3'
 	(139 125 107)   'bisque4'
 	(  0   0   0)   'black'
-	(255 235 205)   'blanched almond'
+	(255 235 205)   'blanchedalmond'
-	(255 235 205)   'BlanchedAlmond'
 	(  0   0 255)   'blue'
-	(138  43 226)   'blue violet'
+	(138  43 226)   'blueviolet'
 	(  0   0 255)   'blue1'
 	(  0   0 238)   'blue2'
 	(  0   0 205)   'blue3'
 	(  0   0 139)   'blue4'
-	(138  43 226)   'BlueViolet'
 	(165  42  42)   'brown'
 	(255  64  64)   'brown1'
 	(238  59  59)   'brown2'
 	(205  51  51)   'brown3'
 	(139  35  35)   'brown4'
 	(222 184 135)   'burlywood'
 	(255 211 155)   'burlywood1'
 	(238 197 145)   'burlywood2'
 	(205 170 125)   'burlywood3'
 	(139 115  85)   'burlywood4'
-	( 95 158 160)   'cadet blue'
+	( 95 158 160)   'cadetblue'
-	( 95 158 160)   'CadetBlue'
 	(152 245 255)   'CadetBlue1'
 	(142 229 238)   'CadetBlue2'
 	(122 197 205)   'CadetBlue3'
 	( 83 134 139)   'CadetBlue4'
 	(127 255   0)   'chartreuse'
 	(255 127  80)   'coral'
 	(255 114  86)   'coral1'
 	(238 106  80)   'coral2'
 	(205  91  69)   'coral3'
 	(139  62  47)   'coral4'
-	(100 149 237)   'cornflower blue'
+	(100 149 237)   'cornflowerblue'
-	(100 149 237)   'CornflowerBlue'
 	(255 248 220)   'cornsilk'
 	(255 248 220)   'cornsilk1'
 	(238 232 205)   'cornsilk2'
 	(205 200 177)   'cornsilk3'
 	(139 136 120)   'cornsilk4'
 	(  0 255 255)   'cyan'
 	(  0 255 255)   'cyan1'
 	(  0 238 238)   'cyan2'
 	(  0 205 205)   'cyan3'
 	(  0 139 139)   'cyan4'
-	(  0   0 139)   'dark blue'
+	(  0   0 139)   'darkblue'
-	(  0 139 139)   'dark cyan'
+	(  0 139 139)   'darkcyan'
-	(184 134  11)   'dark goldenrod'
+	(184 134  11)   'darkgoldenrod'
-	(169 169 169)   'dark gray'
+	(169 169 169)   'darkgray'
-	(  0 100   0)   'dark green'
+	(  0 100   0)   'darkgreen'
-	(169 169 169)   'dark grey'
+	(169 169 169)   'darkgrey'
-	(189 183 107)   'dark khaki'
+	(189 183 107)   'darkkhaki'
-	(139   0 139)   'dark magenta'
+	(139   0 139)   'darkmagenta'
-	( 85 107  47)   'dark olive green'
+	( 85 107  47)   'darkolivegreen'
-	(255 140   0)   'dark orange'
+	(255 140   0)   'darkorange'
-	(153  50 204)   'dark orchid'
+	(153  50 204)   'darkorchid'
-	(139   0   0)   'dark red'
+	(139   0   0)   'darkred'
-	(233 150 122)   'dark salmon'
+	(233 150 122)   'darksalmon'
-	(143 188 143)   'dark sea green'
+	(143 188 143)   'darkseagreen'
-	( 72  61 139)   'dark slate blue'
+	( 72  61 139)   'darkslateblue'
-	( 47  79  79)   'dark slate gray'
+	( 47  79  79)   'darkslategray'
-	( 47  79  79)   'dark slate grey'
+	( 47  79  79)   'darkslategrey'
-	(  0 206 209)   'dark turquoise'
+	(  0 206 209)   'darkturquoise'
-	(148   0 211)   'dark violet'
+	(148   0 211)   'darkviolet'
-	(  0   0 139)   'DarkBlue'
-	(  0 139 139)   'DarkCyan'
-	(184 134  11)   'DarkGoldenrod'
 	(255 185  15)   'DarkGoldenrod1'
 	(238 173  14)   'DarkGoldenrod2'
 	(205 149  12)   'DarkGoldenrod3'
 	(139 101   8)   'DarkGoldenrod4'
-	(169 169 169)   'DarkGray'
-	(  0 100   0)   'DarkGreen'
-	(169 169 169)   'DarkGrey'
-	(189 183 107)   'DarkKhaki'
-	(139   0 139)   'DarkMagenta'
-	( 85 107  47)   'DarkOliveGreen'
 	(202 255 112)   'DarkOliveGreen1'
 	(188 238 104)   'DarkOliveGreen2'
 	(162 205  90)   'DarkOliveGreen3'
 	(110 139  61)   'DarkOliveGreen4'
-	(255 140   0)   'DarkOrange'
 	(255 127   0)   'DarkOrange1'
 	(238 118   0)   'DarkOrange2'
 	(205 102   0)   'DarkOrange3'
 	(139  69   0)   'DarkOrange4'
-	(153  50 204)   'DarkOrchid'
 	(191  62 255)   'DarkOrchid1'
 	(178  58 238)   'DarkOrchid2'
 	(154  50 205)   'DarkOrchid3'
 	(104  34 139)   'DarkOrchid4'
-	(139   0   0)   'DarkRed'
-	(233 150 122)   'DarkSalmon'
-	(143 188 143)   'DarkSeaGreen'
 	(193 255 193)   'DarkSeaGreen1'
 	(180 238 180)   'DarkSeaGreen2'
 	(155 205 155)   'DarkSeaGreen3'
 	(105 139 105)   'DarkSeaGreen4'
-	( 72  61 139)   'DarkSlateBlue'
-	( 47  79  79)   'DarkSlateGray'
 	(151 255 255)   'DarkSlateGray1'
 	(141 238 238)   'DarkSlateGray2'
 	(121 205 205)   'DarkSlateGray3'
 	( 82 139 139)   'DarkSlateGray4'
-	( 47  79  79)   'DarkSlateGrey'
+	(255  20 147)   'deeppink'
-	(  0 206 209)   'DarkTurquoise'
+	(  0 191 255)   'deepskyblue'
-	(148   0 211)   'DarkViolet'
-	(255  20 147)   'deep pink'
-	(  0 191 255)   'deep sky blue'
 	(255  20 147)   'DeepPink'
 	(255  20 147)   'DeepPink1'
 	(238  18 137)   'DeepPink2'
 	(205  16 118)   'DeepPink3'
 	(139  10  80)   'DeepPink4'
-	(  0 191 255)   'DeepSkyBlue'
 	(  0 191 255)   'DeepSkyBlue1'
 	(  0 178 238)   'DeepSkyBlue2'
 	(  0 154 205)   'DeepSkyBlue3'
 	(  0 104 139)   'DeepSkyBlue4'
-	(105 105 105)   'dim gray'
+	(105 105 105)   'dimgray'
-	(105 105 105)   'dim grey'
+	(105 105 105)   'dimgrey'
-	(105 105 105)   'DimGray'
+	( 30 144 255)   'dodgerblue'
-	(105 105 105)   'DimGrey'
-	( 30 144 255)   'dodger blue'
-	( 30 144 255)   'DodgerBlue'
 	( 30 144 255)   'DodgerBlue1'
 	( 28 134 238)   'DodgerBlue2'
 	( 24 116 205)   'DodgerBlue3'
 	( 16  78 139)   'DodgerBlue4'
 	(178  34  34)   'firebrick'
 	(255  48  48)   'firebrick1'
 	(238  44  44)   'firebrick2'
 	(205  38  38)   'firebrick3'
 	(139  26  26)   'firebrick4'
-	(255 250 240)   'floral white'
+	(255 250 240)   'floralwhite'
-	(255 250 240)   'FloralWhite'
+	( 34 139  34)   'forestgreen'
-	( 34 139  34)   'forest green'
-	( 34 139  34)   'ForestGreen'
 	(220 220 220)   'gainsboro'
-	(248 248 255)   'ghost white'
+	(248 248 255)   'ghostwhite'
-	(248 248 255)   'GhostWhite'
 	(255 215   0)   'gold'
 	(255 215   0)   'gold1'
 	(238 201   0)   'gold2'
 	(205 173   0)   'gold3'
 	(139 117   0)   'gold4'
 	(218 165  32)   'goldenrod'
 	(255 193  37)   'goldenrod1'
 	(238 180  34)   'goldenrod2'
 	(205 155  29)   'goldenrod3'
 	(139 105  20)   'goldenrod4'
 	(192 192 192)   'grey'
 	(  0   0   0)   'grey0'
 	(  3   3   3)   'grey1'
 	( 26  26  26)   'grey10'
 	(255 255 255)   'grey100'
 	(245 245 245)   'gray96'
 	(247 247 247)   'gray97'
 	(250 250 250)   'gray98'
 	(252 252 252)   'gray99'
 	(  0 255   0)   'green'
-	(173 255  47)   'green yellow'
+	(173 255  47)   'greenyellow'
 	(  0 255   0)   'green1'
 	(  0 238   0)   'green2'
 	(  0 205   0)   'green3'
 	(  0 139   0)   'green4'
-	(173 255  47)   'GreenYellow'
 	(240 255 240)   'honeydew'
 	(240 255 240)   'honeydew1'
 	(224 238 224)   'honeydew2'
 	(193 205 193)   'honeydew3'
 	(131 139 131)   'honeydew4'
-	(255 105 180)   'hot pink'
+	(255 105 180)   'hotpink'
-	(255 105 180)   'HotPink'
 	(255 110 180)   'HotPink1'
 	(238 106 167)   'HotPink2'
 	(205  96 144)   'HotPink3'
 	(139  58  98)   'HotPink4'
-	(205  92  92)   'indian red'
+	(205  92  92)   'indianred'
-	(205  92  92)   'IndianRed'
 	(255 106 106)   'IndianRed1'
 	(238  99  99)   'IndianRed2'
 	(205  85  85)   'IndianRed3'
 	(139  58  58)   'IndianRed4'
 	(255 255 240)   'ivory'
 	(255 246 143)   'khaki1'
 	(238 230 133)   'khaki2'
 	(205 198 115)   'khaki3'
 	(139 134  78)   'khaki4'
 	(230 230 250)   'lavender'
-	(255 240 245)   'lavender blush'
+	(255 240 245)   'lavenderblush'
-	(255 240 245)   'LavenderBlush'
 	(255 240 245)   'LavenderBlush1'
 	(238 224 229)   'LavenderBlush2'
 	(205 193 197)   'LavenderBlush3'
 	(139 131 134)   'LavenderBlush4'
-	(124 252   0)   'lawn green'
+	(124 252   0)   'lawngreen'
-	(124 252   0)   'LawnGreen'
+	(255 250 205)   'lemonchiffon'
-	(255 250 205)   'lemon chiffon'
-	(255 250 205)   'LemonChiffon'
 	(255 250 205)   'LemonChiffon1'
 	(238 233 191)   'LemonChiffon2'
 	(205 201 165)   'LemonChiffon3'
 	(139 137 112)   'LemonChiffon4'
-	(173 216 230)   'light blue'
+	(173 216 230)   'lightblue'
-	(240 128 128)   'light coral'
+	(240 128 128)   'lightcoral'
-	(224 255 255)   'light cyan'
+	(224 255 255)   'lightcyan'
-	(238 221 130)   'light goldenrod'
+	(238 221 130)   'lightgoldenrod'
-	(250 250 210)   'light goldenrod yellow'
+	(250 250 210)   'lightgoldenrodyellow'
-	(211 211 211)   'light gray'
+	(211 211 211)   'lightgray'
-	(144 238 144)   'light green'
+	(144 238 144)   'lightgreen'
-	(211 211 211)   'light grey'
+	(211 211 211)   'lightgrey'
-	(255 182 193)   'light pink'
+	(255 182 193)   'lightpink'
-	(255 160 122)   'light salmon'
+	(255 160 122)   'lightsalmon'
-	( 32 178 170)   'light sea green'
+	( 32 178 170)   'lightseagreen'
-	(135 206 250)   'light sky blue'
+	(135 206 250)   'lightskyblue'
-	(132 112 255)   'light slate blue'
+	(132 112 255)   'lightslateblue'
-	(119 136 153)   'light slate gray'
+	(119 136 153)   'lightslategray'
-	(119 136 153)   'light slate grey'
+	(119 136 153)   'lightslategrey'
-	(176 196 222)   'light steel blue'
+	(176 196 222)   'lightsteelblue'
-	(255 255 224)   'light yellow'
+	(255 255 224)   'lightyellow'
-	(173 216 230)   'LightBlue'
 	(191 239 255)   'LightBlue1'
 	(178 223 238)   'LightBlue2'
 	(154 192 205)   'LightBlue3'
 	(104 131 139)   'LightBlue4'
-	(240 128 128)   'LightCoral'
-	(224 255 255)   'LightCyan'
 	(224 255 255)   'LightCyan1'
 	(209 238 238)   'LightCyan2'
 	(180 205 205)   'LightCyan3'
 	(122 139 139)   'LightCyan4'
-	(238 221 130)   'LightGoldenrod'
 	(255 236 139)   'LightGoldenrod1'
 	(238 220 130)   'LightGoldenrod2'
 	(205 190 112)   'LightGoldenrod3'
 	(139 129  76)   'LightGoldenrod4'
-	(250 250 210)   'LightGoldenrodYellow'
-	(211 211 211)   'LightGray'
-	(144 238 144)   'LightGreen'
-	(211 211 211)   'LightGrey'
-	(255 182 193)   'LightPink'
 	(255 174 185)   'LightPink1'
 	(238 162 173)   'LightPink2'
 	(205 140 149)   'LightPink3'
 	(139  95 101)   'LightPink4'
-	(255 160 122)   'LightSalmon'
 	(255 160 122)   'LightSalmon1'
 	(238 149 114)   'LightSalmon2'
 	(205 129  98)   'LightSalmon3'
 	(139  87  66)   'LightSalmon4'
-	( 32 178 170)   'LightSeaGreen'
-	(135 206 250)   'LightSkyBlue'
 	(176 226 255)   'LightSkyBlue1'
 	(164 211 238)   'LightSkyBlue2'
 	(141 182 205)   'LightSkyBlue3'
 	( 96 123 139)   'LightSkyBlue4'
-	(132 112 255)   'LightSlateBlue'
-	(119 136 153)   'LightSlateGray'
-	(119 136 153)   'LightSlateGrey'
-	(176 196 222)   'LightSteelBlue'
 	(202 225 255)   'LightSteelBlue1'
 	(188 210 238)   'LightSteelBlue2'
 	(162 181 205)   'LightSteelBlue3'
 	(110 123 139)   'LightSteelBlue4'
-	(255 255 224)   'LightYellow'
 	(255 255 224)   'LightYellow1'
 	(238 238 209)   'LightYellow2'
 	(205 205 180)   'LightYellow3'
 	(139 139 122)   'LightYellow4'
-	( 50 205  50)   'lime green'
+	( 50 205  50)   'limegreen'
-	( 50 205  50)   'LimeGreen'
 	(250 240 230)   'linen'
 	(255   0 255)   'magenta'
 	(255   0 255)   'magenta1'
 	(238   0 238)   'magenta2'
 	(205   0 205)   'magenta3'
 	(176  48  96)   'maroon'
 	(255  52 179)   'maroon1'
 	(238  48 167)   'maroon2'
 	(205  41 144)   'maroon3'
 	(139  28  98)   'maroon4'
-	(102 205 170)   'medium aquamarine'
+	(102 205 170)   'mediumaquamarine'
-	(  0   0 205)   'medium blue'
+	(  0   0 205)   'mediumblue'
-	(186  85 211)   'medium orchid'
+	(186  85 211)   'mediumorchid'
-	(147 112 219)   'medium purple'
+	(147 112 219)   'mediumpurple'
-	( 60 179 113)   'medium sea green'
+	( 60 179 113)   'mediumseagreen'
-	(123 104 238)   'medium slate blue'
+	(123 104 238)   'mediumslateblue'
-	(  0 250 154)   'medium spring green'
+	(  0 250 154)   'mediumspringgreen'
-	( 72 209 204)   'medium turquoise'
+	( 72 209 204)   'mediumturquoise'
-	(199  21 133)   'medium violet red'
+	(199  21 133)   'mediumvioletred'
-	(102 205 170)   'MediumAquamarine'
-	(  0   0 205)   'MediumBlue'
-	(186  85 211)   'MediumOrchid'
 	(224 102 255)   'MediumOrchid1'
 	(209  95 238)   'MediumOrchid2'
 	(180  82 205)   'MediumOrchid3'
 	(122  55 139)   'MediumOrchid4'
-	(147 112 219)   'MediumPurple'
 	(171 130 255)   'MediumPurple1'
 	(159 121 238)   'MediumPurple2'
 	(137 104 205)   'MediumPurple3'
 	( 93  71 139)   'MediumPurple4'
-	( 60 179 113)   'MediumSeaGreen'
+	( 25  25 112)   'midnightblue'
-	(123 104 238)   'MediumSlateBlue'
+	(245 255 250)   'mintcream'
-	(  0 250 154)   'MediumSpringGreen'
+	(255 228 225)   'mistyrose'
-	( 72 209 204)   'MediumTurquoise'
-	(199  21 133)   'MediumVioletRed'
-	( 25  25 112)   'midnight blue'
-	( 25  25 112)   'MidnightBlue'
-	(245 255 250)   'mint cream'
-	(245 255 250)   'MintCream'
-	(255 228 225)   'misty rose'
-	(255 228 225)   'MistyRose'
 	(255 228 225)   'MistyRose1'
 	(238 213 210)   'MistyRose2'
 	(205 183 181)   'MistyRose3'
 	(139 125 123)   'MistyRose4'
 	(255 228 181)   'moccasin'
-	(255 222 173)   'navajo white'
+	(255 222 173)   'navajowhite'
-	(255 222 173)   'NavajoWhite'
 	(255 222 173)   'NavajoWhite1'
 	(238 207 161)   'NavajoWhite2'
 	(205 179 139)   'NavajoWhite3'
 	(139 121  94)   'NavajoWhite4'
 	(  0   0 128)   'navy'
-	(  0   0 128)   'navy blue'
+	(  0   0 128)   'navyblue'
-	(  0   0 128)   'NavyBlue'
+	(253 245 230)   'oldlace'
-	(253 245 230)   'old lace'
+	(107 142  35)   'olivedrab'
-	(253 245 230)   'OldLace'
-	(107 142  35)   'olive drab'
-	(107 142  35)   'OliveDrab'
 	(192 255  62)   'OliveDrab1'
 	(179 238  58)   'OliveDrab2'
 	(154 205  50)   'OliveDrab3'
 	(105 139  34)   'OliveDrab4'
 	(255 165   0)   'orange'
-	(255  69   0)   'orange red'
 	(255 165   0)   'orange1'
 	(238 154   0)   'orange2'
 	(205 133   0)   'orange3'
 	(139  90   0)   'orange4'
-	(255  69   0)   'OrangeRed'
+	(255  69   0)   'orangered'
 	(255  69   0)   'OrangeRed1'
 	(238  64   0)   'OrangeRed2'
 	(205  55   0)   'OrangeRed3'
 	(139  37   0)   'OrangeRed4'
 	(218 112 214)   'orchid'
 	(255 131 250)   'orchid1'
 	(238 122 233)   'orchid2'
 	(205 105 201)   'orchid3'
 	(139  71 137)   'orchid4'
-	(238 232 170)   'pale goldenrod'
+	(238 232 170)   'palegoldenrod'
-	(152 251 152)   'pale green'
+	(152 251 152)   'palegreen'
-	(175 238 238)   'pale turquoise'
+	(175 238 238)   'paleturquoise'
-	(219 112 147)   'pale violet red'
+	(219 112 147)   'palevioletred'
-	(238 232 170)   'PaleGoldenrod'
-	(152 251 152)   'PaleGreen'
 	(154 255 154)   'PaleGreen1'
 	(144 238 144)   'PaleGreen2'
 	(124 205 124)   'PaleGreen3'
 	( 84 139  84)   'PaleGreen4'
-	(175 238 238)   'PaleTurquoise'
 	(187 255 255)   'PaleTurquoise1'
 	(174 238 238)   'PaleTurquoise2'
 	(150 205 205)   'PaleTurquoise3'
 	(102 139 139)   'PaleTurquoise4'
-	(219 112 147)   'PaleVioletRed'
 	(255 130 171)   'PaleVioletRed1'
 	(238 121 159)   'PaleVioletRed2'
 	(205 104 137)   'PaleVioletRed3'
 	(139  71  93)   'PaleVioletRed4'
-	(255 239 213)   'papaya whip'
+	(255 239 213)   'papayawhip'
-	(255 239 213)   'PapayaWhip'
+	(255 218 185)   'peachpuff'
-	(255 218 185)   'peach puff'
-	(255 218 185)   'PeachPuff'
 	(255 218 185)   'PeachPuff1'
 	(238 203 173)   'PeachPuff2'
 	(205 175 149)   'PeachPuff3'
 	(139 119 101)   'PeachPuff4'
 	(205 133  63)   'peru'
 	(221 160 221)   'plum'
 	(255 187 255)   'plum1'
 	(238 174 238)   'plum2'
 	(205 150 205)   'plum3'
 	(139 102 139)   'plum4'
-	(176 224 230)   'powder blue'
+	(176 224 230)   'powderblue'
-	(176 224 230)   'PowderBlue'
 	(160  32 240)   'purple'
 	(155  48 255)   'purple1'
 	(145  44 238)   'purple2'
 	(125  38 205)   'purple3'
 	( 85  26 139)   'purple4'
 	(255   0   0)   'red'
 	(255   0   0)   'red1'
 	(238   0   0)   'red2'
 	(205   0   0)   'red3'
 	(139   0   0)   'red4'
-	(188 143 143)   'rosy brown'
+	(188 143 143)   'rosybrown'
-	(188 143 143)   'RosyBrown'
 	(255 193 193)   'RosyBrown1'
 	(238 180 180)   'RosyBrown2'
 	(205 155 155)   'RosyBrown3'
 	(139 105 105)   'RosyBrown4'
-	( 65 105 225)   'royal blue'
+	( 65 105 225)   'royalblue'
-	( 65 105 225)   'RoyalBlue'
 	( 72 118 255)   'RoyalBlue1'
 	( 67 110 238)   'RoyalBlue2'
 	( 58  95 205)   'RoyalBlue3'
 	( 39  64 139)   'RoyalBlue4'
-	(139  69  19)   'saddle brown'
+	(139  69  19)   'saddlebrown'
-	(139  69  19)   'SaddleBrown'
 	(250 128 114)   'salmon'
 	(255 140 105)   'salmon1'
 	(238 130  98)   'salmon2'
 	(205 112  84)   'salmon3'
 	(139  76  57)   'salmon4'
-	(244 164  96)   'sandy brown'
+	(244 164  96)   'sandybrown'
-	(244 164  96)   'SandyBrown'
+	( 255 206 137)  'scoActiveBackground'
-	( 255 206 137)   'scoActiveBackground'
 	( 43  45  49)   'scoActiveForeground'
-	( 254 222 255)   'scoActiveTopShadow'
+	( 254 222 255)  'scoActiveTopShadow'
-	( 172 186 204)   'scoAltBackground'
+	( 172 186 204)  'scoAltBackground'
-	( 203 203 192)   'scoBackground'
+	( 203 203 192)  'scoBackground'
 	( 11   0 113)   'scoForeground'
-	( 141 178 215)   'scoHighlight'
+	( 141 178 215)  'scoHighlight'
-	( 255 240 248)   'scoTopShadow'
+	( 255 240 248)  'scoTopShadow'
-	( 46 139  87)   'sea green'
+	( 46 139  87)   'seagreen'
-	( 46 139  87)   'SeaGreen'
 	( 84 255 159)   'SeaGreen1'
 	( 78 238 148)   'SeaGreen2'
 	( 67 205 128)   'SeaGreen3'
 	( 46 139  87)   'SeaGreen4'
 	(255 245 238)   'seashell'
 	(255 245 238)   'seashell1'
 	(238 229 222)   'seashell2'
 	(205 197 191)   'seashell3'
 	(139 134 130)   'seashell4'
-	(142 56 142)   'sgi beet'
+	(142 56 142)    'sgi beet'
 	(197 193 170)   'sgi bright gray'
 	(197 193 170)   'sgi bright grey'
 	(113 198 113)   'sgi chartreuse'
 	( 85  85  85)   'sgi dark gray'
 	( 85  85  85)   'sgi dark grey'
 	( 56 142 142)   'sgi teal'
 	( 40  40  40)   'sgi very dark gray'
 	( 40  40  40)   'sgi very dark grey'
 	(214 214 214)   'sgi very light gray'
 	(214 214 214)   'sgi very light grey'
-	(142 56 142)   'SGIBeet'
+	(142 56 142)    'SGIBeet'
 	(197 193 170)   'SGIBrightGray'
 	(197 193 170)   'SGIBrightGrey'
 	(113 198 113)   'SGIChartreuse'
 	( 85  85  85)   'SGIDarkGray'
 	( 85  85  85)   'SGIDarkGrey'
 	(160  82  45)   'sienna'
 	(255 130  71)   'sienna1'
 	(238 121  66)   'sienna2'
 	(205 104  57)   'sienna3'
 	(139  71  38)   'sienna4'
-	(135 206 235)   'sky blue'
+	(135 206 235)   'skyblue'
-	(135 206 235)   'SkyBlue'
 	(135 206 255)   'SkyBlue1'
 	(126 192 238)   'SkyBlue2'
 	(108 166 205)   'SkyBlue3'
 	( 74 112 139)   'SkyBlue4'
-	(106  90 205)   'slate blue'
+	(112 128 144)   'slategray'
-	(112 128 144)   'slate gray'
+	(112 128 144)   'slategrey'
-	(112 128 144)   'slate grey'
+	(106  90 205)   'slateblue'
-	(106  90 205)   'SlateBlue'
 	(131 111 255)   'SlateBlue1'
 	(122 103 238)   'SlateBlue2'
 	(105  89 205)   'SlateBlue3'
 	( 71  60 139)   'SlateBlue4'
-	(112 128 144)   'SlateGray'
 	(198 226 255)   'SlateGray1'
 	(185 211 238)   'SlateGray2'
 	(159 182 205)   'SlateGray3'
 	(108 123 139)   'SlateGray4'
-	(112 128 144)   'SlateGrey'
 	(255 250 250)   'snow'
 	(255 250 250)   'snow1'
 	(238 233 233)   'snow2'
 	(205 201 201)   'snow3'
 	(139 137 137)   'snow4'
-	(  0 255 127)   'spring green'
+	(  0 255 127)   'springgreen'
-	(  0 255 127)   'SpringGreen'
 	(  0 255 127)   'SpringGreen1'
 	(  0 238 118)   'SpringGreen2'
 	(  0 205 102)   'SpringGreen3'
 	(  0 139  69)   'SpringGreen4'
-	( 70 130 180)   'steel blue'
+	( 70 130 180)   'steelblue'
-	( 70 130 180)   'SteelBlue'
 	( 99 184 255)   'SteelBlue1'
 	( 92 172 238)   'SteelBlue2'
 	( 79 148 205)   'SteelBlue3'
 	( 54 100 139)   'SteelBlue4'
 	(210 180 140)   'tan'
 	(  0 245 255)   'turquoise1'
 	(  0 229 238)   'turquoise2'
 	(  0 197 205)   'turquoise3'
 	(  0 134 139)   'turquoise4'
 	(238 130 238)   'violet'
-	(208  32 144)   'violet red'
+	(208  32 144)   'violetred'
-	(208  32 144)   'VioletRed'
 	(255  62 150)   'VioletRed1'
 	(238  58 140)   'VioletRed2'
 	(205  50 120)   'VioletRed3'
 	(139  34  82)   'VioletRed4'
 	(245 222 179)   'wheat'
 	(255 231 186)   'wheat1'
 	(238 216 174)   'wheat2'
 	(205 186 150)   'wheat3'
 	(139 126 102)   'wheat4'
 	(255 255 255)   'white'
-	(245 245 245)   'white smoke'
+	(245 245 245)   'whitesmoke'
-	(245 245 245)   'WhiteSmoke'
 	(255 255   0)   'yellow'
-	(154 205  50)   'yellow green'
+	(154 205  50)   'yellowgreen'
 	(255 255   0)   'yellow1'
 	(238 238   0)   'yellow2'
 	(205 205   0)   'yellow3'
 	(139 139   0)   'yellow4'
-	(154 205  50)   'YellowGreen'
 ) pairWiseDo:[ :value :name |
 	StandardColorValues at:name put:value
 ].
 "
 WinWorkstation initializeStandardColorNames
 getScaledRGBFromName:colorName into:aBlock
 "get scaled rgb components (0..16rFFFF) of color named colorName,
 and evaluate the 3-arg block, aBlock with them"
-|triple r g b found|
+|triple r g b found cName|
 r := g := b := 0.
 found := false.
 (colorName startsWith:$#) ifTrue:[
 	"/ color in r/g/b hex notation
 	r := Integer readFrom:(colorName copyFrom:2 to:3) radix:16.
 	g := Integer readFrom:(colorName copyFrom:4 to:5) radix:16.
 	b := Integer readFrom:(colorName copyFrom:6 to:7) radix:16.
 	found := true.
 ] ifFalse:[
+	cName := colorName asString.
-	triple := StandardColorValues at:colorName asString ifAbsent:nil.
+	triple := StandardColorValues at:cName ifAbsent:nil.
 	triple isNil ifTrue:[
-	    triple := StandardColorValues at:colorName asString asLowercase ifAbsent:nil.
+	    "/ try lowercase name
+	    cName := cName asLowercase.
+	    triple := StandardColorValues at:cName ifAbsent:nil.
+	    triple isNil ifTrue:[
+		"/ try lowercase without intermixed spaces
+		cName := cName asCollectionOfWords asStringWith:nil.
+		triple := StandardColorValues at:cName ifAbsent:nil.
+	    ].
 	].
 	triple notNil ifTrue:[
 	    r := triple at:1.
 	    g := triple at:2.
 	    b := triple at:3.
 # else
 		UpdateWindow(srcGcData->hWnd);
 # endif
 #endif /* 0 */
+#if 0
 		UpdateWindow(srcGcData->hWnd);
+#else
+		if (GetUpdateRect(srcGcData->hWnd, &upd, FALSE)) {
+		    if ((upd.right >= upd.left)
+		     && (upd.bottom >= upd.top)) {
+			if (GetWindow_eventMask(srcGcData->hWnd) & ExposureMask) {
+			    enqEvent(ENQ_AT_FRONT, ExposureMask,srcGcData->hWnd, __WM_GEXPOSE, 0, upd.left, upd.top, upd.right-upd.left+1, upd.bottom-upd.top+1);
+			}
+		    }
+		}
+#endif
 		enqEvent(ENQ_AT_END, ExposureMask, srcGcData->hWnd, __WM_NOGEXPOSE, 0, 0, 0, 0, 0);
 		RETURN ( self );
 	    }
 #if 0
 	POINT p;
 	int __x = __intVal(px), __y = __intVal(py);
 	int savedLStyle = gcData->lStyle;
 	int savedLWidth = gcData->lineWidth;
+#ifdef OLD
 	/*
 	 * a point is a point - no matter what lineWidth we have set before
 	 */
 	if ((gcData->lStyle != PS_SOLID)
 	 || (gcData->lineWidth > 1)) {
 	    LineTo(hDC, __x+1, __y);
 	    GcDataReleasePen(hDC, gcData);
 	}
-#ifndef CACHE_LAST_DC
+# ifndef CACHE_LAST_DC
 	_releaseDC(gcData);
-#endif
+# endif
 	if ((gcData->lStyle != savedLStyle)
 	 || (gcData->lineWidth != savedLWidth)) {
 	    FLUSH_CACHED_DC(gcData);
 	    gcData->lStyle = savedLStyle;
 	    gcData->lineWidth = savedLWidth;
 	}
+#else
+	hDC = _getDC(gcData);
+	SetPixel(hDC, __x, __y, gcData->fgColor);
+# ifndef CACHE_LAST_DC
+	_releaseDC(gcData);
+# endif
+#endif
 	RETURN ( self );
 }
 %}
 !
 	    } else {
 		HPEN hSavePen;
 		rct.left = __intVal(x);
 		rct.top = __intVal(y);
-		rct.right = rct.left + w + 1;
+		rct.right = rct.left + w + 1;    /* definitiv ! */
 		rct.bottom = rct.top + h + 1;
 		CPRINTF(("fillRectangle:%d.%d -> %d.%d\n",rct.left,rct.top,rct.right,rct.bottom));
 		/*
 			rec.bottom = y + h - 1;
 			// printf("erase %d %d %d %d\n",rec.left,rec.top,rec.right,rec.bottom);
 			SelectClipRgn(dc,0);
 			FillRect(dc, &rec, br);
 			if (mustDeleteBrush) {
-			    _DeleteObject(br, __LINE__);
+			    _DeleteBrush(br, __LINE__);
 			}
 		    }
 		    ReleaseDC(ev->ev_hWnd,dc);
 		}
 #endif
 	if (__isExternalAddress(aViewIdOrNil)) {
 	    wWanted = _HWNDVal(aViewIdOrNil);
 	} else{
 	    wWanted = 0;
 	}
-	if (deqEvent(ev, wWanted, evMask)) {
+	do { /* only to allow continue */
-	    RETURN ( true );
+	    if (deqEvent(ev, wWanted, evMask)) {
-	}
+		if ((ev->ev_hWnd == lastPos_win)
+		 && (ev->ev_message == WM_WINDOWPOSCHANGED)
+		 && ((ev->ev_arg1 != lastPos_x)
+		     || (ev->ev_arg2 != lastPos_y)
+		     || (ev->ev_arg3 != lastPos_w)
+		     || (ev->ev_arg4 != lastPos_h))) {
+		    /*
+		     * ignore resize
+		     * (that event is an intermediate one)
+		     */
+		    continue;
+		}
+		RETURN ( true );
+	    }
+	} while (0);
 }
 %}.
 ^ false
 !
 	int clr;
 	HBRUSH oldBrush;
 	if (oldBrush = GetWindow_viewBgBrush(hWnd)) {
 	    SetWindow_viewBgBrush(hWnd, 0);
-	    _DeleteObject(oldBrush, __LINE__);
+	    _DeleteBrush(oldBrush, __LINE__);
 	}
 	clr = st2RGB(__intVal(aColorIndex), 0);
 	SetWindow_viewBgColor(hWnd, clr);
 	RETURN (self);
 	else
 	    pixmap = 0;
 	if (oldBrush = GetWindow_viewBgBrush(hWnd)) {
 	    SetWindow_viewBgBrush(hWnd, 0);
-	    _DeleteObject(oldBrush, __LINE__);
+	    _DeleteBrush(oldBrush, __LINE__);
 	}
 	if (pixmap) {
 	    newBrush = CreatePatternBrush(pixmap);
-	    SetWindow_viewBgBrush(newBrush, 0);
+	    SetWindow_viewBgBrush(hWnd, newBrush);
 /*
 *            SetBrushOrgEx(hDC, gcData->maskOrgX, gcData->maskOrgY, 0);
 */
 	}
 ! !
 !WinWorkstation class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.117 1999-05-06 19:59:52 cg Exp $'
+^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.118 1999-05-08 15:46:18 cg Exp $'
 ! !
 WinWorkstation initialize!

changeset 2659	c181846c6f5a
parent 2653	f0ca966a5636
child 2661	c68f92ae1cb5