[PATCH app-xdpyinfo 3/3] xprint: remove isPrintScreen code

Gaetan Nadon memsize at videotron.ca
Fri Mar 26 17:06:11 PDT 2010


The if (isPrintScreen) always evaluate to false

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 xdpyinfo.c |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/xdpyinfo.c b/xdpyinfo.c
index cf5e14c..db4a438 100644
--- a/xdpyinfo.c
+++ b/xdpyinfo.c
@@ -439,7 +439,6 @@ print_screen_info(Display *dpy, int scr)
     double xres, yres;
     int ndepths = 0, *depths = NULL;
     unsigned int width, height;
-    Bool isPrintScreen = False; /* Initialise this if |INCLUDE_XPRINT_SUPPORT| is not set */
 
     /*
      * there are 2.54 centimeters to an inch; so there are 25.4 millimeters.
@@ -456,21 +455,11 @@ print_screen_info(Display *dpy, int scr)
 
     printf ("\n");
     printf ("screen #%d:\n", scr);
-
-    if (isPrintScreen) {
-        /* Print resolution is set on a per-printer basis (per-document
-         * or per-page), the screen itself has no "default" resolution */
-        printf ("  maximum dimensions:    %dx%d pixels\n",
-	        XDisplayWidth (dpy, scr),  XDisplayHeight (dpy, scr));
-    }
-    else
-    {
-        printf ("  dimensions:    %dx%d pixels (%dx%d millimeters)\n",
-	        XDisplayWidth (dpy, scr),  XDisplayHeight (dpy, scr),
-	        XDisplayWidthMM(dpy, scr), XDisplayHeightMM (dpy, scr));
-        printf ("  resolution:    %dx%d dots per inch\n", 
-	        (int) (xres + 0.5), (int) (yres + 0.5));
-    }
+    printf ("  dimensions:    %dx%d pixels (%dx%d millimeters)\n",
+	    XDisplayWidth (dpy, scr),  XDisplayHeight (dpy, scr),
+	    XDisplayWidthMM(dpy, scr), XDisplayHeightMM (dpy, scr));
+    printf ("  resolution:    %dx%d dots per inch\n", 
+	    (int) (xres + 0.5), (int) (yres + 0.5));
     depths = XListDepths (dpy, scr, &ndepths);
     if (!depths) ndepths = 0;
     printf ("  depths (%d):    ", ndepths);
-- 
1.6.0.4



More information about the xorg-devel mailing list