Tk Source Code

Artifact [9d2d9a6a]
Login

Artifact 9d2d9a6a16f7359c8243155e011a400679e8ee5b:

Attachment "wmgeom.patch2" to ticket [572995ff] added by mdejong 2002-06-24 14:26:00.
2002-06-23  Mo DeJong  <[email protected]>

	* mac/tkMacWm.c (ParseGeometry): Ensure that
	x and y geom values are not negative.
	* tests/unixWm.test: Remove invalid tests that
	allow a geometry like "+5+-5". Move other test
	into wm.test.
	* tests/wm.test: Add cross platform wm geom tests.
	Check that "+-10+5" is invalid.
	* unix/tkUnixWm.c (ParseGeometry): Ensure that
	x and y geom values are not negative.
	* win/tkWinWm.c (ParseGeometry): Ditto.

Index: mac/tkMacWm.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/mac/tkMacWm.c,v
retrieving revision 1.19
diff -u -r1.19 tkMacWm.c
--- mac/tkMacWm.c	22 Jun 2002 10:13:26 -0000	1.19
+++ mac/tkMacWm.c	24 Jun 2002 07:05:21 -0000
@@ -2433,14 +2433,26 @@
 	} else if (*p != '+') {
 	    goto error;
 	}
-	x = strtol(p+1, &end, 10);
+	p++;
+	if (!isdigit(UCHAR(*p))) {
+	    goto error;
+	}
+	x = strtol(p, &end, 10);
+	if (x < 0)
+	    panic("negative x coord");
 	p = end;
 	if (*p == '-') {
 	    flags |= WM_NEGATIVE_Y;
 	} else if (*p != '+') {
 	    goto error;
 	}
-	y = strtol(p+1, &end, 10);
+	p++;
+	if (!isdigit(UCHAR(*p))) {
+	    goto error;
+	}
+	y = strtol(p, &end, 10);
+	if (y < 0)
+	    panic("negative y coord");
 	if (*end != '\0') {
 	    goto error;
 	}
Index: tests/unixWm.test
===================================================================
RCS file: /cvsroot/tktoolkit/tk/tests/unixWm.test,v
retrieving revision 1.19
diff -u -r1.19 unixWm.test
--- tests/unixWm.test	22 Jun 2002 10:13:26 -0000	1.19
+++ tests/unixWm.test	24 Jun 2002 07:05:22 -0000
@@ -1642,40 +1642,8 @@
     update
     list [winfo width .t] [winfo height .t]
 } {100 120}
-test unixWm-48.2 {ParseGeometry procedure} {
-    list [catch {wm geometry .t =10zx120} msg] $msg
-} {1 {bad geometry specifier "=10zx120"}}
-test unixWm-48.3 {ParseGeometry procedure} {
-    list [catch {wm geometry .t x120} msg] $msg
-} {1 {bad geometry specifier "x120"}}
-test unixWm-48.4 {ParseGeometry procedure} {
-    list [catch {wm geometry .t =100x120a} msg] $msg
-} {1 {bad geometry specifier "=100x120a"}}
-test unixWm-48.5 {ParseGeometry procedure} {
-    list [catch {wm geometry .t z} msg] $msg
-} {1 {bad geometry specifier "z"}}
-test unixWm-48.6 {ParseGeometry procedure} {
-    list [catch {wm geometry .t +20&} msg] $msg
-} {1 {bad geometry specifier "+20&"}}
-test unixWm-48.7 {ParseGeometry procedure} {
-    list [catch {wm geometry .t +-} msg] $msg
-} {1 {bad geometry specifier "+-"}}
-test unixWm-48.8 {ParseGeometry procedure} {
-    list [catch {wm geometry .t +20a} msg] $msg
-} {1 {bad geometry specifier "+20a"}}
-test unixWm-48.9 {ParseGeometry procedure} {
-    list [catch {wm geometry .t +20-} msg] $msg
-} {1 {bad geometry specifier "+20-"}}
-test unixWm-48.10 {ParseGeometry procedure} {
-    list [catch {wm geometry .t +20+10z} msg] $msg
-} {1 {bad geometry specifier "+20+10z"}}
-test unixWm-48.11 {ParseGeometry procedure} {
-    catch {wm geometry .t +-10+20}
-} {0}
-test unixWm-48.12 {ParseGeometry procedure} {
-    catch {wm geometry .t +30+-10}
-} {0}
-test unixWm-48.13 {ParseGeometry procedure, resize causes window to move} {
+
+test unixWm-48.2 {ParseGeometry procedure, resize causes window to move} {
     catch {destroy .t}
     toplevel .t -width 200 -height 200
     wm geom .t +0+0
Index: tests/wm.test
===================================================================
RCS file: /cvsroot/tktoolkit/tk/tests/wm.test,v
retrieving revision 1.12
diff -u -r1.12 wm.test
--- tests/wm.test	24 Jun 2002 02:17:57 -0000	1.12
+++ tests/wm.test	24 Jun 2002 07:05:26 -0000
@@ -744,6 +744,148 @@
 } {200 150}
 
 
+test wm-geometry-1.1 {usage} {
+    list [catch {wm geometry} msg]  $msg
+} {1 {wrong # args: should be "wm option window ?arg ...?"}}
+
+test wm-geometry-1.2 {usage} {
+    list [catch {wm geometry . . .} msg]  $msg
+} {1 {wrong # arguments: must be "wm geometry window ?newGeometry?"}}
+
+test wm-geometry-1.3 {usage} {
+    list [catch {wm geometry _} msg]  $msg
+} {1 {bad window path name "_"}}
+
+test wm-geometry-2.1 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t =400x400
+    update
+    lindex [split [wm geometry .t] +-] 0
+} {400x400}
+
+test wm-geometry-2.2 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t 300x300
+    update
+    lindex [split [wm geometry .t] +-] 0
+} {300x300}
+
+test wm-geometry-2.3 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t =400x400+0+0
+    update
+    wm geometry .t
+} {400x400+0+0}
+
+test wm-geometry-2.4 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t 300x300+1+1
+    update
+    wm geometry .t
+} {300x300+1+1}
+
+test wm-geometry-2.5 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t 400x400+0+0
+    update
+    wm geometry .t
+} {400x400+0+0}
+
+test wm-geometry-2.6 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t 300x300-0-0
+    update
+    wm geometry .t
+} {300x300-0-0}
+
+test wm-geometry-2.7 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t +2+2
+    update
+    set g [wm geometry .t]
+    set ind [string first + $g]
+    string range $g $ind end
+} {+2+2}
+
+test wm-geometry-2.8 {parse geometry} {
+    deleteWindows
+    toplevel .t
+    wm geometry .t -2-2
+    update
+    set g [wm geometry .t]
+    set ind [string first - $g]
+    string range $g $ind end
+} {-2-2}
+
+test wm-geometry-3.1 {parse invalid geometry} {
+    list [catch {wm geometry . HELLO} msg] $msg
+} {1 {bad geometry specifier "HELLO"}}
+
+test wm-geometry-3.2 {parse invalid geometry} {
+    list [catch {wm geometry . 1X1} msg] $msg
+} {1 {bad geometry specifier "1X1"}}
+
+test wm-geometry-3.3 {parse invalid geometry} {
+    list [catch {wm geometry . 1} msg] $msg
+} {1 {bad geometry specifier "1"}}
+
+test wm-geometry-3.4 {parse invalid geometry} {
+    list [catch {wm geometry . 1x} msg] $msg
+} {1 {bad geometry specifier "1x"}}
+
+test wm-geometry-3.5 {parse invalid geometry} {
+    list [catch {wm geometry . -1x-1} msg] $msg
+} {1 {bad geometry specifier "-1x-1"}}
+
+test wm-geometry-3.6 {parse invalid geometry} {
+    list [catch {wm geometry . +-1+1} msg] $msg
+} {1 {bad geometry specifier "+-1+1"}}
+
+test wm-geometry-3.7 {parse invalid geometry} {
+    list [catch {wm geometry . +1+-1} msg] $msg
+} {1 {bad geometry specifier "+1+-1"}}
+
+test wm-geometry-3.8 {parse invalid geometry} {
+    list [catch {wm geometry . ++1+1} msg] $msg
+} {1 {bad geometry specifier "++1+1"}}
+
+test wm-geometry-3.9 {parse invalid geometry} {
+    list [catch {wm geometry . +1++1} msg] $msg
+} {1 {bad geometry specifier "+1++1"}}
+
+test wm-geometry-3.10 {parse invalid geometry} {
+    list [catch {wm geometry . --1+1} msg] $msg
+} {1 {bad geometry specifier "--1+1"}}
+
+test wm-geometry-3.11 {parse invalid geometry} {
+    list [catch {wm geometry . +1--1} msg] $msg
+} {1 {bad geometry specifier "+1--1"}}
+
+test wm-geometry-3.12 {parse invalid geometry} {
+    list [catch {wm geometry . 1x1+1+1a} msg] $msg
+} {1 {bad geometry specifier "1x1+1+1a"}}
+
+test wm-geometry-3.13 {parse invalid geometry} {
+    list [catch {wm geometry . +1+1a} msg] $msg
+} {1 {bad geometry specifier "+1+1a"}}
+
+test wm-geometry-3.14 {parse invalid geometry} {
+    list [catch {wm geometry . +-} msg] $msg
+} {1 {bad geometry specifier "+-"}}
+
+test wm-geometry-3.15 {parse invalid geometry} {
+    list [catch {wm geometry . +20-} msg] $msg
+} {1 {bad geometry specifier "+20-"}}
+
+
+
 # FIXME:
 
 # Test delivery of virtual events to the WM. We could check to see
Index: unix/tkUnixWm.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/unix/tkUnixWm.c,v
retrieving revision 1.26
diff -u -r1.26 tkUnixWm.c
--- unix/tkUnixWm.c	24 Jun 2002 02:17:57 -0000	1.26
+++ unix/tkUnixWm.c	24 Jun 2002 07:05:29 -0000
@@ -3665,10 +3665,12 @@
 	    goto error;
 	}
 	p++;
-	if (!isdigit(UCHAR(*p)) && (*p != '-')) {
+	if (!isdigit(UCHAR(*p))) {
 	    goto error;
 	}
 	x = strtol(p, &end, 10);
+	if (x < 0)
+	    panic("negative x coord");
 	p = end;
 	if (*p == '-') {
 	    flags |= WM_NEGATIVE_Y;
@@ -3676,10 +3678,12 @@
 	    goto error;
 	}
 	p++;
-	if (!isdigit(UCHAR(*p)) && (*p != '-')) {
+	if (!isdigit(UCHAR(*p))) {
 	    goto error;
 	}
 	y = strtol(p, &end, 10);
+	if (y < 0)
+	    panic("negative y coord");
 	if (*end != '\0') {
 	    goto error;
 	}
Index: win/tkWinWm.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/win/tkWinWm.c,v
retrieving revision 1.45
diff -u -r1.45 tkWinWm.c
--- win/tkWinWm.c	24 Jun 2002 05:31:35 -0000	1.45
+++ win/tkWinWm.c	24 Jun 2002 07:05:32 -0000
@@ -4113,10 +4113,12 @@
 	    goto error;
 	}
 	p++;
-	if (!isdigit(UCHAR(*p)) && (*p != '-')) {
+	if (!isdigit(UCHAR(*p))) {
 	    goto error;
 	}
 	x = strtol(p, &end, 10);
+	if (x < 0)
+	    panic("negative x coord");
 	p = end;
 	if (*p == '-') {
 	    flags |= WM_NEGATIVE_Y;
@@ -4124,10 +4126,12 @@
 	    goto error;
 	}
 	p++;
-	if (!isdigit(UCHAR(*p)) && (*p != '-')) {
+	if (!isdigit(UCHAR(*p))) {
 	    goto error;
 	}
 	y = strtol(p, &end, 10);
+	if (y < 0)
+	    panic("negative y coord");
 	if (*end != '\0') {
 	    goto error;
 	}