diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
| commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
| tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /libXaw/src/AsciiSink.c | |
| parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
| parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
| download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'libXaw/src/AsciiSink.c')
| -rw-r--r-- | libXaw/src/AsciiSink.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libXaw/src/AsciiSink.c b/libXaw/src/AsciiSink.c index 56f899c09..d77689518 100644 --- a/libXaw/src/AsciiSink.c +++ b/libXaw/src/AsciiSink.c @@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -331,7 +331,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y, * | #### | * | #### | * | #### | - * |### | + * |### | * #### | * | | * @@ -369,7 +369,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y, c = ' '; } if (font->per_char && - (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) + (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) rbearing = font->per_char[c - font->min_char_or_byte2].rbearing - font->per_char[c - font->min_char_or_byte2].width; if (rbearing > 0) { @@ -405,7 +405,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y, c = ' '; } if (font->per_char && - (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) + (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) lbearing = font->per_char[c - font->min_char_or_byte2].lbearing; if (lbearing < 0) { paint = XtNew(XawTextPaintStruct); @@ -1707,7 +1707,7 @@ XawAsciiSinkInitialize(Widget request, Widget cnew, GetGC(sink); if (!sink->ascii_sink.font) XtError("Aborting: no font found\n"); - + sink->ascii_sink.cursor_position = 0; sink->ascii_sink.laststate = XawisOff; sink->ascii_sink.cursor_x = sink->ascii_sink.cursor_y = 0; |