stpntrmppn.m

[Geoff Clare,,,,]

Update of /cvs/xtest/xts5/tset/Xlib13/stpntrmppn
In directory kemper:/tmp/cvs-serv26279

Modified Files:
	stpntrmppn.m 
Log Message:
Patch from bug #7428 - remove MAXBUTTON=5 constraints

Index: stpntrmppn.m
===================================================================
RCS file: /cvs/xtest/xts5/tset/Xlib13/stpntrmppn/stpntrmppn.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- stpntrmppn.m	3 Nov 2005 08:42:41 -0000	1.2
+++ stpntrmppn.m	7 Dec 2006 15:52:49 -0000	1.3
@@ -31,6 +31,9 @@
 >># 
 >># Modifications:
 >># $Log$
+>># Revision 1.3  2006/12/07 15:52:49  gwc
+>># Patch from bug #7428 - remove MAXBUTTON=5 constraints
+>>#
 >># Revision 1.2  2005/11/03 08:42:41  jmichael
 >># clean up all vsw5 paths to use xts5 instead.
 >>#
@@ -107,9 +110,6 @@
 int 	nmap;
 >>EXTERN
 
-/* Maximum button number allowed. */
-#define	MAXBUTTON	5
-
 /*
  * MAPSIZE must be at least one greater than the maximum number of buttons
  * allowed.  We use a much larger value.
@@ -179,7 +179,7 @@
 	 */
 	for (i = 0; i < numbuttons; i++) {
 		map[i] = map[i] + 1;
-		if (map[i] > MAXBUTTON)
+		if (map[i] > numbuttons)
 			map[i] = 1;
 	}
 
@@ -253,7 +253,7 @@
   Report untested.
 >>CODE
 int	i;
-unsigned char zmap[5];
+unsigned char zmap[MAPSIZE];
 Window	win;
 
 	if (noext(numbuttons))
@@ -261,8 +261,8 @@
 	else
 		CHECK;
 
-	if (numbuttons<1 || numbuttons>5) {
-		report("Protocol limit of 1..5 buttons exceeded (%d).", numbuttons);
+	if (numbuttons<1 || numbuttons>MAPSIZE) {
+		report("Limit of 1..%d buttons exceeded (%d).", MAPSIZE, numbuttons);
 		return;
 	} else
 		CHECK;
@@ -358,8 +358,8 @@
 	else
 		CHECK;
 
-	if (numbuttons<1 || numbuttons>5) {
-		delete("Protocol limit of 1..5 buttons exceeded (%d).", numbuttons);
+	if (numbuttons<1 || numbuttons>MAPSIZE) {
+		delete("Limit of 1..%d buttons exceeded (%d).", MAPSIZE, numbuttons);
 		return;
 	} else
 		CHECK;