Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | add tk upstream changes |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
98d0400928eeb41c2bb006fcedca0172 |
User & Date: | chw 2019-05-19 05:36:04 |
Context
2019-05-21
| ||
04:49 | improve "wm attributes ... -topmost" from [c287e160cb] check-in: e7c3ae3334 user: chw tags: trunk | |
2019-05-19
| ||
05:37 | merge with trunk check-in: ec9ba40b00 user: chw tags: wtf-8-experiment | |
05:36 | add tk upstream changes check-in: 98d0400928 user: chw tags: trunk | |
2019-05-18
| ||
17:36 | handle "wm attributes ... -topmost" in SDL tk port check-in: c287e160cb user: chw tags: trunk | |
Changes
Changes to jni/sdl2tk/win/tkWinWm.c.
441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 |
static SetGestureConfigProc *pSetGestureConfig;
#ifndef TWF_FINETOUCH
#define TWF_FINETOUCH 1
#endif
#ifndef TWF_WANTPALM
#define TWF_WANTPALM 2
#endif
#ifndef TOUCH_COORD_TO_PIXEL
#define TOUCH_COORD_TO_PIXEL(c) ((c) / 100)
#endif
#endif
|
| |
441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 |
static SetGestureConfigProc *pSetGestureConfig; #ifndef TWF_FINETOUCH #define TWF_FINETOUCH 1 #endif #ifndef TWF_WANTPALM #define TWF_WANTPALM 2 #endif #ifndef TOUCH_COORD_TO_PIXEL #define TOUCH_COORD_TO_PIXEL(c) ((c) / 100) #endif #endif |
Changes to jni/sdl2tk/win/tkWinX.c.
31 32 33 34 35 36 37 38 39 40 41 42 43 44 .. 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 ... 557 558 559 560 561 562 563 564 565 566 567 568 569 570 ... 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 ... 951 952 953 954 955 956 957 958 959 960 961 962 963 964 ... 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 .... 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 .... 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 .... 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 |
/* * The zmouse.h file includes the definition for WM_MOUSEWHEEL. */ #include <zmouse.h> /* * imm.h is needed by HandleIMEComposition */ #include <imm.h> #ifdef _MSC_VER # pragma comment (lib, "imm32.lib") ................................................................................ */ typedef struct ThreadSpecificData { TkDisplay *winDisplay; /* TkDisplay structure that represents Windows * screen. */ int updatingClipboard; /* If 1, we are updating the clipboard. */ int surrogateBuffer; /* Buffer for first of surrogate pair. */ DWORD wheelTickPrev; /* For high resolution wheels. */ short wheelAcc; /* For high resolution wheels. */ } ThreadSpecificData; static Tcl_ThreadDataKey dataKey; /* * Forward declarations of functions used in this file. */ ................................................................................ const char *display_name) { Screen *screen; TkWinDrawable *twdPtr; Display *display; ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (tsdPtr->winDisplay != NULL) { if (!strcmp(tsdPtr->winDisplay->display->display_name, display_name)) { return tsdPtr->winDisplay; } else { return NULL; } ................................................................................ TkWinDisplayChanged(display); tsdPtr->winDisplay = ckalloc(sizeof(TkDisplay)); ZeroMemory(tsdPtr->winDisplay, sizeof(TkDisplay)); tsdPtr->winDisplay->display = display; tsdPtr->updatingClipboard = FALSE; tsdPtr->wheelTickPrev = GetTickCount(); tsdPtr->wheelAcc = 0; /* * Key map info must be available immediately, because of "send event". */ TkpInitKeymapInfo(tsdPtr->winDisplay); return tsdPtr->winDisplay; ................................................................................ case WM_KILLFOCUS: case WM_DESTROYCLIPBOARD: case WM_UNICHAR: case WM_CHAR: case WM_SYSKEYUP: case WM_KEYUP: case WM_MOUSEWHEEL: GenerateXEvent(hwnd, message, wParam, lParam); return 1; case WM_MENUCHAR: GenerateXEvent(hwnd, message, wParam, lParam); /* * MNC_CLOSE is the only one that looks right. This is a hack. ................................................................................ LPARAM lParam) { XEvent event; TkWindow *winPtr; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (message == WM_MOUSEWHEEL) { union {LPARAM lParam; POINTS point;} root; POINT pos; root.lParam = lParam; /* * Redirect mousewheel events to the window containing the cursor. * That feels much less strange to users, and is how all the other ................................................................................ event.type = SelectionClear; event.xselectionclear.selection = Tk_InternAtom((Tk_Window)winPtr, "CLIPBOARD"); event.xselectionclear.time = TkpGetMS(); break; case WM_MOUSEWHEEL: case WM_CHAR: case WM_UNICHAR: case WM_SYSKEYDOWN: case WM_SYSKEYUP: case WM_KEYDOWN: case WM_KEYUP: { unsigned int state = GetState(message, wParam, lParam); ................................................................................ /* * Now set up event specific fields. */ switch (message) { case WM_MOUSEWHEEL: { /* * Support for high resolution wheels. */ DWORD wheelTick = GetTickCount(); if (wheelTick - tsdPtr->wheelTickPrev < 1500) { tsdPtr->wheelAcc += (short) HIWORD(wParam); } else { tsdPtr->wheelAcc = (short) HIWORD(wParam); } tsdPtr->wheelTickPrev = wheelTick; if (abs(tsdPtr->wheelAcc) < WHEEL_DELTA) { return; } /* * We have invented a new X event type to handle this event. It * still uses the KeyPress struct. However, the keycode field has * been overloaded to hold the zDelta of the wheel. Set nbytes to ................................................................................ * 0 to prevent conversion of the keycode to a keysym in * TkpGetString. [Bug 1118340]. */ event.type = MouseWheelEvent; event.xany.send_event = -1; event.xkey.nbytes = 0; event.xkey.keycode = tsdPtr->wheelAcc / WHEEL_DELTA * WHEEL_DELTA; tsdPtr->wheelAcc = tsdPtr->wheelAcc % WHEEL_DELTA; break; } case WM_SYSKEYDOWN: case WM_KEYDOWN: /* * Check for translated characters in the event queue. Setting * xany.send_event to -1 indicates to the Windows implementation |
> > > > > > > > > | > | > > | > > | > > | > | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > |
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 .. 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 ... 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 ... 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 ... 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 .... 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 .... 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 .... 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 .... 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 |
/* * The zmouse.h file includes the definition for WM_MOUSEWHEEL. */ #include <zmouse.h> /* * WM_MOUSEHWHEEL is normally defined by Winuser.h for Vista/2008 or later, * but is also usable on 2000/XP if IntelliPoint drivers are installed. */ #ifndef WM_MOUSEHWHEEL #define WM_MOUSEHWHEEL 0x020E #endif /* * imm.h is needed by HandleIMEComposition */ #include <imm.h> #ifdef _MSC_VER # pragma comment (lib, "imm32.lib") ................................................................................ */ typedef struct ThreadSpecificData { TkDisplay *winDisplay; /* TkDisplay structure that represents Windows * screen. */ int updatingClipboard; /* If 1, we are updating the clipboard. */ int surrogateBuffer; /* Buffer for first of surrogate pair. */ DWORD vWheelTickPrev; /* For high resolution wheels (vertical). */ DWORD hWheelTickPrev; /* For high resolution wheels (horizontal). */ short vWheelAcc; /* For high resolution wheels (vertical). */ short hWheelAcc; /* For high resolution wheels (horizontal). */ } ThreadSpecificData; static Tcl_ThreadDataKey dataKey; /* * Forward declarations of functions used in this file. */ ................................................................................ const char *display_name) { Screen *screen; TkWinDrawable *twdPtr; Display *display; ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); DWORD initialWheelTick; if (tsdPtr->winDisplay != NULL) { if (!strcmp(tsdPtr->winDisplay->display->display_name, display_name)) { return tsdPtr->winDisplay; } else { return NULL; } ................................................................................ TkWinDisplayChanged(display); tsdPtr->winDisplay = ckalloc(sizeof(TkDisplay)); ZeroMemory(tsdPtr->winDisplay, sizeof(TkDisplay)); tsdPtr->winDisplay->display = display; tsdPtr->updatingClipboard = FALSE; initialWheelTick = GetTickCount(); tsdPtr->vWheelTickPrev = initialWheelTick; tsdPtr->hWheelTickPrev = initialWheelTick; tsdPtr->vWheelAcc = 0; tsdPtr->hWheelAcc = 0; /* * Key map info must be available immediately, because of "send event". */ TkpInitKeymapInfo(tsdPtr->winDisplay); return tsdPtr->winDisplay; ................................................................................ case WM_KILLFOCUS: case WM_DESTROYCLIPBOARD: case WM_UNICHAR: case WM_CHAR: case WM_SYSKEYUP: case WM_KEYUP: case WM_MOUSEWHEEL: case WM_MOUSEHWHEEL: GenerateXEvent(hwnd, message, wParam, lParam); return 1; case WM_MENUCHAR: GenerateXEvent(hwnd, message, wParam, lParam); /* * MNC_CLOSE is the only one that looks right. This is a hack. ................................................................................ LPARAM lParam) { XEvent event; TkWindow *winPtr; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if ((message == WM_MOUSEWHEEL) || (message == WM_MOUSEHWHEEL)) { union {LPARAM lParam; POINTS point;} root; POINT pos; root.lParam = lParam; /* * Redirect mousewheel events to the window containing the cursor. * That feels much less strange to users, and is how all the other ................................................................................ event.type = SelectionClear; event.xselectionclear.selection = Tk_InternAtom((Tk_Window)winPtr, "CLIPBOARD"); event.xselectionclear.time = TkpGetMS(); break; case WM_MOUSEWHEEL: case WM_MOUSEHWHEEL: case WM_CHAR: case WM_UNICHAR: case WM_SYSKEYDOWN: case WM_SYSKEYUP: case WM_KEYDOWN: case WM_KEYUP: { unsigned int state = GetState(message, wParam, lParam); ................................................................................ /* * Now set up event specific fields. */ switch (message) { case WM_MOUSEWHEEL: { /* * Support for high resolution wheels (vertical). */ DWORD wheelTick = GetTickCount(); if (wheelTick - tsdPtr->vWheelTickPrev < 1500) { tsdPtr->vWheelAcc += (short) HIWORD(wParam); } else { tsdPtr->vWheelAcc = (short) HIWORD(wParam); } tsdPtr->vWheelTickPrev = wheelTick; if (abs(tsdPtr->vWheelAcc) < WHEEL_DELTA) { return; } /* * We have invented a new X event type to handle this event. It * still uses the KeyPress struct. However, the keycode field has * been overloaded to hold the zDelta of the wheel. Set nbytes to * 0 to prevent conversion of the keycode to a keysym in * TkpGetString. [Bug 1118340]. */ event.type = MouseWheelEvent; event.xany.send_event = -1; event.xkey.nbytes = 0; event.xkey.keycode = tsdPtr->vWheelAcc / WHEEL_DELTA * WHEEL_DELTA; tsdPtr->vWheelAcc = tsdPtr->vWheelAcc % WHEEL_DELTA; break; } case WM_MOUSEHWHEEL: { /* * Support for high resolution wheels (horizontal). */ DWORD wheelTick = GetTickCount(); if (wheelTick - tsdPtr->hWheelTickPrev < 1500) { tsdPtr->hWheelAcc -= (short) HIWORD(wParam); } else { tsdPtr->hWheelAcc = -((short) HIWORD(wParam)); } tsdPtr->hWheelTickPrev = wheelTick; if (abs(tsdPtr->hWheelAcc) < WHEEL_DELTA) { return; } /* * We have invented a new X event type to handle this event. It * still uses the KeyPress struct. However, the keycode field has * been overloaded to hold the zDelta of the wheel. Set nbytes to ................................................................................ * 0 to prevent conversion of the keycode to a keysym in * TkpGetString. [Bug 1118340]. */ event.type = MouseWheelEvent; event.xany.send_event = -1; event.xkey.nbytes = 0; event.xkey.state |= ShiftMask; event.xkey.keycode = tsdPtr->hWheelAcc / WHEEL_DELTA * WHEEL_DELTA; tsdPtr->hWheelAcc = tsdPtr->hWheelAcc % WHEEL_DELTA; break; } case WM_SYSKEYDOWN: case WM_KEYDOWN: /* * Check for translated characters in the event queue. Setting * xany.send_event to -1 indicates to the Windows implementation |