Bug #5511, #5512: Print more sensible error messages when fed brokenXORG-7_0_99_901

    command lines. (Bill Crawford)

2 files changed, 22 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c7a87f5..3a1d8b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-20  Adam Jackson  <ajax@freedesktop.org>
+
+	* xrandr.c:
+	Bug #5511, #5512: Print more sensible error messages when fed broken
+	command lines.  (Bill Crawford)
+
 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/xrandr.c b/xrandr.c
index 60f3d9d..ec9586b 100644
--- a/xrandr.c
+++ b/xrandr.c
@@ -219,12 +219,15 @@ main (int argc, char **argv)
       if (sizes[size].width == width && sizes[size].height == height)
 	break;
     }
+    if (size >= nsize) {
+      fprintf (stderr,
+	       "Size %dx%d not found in available modes\n", width, height);
+      exit (1);
+    }
   }
   else if (size < 0)
     size = current_size;
 
-  if (size >= nsize) usage();
-
   if (rot < 0)
   {
     for (rot = 0; rot < 4; rot++)
@@ -241,6 +244,17 @@ main (int argc, char **argv)
     else
 	rate = 0;
   }
+  else
+  {
+    rates = XRRConfigRates (sc, size, &nrate);
+    for (i = 0; i < nrate; i++)
+      if (rate == rates[i])
+	break;
+    if (i == nrate) {
+      fprintf (stderr, "Rate %d not available for this size\n", rate);
+      exit (1);
+    }
+  }
 
   if (version) {
     int major_version, minor_version;