Attachment "0003-ak-Enable-dropshadow-for-toplevels-on-Windows.patch" to
ticket [2838812f]
added by
patthoyts
2010-01-02 23:44:57.
From 4e9fdd7a70edceda1c44faf99bcd9295a9f31f73 Mon Sep 17 00:00:00 2001
From: Pat Thoyts <[email protected]>
Date: Sat, 2 Jan 2010 14:08:51 +0000
Subject: [PATCH 3/3] ak: Enable dropshadow for toplevels on Windows
This patch from Anton Kovalenko adds a -dropshadow option to the wm
attributes command on Windows.
Signed-off-by: Pat Thoyts <[email protected]>
---
win/tkWinInt.h | 5 ++++
win/tkWinWm.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
win/tkWinX.c | 2 +-
3 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index e5e3cc7..d95244b 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -40,6 +40,10 @@
#define WS_EX_TOOLWINDOW 0x00000080L
#endif
+#ifndef CS_DROPSHADOW
+#define CS_DROPSHADOW 0x00020000
+#endif
+
/*
* The TkWinDCState is used to save the state of a device context so that it
* can be restored later.
@@ -121,6 +125,7 @@ typedef struct {
*/
#define TK_WIN_TOPLEVEL_CLASS_NAME "TkTopLevel"
+#define TK_WIN_TOPLEVEL_SHADOW_CLASS_NAME "TkTopLevelShadow"
#define TK_WIN_CHILD_CLASS_NAME "TkChild"
/*
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index b0276ea..35a8ff3 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -337,6 +337,7 @@ typedef struct TkWmInfo {
#define WM_HEIGHT_NOT_RESIZABLE (1<<11)
#define WM_WITHDRAWN (1<<12)
#define WM_FULLSCREEN (1<<13)
+#define WM_DROPSHADOW (1<<14)
/*
* Window styles for various types of toplevel windows.
@@ -936,7 +937,7 @@ InitWindowClass(
ZeroMemory(&class, sizeof(WNDCLASS));
- class.style = CS_HREDRAW | CS_VREDRAW;
+ class.style = 0;
class.hInstance = Tk_GetHINSTANCE();
Tcl_WinUtfToTChar(TK_WIN_TOPLEVEL_CLASS_NAME, -1, &classString);
class.lpszClassName = (LPCTSTR) Tcl_DStringValue(&classString);
@@ -961,6 +962,14 @@ InitWindowClass(
if (!tkWinProcs->registerClass(&class)) {
Tcl_Panic("Unable to register TkTopLevel class");
}
+ class.style = CS_DROPSHADOW;
+ Tcl_DStringFree(&classString);
+ Tcl_WinUtfToTChar(TK_WIN_TOPLEVEL_SHADOW_CLASS_NAME,
+ -1, &classString);
+ class.lpszClassName = (LPCTSTR) Tcl_DStringValue(&classString);
+ if (!(*tkWinProcs->registerClass)(&class)) {
+ Tcl_Panic("Unable to register TkTopLevelShadow class");
+ }
Tcl_DStringFree(&classString);
}
@@ -1945,6 +1954,7 @@ TkWinWmCleanup(
tsdPtr->initialized = 0;
UnregisterClass(TK_WIN_TOPLEVEL_CLASS_NAME, hInstance);
+ UnregisterClass(TK_WIN_TOPLEVEL_SHADOW_CLASS_NAME, hInstance);
}
/*
@@ -2187,7 +2197,9 @@ UpdateWrapper(
Tcl_WinUtfToTChar(((wmPtr->title != NULL) ?
wmPtr->title : winPtr->nameUid), -1, &titleString);
- Tcl_WinUtfToTChar(TK_WIN_TOPLEVEL_CLASS_NAME, -1, &classString);
+ Tcl_WinUtfToTChar(wmPtr->flags & WM_DROPSHADOW ?
+ TK_WIN_TOPLEVEL_SHADOW_CLASS_NAME :
+ TK_WIN_TOPLEVEL_CLASS_NAME, -1, &classString);
wmPtr->wrapper = tkWinProcs->createWindowEx(wmPtr->exStyle,
(LPCTSTR) Tcl_DStringValue(&classString),
@@ -3083,6 +3095,9 @@ WmAttributesCmd(
const char *string;
int i, boolean, length;
int config_fullscreen = 0, updatewrapper = 0;
+ int config_shadow = 0;
+ int shadow_attr_changed = 0;
+ int shadow_attr = 0;
int fullscreen_attr_changed = 0, fullscreen_attr = 0;
if ((objc < 3) || ((objc > 5) && ((objc%2) == 0))) {
@@ -3095,6 +3110,7 @@ WmAttributesCmd(
" ?-disabled ?bool??"
" ?-fullscreen ?bool??"
" ?-toolwindow ?bool??"
+ " ?-shadow ?bool??"
" ?-topmost ?bool??");
return TCL_ERROR;
}
@@ -3129,6 +3145,10 @@ WmAttributesCmd(
Tcl_NewStringObj("-contexthelp", -1));
Tcl_ListObjAppendElement(NULL, objPtr,
Tcl_NewBooleanObj((style & WS_EX_CONTEXTHELP)));
+ Tcl_ListObjAppendElement(NULL, objPtr,
+ Tcl_NewStringObj("-shadow", -1));
+ Tcl_ListObjAppendElement(NULL, objPtr,
+ Tcl_NewBooleanObj((wmPtr->flags & WM_DROPSHADOW)));
Tcl_SetObjResult(interp, objPtr);
return TCL_OK;
}
@@ -3148,6 +3168,9 @@ WmAttributesCmd(
} else if (strncmp(string, "-fullscreen", (unsigned) length) == 0) {
config_fullscreen = 1;
styleBit = 0;
+ } else if (strncmp(string, "-shadow", (unsigned) length) == 0) {
+ config_shadow = 1;
+ styleBit = 0;
} else if (strncmp(string,"-contexthelp", length) == 0) {
stylePtr=&exStyle;
styleBit=WS_EX_CONTEXTHELP;
@@ -3273,6 +3296,15 @@ WmAttributesCmd(
fullscreen_attr = boolean;
}
config_fullscreen = 0;
+ } else if (config_shadow) {
+ if (objc == 4) {
+ Tcl_SetBooleanObj(Tcl_GetObjResult(interp),
+ (wmPtr->flags & WM_DROPSHADOW));
+ } else {
+ shadow_attr_changed = 1;
+ shadow_attr = boolean;
+ }
+ config_shadow = 0;
} else if (objc == 4) {
Tcl_SetObjResult(interp,
Tcl_NewBooleanObj(*stylePtr & styleBit));
@@ -3350,6 +3382,16 @@ WmAttributesCmd(
TkpWmSetFullScreen(winPtr, fullscreen_attr);
}
+ if (shadow_attr_changed) {
+ if (shadow_attr) {
+ wmPtr->flags |= WM_DROPSHADOW;
+ } else {
+ wmPtr->flags &= ~WM_DROPSHADOW;
+ }
+ if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
+ UpdateWrapper(winPtr);
+ }
+ }
return TCL_OK;
}
@@ -7966,6 +8008,20 @@ WmProc(
break;
}
+ case WM_NCLBUTTONDOWN:
+ case WM_NCLBUTTONDBLCLK:
+ case WM_NCLBUTTONUP:
+ case WM_NCMBUTTONDOWN:
+ case WM_NCMBUTTONDBLCLK:
+ case WM_NCMBUTTONUP:
+ case WM_NCRBUTTONDOWN:
+ case WM_NCRBUTTONDBLCLK:
+ case WM_NCRBUTTONUP:
+ Tk_UpdatePointer(NULL, 0, 0, TkWinGetModifierState() |
+ NOCURSOR_MASK);
+ result = (*tkWinProcs->defWindowProc)(hwnd, message, wParam, lParam);
+ goto done;
+
case WM_MOUSEACTIVATE: {
winPtr = GetTopLevel((HWND) wParam);
if (winPtr && (TkGrabState(winPtr) != TK_GRAB_EXCLUDED)) {
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 40a4488..c2ee0d1 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -280,7 +280,7 @@ TkWinXInit(
tkWinProcs = &asciiProcs;
}
- childClass.style = CS_HREDRAW | CS_VREDRAW;
+ childClass.style = 0;
childClass.cbClsExtra = 0;
childClass.cbWndExtra = 0;
childClass.hInstance = hInstance;
--
1.6.6