mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 17:06:19 +00:00
02e90087ff
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [debugger/db_disasm.c] Added cpuid and cmpxchg instructions. * [if1632/builtin.c] [relay32/builtin32.c] Fixed broken -dll option with Win32 DLLs. * [include/heap.h] Added SYSTEM_LOCK/SYSTEM_UNLOCK macros. * [configure.in] [misc/lstr.c] Added check for wctype.h. Commented out --enable-ipc option (IPC code has been broken for a long time anyway). * [scheduler/critsection.c] [scheduler/event.c] [scheduler/mutex.c] [scheduler/semaphore.c] Implemented Win32 synchronization objects. * [scheduler/synchro.c] Implemented WaitForMultipleObjects and related functions. * [scheduler/thread.c] If possible, use clone() in CreateThread(). * [scheduler/thread.c] [scheduler/process.c] Made thread and process waitable objects. Thread and process id values are now different from the pointers they represent. * [win32/k32obj.c] Moved to scheduler directory. Added function table for waiting operations on objects. * [files/file.c] [memory/virtual.c] Added new K32OBJ function table. Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net> * [files/file.c] Fixed my patch for GetTempFileName16() as needed. It was ...Name32A() that didn't work properly, not ...Name16(). * [graphics/x11drv/brush.c] Fixed a BadMatch error. * [msdos/int21.c] Fixed INT21_FindNextFCB() to get correct volume labels e.g. in "file open" dialog. * [multimedia/joystick.c] [relay32/winmm.spec] Stub JoyGetPosEx(). * [scheduler/process.c] [relay32/kernel32.spec] Implemented RegisterServiceProcess(). Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com> * [if1632/kernel.spec] [if1632/relay.c] Define CallProcEx32w - Thanks to Marcus Meissner for his excellent CallProc32W. * [loader/module.c] Take a shot at defining FreeLibrary32W. Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de> * [controls/menu.c] Menu modification from WM_INITMENUPOPUP message fixed. Menu items now can have different wID and hSubMenu (Win95 behavior). * [misc/cpu.c] Improved IsProcessorFeaturePresent. Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no> * [include/winsock.h] [misc/winsock.c] Fixed WS_SOL_SOCKET for setsockopt(), and made select() return empty fd_sets if timeout. * [objects/palette.c] AnimatePalette() bailed out if entire palette is animated. Fixed. * [objects/dib.c] Added some code to SetDIBitsToDevice() and its helpers to fix some offseting problems. * [objects/cursoricon.c] Made CreateCursor32() convert the instance handle properly. Made DestroyCursor() return correct success status. Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu> * [windows/syscolor.c] Added definition of GetSysColorPen16/32. This function does not exist in the Win32 API but is a very close (and natural) relative to GetSysColorBrush function. Moreover, it is *very* much used within Wine since there are a lot of places where we need to draw lines with the standard colors. * [controls/button.c] [controls/combo.c] [controls/icontitle.c] [controls/menu.c] [controls/progress.c] [controls/scroll.c] [controls/updown.c] [graphics/painting.c] [misc/tweak.c] [windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c] Replaced references to sysColorObjects with the appropriate call to GetSysColorBrush32/GetSysColorPen32. There is no need to expose the implementation of these functions, even within Wine. This makes the code easier to understand, debug, maintain. * [controls/uitools.c] Modified most of the functions in this file to use the now standard pens (i.e. GetSysColorPen32). These functions made *heavy* use of standard pens so I expect a lot less CreatePen/DeleteObject calls can do only good...:) Plus some minor modifications (*no* functional changes though). * [controls/updown.c] Used the new DrawFrameControl32 function to paint the control. I also deleted UDDOWN_DrawArrow since it was no longer required. Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no> * [configure.in] Added check for -lw. * [include/wintypes.h] [tools/build.c] Changes to make the assembly understandable for even sun as. ".ascii" -> ".string", "call %foo" -> "call *%foo", "pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s". * [memory/ldt.c] #ifdef added so <sys/seg.h> will not be included on Solaris. Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [configure.in] Added XF86DGA check. * [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h] Started DirectSound. Only stubs for now. * [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec] Started to implement DirectDraw. Mostly stubs, some testcases work. Requires the XF86DGA extension to XFree86. (check demo/blizdemo.exe from the Diablo CD-ROM). * [files/drive.c] Return correct "CDFS" fsname so Diablo is a bit happier. Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com> * [misc/registry.c] Fixed bugs in the routines which read the Windows '95 registry files. Added extra information regarding the format of the Windows '95 registry files.
230 lines
8.1 KiB
C
230 lines
8.1 KiB
C
/*
|
|
* Support for system colors
|
|
*
|
|
* Copyright David W. Metcalfe, 1993
|
|
* Copyright Alexandre Julliard, 1994
|
|
*
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "gdi.h"
|
|
#include "tweak.h"
|
|
|
|
static const char * const DefSysColors[] =
|
|
{
|
|
"Scrollbar", "224 224 224", /* COLOR_SCROLLBAR */
|
|
"Background", "192 192 192", /* COLOR_BACKGROUND */
|
|
"ActiveTitle", "0 64 128", /* COLOR_ACTIVECAPTION */
|
|
"InactiveTitle", "255 255 255", /* COLOR_INACTIVECAPTION */
|
|
"Menu", "255 255 255", /* COLOR_MENU */
|
|
"Window", "255 255 255", /* COLOR_WINDOW */
|
|
"WindowFrame", "0 0 0", /* COLOR_WINDOWFRAME */
|
|
"MenuText", "0 0 0", /* COLOR_MENUTEXT */
|
|
"WindowText", "0 0 0", /* COLOR_WINDOWTEXT */
|
|
"TitleText", "255 255 255", /* COLOR_CAPTIONTEXT */
|
|
"ActiveBorder", "128 128 128", /* COLOR_ACTIVEBORDER */
|
|
"InactiveBorder", "255 255 255", /* COLOR_INACTIVEBORDER */
|
|
"AppWorkspace", "255 255 232", /* COLOR_APPWORKSPACE */
|
|
"Hilight", "166 202 240", /* COLOR_HIGHLIGHT */
|
|
"HilightText", "0 0 0", /* COLOR_HIGHLIGHTTEXT */
|
|
"ButtonFace", "192 192 192", /* COLOR_BTNFACE */
|
|
"ButtonShadow", "128 128 128", /* COLOR_BTNSHADOW */
|
|
"GrayText", "192 192 192", /* COLOR_GRAYTEXT */
|
|
"ButtonText", "0 0 0", /* COLOR_BTNTEXT */
|
|
"InactiveTitleText", "0 0 0", /* COLOR_INACTIVECAPTIONTEXT */
|
|
"ButtonHilight", "255 255 255", /* COLOR_BTNHIGHLIGHT */
|
|
"3DDarkShadow", "32 32 32", /* COLOR_3DDKSHADOW */
|
|
"3DLight", "192 192 192", /* COLOR_3DLIGHT */
|
|
"InfoText", "0 0 0", /* COLOR_INFOTEXT */
|
|
"InfoBackground", "255 255 192" /* COLOR_INFOBK */
|
|
};
|
|
|
|
static const char * const DefSysColors95[] =
|
|
{
|
|
"Scrollbar", "224 224 224", /* COLOR_SCROLLBAR */
|
|
"Background", "192 192 192", /* COLOR_BACKGROUND */
|
|
"ActiveTitle", "0 64 128", /* COLOR_ACTIVECAPTION */
|
|
"InactiveTitle", "255 255 255", /* COLOR_INACTIVECAPTION */
|
|
"Menu", "192 192 192", /* COLOR_MENU */
|
|
"Window", "255 255 255", /* COLOR_WINDOW */
|
|
"WindowFrame", "0 0 0", /* COLOR_WINDOWFRAME */
|
|
"MenuText", "0 0 0", /* COLOR_MENUTEXT */
|
|
"WindowText", "0 0 0", /* COLOR_WINDOWTEXT */
|
|
"TitleText", "255 255 255", /* COLOR_CAPTIONTEXT */
|
|
"ActiveBorder", "128 128 128", /* COLOR_ACTIVEBORDER */
|
|
"InactiveBorder", "255 255 255", /* COLOR_INACTIVEBORDER */
|
|
"AppWorkspace", "255 255 232", /* COLOR_APPWORKSPACE */
|
|
"Hilight", "166 202 240", /* COLOR_HIGHLIGHT */
|
|
"HilightText", "0 0 0", /* COLOR_HIGHLIGHTTEXT */
|
|
"ButtonFace", "192 192 192", /* COLOR_BTNFACE */
|
|
"ButtonShadow", "128 128 128", /* COLOR_BTNSHADOW */
|
|
"GrayText", "192 192 192", /* COLOR_GRAYTEXT */
|
|
"ButtonText", "0 0 0", /* COLOR_BTNTEXT */
|
|
"InactiveTitleText", "0 0 0", /* COLOR_INACTIVECAPTIONTEXT */
|
|
"ButtonHilight", "255 255 255", /* COLOR_BTNHIGHLIGHT */
|
|
"3DDarkShadow", "32 32 32", /* COLOR_3DDKSHADOW */
|
|
"3DLight", "192 192 192", /* COLOR_3DLIGHT */
|
|
"InfoText", "0 0 0", /* COLOR_INFOTEXT */
|
|
"InfoBackground", "255 255 192" /* COLOR_INFOBK */
|
|
};
|
|
|
|
|
|
#define NUM_SYS_COLORS (COLOR_INFOBK+1)
|
|
|
|
static COLORREF SysColors[NUM_SYS_COLORS];
|
|
static HBRUSH32 SysColorBrushes[NUM_SYS_COLORS];
|
|
static HPEN32 SysColorPens[NUM_SYS_COLORS];
|
|
|
|
#define MAKE_SOLID(color) \
|
|
(PALETTEINDEX(GetNearestPaletteIndex32(STOCK_DEFAULT_PALETTE,(color))))
|
|
|
|
/*************************************************************************
|
|
* SYSCOLOR_SetColor
|
|
*/
|
|
static void SYSCOLOR_SetColor( int index, COLORREF color )
|
|
{
|
|
if (index < 0 || index >= NUM_SYS_COLORS) return;
|
|
SysColors[index] = color;
|
|
if (SysColorBrushes[index]) DeleteObject32( SysColorBrushes[index] );
|
|
SysColorBrushes[index] = CreateSolidBrush32( color );
|
|
if (SysColorPens[index]) DeleteObject32( SysColorPens[index] );
|
|
SysColorPens[index] = CreatePen32( PS_SOLID, 1, color );
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
* SYSCOLOR_Init
|
|
*/
|
|
void SYSCOLOR_Init(void)
|
|
{
|
|
int i, r, g, b;
|
|
const char * const *p;
|
|
char buffer[100];
|
|
|
|
for (i = 0, p = TWEAK_Win95Look ? DefSysColors95 : DefSysColors;
|
|
i < NUM_SYS_COLORS; i++, p += 2)
|
|
{
|
|
GetProfileString32A( "colors", p[0], p[1], buffer, 100 );
|
|
if (sscanf( buffer, " %d %d %d", &r, &g, &b ) != 3) r = g = b = 0;
|
|
SYSCOLOR_SetColor( i, RGB(r,g,b) );
|
|
}
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
* GetSysColor16 (USER.180)
|
|
*/
|
|
COLORREF WINAPI GetSysColor16( INT16 nIndex )
|
|
{
|
|
return GetSysColor32 (nIndex);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
* GetSysColor32 (USER32.288)
|
|
*/
|
|
COLORREF WINAPI GetSysColor32( INT32 nIndex )
|
|
{
|
|
if (nIndex >= 0 && nIndex < NUM_SYS_COLORS)
|
|
return SysColors[nIndex];
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
* SetSysColors16 (USER.181)
|
|
*/
|
|
VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
|
|
const COLORREF *lpColorValues )
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < nChanges; i++)
|
|
{
|
|
SYSCOLOR_SetColor( lpSysColor[i], lpColorValues[i] );
|
|
}
|
|
|
|
/* Send WM_SYSCOLORCHANGE message to all windows */
|
|
|
|
SendMessage32A( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 );
|
|
|
|
/* Repaint affected portions of all visible windows */
|
|
|
|
RedrawWindow32( GetDesktopWindow32(), NULL, 0,
|
|
RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN );
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
* SetSysColors32 (USER32.504)
|
|
*/
|
|
BOOL32 WINAPI SetSysColors32( INT32 nChanges, const INT32 *lpSysColor,
|
|
const COLORREF *lpColorValues )
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < nChanges; i++)
|
|
{
|
|
SYSCOLOR_SetColor( lpSysColor[i], lpColorValues[i] );
|
|
}
|
|
|
|
/* Send WM_SYSCOLORCHANGE message to all windows */
|
|
|
|
SendMessage32A( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 );
|
|
|
|
/* Repaint affected portions of all visible windows */
|
|
|
|
RedrawWindow32( GetDesktopWindow32(), NULL, 0,
|
|
RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN );
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* GetSysColorBrush16 (USER.281)
|
|
*/
|
|
HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
|
|
{
|
|
return (HBRUSH16)GetSysColorBrush32(index);
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* GetSysColorBrush32 (USER32.289)
|
|
*/
|
|
HBRUSH32 WINAPI GetSysColorBrush32( INT32 index )
|
|
{
|
|
if (0 <= index && index < NUM_SYS_COLORS)
|
|
return SysColorBrushes[index];
|
|
fprintf( stderr, "GetSysColorBrush32: Unknown index(%d)\n", index );
|
|
return GetStockObject32(LTGRAY_BRUSH);
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* GetSysColorPen16 (Not a Windows API)
|
|
*/
|
|
HPEN16 WINAPI GetSysColorPen16( INT16 index )
|
|
{
|
|
return (HPEN16)GetSysColorPen32(index);
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* GetSysColorPen32 (Not a Windows API)
|
|
*
|
|
* This function is new to the Wine lib -- it does not exist in
|
|
* Windows. However, it is a natural complement for GetSysColorBrush
|
|
* in the Win32 API and is needed quite a bit inside Wine.
|
|
*/
|
|
HPEN32 WINAPI GetSysColorPen32( INT32 index )
|
|
{
|
|
/* We can assert here, because this function is internal to Wine */
|
|
assert (0 <= index && index < NUM_SYS_COLORS);
|
|
return SysColorPens[index];
|
|
|
|
}
|