diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-02 11:48:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-02 11:48:45 (GMT) |
| commit | acfb83993a6266257e059e30e5dffde280882c11 (patch) | |
| tree | ff59694615ea38e034d8e98a8f4b199b111e243b /generic/tkFocus.c | |
| parent | c7759d4c7d331a7db4a2b4d9cf0444cd9bcf1702 (diff) | |
| parent | f6ce17f323f35d5c06e37723848cbd7fa8f2f6fa (diff) | |
| download | tk-acfb83993a6266257e059e30e5dffde280882c11.zip tk-acfb83993a6266257e059e30e5dffde280882c11.tar.gz tk-acfb83993a6266257e059e30e5dffde280882c11.tar.bz2 | |
merge core-8-4-branch
Diffstat (limited to 'generic/tkFocus.c')
| -rw-r--r-- | generic/tkFocus.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tkFocus.c b/generic/tkFocus.c index aad1305..93e1617 100644 --- a/generic/tkFocus.c +++ b/generic/tkFocus.c @@ -737,7 +737,7 @@ TkFocusKeyEvent(winPtr, eventPtr) { DisplayFocusInfo *displayFocusPtr; TkWindow *focusWinPtr; - int focusX, focusY, vRootX, vRootY, vRootWidth, vRootHeight; + int focusX, focusY; displayFocusPtr = FindDisplayFocusInfo(winPtr->mainPtr, winPtr->dispPtr); focusWinPtr = displayFocusPtr->focusWinPtr; @@ -770,11 +770,9 @@ TkFocusKeyEvent(winPtr, eventPtr) 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; |