mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 17:26:22 +00:00
60ce85c965
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
501 lines
15 KiB
C
501 lines
15 KiB
C
/******************************************************************************
|
|
*
|
|
* tweak.c
|
|
*
|
|
* Windows 95 style interface tweaks.
|
|
* Copyright (c) 1997 Dave Cuthbert.
|
|
*
|
|
* FIXME: This file is, unfortunately, aptly named: the method of
|
|
* displaying Win95 style windows is a tweak. Lots of stuff does not yet
|
|
* work -- and probably never will unless some of this code is
|
|
* incorporated into the mainstream Wine code.
|
|
*
|
|
* DEVELOPERS, PLEASE NOTE: Before delving into the mainstream code and
|
|
* altering it, consider how your changes will affect the Win3.1 interface
|
|
* (which has taken a major effort to create!). After you make any sort of
|
|
* non-trivial change, *test* the Wine code running in Win3.1 mode! The
|
|
* object here is to make it so that the person who tests the latest version
|
|
* of Wine without adding the tweaks into wine.conf notices nothing out of
|
|
* the ordinary.
|
|
*
|
|
* Revision history
|
|
* 03-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
#include <stdio.h>
|
|
#include <malloc.h>
|
|
#include "ts_xlib.h"
|
|
#include <string.h>
|
|
#include "dc.h"
|
|
#include "debug.h"
|
|
#include "graphics.h"
|
|
#include "options.h"
|
|
#include "stackframe.h"
|
|
#include "tweak.h"
|
|
#include "windows.h"
|
|
|
|
/* Parameters for windows/nonclient.c */
|
|
extern int NC_CaptionLeftNudge;
|
|
extern int NC_CaptionTopNudge;
|
|
extern int NC_SysControlNudge;
|
|
extern int NC_MaxControlNudge;
|
|
extern int NC_MinControlNudge;
|
|
extern UINT32 NC_CaptionTextFlags;
|
|
extern HBRUSH32 NC_WinHighlight95;
|
|
extern HBRUSH32 NC_WinShadow95;
|
|
|
|
/* Parameters for controls/menu.c */
|
|
extern UINT32 MENU_BarItemTopNudge;
|
|
extern UINT32 MENU_BarItemLeftNudge;
|
|
extern UINT32 MENU_ItemTopNudge;
|
|
extern UINT32 MENU_ItemLeftNudge;
|
|
extern UINT32 MENU_HighlightTopNudge;
|
|
extern UINT32 MENU_HighlightLeftNudge;
|
|
extern UINT32 MENU_HighlightBottomNudge;
|
|
extern UINT32 MENU_HighlightRightNudge;
|
|
|
|
/* General options */
|
|
HPEN32 TWEAK_PenFF95;
|
|
HPEN32 TWEAK_PenE095;
|
|
HPEN32 TWEAK_PenC095;
|
|
HPEN32 TWEAK_Pen8095;
|
|
HPEN32 TWEAK_Pen0095;
|
|
|
|
#if defined(WIN_95_LOOK)
|
|
int TWEAK_Win95Look = 1;
|
|
#else
|
|
int TWEAK_Win95Look = 0;
|
|
#endif
|
|
|
|
int TWEAK_WineInitialized = 0;
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* int TWEAK_MenuInit()
|
|
*
|
|
* Initializes the Win95 tweaks to the menu code. See controls/menu.c.
|
|
* Return value indicates success (non-zero) or failure.
|
|
*
|
|
* Revision history
|
|
* 06-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
static int TWEAK_MenuInit()
|
|
{
|
|
MENU_BarItemTopNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuBarItemTopNudge", 0);
|
|
MENU_BarItemLeftNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuBarItemLeftNudge", 0);
|
|
MENU_ItemTopNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuItemTopNudge", 0);
|
|
MENU_ItemLeftNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuItemLeftNudge", 0);
|
|
MENU_HighlightTopNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuHighlightTopNudge", 0);
|
|
MENU_HighlightLeftNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuHighlightLeftNudge", 0);
|
|
MENU_HighlightBottomNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuHighlightBottomNudge", 0);
|
|
MENU_HighlightRightNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MenuHighlightRightNudge", 0);
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* int TWEAK_NonClientInit()
|
|
*
|
|
* Initializes the Win95 tweaks to the non-client drawing functions. See
|
|
* windows/nonclient.c. Return value indicates success (non-zero) or
|
|
* failure.
|
|
*
|
|
* Revision history
|
|
* 05-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
static int TWEAK_NonClientInit()
|
|
{
|
|
char key_value[2];
|
|
|
|
NC_CaptionLeftNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "CaptionLeftNudge", 0);
|
|
NC_CaptionTopNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "CaptionTopNudge", 0);
|
|
NC_SysControlNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "SysControlNudge", 0);
|
|
NC_MaxControlNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MaxControlNudge", 0);
|
|
NC_MinControlNudge =
|
|
PROFILE_GetWineIniInt("Tweak.Layout", "MinControlNudge", 0);
|
|
|
|
NC_WinHighlight95 = CreateSolidBrush32(RGB(0xc0, 0xc0, 0xc0));
|
|
NC_WinShadow95 = CreateSolidBrush32(RGB(0x00, 0x00, 0x00));
|
|
|
|
NC_CaptionTextFlags = DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX;
|
|
|
|
PROFILE_GetWineIniString("Tweak.Layout", "CaptionAlignment",
|
|
TWEAK_Win95Look ? "l" : "c", key_value, 2);
|
|
|
|
switch(key_value[0]) {
|
|
case 'l':
|
|
case 'L':
|
|
NC_CaptionTextFlags |= DT_LEFT;
|
|
break;
|
|
|
|
case 'r':
|
|
case 'R':
|
|
NC_CaptionTextFlags |= DT_RIGHT;
|
|
break;
|
|
|
|
default:
|
|
NC_CaptionTextFlags |= DT_CENTER;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* int TWEAK_VarInit()
|
|
*
|
|
* Initializes the miscellaneous variables which are used in the tweak
|
|
* routines. Return value is non-zero on success.
|
|
*
|
|
* Revision history
|
|
* 07-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
static int TWEAK_VarInit()
|
|
{
|
|
TWEAK_Win95Look = PROFILE_GetWineIniBool("Tweak.Layout", "Win95Look", 0);
|
|
|
|
/* FIXME: Each color should really occupy a single entry in the wine.conf
|
|
file, but I couldn't settle on a good (intuitive!) format. */
|
|
|
|
TWEAK_PenFF95 = CreatePen32(
|
|
PS_SOLID, 1,
|
|
RGB(PROFILE_GetWineIniInt("Tweak.Colors", "PenFF95.Red", 0xff),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "PenFF95.Grn", 0xff),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "PenFF95.Blu", 0xff)));
|
|
TWEAK_PenE095 = CreatePen32(
|
|
PS_SOLID, 1,
|
|
RGB(PROFILE_GetWineIniInt("Tweak.Colors", "PenE095.Red", 0xe0),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "PenE095.Grn", 0xe0),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "PenE095.Blu", 0xe0)));
|
|
TWEAK_PenC095 = CreatePen32(
|
|
PS_SOLID, 1,
|
|
RGB(PROFILE_GetWineIniInt("Tweak.Colors", "PenC095.Red", 0xc0),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "PenC095.Grn", 0xc0),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "PenC095.Blu", 0xc0)));
|
|
TWEAK_Pen8095 = CreatePen32(
|
|
PS_SOLID, 1,
|
|
RGB(PROFILE_GetWineIniInt("Tweak.Colors", "Pen8095.Red", 0x80),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "Pen8095.Grn", 0x80),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "Pen8095.Blu", 0x80)));
|
|
TWEAK_Pen0095 = CreatePen32(
|
|
PS_SOLID, 1,
|
|
RGB(PROFILE_GetWineIniInt("Tweak.Colors", "Pen0095.Red", 0x00),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "Pen0095.Grn", 0x00),
|
|
PROFILE_GetWineIniInt("Tweak.Colors", "Pen0095.Blu", 0x00)));
|
|
|
|
dprintf_tweak(stddeb, "TWEAK_VarInit: Using %s look and feel.\n",
|
|
TWEAK_Win95Look ? "Win95" : "Win3.1");
|
|
return 1;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* int TWEAK_Init()
|
|
*
|
|
* Does the full initialization of the Win95 tweak subsystem. Return value
|
|
* indicates success. Called by loader/main.c's MAIN_Init().
|
|
*
|
|
* Revision history
|
|
* 05-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
int TWEAK_Init()
|
|
{
|
|
TWEAK_VarInit();
|
|
TWEAK_NonClientInit();
|
|
TWEAK_MenuInit();
|
|
return 1;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* int TWEAK_CheckConfiguration()
|
|
*
|
|
* Examines wine.conf for old/bad entries and recommends changes to the user.
|
|
*
|
|
* Revision history
|
|
* 05-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
int TWEAK_CheckConfiguration()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* Tweak graphic subsystem.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
/******************************************************************************
|
|
*
|
|
* void TWEAK_DrawReliefRect95(
|
|
* HDC32 hdc, // Device context on which to draw
|
|
* RECT32 const *rect ) // Rectangle to use
|
|
*
|
|
* Draws the double-bordered Win95-style relief rectangle.
|
|
*
|
|
* Bugs
|
|
* There are some checks missing from this function. Perhaps the
|
|
* SelectObject32 calls should be examined? Hasn't failed on me (yet).
|
|
*
|
|
* Should I really be calling X functions directly from here? It is
|
|
* an optimization, but should I be optimizing alpha code? Probably
|
|
* not.
|
|
*
|
|
* Revision history
|
|
* 08-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
void TWEAK_DrawReliefRect95(
|
|
HDC32 hdc,
|
|
RECT32 const *rect )
|
|
{
|
|
DC *dc;
|
|
HPEN32 prevpen;
|
|
|
|
if((dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC))) {
|
|
|
|
/* Draw the top/left lines first */
|
|
prevpen = SelectObject32(hdc, TWEAK_PenE095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left, rect->top,
|
|
rect->right - 1, rect->top);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left, rect->top,
|
|
rect->left, rect->bottom - 1);
|
|
|
|
SelectObject32(hdc, TWEAK_PenFF95);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left + 1,
|
|
rect->top + 1, rect->right - 2, rect->top + 1);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left + 1,
|
|
rect->top + 1, rect->left + 1, rect->bottom - 2);
|
|
|
|
|
|
/* Now the bottom/right lines */
|
|
SelectObject32(hdc, TWEAK_Pen0095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left,
|
|
rect->bottom - 1, rect->right - 1, rect->bottom - 1);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->right - 1,
|
|
rect->top, rect->right - 1, rect->bottom - 1);
|
|
|
|
SelectObject32(hdc, TWEAK_Pen8095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left + 1,
|
|
rect->bottom - 2, rect->right - 2, rect->bottom - 2);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->right - 2,
|
|
rect->top + 1, rect->right - 2, rect->bottom - 2);
|
|
|
|
SelectObject32(hdc, prevpen);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* void TWEAK_DrawRevReliefRect95(
|
|
* HDC32 hdc, // Device context on which to draw
|
|
* RECT32 const *rect ) // Rectangle to use
|
|
*
|
|
* Draws the double-bordered Win95-style relief rectangle.
|
|
*
|
|
* Bugs
|
|
* There are some checks missing from this function. Perhaps the
|
|
* SelectObject32 calls should be examined? Hasn't failed on me (yet).
|
|
*
|
|
* Should I really be calling X functions directly from here? It is
|
|
* an optimization, but should I be optimizing alpha code? Probably
|
|
* not.
|
|
*
|
|
* Revision history
|
|
* 08-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
void TWEAK_DrawRevReliefRect95(
|
|
HDC32 hdc,
|
|
RECT32 const *rect )
|
|
{
|
|
DC *dc;
|
|
HPEN32 prevpen;
|
|
|
|
if((dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC))) {
|
|
|
|
/* Draw the top/left lines first */
|
|
prevpen = SelectObject32(hdc, TWEAK_Pen8095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left, rect->top,
|
|
rect->right - 1, rect->top);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left, rect->top,
|
|
rect->left, rect->bottom - 1);
|
|
|
|
SelectObject32(hdc, TWEAK_Pen0095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left + 1,
|
|
rect->top + 1, rect->right - 2, rect->top + 1);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left + 1,
|
|
rect->top + 1, rect->left + 1, rect->bottom - 2);
|
|
|
|
|
|
/* Now the bottom/right lines */
|
|
SelectObject32(hdc, TWEAK_PenFF95);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left,
|
|
rect->bottom - 1, rect->right - 1, rect->bottom - 1);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->right - 1,
|
|
rect->top, rect->right - 1, rect->bottom - 1);
|
|
|
|
SelectObject32(hdc, TWEAK_PenE095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->left + 1,
|
|
rect->bottom - 2, rect->right - 2, rect->bottom - 2);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, rect->right - 2,
|
|
rect->top + 1, rect->right - 2, rect->bottom - 2);
|
|
|
|
SelectObject32(hdc, prevpen);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* void TWEAK_DrawMenuSeparatorHoriz95(
|
|
* HDC32 hdc, // Device context on which to draw
|
|
* UINT32 xc1, // Left x-coordinate
|
|
* UINT32 yc, // Y-coordinate of the LOWER line
|
|
* UINT32 xc2 ) // Right x-coordinate
|
|
*
|
|
* Draws a horizontal menu separator bar Win 95 style.
|
|
*
|
|
* Bugs
|
|
* Same as those for DrawReliefRect95.
|
|
*
|
|
* Revision history
|
|
* 08-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
* 11-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Changed name from DrawMenuSeparator95
|
|
*
|
|
*****************************************************************************/
|
|
|
|
void TWEAK_DrawMenuSeparatorHoriz95(
|
|
HDC32 hdc,
|
|
UINT32 xc1,
|
|
UINT32 yc,
|
|
UINT32 xc2 )
|
|
{
|
|
DC *dc;
|
|
HPEN32 prevpen;
|
|
|
|
if((dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC))) {
|
|
|
|
/* Draw the top line */
|
|
prevpen = SelectObject32(hdc, TWEAK_Pen8095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, xc1, yc - 1, xc2,
|
|
yc - 1);
|
|
|
|
/* And the bottom line */
|
|
SelectObject32(hdc, TWEAK_PenFF95);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, xc1, yc, xc2, yc);
|
|
|
|
SelectObject32(hdc, prevpen);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
/******************************************************************************
|
|
*
|
|
* void TWEAK_DrawMenuSeparatorVert95(
|
|
* HDC32 hdc, // Device context on which to draw
|
|
* UINT32 xc, // X-coordinate of the RIGHT line
|
|
* UINT32 yc1, // top Y-coordinate
|
|
* UINT32 yc2 ) // bottom Y-coordinate
|
|
*
|
|
* Draws a vertical menu separator bar Win 95 style.
|
|
*
|
|
* Bugs
|
|
* Same as those for DrawReliefRect95.
|
|
*
|
|
* Revision history
|
|
* 11-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
|
|
* Original implementation.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
void TWEAK_DrawMenuSeparatorVert95(
|
|
HDC32 hdc,
|
|
UINT32 xc,
|
|
UINT32 yc1,
|
|
UINT32 yc2 )
|
|
{
|
|
DC *dc;
|
|
HPEN32 prevpen;
|
|
|
|
if((dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC))) {
|
|
|
|
/* Draw the top line */
|
|
prevpen = SelectObject32(hdc, TWEAK_Pen8095);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, xc, yc1, xc,
|
|
yc2);
|
|
|
|
/* And the bottom line */
|
|
SelectObject32(hdc, TWEAK_PenFF95);
|
|
DC_SetupGCForPen(dc);
|
|
TSXDrawLine(display, dc->u.x.drawable, dc->u.x.gc, xc + 1, yc1, xc + 1,
|
|
yc2);
|
|
|
|
SelectObject32(hdc, prevpen);
|
|
}
|
|
|
|
return;
|
|
}
|