summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-03-26 19:23:35 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-03-27 08:55:10 -0400
commitd3487b3fd52c1361e689d28fd8fb6f6d7140825b (patch)
treec00468fe578e8d829c949bf5ec8b8913e98e72bb
parent889264a52a6cf9882b010de55d555c877dd216f3 (diff)
downloadxdpyinfo-d3487b3fd52c1361e689d28fd8fb6f6d7140825b.tar.gz
xdpyinfo-d3487b3fd52c1361e689d28fd8fb6f6d7140825b.tar.bz2
xdpyinfo-d3487b3fd52c1361e689d28fd8fb6f6d7140825b.zip
xprint: remove isPrintScreen code
The if (isPrintScreen) always evaluate to false Reviewed-by: Jeremy Huddleston <jeremyhu@freedesktop.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--xdpyinfo.c21
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);