Attachment "mppatch-chelp-shadow-bugfixes.patch" to
ticket [2838812f]
added by
a_kovalenko
2009-08-17 15:42:09.
diff -Naur tk/generic/tkEvent.c tk-patched-head-86/generic/tkEvent.c
--- tk/generic/tkEvent.c 2009-01-11 22:05:17.000000000 +0300
+++ tk-patched-head-86/generic/tkEvent.c 2009-08-17 11:09:52.000000000 +0400
@@ -16,6 +16,8 @@
*/
#include "tkInt.h"
+#include <tclInt.h>
+#include <signal.h>
/*
* There's a potential problem if a handler is deleted while it's current
diff -Naur tk/generic/tkInt.h tk-patched-head-86/generic/tkInt.h
--- tk/generic/tkInt.h 2009-07-02 14:34:32.000000000 +0400
+++ tk-patched-head-86/generic/tkInt.h 2009-08-17 11:10:22.000000000 +0400
@@ -939,6 +939,16 @@
#define ALT_MASK (AnyModifier<<2)
#define EXTENDED_MASK (AnyModifier<<3)
+/* The following special modifier is passed to Tk_UpdatePointer to specify
+ * that the cursor should not be changed.
+ * */
+#define NOCURSOR_MASK (AnyModifier<<4)
+
+/* The following special modifier is passed to Tk_UpdatePointer
+ * in order to update current position but not to generate button events
+ * */
+#define NOBUTTONEVENTS_MASK (AnyModifier<<5)
+
/*
* Object types not declared in tkObj.c need to be mentioned here so they can
* be properly registered with Tcl:
diff -Naur tk/generic/tkPointer.c tk-patched-head-86/generic/tkPointer.c
--- tk/generic/tkPointer.c 2009-04-10 20:20:00.000000000 +0400
+++ tk-patched-head-86/generic/tkPointer.c 2009-08-17 12:19:15.000000000 +0400
@@ -239,9 +239,25 @@
TkWindow *targetWinPtr;
XPoint pos;
XEvent event;
- int changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS;
+ int no_cursor = (state & NOCURSOR_MASK);
+ int no_button_events = (state & NOBUTTONEVENTS_MASK);
+ int changes;
int type, b, mask;
+ if (state & ALL_BUTTONS) {
+ tsdPtr->lastState &= ~NOCURSOR_MASK;
+ }
+ state &= ~NOCURSOR_MASK & ~NOBUTTONEVENTS_MASK;
+ if (no_cursor) {
+ tsdPtr->lastState = (tsdPtr->lastState & ~ALL_BUTTONS) |
+ (state & ALL_BUTTONS) | NOCURSOR_MASK;
+ return;
+ } else if (tsdPtr->lastState & NOCURSOR_MASK) {
+ tsdPtr->lastState = (tsdPtr->lastState & ~NOCURSOR_MASK & ~ALL_BUTTONS) |
+ (state & ALL_BUTTONS);
+ return;
+ }
+ changes = ( state ^ tsdPtr->lastState) & ALL_BUTTONS;
pos.x = x;
pos.y = y;
@@ -253,6 +269,11 @@
tsdPtr->lastState = (state & ~ALL_BUTTONS) | (tsdPtr->lastState
& ALL_BUTTONS);
+ if (no_button_events) {
+ tsdPtr->lastState = state;
+ return;
+ }
+
/*
* Generate Enter/Leave events. If the pointer has crossed window
* boundaries, update the current mouse position so we don't generate
diff -Naur tk/unix/tkUnixFont.c tk-patched-head-86/unix/tkUnixFont.c
--- tk/unix/tkUnixFont.c 2009-01-28 23:47:49.000000000 +0300
+++ tk-patched-head-86/unix/tkUnixFont.c 2009-08-17 11:09:52.000000000 +0400
@@ -22,7 +22,7 @@
*/
static const char *const encodingList[] = {
- "iso8859-1", "jis0208", "jis0212", NULL
+ "ucs-2be", "iso8859-1", "jis0208", "jis0212", NULL
};
/*
diff -Naur tk/unix/tkUnixRFont.c tk-patched-head-86/unix/tkUnixRFont.c
--- tk/unix/tkUnixRFont.c 2008-11-22 21:08:51.000000000 +0300
+++ tk-patched-head-86/unix/tkUnixRFont.c 2009-08-17 11:09:52.000000000 +0400
@@ -36,6 +36,9 @@
int screen;
XftDraw *ftDraw;
XftColor color;
+
+ int underline_position;
+ int underline_thickness;
} UnixFtFont;
@@ -229,6 +232,8 @@
FcCharSet *charset;
FcResult result;
XftFont *ftFont;
+ FT_Face ftFace;
+
int i;
if (!fontPtr) {
@@ -285,6 +290,25 @@
*/
ftFont = GetFont(fontPtr, 0, 0.0);
+ fontPtr->underline_position = -1;
+ fontPtr->underline_thickness = -1;
+
+ ftFace = XftLockFace(ftFont);
+ if (ftFace->face_flags & FT_FACE_FLAG_SCALABLE) {
+ fontPtr->underline_position =
+ - FT_MulFix(ftFace->underline_position,
+ ftFace->size->metrics.y_scale) / 64;
+ fontPtr->underline_thickness =
+ (32 + FT_MulFix(ftFace->underline_thickness,
+ ftFace->size->metrics.y_scale)) / 64;
+ }
+ if (fontPtr->underline_position <=0 || fontPtr->underline_thickness <=0) {
+ fontPtr->underline_position = ftFont->descent / 2;
+ fontPtr->underline_thickness = 1;
+ }
+ XftUnlockFace(ftFont);
+
+
fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
GetTkFontAttributes(ftFont, &fontPtr->font.fa);
GetTkFontMetrics(ftFont, &fontPtr->font.fm);
@@ -343,7 +367,10 @@
pattern = XftXlfdParse(name, FcFalse, FcFalse);
if (!pattern) {
- return NULL;
+ if (!strncmp("xft:",name,4))
+ pattern = FcNameParse(name+4);
+ if (!pattern)
+ return NULL;
}
/*
@@ -421,6 +448,8 @@
if (!fontPtr) {
return NULL;
}
+ fontPtr->font.fa.underline = faPtr->underline;
+ fontPtr->font.fa.overstrike = faPtr->overstrike;
return &fontPtr->font;
}
@@ -695,6 +724,16 @@
int clen, nspec;
XftGlyphFontSpec specs[NUM_SPEC];
XGlyphInfo metrics;
+ int underlinePos, overstrikePos, barHeight;
+
+ underlinePos = fontPtr->underline_position;
+ barHeight = fontPtr->underline_thickness;
+
+ if (underlinePos <= 0)
+ underlinePos = fontPtr->font.fm.descent / 2;
+ if (barHeight <= 0)
+ barHeight = 1;
+ overstrikePos = fontPtr->font.fm.descent + (fontPtr->font.fm.ascent) / 10;
if (fontPtr->ftDraw == 0) {
#if DEBUG_FONTSEL
@@ -745,6 +784,18 @@
specs[nspec].y = y;
XftGlyphExtents(fontPtr->display, ftFont, &specs[nspec].glyph, 1,
&metrics);
+ if (fontPtr->font.fa.underline != 0) {
+ XftDrawRect(fontPtr->ftDraw, &fontPtr->color,
+ x, y + underlinePos,
+ (unsigned) metrics.xOff,
+ (unsigned) barHeight);
+ }
+ if (fontPtr->font.fa.overstrike != 0) {
+ XftDrawRect(fontPtr->ftDraw, &fontPtr->color,
+ x, y - overstrikePos,
+ (unsigned) metrics.xOff,
+ (unsigned) barHeight);
+ }
x += metrics.xOff;
y += metrics.yOff;
nspec++;
diff -Naur tk/win/tkWinCursor.c tk-patched-head-86/win/tkWinCursor.c
--- tk/win/tkWinCursor.c 2009-02-23 02:39:11.000000000 +0300
+++ tk-patched-head-86/win/tkWinCursor.c 2009-08-17 11:09:52.000000000 +0400
@@ -250,6 +250,10 @@
TkpSetCursor(
TkpCursor cursor)
{
+ /* the hcursor_idc_help test is necessary for the CONTEXT HELP to work
+ by using wm attributes $window -contexthelp */
+
+ static HCURSOR hcursor_idc_help=NULL;
HCURSOR hcursor;
TkWinCursor *winCursor = (TkWinCursor *) cursor;
@@ -259,6 +263,8 @@
hcursor = winCursor->winCursor;
}
+ if (hcursor_idc_help==NULL) hcursor_idc_help=LoadCursor(NULL,IDC_HELP);
+ if (GetCursor()==hcursor_idc_help) return;
if (hcursor != NULL) {
SetCursor(hcursor);
}
diff -Naur tk/win/tkWinDialog.c tk-patched-head-86/win/tkWinDialog.c
--- tk/win/tkWinDialog.c 2009-08-03 01:40:17.000000000 +0400
+++ tk-patched-head-86/win/tkWinDialog.c 2009-08-17 12:21:37.000000000 +0400
@@ -231,15 +231,9 @@
static void
EatSpuriousMessageBugFix(void)
{
- MSG msg;
- DWORD nTime = GetTickCount() + 250;
-
- while (GetTickCount() < nTime) {
- if (PeekMessage(&msg, 0, WM_LBUTTONDOWN, WM_LBUTTONDOWN, PM_NOREMOVE)){
- break;
- }
- PeekMessage(&msg, 0, WM_LBUTTONUP, WM_LBUTTONUP, PM_REMOVE);
- }
+ int state = TkWinGetModifierState();
+ Tk_UpdatePointer(NULL,0,0, state | NOBUTTONEVENTS_MASK);
+ return;
}
/*
diff -Naur tk/win/tkWinInt.h tk-patched-head-86/win/tkWinInt.h
--- tk/win/tkWinInt.h 2008-12-10 08:02:52.000000000 +0300
+++ tk-patched-head-86/win/tkWinInt.h 2009-08-17 11:09:52.000000000 +0400
@@ -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 @@
*/
#define TK_WIN_TOPLEVEL_CLASS_NAME "TkTopLevel"
+#define TK_WIN_TOPLEVEL_SHADOW_CLASS_NAME "TkTopLevelShadow"
#define TK_WIN_CHILD_CLASS_NAME "TkChild"
/*
diff -Naur tk/win/tkWinWm.c tk-patched-head-86/win/tkWinWm.c
--- tk/win/tkWinWm.c 2009-08-11 03:16:28.000000000 +0400
+++ tk-patched-head-86/win/tkWinWm.c 2009-08-17 12:20:51.000000000 +0400
@@ -336,6 +336,7 @@
#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.
@@ -935,7 +936,7 @@
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);
@@ -960,6 +961,14 @@
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);
}
@@ -1944,6 +1953,7 @@
tsdPtr->initialized = 0;
UnregisterClass(TK_WIN_TOPLEVEL_CLASS_NAME, hInstance);
+ UnregisterClass(TK_WIN_TOPLEVEL_SHADOW_CLASS_NAME, hInstance);
}
/*
@@ -2131,7 +2141,7 @@
if (! ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE)
&& (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE))) {
wmPtr->style |= WS_THICKFRAME;
- }
+ }
} else {
wmPtr->style = WM_TOPLEVEL_STYLE;
wmPtr->exStyle = EX_TOPLEVEL_STYLE;
@@ -2186,7 +2196,9 @@
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),
@@ -3082,6 +3094,9 @@
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))) {
@@ -3089,10 +3104,12 @@
Tcl_WrongNumArgs(interp, 2, objv,
"window"
" ?-alpha ?double??"
+ " ?-contexthelp ?bool??"
" ?-transparentcolor ?color??"
" ?-disabled ?bool??"
" ?-fullscreen ?bool??"
" ?-toolwindow ?bool??"
+ " ?-shadow ?bool??"
" ?-topmost ?bool??");
return TCL_ERROR;
}
@@ -3123,6 +3140,14 @@
Tcl_NewStringObj("-topmost", -1));
Tcl_ListObjAppendElement(NULL, objPtr,
Tcl_NewBooleanObj((exStyle & WS_EX_TOPMOST)));
+ Tcl_ListObjAppendElement(NULL, objPtr,
+ 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;
}
@@ -3142,6 +3167,12 @@
} 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;
} else if ((length > 3)
&& (strncmp(string, "-toolwindow", (unsigned) length) == 0)) {
stylePtr = &exStyle;
@@ -3264,6 +3295,15 @@
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));
@@ -3341,6 +3381,16 @@
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;
}
@@ -7820,6 +7870,8 @@
* one level deep. */
LRESULT result = 0;
TkWindow *winPtr = NULL;
+ POINT point;
+ int state;
switch (message) {
case WM_KILLFOCUS:
@@ -7940,7 +7992,7 @@
result = 0;
goto done;
- case WM_NCHITTEST: {
+ case WM_NCHITTEST:
winPtr = GetTopLevel(hwnd);
if (winPtr && (TkGrabState(winPtr) == TK_GRAB_EXCLUDED)) {
/*
@@ -7955,7 +8007,20 @@
goto done;
}
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);
diff -Naur tk/win/tkWinX.c tk-patched-head-86/win/tkWinX.c
--- tk/win/tkWinX.c 2009-08-03 01:40:17.000000000 +0400
+++ tk-patched-head-86/win/tkWinX.c 2009-08-17 12:25:04.000000000 +0400
@@ -280,7 +280,7 @@
tkWinProcs = &asciiProcs;
}
- childClass.style = CS_HREDRAW | CS_VREDRAW;
+ childClass.style = 0;
childClass.cbClsExtra = 0;
childClass.cbWndExtra = 0;
childClass.hInstance = hInstance;
@@ -786,6 +786,62 @@
/*
*----------------------------------------------------------------------
*
+ * HelpEvent --
+ *
+ * Generates a "Help" virtual event. This can be used to do
+ * context-sensitive help.
+ *
+ * Results:
+ * None.
+ *
+ * Side effects:
+ * Places a virtual event on the event queue.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void
+HelpEvent (hwnd, message, wParam, lParam)
+ HWND hwnd;
+ UINT message;
+ WPARAM wParam;
+ LPARAM lParam;
+{
+ TkWindow *winPtr = (TkWindow *)Tk_HWNDToWindow(hwnd);
+ XVirtualEvent event;
+ POINTS rootPoint;
+ POINT clientPoint;
+ DWORD msgPos;
+
+ event.type = VirtualEvent;
+ event.serial = winPtr->display->request;
+ event.send_event = 0;
+ event.display = winPtr->display;
+ event.event = Tk_WindowId(winPtr);
+ event.root = XRootWindow(winPtr->display, 0);
+ event.subwindow = None;
+ event.time = TkpGetMS();
+
+ msgPos = GetMessagePos();
+ rootPoint = MAKEPOINTS(msgPos);
+ clientPoint.x = rootPoint.x;
+ clientPoint.y = rootPoint.y;
+ ScreenToClient(hwnd, &clientPoint);
+ event.x = clientPoint.x;
+ event.y = clientPoint.y;
+ event.x_root = rootPoint.x;
+ event.y_root = rootPoint.y;
+ event.state = TkWinGetModifierState();
+ event.same_screen = 1;
+ event.name = Tk_GetUid("Help");
+ event.user_data = NULL;
+ Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
+}
+
+
+/*
+ *----------------------------------------------------------------------
+ *
* TkWinChildProc --
*
* Callback from Windows whenever an event occurs on a child window.
@@ -809,6 +865,14 @@
LRESULT result;
switch (message) {
+
+ case WM_HELP:
+ Tk_UpdatePointer(NULL, 0, 0, TkWinGetModifierState() |
+ NOBUTTONEVENTS_MASK);
+ HelpEvent(hwnd, message, wParam, lParam);
+ result = DefWindowProc(hwnd, message, wParam, lParam);
+ break;
+
case WM_INPUTLANGCHANGE:
UpdateInputLanguage((int) wParam);
result = 1;