summaryrefslogtreecommitdiffstats
path: root/generic/tkFocus.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-21 08:06:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-21 08:06:59 (GMT)
commit604b9d13db47430c5f580290a801beae05eef13e (patch)
tree90a40fd039da5472d189be8b8b34c440f4de0dff /generic/tkFocus.c
parentfd636b80ebd519e891807305cf5c22f69a03edd6 (diff)
parent1ad8b81988aa95d3ae080faa924677e7c9d56c1f (diff)
downloadtk-604b9d13db47430c5f580290a801beae05eef13e.zip
tk-604b9d13db47430c5f580290a801beae05eef13e.tar.gz
tk-604b9d13db47430c5f580290a801beae05eef13e.tar.bz2
same bugfix, but now applied to trunk
Diffstat (limited to 'generic/tkFocus.c')
-rw-r--r--generic/tkFocus.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tkFocus.c b/generic/tkFocus.c
index 5f68d8b..2f50009 100644
--- a/generic/tkFocus.c
+++ b/generic/tkFocus.c
@@ -715,7 +715,7 @@ TkFocusKeyEvent(
{
DisplayFocusInfo *displayFocusPtr;
TkWindow *focusWinPtr;
- int focusX, focusY, vRootX, vRootY, vRootWidth, vRootHeight;
+ int focusX, focusY;
displayFocusPtr = FindDisplayFocusInfo(winPtr->mainPtr, winPtr->dispPtr);
focusWinPtr = displayFocusPtr->focusWinPtr;
@@ -748,11 +748,9 @@ TkFocusKeyEvent(
eventPtr->xkey.x = -1;
eventPtr->xkey.y = -1;
} else {
- Tk_GetVRootGeometry((Tk_Window) focusWinPtr, &vRootX, &vRootY,
- &vRootWidth, &vRootHeight);
Tk_GetRootCoords((Tk_Window) focusWinPtr, &focusX, &focusY);
- eventPtr->xkey.x = eventPtr->xkey.x_root - vRootX - focusX;
- eventPtr->xkey.y = eventPtr->xkey.y_root - vRootY - focusY;
+ eventPtr->xkey.x = eventPtr->xkey.x_root - focusX;
+ eventPtr->xkey.y = eventPtr->xkey.y_root - focusY;
}
eventPtr->xkey.window = focusWinPtr->window;
return focusWinPtr;