diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-07-16 17:21:42 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-07-16 17:21:42 +0000 |
commit | 274637978ee822b42a77b595e5f7f702cc7e253f (patch) | |
tree | 8ea2e06156c8d7aed9834a675b69d823bcac2ecf /app | |
parent | ff65601a1cd5163da38f2b0a348331317369be4a (diff) |
White space cleanup.
Diffstat (limited to 'app')
-rw-r--r-- | app/xtsscale/xtsscale.1 | 22 | ||||
-rw-r--r-- | app/xtsscale/xtsscale.c | 44 |
2 files changed, 33 insertions, 33 deletions
diff --git a/app/xtsscale/xtsscale.1 b/app/xtsscale/xtsscale.1 index 349877648..be9cae39a 100644 --- a/app/xtsscale/xtsscale.1 +++ b/app/xtsscale/xtsscale.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: xtsscale.1,v 1.11 2010/12/06 06:49:47 jasper Exp $ +.\" $OpenBSD: xtsscale.1,v 1.12 2011/07/16 17:21:41 matthieu Exp $ .\" .\" Copyright (c) 2007 Robert Nagy <robert@openbsd.org> .\" Copyright (c) 2009 Matthieu Herrb <matthieu@herrb.eu> @@ -24,12 +24,12 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 6 2010 $ +.Dd $Mdocdate: July 16 2011 $ .Dt XTSSCALE 1 .Os .Sh NAME .Nm xtsscale -.Nd X touch screen calibration tool +.Nd X touch screen calibration tool .Sh SYNOPSIS .Nm xtsscale .Bk -words @@ -47,8 +47,8 @@ The following options can be used: .Bl -tag -width Ds .It Fl D Ar display specify the X11 display to use. -.It Fl d Ar device -defines the name or numerical identifier of the X Input extension device +.It Fl d Ar device +defines the name or numerical identifier of the X Input extension device to calibrate. Use .Pp @@ -84,17 +84,17 @@ will exit and provide on standard output a result like the following: .Pp This result should be placed into .Pa /etc/wsconsctl.conf -for further use. +for further use. The new calibration is automatically used by the X server. -The Calibration process can be interrupted at any time using the ESC +The calibration process can be interrupted at any time using the ESC key. In this case the current screen calibration data will not be modified. .Sh NOTES -To use +To use .Nm the mode of the raw mode of the input device should be set in the .Pa /etc/X11/xorg.conf -X configuration file. See +X configuration file. See .Xr ws 4 for details. .Pp @@ -114,6 +114,6 @@ that is not the first device. ( .Xr X 7 .Sh HISTORY The -.Nm +.Nm command appeared in -.Ox 4.2 . +.Ox 4.2 . diff --git a/app/xtsscale/xtsscale.c b/app/xtsscale/xtsscale.c index a4aa44bee..8f825ac6c 100644 --- a/app/xtsscale/xtsscale.c +++ b/app/xtsscale/xtsscale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xtsscale.c,v 1.17 2011/06/28 08:18:49 jasper Exp $ */ +/* $OpenBSD: xtsscale.c,v 1.18 2011/07/16 17:21:41 matthieu Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> * Copyright (c) 2009 Matthieu Herrb <matthieu@herrb.eu> @@ -68,7 +68,7 @@ #define FONT_SIZE 14 #define Background "white" -#define TouchCross "black" +#define TouchCross "black" #define PromptText "black" #define Error "red" @@ -220,7 +220,7 @@ draw_point(int x, int y, int width, int size, XftColor *color) void draw_text(char **message, XftColor *color) { - int len; + int len; int i, x, y; XGlyphInfo extents; @@ -487,7 +487,7 @@ get_xrandr_config(Display *dpy, Window root, char *name, for (o = 0; o < res->noutput; o++) { output_info = XRRGetOutputInfo (dpy, res, res->outputs[o]); if (!output_info) { - fprintf(stderr, + fprintf(stderr, "could not get output 0x%lx information\n", res->outputs[o]); exit(2); @@ -498,7 +498,7 @@ get_xrandr_config(Display *dpy, Window root, char *name, if (!crtc_info) { fprintf(stderr, "%s: could not get crtc 0x%lx " - "information\n", __progname, + "information\n", __progname, output_info->crtc); exit(2); } @@ -589,25 +589,25 @@ main(int argc, char *argv[], char *env[]) width = DisplayWidth(display, screen); height = DisplayHeight(display, screen); - if (XRRQueryExtension(display, &event, &error)) { - int major, minor; - - if (XRRQueryVersion(display, &major, &minor) != True) { - fprintf(stderr, "Error querying XRandR version"); - } else { - printf("XRandR extension version %d.%d present\n", - major, minor); - has_xrandr = True; - if (major > 1 || (major == 1 && minor >=2)) - has_xrandr_1_2 = True; - if (major > 1 || (major == 1 && minor >=3)) - has_xrandr_1_3 = True; - } - } - + if (XRRQueryExtension(display, &event, &error)) { + int major, minor; + + if (XRRQueryVersion(display, &major, &minor) != True) { + fprintf(stderr, "Error querying XRandR version"); + } else { + printf("XRandR extension version %d.%d present\n", + major, minor); + has_xrandr = True; + if (major > 1 || (major == 1 && minor >=2)) + has_xrandr_1_2 = True; + if (major > 1 || (major == 1 && minor >=3)) + has_xrandr_1_3 = True; + } + } + if (output_name != NULL) { if (has_xrandr_1_2) { - get_xrandr_config(display, root, output_name, + get_xrandr_config(display, root, output_name, &xpos, &ypos, &width, &height); } else { fprintf(stderr, "%s: can not specify an output " |