diff options
| author | marc_culler <marc.culler@gmail.com> | 2023-12-11 02:43:36 (GMT) |
|---|---|---|
| committer | marc_culler <marc.culler@gmail.com> | 2023-12-11 02:43:36 (GMT) |
| commit | 0d12868cda17abd3b17555a2e1e0521a17a9e341 (patch) | |
| tree | a7c5965014e07a6e70a83d856e415343276a5527 /generic/tkBind.c | |
| parent | 68790d79d9a67fabf06124d15054c58933a5b93d (diff) | |
| parent | 730e3b750ea3dfdd1e339bc82743ee4d4b9bffbd (diff) | |
| download | tk-0d12868cda17abd3b17555a2e1e0521a17a9e341.zip tk-0d12868cda17abd3b17555a2e1e0521a17a9e341.tar.gz tk-0d12868cda17abd3b17555a2e1e0521a17a9e341.tar.bz2 | |
Merge implementation of TIP #684 from core-8-branch.
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 d62666f..2b1caff 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 != '>') { |