dwindows: win/dw.c comparison

comparison win/dw.c @ 969:69f620df0c47

Step 1 in modernization of the Win32 module. Eliminate Windows NT based Windows checks, since that is all we support now. Eliminate thread limits by eliminating thread arrays and switching to using Thread Local Storage (TLS). Simplify dw_clipboard_get_text() by returning a malloc()ed buffer which now must need to be dw_free()ed. This makes this function the same as it does on OS/2 and Mac currently.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 05 May 2011 05:53:56 +0000
parents	0345e37d6c86
children	b00943f21392

comparison

equal deleted inserted replaced

-:0345e37d6c86
+:69f620df0c47
 HIMAGELIST hSmall  = 0, hLarge = 0;
 /* Special flag used for internal tracking */
 #define DW_CFA_RESERVED (1 << 30)
-#define THREAD_LIMIT 128
+DWORD _foreground;
-COLORREF _foreground[THREAD_LIMIT];
+DWORD _background;
-COLORREF _background[THREAD_LIMIT];
+DWORD _hPen;
-HPEN _hPen[THREAD_LIMIT];
+DWORD _hBrush;
-HBRUSH _hBrush[THREAD_LIMIT];
-char *_clipboard_contents[THREAD_LIMIT];
 BYTE _red[] = {   0x00, 0xbb, 0x00, 0xaa, 0x00, 0xbb, 0x00, 0xaa, 0x77,
 0xff, 0x00, 0xee, 0x00, 0xff, 0x00, 0xff, 0xaa, 0x00 };
 BYTE _green[] = { 0x00, 0x00, 0xbb, 0xaa, 0x00, 0x00, 0xbb, 0xaa, 0x77,
 0x00, 0xff, 0xee, 0x00, 0x00, 0xee, 0xff, 0xaa, 0x00 };
 argv = _convertargs(&argc, lpCmdLine);
 return main(argc, argv);
 }
 #endif
-/* This should return true for WinNT/2K/XP and false on Win9x */
-int IsWinNT(void)
-{
-static int isnt = -1;
-if(isnt == -1)
-{
-if (GetVersion() < 0x80000000)
-isnt = 1;
-else
-isnt = 0;
-}
-return isnt;
-}
 void DrawTransparentBitmap(HDC hdc, HDC hdcSrc, HBITMAP hBitmap, int xStart, int yStart, COLORREF cTransparentColor)
 {
 BITMAP bm;
 COLORREF cColor;
 /* Tell the spinner control that a keypress has
 * occured and to update it's internal value.
 */
 if (cinfo->buddy && !cinfo->combo)
 {
-if (IsWinNT())
+PostMessage(cinfo->buddy, WM_USER+10, 0, 0);
-PostMessage(cinfo->buddy, WM_USER+10, 0, 0);
-else
-SendMessage(cinfo->buddy, WM_USER+10, 0, 0);
 }
 break;
 case WM_USER+10:
 {
 if(cinfo->buddy)
 free(file);
 }
 return windowtype;
 }
+/* Initialize thread local values to the defaults */
+void _init_thread(void)
+{
+COLORREF foreground = RGB(128,128,128);
+COLORREF background = DW_RGB_TRANSPARENT;
+TlsSetValue(_foreground, (LPVOID)foreground);
+TlsSetValue(_background, (LPVOID)background);
+TlsSetValue(_hPen, CreatePen(PS_SOLID, 1, foreground));
+TlsSetValue(_hBrush, CreateSolidBrush(foreground));
+}
 /*
 * Initializes the Dynamic Windows engine.
 * Parameters:
 *           newthread: True if this is the only thread.
 *                      False if there is already a message loop running.
 WNDCLASS wc;
 int z;
 INITCOMMONCONTROLSEX icc;
 char *fname;
 HFONT oldfont;
+/* Initialize our thread local storage */
+_foreground = TlsAlloc();
+_background = TlsAlloc();
+_hPen = TlsAlloc();
+_hBrush = TlsAlloc();
+_init_thread();
 icc.dwSize = sizeof(INITCOMMONCONTROLSEX);
 icc.dwICC = ICC_WIN95_CLASSES|ICC_DATE_CLASSES;
 InitCommonControlsEx(&icc);
 }
 /* We need the version to check capability like up-down controls */
 dwVersion = GetVersion();
 dwComctlVer = GetDllVersion(TEXT("comctl32.dll"));
-for ( z = 0; z < THREAD_LIMIT; z++ )
-{
-_foreground[z] = RGB(128,128,128);
-_background[z] = DW_RGB_TRANSPARENT;
-_hPen[z] = CreatePen(PS_SOLID, 1, _foreground[z]);
-_hBrush[z] = CreateSolidBrush(_foreground[z]);
-_clipboard_contents[z] = NULL;
-}
 /* Initialize Security for named events and memory */
 InitializeSecurityDescriptor(&_dwsd, SECURITY_DESCRIPTOR_REVISION);
 SetSecurityDescriptorDacl(&_dwsd, TRUE, (PACL) NULL, FALSE);
 *       green: green value.
 *       blue: blue value.
 */
 void API dw_color_foreground_set(unsigned long value)
 {
-int threadid = dw_thread_id();
+HPEN hPen = TlsGetValue(_hPen);
+HBRUSH hBrush = TlsGetValue(_hBrush);
-if(threadid < 0 || threadid >= THREAD_LIMIT)
+COLORREF foreground;
-threadid = 0;
 value = _internal_color(value);
+foreground = RGB(DW_RED_VALUE(value), DW_GREEN_VALUE(value), DW_BLUE_VALUE(value));
-DeleteObject(_hPen[threadid]);
-DeleteObject(_hBrush[threadid]);
+DeleteObject(hPen);
-_foreground[threadid] = RGB(DW_RED_VALUE(value), DW_GREEN_VALUE(value), DW_BLUE_VALUE(value));
+DeleteObject(hBrush);
-_hPen[threadid] = CreatePen(PS_SOLID, 1, _foreground[threadid]);
+TlsSetValue(_foreground, (LPVOID)foreground);
-_hBrush[threadid] = CreateSolidBrush(_foreground[threadid]);
+TlsSetValue(_hPen, CreatePen(PS_SOLID, 1, foreground));
+TlsSetValue(_hBrush, CreateSolidBrush(foreground));
 }
 /* Sets the current background drawing color.
 * Parameters:
 *       red: red value.
 *       green: green value.
 *       blue: blue value.
 */
 void API dw_color_background_set(unsigned long value)
 {
-int threadid = dw_thread_id();
+COLORREF background;
-if(threadid < 0 || threadid >= THREAD_LIMIT)
-threadid = 0;
 value = _internal_color(value);
+background = RGB(DW_RED_VALUE(value), DW_GREEN_VALUE(value), DW_BLUE_VALUE(value));
 if(value == DW_RGB_TRANSPARENT)
-_background[threadid] = DW_RGB_TRANSPARENT;
+TlsSetValue(_background, (LPVOID)DW_RGB_TRANSPARENT);
 else
-_background[threadid] = RGB(DW_RED_VALUE(value), DW_GREEN_VALUE(value), DW_BLUE_VALUE(value));
+TlsSetValue(_background, (LPVOID)background);
 }
 /* Allows the user to choose a color using the system's color chooser dialog.
 * Parameters:
 *       value: current color
 *       y: Y coordinate.
 */
 void API dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
 {
 HDC hdcPaint;
-int threadid = dw_thread_id();
-if(threadid < 0 || threadid >= THREAD_LIMIT)
-threadid = 0;
 if(handle)
 hdcPaint = GetDC(handle);
 else if(pixmap)
 hdcPaint = pixmap->hdc;
 else
 return;
-SetPixel(hdcPaint, x, y, _foreground[threadid]);
+SetPixel(hdcPaint, x, y, (COLORREF)TlsGetValue(_foreground));
 if(!pixmap)
 ReleaseDC(handle, hdcPaint);
 }
 /* Draw a line on a window (preferably a render window).
 */
 void API dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
 {
 HDC hdcPaint;
 HPEN oldPen;
-int threadid = dw_thread_id();
-if(threadid < 0 || threadid >= THREAD_LIMIT)
-threadid = 0;
 if(handle)
 hdcPaint = GetDC(handle);
 else if(pixmap)
 hdcPaint = pixmap->hdc;
 else
 return;
-oldPen = SelectObject(hdcPaint, _hPen[threadid]);
+oldPen = SelectObject(hdcPaint, TlsGetValue(_hPen));
 MoveToEx(hdcPaint, x1, y1, NULL);
 LineTo(hdcPaint, x2, y2);
 SelectObject(hdcPaint, oldPen);
 /* For some reason Win98 (at least) fails
 * to draw the last pixel.  So I do it myself.
 */
-SetPixel(hdcPaint, x2, y2, _foreground[threadid]);
+SetPixel(hdcPaint, x2, y2, (COLORREF)TlsGetValue(_foreground));
 if(!pixmap)
 ReleaseDC(handle, hdcPaint);
 }
 /* Draw a closed polygon on a window (preferably a render window).
 HDC hdcPaint;
 HBRUSH oldBrush;
 HPEN oldPen;
 POINT *points;
 int i;
-int threadid = dw_thread_id();
-if(threadid < 0 || threadid >= THREAD_LIMIT)
-threadid = 0;
 if ( handle )
 hdcPaint = GetDC( handle );
 else if ( pixmap )
 hdcPaint = pixmap->hdc;
 /* ... and increment the number of points */
 npoints++;
 }
 }
-oldBrush = SelectObject( hdcPaint, _hBrush[threadid] );
+oldBrush = SelectObject( hdcPaint, TlsGetValue(_hBrush) );
-oldPen = SelectObject( hdcPaint, _hPen[threadid] );
+oldPen = SelectObject( hdcPaint, TlsGetValue(_hPen) );
 if ( fill )
 Polygon( hdcPaint, points, npoints );
 else
 Polyline( hdcPaint, points, npoints );
 SelectObject( hdcPaint, oldBrush );
 */
 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height)
 {
 HDC hdcPaint;
 RECT Rect;
-int threadid = dw_thread_id();
-if(threadid < 0 || threadid >= THREAD_LIMIT)
-threadid = 0;
 if(handle)
 hdcPaint = GetDC(handle);
 else if(pixmap)
 hdcPaint = pixmap->hdc;
 else
 return;
 SetRect(&Rect, x, y, x + width , y + height );
 if(fill)
-FillRect(hdcPaint, &Rect, _hBrush[threadid]);
+FillRect(hdcPaint, &Rect, TlsGetValue(_hBrush));
 else
-FrameRect(hdcPaint, &Rect, _hBrush[threadid]);
+FrameRect(hdcPaint, &Rect, TlsGetValue(_hBrush));
 if(!pixmap)
 ReleaseDC(handle, hdcPaint);
 }
 /* Draw text on a window (preferably a render window).
 void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text)
 {
 HDC hdc;
 int mustdelete = 0;
 HFONT hFont = 0, oldFont = 0;
-int threadid = dw_thread_id();
 ColorInfo *cinfo;
+COLORREF background;
-if(threadid < 0 || threadid >= THREAD_LIMIT)
-threadid = 0;
 if(handle)
 hdc = GetDC(handle);
 else if(pixmap)
 hdc = pixmap->hdc;
 {
 hFont = _acquire_font(handle, cinfo->fontname);
 mustdelete = 1;
 }
+background = (COLORREF)TlsGetValue(_background);
 if(hFont)
 oldFont = SelectObject(hdc, hFont);
-SetTextColor(hdc, _foreground[threadid]);
+SetTextColor(hdc, (COLORREF)TlsGetValue(_foreground));
-if(_background[threadid] == DW_RGB_TRANSPARENT)
+if(background == DW_RGB_TRANSPARENT)
 SetBkMode(hdc, TRANSPARENT);
 else
 {
 SetBkMode(hdc, OPAQUE);
-SetBkColor(hdc, _background[threadid]);
+SetBkColor(hdc, background);
 }
 TextOut(hdc, x, y, text, strlen(text));
 if(oldFont)
 SelectObject(hdc, oldFont);
 if(mustdelete)
 CloseHandle(handle);
 return 0;
 }
 /*
+* Encapsulate thread creation on Win32.
+*/
+void _dwthreadstart(void *data)
+{
+void (* threadfunc)(void *) = NULL;
+void **tmp = (void **)data;
+_init_thread();
+threadfunc = (void (*)(void *))tmp[0];
+threadfunc(tmp[1]);
+free(tmp);
+}
+/*
 * Creates a new thread with a starting point of func.
 * Parameters:
 *       func: Function which will be run in the new thread.
 *       data: Parameter(s) passed to the function.
 *       stack: Stack size of new thread (OS/2 and Windows only).
 DWTID API dw_thread_new(void *func, void *data, int stack)
 {
 #if defined(__CYGWIN__)
 return 0;
 #else
-return (DWTID)_beginthread((void(*)(void *))func, stack, data);
+void **tmp = malloc(sizeof(void *) * 2);
+tmp[0] = func;
+tmp[1] = data;
+return (DWTID)_beginthread((void(*)(void *))_dwthreadstart, stack, tmp);
 #endif
 }
 /*
 * Ends execution of current thread immediately.
 *       be converted to text.
 */
 char *dw_clipboard_get_text()
 {
 HANDLE handle;
-int threadid = dw_thread_id();
+char *tmp, *ret = NULL;
-long len;
 if ( !OpenClipboard( NULL ) )
-return NULL;
+return ret;
 if ( ( handle = GetClipboardData( CF_TEXT) ) == NULL )
 {
 CloseClipboard();
-return NULL;
+return ret;
 }
-len = strlen( (char *)handle );
+if ( (tmp = GlobalLock(handle)) && strlen(tmp) )
+{
-if ( threadid < 0 || threadid >= THREAD_LIMIT )
+ret = strdup(tmp);
-threadid = 0;
+GlobalUnlock(handle);
+}
-if ( _clipboard_contents[threadid] != NULL )
-{
-GlobalFree( _clipboard_contents[threadid] );
-}
-_clipboard_contents[threadid] = (char *)GlobalAlloc(GMEM_FIXED, len + 1);
-if ( !_clipboard_contents[threadid] )
-{
-CloseClipboard();
-return NULL;
-}
-strcpy( (char *)_clipboard_contents[threadid], (char *)handle );
 CloseClipboard();
+return ret;
-return _clipboard_contents[threadid];
 }
 /*
 * Sets the contents of the default clipboard to the supplied text.
 * Parameters:
 memcpy( (char *)ptr2, str, len + 1);
 GlobalUnlock( ptr1 );
 EmptyClipboard();
-if ( !SetClipboardData( CF_TEXT, ptr1 ) )
+SetClipboardData( CF_TEXT, ptr1 );
-{
-GlobalFree( ptr1 );
-return;
-}
 CloseClipboard();
 GlobalFree( ptr1 );
 return;

Mercurial > dwindows

comparison win/dw.c @ 969:69f620df0c47