diff options
| author | marc_culler <marc.culler@gmail.com> | 2023-12-11 02:28:43 (GMT) |
|---|---|---|
| committer | marc_culler <marc.culler@gmail.com> | 2023-12-11 02:28:43 (GMT) |
| commit | 730e3b750ea3dfdd1e339bc82743ee4d4b9bffbd (patch) | |
| tree | c891bd75c4bc34d13042ffae147599a11ce9ebab /generic/tkBind.c | |
| parent | 8a1948af29ccf03658724cf589bdf9deb773911b (diff) | |
| parent | fa30d6e92c313f3f6cfb3d1a9f99da4c04fe4022 (diff) | |
| download | tk-730e3b750ea3dfdd1e339bc82743ee4d4b9bffbd.zip tk-730e3b750ea3dfdd1e339bc82743ee4d4b9bffbd.tar.gz tk-730e3b750ea3dfdd1e339bc82743ee4d4b9bffbd.tar.bz2 | |
Merge implementation of TIP #684.
Diffstat (limited to 'generic/tkBind.c')
| -rw-r--r-- | generic/tkBind.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index acd982b..6c83dd0 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -528,6 +528,7 @@ static const EventInfo eventArray[] = { {"Activate", ActivateNotify, ActivateMask}, {"Deactivate", DeactivateNotify, ActivateMask}, {"MouseWheel", MouseWheelEvent, MouseWheelMask}, + {"TouchpadScroll", TouchpadScroll, TouchpadScrollMask}, {"CirculateRequest", CirculateRequest, SubstructureRedirectMask}, {"ConfigureRequest", ConfigureRequest, SubstructureRedirectMask}, {"Create", CreateNotify, SubstructureNotifyMask}, @@ -632,7 +633,8 @@ static const int flagArray[TK_LASTEVENT] = { /* VirtualEvent */ VIRTUAL, /* Activate */ ACTIVATE, /* Deactivate */ ACTIVATE, - /* MouseWheel */ WHEEL + /* MouseWheel */ WHEEL, + /* TouchpadScroll */ WHEEL }; /* @@ -5016,7 +5018,6 @@ ParseEventDescription( eventFlags = 0; if ((hPtr = Tcl_FindHashEntry(&eventTable, field))) { const EventInfo *eiPtr = (const EventInfo *)Tcl_GetHashValue(hPtr); - patPtr->eventType = eiPtr->type; eventFlags = flagArray[eiPtr->type]; eventMask = eiPtr->eventMask; @@ -5091,7 +5092,6 @@ ParseEventDescription( } else if (patPtr->eventType == MotionNotify) { patPtr->info = ButtonNumberFromState(patPtr->modMask); } - p = SkipFieldDelims(p); if (*p != '>') { |