summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2020-05-10 21:15:36 (GMT)
committerfvogel <fvogelnew1@free.fr>2020-05-10 21:15:36 (GMT)
commit4a4d0989f729f9bcd2ba56b6cf8293c93c98f121 (patch)
tree999b064bc1ae9612f69158cbf79ed50b60fdcafa /generic
parent93f919cfa602e72d68863dcd680ef59e236dfeb1 (diff)
downloadtk-4a4d0989f729f9bcd2ba56b6cf8293c93c98f121.zip
tk-4a4d0989f729f9bcd2ba56b6cf8293c93c98f121.tar.gz
tk-4a4d0989f729f9bcd2ba56b6cf8293c93c98f121.tar.bz2
Restore distinguishing of the case of CROSSING in %x and %y substitutions.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkBind.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 9bb4f06..5561f1d 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3074,8 +3074,10 @@ ExpandPercents(
}
break;
case 'x':
- if (flags & (KEY|BUTTON|MOTION|VIRTUAL|WHEEL|CROSSING)) {
+ if (flags & (KEY|BUTTON|MOTION|VIRTUAL|WHEEL)) {
SET_NUMBER(evPtr->xkey.x);
+ } else if (flags & CROSSING) {
+ SET_NUMBER(evPtr->xcrossing.x);
} else if (flags & EXPOSE) {
SET_NUMBER(evPtr->xexpose.x);
} else if (flags & (CREATE|CONFIG|GRAVITY)) {
@@ -3089,8 +3091,10 @@ ExpandPercents(
}
break;
case 'y':
- if (flags & (KEY|BUTTON|MOTION|VIRTUAL|WHEEL|CROSSING)) {
+ if (flags & (KEY|BUTTON|MOTION|VIRTUAL|WHEEL)) {
SET_NUMBER(evPtr->xkey.y);
+ } else if (flags & CROSSING) {
+ SET_NUMBER(evPtr->xcrossing.y);
} else if (flags & EXPOSE) {
SET_NUMBER(evPtr->xexpose.y);
} else if (flags & (CREATE|CONFIG|GRAVITY)) {