summaryrefslogtreecommitdiff
path: root/xts5/Xlib13
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-06-28 08:09:49 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-06-28 08:09:49 -0700
commit52012140bffb725452eeeeb5913b553800c4ec32 (patch)
tree25b48c88bf878d6426bd3ae3709138f0e538b902 /xts5/Xlib13
parent115dc059fd1a7d480ac37226ddf551059928d704 (diff)
parent9da20dd6962d6704f4c3517993b633392a3efadd (diff)
Merge remote branch 'whot/master'HEADmaster
Conflicts: xts5/Makefile.am Moved the DISPLAY check to the top-level Makefile.am where check-local is now defined.
Diffstat (limited to 'xts5/Xlib13')
-rw-r--r--xts5/Xlib13/XGrabButton.m5
1 files changed, 3 insertions, 2 deletions
diff --git a/xts5/Xlib13/XGrabButton.m b/xts5/Xlib13/XGrabButton.m
index 8bf89eb9..dac8535f 100644
--- a/xts5/Xlib13/XGrabButton.m
+++ b/xts5/Xlib13/XGrabButton.m
@@ -852,6 +852,7 @@ else
Report untested.
>>CODE
extern struct valname S_button[];
+extern int NS_button;
int i;
button = AnyButton;
@@ -865,7 +866,7 @@ int i;
(void) warppointer(display, grab_window, 10, 10);
- for (i = 0; i < nbuttons(); i++) {
+ for (i = 0; i < NS_button; i++) {
buttonpress(display, (unsigned int)S_button[i].val);
if (pgrabbed())
CHECK;
@@ -886,7 +887,7 @@ int i;
CHECK;
}
- CHECKPASS(1+2*nbuttons());
+ CHECKPASS(1+2*NS_button);
>>ASSERTION Good B 3
It is not required that the specified button currently be assigned
to a physical button.