jcs.org / openbsd-xenocara
mirror of OpenBSD xenocara tree github.com/openbsd/xenocara
openbsd
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Update xgc to version 1.0.6

matthieu 4d445a6d 37cbb790

+558 -295
+122 -2
app/xgc/ChangeLog
··· 1 + commit 7883d1c27a12320b2c3a03aeca573259cb60b3b0 2 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 + Date: Sat Oct 15 10:17:34 2022 -0700 4 + 5 + xgc 1.0.6 6 + 7 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8 + 9 + commit f3424f4c7c7e1aba33d0a117ea90dd5412530f45 10 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 11 + Date: Sun Apr 3 16:08:14 2022 -0700 12 + 13 + Fix -Wformat-truncation warning 14 + 15 + planemask.c: In function ‘create_planemask_choice’: 16 + planemask.c:109:43: warning: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 3 [-Wformat-truncation=] 17 + snprintf(name, sizeof name, "planemask%d",i); 18 + ^~ 19 + planemask.c:109:33: note: directive argument in the range [0, 2147483647] 20 + snprintf(name, sizeof name, "planemask%d",i); 21 + ^~~~~~~~~~~~~ 22 + planemask.c:109:5: note: ‘snprintf’ output between 11 and 20 bytes into a destination of size 12 23 + snprintf(name, sizeof name, "planemask%d",i); 24 + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 25 + 26 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 27 + 28 + commit c3e109f0bb814f2a0e3385bdada58a52473397ac 29 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 30 + Date: Sun Apr 3 16:04:34 2022 -0700 31 + 32 + Use _CONST_X_STRING to make libXt declare String as const char * 33 + 34 + Clears 57 out of 61 -Wdiscarded-qualifiers warnings from gcc 35 + 36 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 37 + 38 + commit 609dfb80abafeea1d4e757403f1cef90c87cde02 39 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 40 + Date: Mon Dec 6 12:45:35 2021 -0800 41 + 42 + Build xz tarballs instead of bzip2 43 + 44 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 45 + 46 + commit 949a0d32c94b54ecfaad80ea90dc8bbf74bb04d7 47 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 48 + Date: Mon Dec 6 12:45:31 2021 -0800 49 + 50 + gitlab CI: add a basic build test 51 + 52 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 53 + 54 + commit 684e4321fa7e96a61f45dc133816ab92a173a52d 55 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 56 + Date: Sun Nov 28 14:40:19 2021 -0800 57 + 58 + Trim trailing whitespace from lines 59 + 60 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 61 + 62 + commit 63e7fce72d704036016258b2cb55c5624f571d92 63 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 64 + Date: Sun Nov 28 14:39:06 2021 -0800 65 + 66 + Fix spelling/wording issues 67 + 68 + Found by using: 69 + codespell --builtin clear,rare,usage,informal,code,names 70 + 71 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 72 + 73 + commit 233611e5a2bc11cb0a965040166c2e4787b946a4 74 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 75 + Date: Wed Nov 21 17:06:08 2018 -0800 76 + 77 + Update configure.ac bug URL for gitlab migration 78 + 79 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 80 + 81 + commit 4786164fba556c753ba8ba2b1ffd98c1f1c70322 82 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 83 + Date: Fri Nov 16 22:14:35 2018 -0800 84 + 85 + Update README for gitlab migration 86 + 87 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 88 + 89 + commit 4c03e97932752295558f0f64c76bd23d26423e26 90 + Author: Mihail Konev <k.mvc@ya.ru> 91 + Date: Thu Jan 26 14:00:21 2017 +1000 92 + 93 + autogen: add default patch prefix 94 + 95 + Signed-off-by: Mihail Konev <k.mvc@ya.ru> 96 + 97 + commit 0d35119c5015fb47c2ec96e102f5c8dab1ead026 98 + Author: Emil Velikov <emil.l.velikov@gmail.com> 99 + Date: Mon Mar 9 12:00:52 2015 +0000 100 + 101 + autogen.sh: use quoted string variables 102 + 103 + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 104 + fall-outs, when they contain space. 105 + 106 + Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 107 + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 108 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 109 + 110 + commit d1757a5d69fbc11121bb84739359599964d13efb 111 + Author: Peter Hutterer <peter.hutterer@who-t.net> 112 + Date: Tue Jan 24 10:32:07 2017 +1000 113 + 114 + autogen.sh: use exec instead of waiting for configure to finish 115 + 116 + Syncs the invocation of configure with the one from the server. 117 + 118 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 119 + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 120 + 1 121 commit 54f109228e566759799894ff4d6ef4bac74c9aac 2 122 Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 123 Date: Thu Apr 16 23:25:45 2015 -0700 ··· 582 702 configure cache, you cache it, and the cached value is probably wrong. 583 703 584 704 commit 23e06fb205c2494dc8c44e976e27ca0a30c30ed2 585 - Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 705 + Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 586 706 Date: Thu Jul 14 22:40:16 2005 +0000 587 707 588 708 Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch 589 709 590 710 commit 07ed043059d5fc7e8d694f6814eb1ba63946d646 591 - Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 711 + Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 592 712 Date: Tue Jul 5 21:11:37 2005 +0000 593 713 594 714 Add build system for xgc
+5 -3
app/xgc/Makefile.am
··· 1 - # 1 + # 2 2 # Copyright 2005 Red Hat, Inc. 3 - # 3 + # 4 4 # Permission to use, copy, modify, distribute, and sell this software and its 5 5 # documentation for any purpose is hereby granted without fee, provided that 6 6 # the above copyright notice appear in all copies and that both that ··· 10 10 # specific, written prior permission. Red Hat makes no 11 11 # representations about the suitability of this software for any purpose. It 12 12 # is provided "as is" without express or implied warranty. 13 - # 13 + # 14 14 # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 15 15 # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO 16 16 # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR ··· 24 24 SUBDIRS = man 25 25 bin_PROGRAMS = xgc 26 26 27 + AM_CPPFLAGS = -D_CONST_X_STRING 27 28 AM_CFLAGS = $(CWARNFLAGS) $(XGC_CFLAGS) -D_BSD_SOURCE 28 29 xgc_LDADD = $(XGC_LIBS) -lm 29 30 ··· 57 58 app-defaults/Xgc-color 58 59 59 60 EXTRA_DIST = tile Bugs \ 61 + README.md \ 60 62 Written/FilledRects \ 61 63 Written/Interface \ 62 64 Written/Jim \
+10 -7
app/xgc/Makefile.in
··· 14 14 15 15 @SET_MAKE@ 16 16 17 - # 17 + # 18 18 # Copyright 2005 Red Hat, Inc. 19 - # 19 + # 20 20 # Permission to use, copy, modify, distribute, and sell this software and its 21 21 # documentation for any purpose is hereby granted without fee, provided that 22 22 # the above copyright notice appear in all copies and that both that ··· 26 26 # specific, written prior permission. Red Hat makes no 27 27 # representations about the suitability of this software for any purpose. It 28 28 # is provided "as is" without express or implied warranty. 29 - # 29 + # 30 30 # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 31 31 # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO 32 32 # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR ··· 74 74 host_triplet = @host@ 75 75 bin_PROGRAMS = xgc$(EXEEXT) 76 76 subdir = . 77 - DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \ 77 + DIST_COMMON = $(am__configure_deps) $(dist_appdefault_DATA) \ 78 78 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 79 79 $(srcdir)/config.h.in $(top_srcdir)/configure COPYING \ 80 80 ChangeLog INSTALL compile config.guess config.sub depcomp \ ··· 227 227 dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ 228 228 done; \ 229 229 reldir="$$dir2" 230 - DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 230 + DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz 231 231 GZIP_ENV = --best 232 - DIST_TARGETS = dist-bzip2 dist-gzip 232 + DIST_TARGETS = dist-xz dist-gzip 233 233 distuninstallcheck_listfiles = find . -type f -print 234 234 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 235 235 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' ··· 354 354 prefix = @prefix@ 355 355 program_transform_name = @program_transform_name@ 356 356 psdir = @psdir@ 357 + runstatedir = @runstatedir@ 357 358 sbindir = @sbindir@ 358 359 sharedstatedir = @sharedstatedir@ 359 360 srcdir = @srcdir@ ··· 364 365 top_srcdir = @top_srcdir@ 365 366 AM_YFLAGS = -d 366 367 SUBDIRS = man 368 + AM_CPPFLAGS = -D_CONST_X_STRING 367 369 AM_CFLAGS = $(CWARNFLAGS) $(XGC_CFLAGS) -D_BSD_SOURCE 368 370 xgc_LDADD = $(XGC_LIBS) -lm 369 371 xgc_SOURCES = \ ··· 392 394 app-defaults/Xgc-color 393 395 394 396 EXTRA_DIST = tile Bugs \ 397 + README.md \ 395 398 Written/FilledRects \ 396 399 Written/Interface \ 397 400 Written/Jim \ ··· 767 770 dist-gzip: distdir 768 771 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 769 772 $(am__post_remove_distdir) 773 + 770 774 dist-bzip2: distdir 771 775 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 772 776 $(am__post_remove_distdir) ··· 774 778 dist-lzip: distdir 775 779 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 776 780 $(am__post_remove_distdir) 777 - 778 781 dist-xz: distdir 779 782 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 780 783 $(am__post_remove_distdir)
-26
app/xgc/README
··· 1 - xgc is an X11 graphics demo that shows various features of the X11 2 - core protocol graphics primitives. 3 - 4 - All questions regarding this software should be directed at the 5 - Xorg mailing list: 6 - 7 - http://lists.freedesktop.org/mailman/listinfo/xorg 8 - 9 - Please submit bug reports to the Xorg bugzilla: 10 - 11 - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 12 - 13 - The master development code repository can be found at: 14 - 15 - git://anongit.freedesktop.org/git/xorg/app/xgc 16 - 17 - http://cgit.freedesktop.org/xorg/app/xgc 18 - 19 - For patch submission instructions, see: 20 - 21 - http://www.x.org/wiki/Development/Documentation/SubmittingPatches 22 - 23 - For more information on the git code manager, see: 24 - 25 - http://wiki.x.org/wiki/GitPage 26 -
+18
app/xgc/README.md
··· 1 + xgc is an X11 graphics demo that shows various features of the X11 2 + core protocol graphics primitives. 3 + 4 + All questions regarding this software should be directed at the 5 + Xorg mailing list: 6 + 7 + https://lists.x.org/mailman/listinfo/xorg 8 + 9 + The primary development code repository can be found at: 10 + 11 + https://gitlab.freedesktop.org/xorg/app/xgc 12 + 13 + Please submit bug reports and requests to merge patches there. 14 + 15 + For patch submission instructions, see: 16 + 17 + https://www.x.org/wiki/Development/Documentation/SubmittingPatches 18 +
+4 -4
app/xgc/Written/FilledRects
··· 26 26 Otherwise, the speed of a single rectangle should be about 27 27 equal to its size. 28 28 29 - Data: 29 + Data: 30 30 Pixels per second. 31 31 Average size of rectangle. 32 32 33 - GC fields: 33 + GC fields: 34 34 function: 35 35 Tiling: likely to be a lot slower, although for whole words 36 36 you're just setting it to a certain value, rather than 0. ··· 58 58 more thought has to be given to what is drawn or not. 59 59 Software vs. hardware, I suppose. 60 60 61 - Possibly 61 + Possibly 62 62 foreground: similar to plane-mask in its effect, I would think. 63 63 64 64 tile: "nice" width tiles would probably be better. A width which ··· 72 72 stipple: like tile 73 73 74 74 Other: 75 - alignment on word bounaries: fastest when one is changing whole 75 + alignment on word boundaries: fastest when one is changing whole 76 76 words at a time. That way, you're just setting whole words to 77 77 0 or ~0 and not doing any computation. A 32x1 rectangle should 78 78 be much faster than a 1x32 rectangle.
+1 -1
app/xgc/Written/Interface
··· 1 1 The command buttons at the top - 2 2 3 - Benchmark Options, Graphics Options, etc. 3 + Benchmark Options, Graphics Options, etc. 4 4 5 5 should just bring up the window, not force you to use it. 6 6
+6 -6
app/xgc/Written/Jim
··· 55 55 56 56 The Graphics Options area would contain the following entries: 57 57 58 - Function - one-of { clear, and, andReverse, copy, andInverted, noop, xor, 59 - or, nor, equiv, invert, orReverse, copyInverted, 58 + Function - one-of { clear, and, andReverse, copy, andInverted, noop, xor, 59 + or, nor, equiv, invert, orReverse, copyInverted, 60 60 orInverted, nand, set } 61 61 PlaneMask - unsigned value or many-of-n representing bits 62 62 Foreground - unsigned value in range 0..2^nplanes ··· 158 158 the application section of the benchmark as separate as possible from the 159 159 user interface. 160 160 161 - test { CopyArea, CopyPlane, PolyPoint, PolyLine, PolySegment, 161 + test { CopyArea, CopyPlane, PolyPoint, PolyLine, PolySegment, 162 162 PolyRectangle, PolyArc, FillPolygon, PolyFillRect, PolyFillArc, 163 163 PutImage, GetImage, ImageText8, PolyText8, ImageText16, 164 164 PolyText16 } ··· 177 177 - specifies the name of the file into which commands are recorded. 178 178 179 179 describe BOOLEAN 180 - - indicates whether or not a description of the test should be 180 + - indicates whether or not a description of the test should be 181 181 displayed whenever a test is selected (or when this option is 182 182 specified). 183 183 ··· 194 194 colormap is being used, the RGB value for this slot may be changed. 195 195 196 196 forecolor COLORNAME 197 - - specifies the RGB value or name of the color to be used for the 197 + - specifies the RGB value or name of the color to be used for the 198 198 foreground pixel, if settable. 199 199 200 200 backcolor COLORNAME 201 - - specifies the RGB value or name of the color to be used for the 201 + - specifies the RGB value or name of the color to be used for the 202 202 background pixel, if settable. 203 203 204 204 linewidth NUMBER
+4 -4
app/xgc/Written/Notes
··· 8 8 9 9 Data: Pixels per second. 10 10 Breaking that down into large and small areas would probably not 11 - be userful. 12 - 11 + be useful. 12 + 13 13 GC Fields: None. 14 14 15 15 ··· 22 22 as that as mentioned specifically in the protocol document. 23 23 24 24 Data: Pixels per second. 25 - 25 + 26 26 GC Fields: function (*) 27 27 plane-mask 28 28 subwindow-mode ··· 64 64 Pixels per second (is this valid - do lines that are twice as 65 65 long take twice as long to draw? Also, is it valid to compare 66 66 thin lines and fat lines?) 67 - 67 + 68 68 GC fields: function (*) 69 69 plane-mask 70 70 line-width (*)
+23 -23
app/xgc/Written/Notes2
··· 19 19 | | | | | | | | | | | | | | | | | 20 20 ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 21 21 function |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX| | | 22 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 22 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 23 23 plane_mask |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| 24 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 24 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 25 25 foreground | | |XX|**|**|**|**|**|**|**|**| |**|**|XX|XX| 26 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 26 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 27 27 background | | | |**|**|**|**|**|**|**|**| |**|**|XX|XX| 28 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 28 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 29 29 line_width | | | |XX|XX|XX|XX| | | | | | | | | | 30 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 30 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 31 31 line_style | | | |XX|XX|XX|XX| | | | | | | | | | 32 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 32 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 33 33 cap_style | | | |XX|XX| |XX| | | | | | | | | | 34 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 34 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 35 35 join_style | | | |XX| |XX|XX| | | | | | | | | | 36 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 36 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 37 37 fill_style | | | |XX|XX|XX|XX|XX|XX|XX| | |XX|XX| | | 38 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 38 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 39 39 fill_rule | | | | | | | |XX| | | | | | | | | 40 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 40 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 41 41 arc_mode | | | | | | | | | |XX| | | | | | | 42 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 42 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 43 43 tile | | | |**|**|**|**|**|**|**| | |**|**| | | 44 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 44 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 45 45 stipple | | | |**|**|**|**|**|**|**| | |**|**| | | 46 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 46 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 47 47 ts_x_origin | | | |**|**|**|**|**|**|**| | |**|**| | | 48 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 48 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 49 49 ts_y_origin | | | |**|**|**|**|**|**|**| | |**|**| | | 50 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 50 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 51 51 font | | | | | | | | | | | | |XX|XX|XX|XX| 52 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 52 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 53 53 subwindow_mode |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| 54 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 54 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 55 55 exposures |XX| | | | | | | | | | | | | | | | 56 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 56 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 57 57 clip_x_origin |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| 58 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 58 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 59 59 clip_y_origin |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| 60 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 60 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 61 61 clip_mask |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| 62 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 62 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 63 63 dash_offset | | | |**|**|**|**| | | | | | | | | | 64 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 64 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 65 65 dashes | | | |**|**|**|**| | | | | | | | | | 66 - ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 66 + ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ 67 67 68 68
+6 -6
app/xgc/Written/Outline
··· 70 70 - read from file until EOF 71 71 Quit 72 72 - quit 73 - 73 + 74 74 The toggling command buttons exist in pairs, of which only one is visible at 75 75 any one point. This makes callbacks/names of buttons easier to implement. 76 76 ··· 84 84 - call disable_gc_choices() with the GC field flags 85 85 Iterations (text) the number of times to run. 86 86 - put "iterations <>" in buffer 87 - 87 + 88 88 --- 89 89 90 90 GraphicsOptions (form) describing graphics options (owned by Toplevel?) ··· 134 134 I really need to find out how to use sources and sinks for Text widgets - 135 135 the documentation does not say how to do it. 136 136 137 - Every test will have a block of text associated with it. When a new 137 + Every test will have a block of text associated with it. When a new 138 138 benchmark is chosen, its associated text will become the source for the 139 - Description widget. Note that we don't have to worry about whether 139 + Description widget. Note that we don't have to worry about whether 140 140 Description is mapped or not; we're just setting a source. 141 141 142 142 --- ··· 165 165 1) change the buffer to the file that he wants, and 2) start reading. 166 166 The rest should be taken care of the buffer-interpreting module. 167 167 168 - RecordingOn changes the output buffer _and_ the input buffer to the 168 + RecordingOn changes the output buffer _and_ the input buffer to the 169 169 desired file. 170 - 170 + 171 171 RecordingOff changes them both back to the usual. 172 172 173 173
+1 -1
app/xgc/Written/Widget
··· 1 1 What we need is a widget which presents a collection of buttons. The user 2 - can select only one of them at a time. When one is selected, its 2 + can select only one of them at a time. When one is selected, its 3 3 foreground and background colors should be reversed and stay that way 4 4 until another one is selected. Exactly one button can be selected at 5 5 any one time.
+193 -93
app/xgc/aclocal.m4
··· 19 19 If you have problems, you may need to regenerate the build system entirely. 20 20 To do so, use the procedure documented by the package, typically 'autoreconf'.])]) 21 21 22 - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 - # serial 1 (pkg-config-0.24) 24 - # 25 - # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 - # 27 - # This program is free software; you can redistribute it and/or modify 28 - # it under the terms of the GNU General Public License as published by 29 - # the Free Software Foundation; either version 2 of the License, or 30 - # (at your option) any later version. 31 - # 32 - # This program is distributed in the hope that it will be useful, but 33 - # WITHOUT ANY WARRANTY; without even the implied warranty of 34 - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 35 - # General Public License for more details. 36 - # 37 - # You should have received a copy of the GNU General Public License 38 - # along with this program; if not, write to the Free Software 39 - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 40 - # 41 - # As a special exception to the GNU General Public License, if you 42 - # distribute this file as part of a program that contains a 43 - # configuration script generated by Autoconf, you may include it under 44 - # the same distribution terms that you use for the rest of that program. 22 + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 + # serial 12 (pkg-config-0.29.2) 45 24 46 - # PKG_PROG_PKG_CONFIG([MIN-VERSION]) 47 - # ---------------------------------- 25 + dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 + dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 27 + dnl 28 + dnl This program is free software; you can redistribute it and/or modify 29 + dnl it under the terms of the GNU General Public License as published by 30 + dnl the Free Software Foundation; either version 2 of the License, or 31 + dnl (at your option) any later version. 32 + dnl 33 + dnl This program is distributed in the hope that it will be useful, but 34 + dnl WITHOUT ANY WARRANTY; without even the implied warranty of 35 + dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 36 + dnl General Public License for more details. 37 + dnl 38 + dnl You should have received a copy of the GNU General Public License 39 + dnl along with this program; if not, write to the Free Software 40 + dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 41 + dnl 02111-1307, USA. 42 + dnl 43 + dnl As a special exception to the GNU General Public License, if you 44 + dnl distribute this file as part of a program that contains a 45 + dnl configuration script generated by Autoconf, you may include it under 46 + dnl the same distribution terms that you use for the rest of that 47 + dnl program. 48 + 49 + dnl PKG_PREREQ(MIN-VERSION) 50 + dnl ----------------------- 51 + dnl Since: 0.29 52 + dnl 53 + dnl Verify that the version of the pkg-config macros are at least 54 + dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's 55 + dnl installed version of pkg-config, this checks the developer's version 56 + dnl of pkg.m4 when generating configure. 57 + dnl 58 + dnl To ensure that this macro is defined, also add: 59 + dnl m4_ifndef([PKG_PREREQ], 60 + dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) 61 + dnl 62 + dnl See the "Since" comment for each macro you use to see what version 63 + dnl of the macros you require. 64 + m4_defun([PKG_PREREQ], 65 + [m4_define([PKG_MACROS_VERSION], [0.29.2]) 66 + m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, 67 + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) 68 + ])dnl PKG_PREREQ 69 + 70 + dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) 71 + dnl ---------------------------------- 72 + dnl Since: 0.16 73 + dnl 74 + dnl Search for the pkg-config tool and set the PKG_CONFIG variable to 75 + dnl first found in the path. Checks that the version of pkg-config found 76 + dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is 77 + dnl used since that's the first version where most current features of 78 + dnl pkg-config existed. 48 79 AC_DEFUN([PKG_PROG_PKG_CONFIG], 49 80 [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 50 81 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) ··· 66 97 PKG_CONFIG="" 67 98 fi 68 99 fi[]dnl 69 - ])# PKG_PROG_PKG_CONFIG 100 + ])dnl PKG_PROG_PKG_CONFIG 70 101 71 - # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 72 - # 73 - # Check to see whether a particular set of modules exists. Similar 74 - # to PKG_CHECK_MODULES(), but does not set variables or print errors. 75 - # 76 - # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 77 - # only at the first occurence in configure.ac, so if the first place 78 - # it's called might be skipped (such as if it is within an "if", you 79 - # have to call PKG_CHECK_EXISTS manually 80 - # -------------------------------------------------------------- 102 + dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 103 + dnl ------------------------------------------------------------------- 104 + dnl Since: 0.18 105 + dnl 106 + dnl Check to see whether a particular set of modules exists. Similar to 107 + dnl PKG_CHECK_MODULES(), but does not set variables or print errors. 108 + dnl 109 + dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 110 + dnl only at the first occurence in configure.ac, so if the first place 111 + dnl it's called might be skipped (such as if it is within an "if", you 112 + dnl have to call PKG_CHECK_EXISTS manually 81 113 AC_DEFUN([PKG_CHECK_EXISTS], 82 114 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 83 115 if test -n "$PKG_CONFIG" && \ ··· 87 119 $3])dnl 88 120 fi]) 89 121 90 - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 91 - # --------------------------------------------- 122 + dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 123 + dnl --------------------------------------------- 124 + dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting 125 + dnl pkg_failed based on the result. 92 126 m4_define([_PKG_CONFIG], 93 127 [if test -n "$$1"; then 94 128 pkg_cv_[]$1="$$1" ··· 100 134 else 101 135 pkg_failed=untried 102 136 fi[]dnl 103 - ])# _PKG_CONFIG 137 + ])dnl _PKG_CONFIG 104 138 105 - # _PKG_SHORT_ERRORS_SUPPORTED 106 - # ----------------------------- 139 + dnl _PKG_SHORT_ERRORS_SUPPORTED 140 + dnl --------------------------- 141 + dnl Internal check to see if pkg-config supports short errors. 107 142 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], 108 143 [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 109 144 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 111 146 else 112 147 _pkg_short_errors_supported=no 113 148 fi[]dnl 114 - ])# _PKG_SHORT_ERRORS_SUPPORTED 149 + ])dnl _PKG_SHORT_ERRORS_SUPPORTED 115 150 116 151 117 - # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 118 - # [ACTION-IF-NOT-FOUND]) 119 - # 120 - # 121 - # Note that if there is a possibility the first call to 122 - # PKG_CHECK_MODULES might not happen, you should be sure to include an 123 - # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 124 - # 125 - # 126 - # -------------------------------------------------------------- 152 + dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 153 + dnl [ACTION-IF-NOT-FOUND]) 154 + dnl -------------------------------------------------------------- 155 + dnl Since: 0.4.0 156 + dnl 157 + dnl Note that if there is a possibility the first call to 158 + dnl PKG_CHECK_MODULES might not happen, you should be sure to include an 159 + dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 127 160 AC_DEFUN([PKG_CHECK_MODULES], 128 161 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 129 162 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl 130 163 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl 131 164 132 165 pkg_failed=no 133 - AC_MSG_CHECKING([for $1]) 166 + AC_MSG_CHECKING([for $2]) 134 167 135 168 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) 136 169 _PKG_CONFIG([$1][_LIBS], [libs], [$2]) ··· 140 173 See the pkg-config man page for more details.]) 141 174 142 175 if test $pkg_failed = yes; then 143 - AC_MSG_RESULT([no]) 176 + AC_MSG_RESULT([no]) 144 177 _PKG_SHORT_ERRORS_SUPPORTED 145 178 if test $_pkg_short_errors_supported = yes; then 146 179 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` 147 - else 180 + else 148 181 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` 149 182 fi 150 183 # Put the nasty error message in config.log where it belongs ··· 161 194 _PKG_TEXT])[]dnl 162 195 ]) 163 196 elif test $pkg_failed = untried; then 164 - AC_MSG_RESULT([no]) 197 + AC_MSG_RESULT([no]) 165 198 m4_default([$4], [AC_MSG_FAILURE( 166 199 [The pkg-config script could not be found or is too old. Make sure it 167 200 is in your PATH or set the PKG_CONFIG environment variable to the full ··· 177 210 AC_MSG_RESULT([yes]) 178 211 $3 179 212 fi[]dnl 180 - ])# PKG_CHECK_MODULES 213 + ])dnl PKG_CHECK_MODULES 181 214 182 215 183 - # PKG_INSTALLDIR(DIRECTORY) 184 - # ------------------------- 185 - # Substitutes the variable pkgconfigdir as the location where a module 186 - # should install pkg-config .pc files. By default the directory is 187 - # $libdir/pkgconfig, but the default can be changed by passing 188 - # DIRECTORY. The user can override through the --with-pkgconfigdir 189 - # parameter. 216 + dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 217 + dnl [ACTION-IF-NOT-FOUND]) 218 + dnl --------------------------------------------------------------------- 219 + dnl Since: 0.29 220 + dnl 221 + dnl Checks for existence of MODULES and gathers its build flags with 222 + dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags 223 + dnl and VARIABLE-PREFIX_LIBS from --libs. 224 + dnl 225 + dnl Note that if there is a possibility the first call to 226 + dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to 227 + dnl include an explicit call to PKG_PROG_PKG_CONFIG in your 228 + dnl configure.ac. 229 + AC_DEFUN([PKG_CHECK_MODULES_STATIC], 230 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 231 + _save_PKG_CONFIG=$PKG_CONFIG 232 + PKG_CONFIG="$PKG_CONFIG --static" 233 + PKG_CHECK_MODULES($@) 234 + PKG_CONFIG=$_save_PKG_CONFIG[]dnl 235 + ])dnl PKG_CHECK_MODULES_STATIC 236 + 237 + 238 + dnl PKG_INSTALLDIR([DIRECTORY]) 239 + dnl ------------------------- 240 + dnl Since: 0.27 241 + dnl 242 + dnl Substitutes the variable pkgconfigdir as the location where a module 243 + dnl should install pkg-config .pc files. By default the directory is 244 + dnl $libdir/pkgconfig, but the default can be changed by passing 245 + dnl DIRECTORY. The user can override through the --with-pkgconfigdir 246 + dnl parameter. 190 247 AC_DEFUN([PKG_INSTALLDIR], 191 248 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) 192 249 m4_pushdef([pkg_description], ··· 197 254 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) 198 255 m4_popdef([pkg_default]) 199 256 m4_popdef([pkg_description]) 200 - ]) dnl PKG_INSTALLDIR 257 + ])dnl PKG_INSTALLDIR 201 258 202 259 203 - # PKG_NOARCH_INSTALLDIR(DIRECTORY) 204 - # ------------------------- 205 - # Substitutes the variable noarch_pkgconfigdir as the location where a 206 - # module should install arch-independent pkg-config .pc files. By 207 - # default the directory is $datadir/pkgconfig, but the default can be 208 - # changed by passing DIRECTORY. The user can override through the 209 - # --with-noarch-pkgconfigdir parameter. 260 + dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) 261 + dnl -------------------------------- 262 + dnl Since: 0.27 263 + dnl 264 + dnl Substitutes the variable noarch_pkgconfigdir as the location where a 265 + dnl module should install arch-independent pkg-config .pc files. By 266 + dnl default the directory is $datadir/pkgconfig, but the default can be 267 + dnl changed by passing DIRECTORY. The user can override through the 268 + dnl --with-noarch-pkgconfigdir parameter. 210 269 AC_DEFUN([PKG_NOARCH_INSTALLDIR], 211 270 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) 212 271 m4_pushdef([pkg_description], ··· 217 276 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) 218 277 m4_popdef([pkg_default]) 219 278 m4_popdef([pkg_description]) 220 - ]) dnl PKG_NOARCH_INSTALLDIR 279 + ])dnl PKG_NOARCH_INSTALLDIR 280 + 281 + 282 + dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, 283 + dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 284 + dnl ------------------------------------------- 285 + dnl Since: 0.28 286 + dnl 287 + dnl Retrieves the value of the pkg-config variable for the given module. 288 + AC_DEFUN([PKG_CHECK_VAR], 289 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 290 + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 291 + 292 + _PKG_CONFIG([$1], [variable="][$3]["], [$2]) 293 + AS_VAR_COPY([$1], [pkg_cv_][$1]) 294 + 295 + AS_VAR_IF([$1], [""], [$5], [$4])dnl 296 + ])dnl PKG_CHECK_VAR 221 297 222 298 # Copyright (C) 2002-2012 Free Software Foundation, Inc. 223 299 # ··· 1242 1318 1243 1319 dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. 1244 1320 dnl 1245 - dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. 1321 + dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 1246 1322 dnl 1247 1323 dnl Permission is hereby granted, free of charge, to any person obtaining a 1248 1324 dnl copy of this software and associated documentation files (the "Software"), ··· 1279 1355 # See the "minimum version" comment for each macro you use to see what 1280 1356 # version you require. 1281 1357 m4_defun([XORG_MACROS_VERSION],[ 1282 - m4_define([vers_have], [1.19.0]) 1358 + m4_define([vers_have], [1.19.2]) 1283 1359 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) 1284 1360 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) 1285 1361 m4_if(m4_cmp(maj_have, maj_needed), 0,, ··· 1356 1432 AC_DEFUN([XORG_MANPAGE_SECTIONS],[ 1357 1433 AC_REQUIRE([AC_CANONICAL_HOST]) 1358 1434 AC_REQUIRE([AC_PROG_SED]) 1435 + 1436 + case $host_os in 1437 + solaris*) 1438 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 1439 + # check for a man page file found in later versions that use 1440 + # traditional section numbers instead 1441 + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], 1442 + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) 1443 + ;; 1444 + *) SYSV_MAN_SECTIONS=false ;; 1445 + esac 1359 1446 1360 1447 if test x$APP_MAN_SUFFIX = x ; then 1361 1448 APP_MAN_SUFFIX=1 ··· 1372 1459 fi 1373 1460 1374 1461 if test x$FILE_MAN_SUFFIX = x ; then 1375 - case $host_os in 1376 - solaris*) FILE_MAN_SUFFIX=4 ;; 1377 - *) FILE_MAN_SUFFIX=5 ;; 1462 + case $SYSV_MAN_SECTIONS in 1463 + true) FILE_MAN_SUFFIX=4 ;; 1464 + *) FILE_MAN_SUFFIX=5 ;; 1378 1465 esac 1379 1466 fi 1380 1467 if test x$FILE_MAN_DIR = x ; then ··· 1382 1469 fi 1383 1470 1384 1471 if test x$MISC_MAN_SUFFIX = x ; then 1385 - case $host_os in 1386 - solaris*) MISC_MAN_SUFFIX=5 ;; 1387 - *) MISC_MAN_SUFFIX=7 ;; 1472 + case $SYSV_MAN_SECTIONS in 1473 + true) MISC_MAN_SUFFIX=5 ;; 1474 + *) MISC_MAN_SUFFIX=7 ;; 1388 1475 esac 1389 1476 fi 1390 1477 if test x$MISC_MAN_DIR = x ; then ··· 1392 1479 fi 1393 1480 1394 1481 if test x$DRIVER_MAN_SUFFIX = x ; then 1395 - case $host_os in 1396 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 1397 - *) DRIVER_MAN_SUFFIX=4 ;; 1482 + case $SYSV_MAN_SECTIONS in 1483 + true) DRIVER_MAN_SUFFIX=7 ;; 1484 + *) DRIVER_MAN_SUFFIX=4 ;; 1398 1485 esac 1399 1486 fi 1400 1487 if test x$DRIVER_MAN_DIR = x ; then ··· 1402 1489 fi 1403 1490 1404 1491 if test x$ADMIN_MAN_SUFFIX = x ; then 1405 - case $host_os in 1406 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 1407 - *) ADMIN_MAN_SUFFIX=8 ;; 1492 + case $SYSV_MAN_SECTIONS in 1493 + true) ADMIN_MAN_SUFFIX=1m ;; 1494 + *) ADMIN_MAN_SUFFIX=8 ;; 1408 1495 esac 1409 1496 fi 1410 1497 if test x$ADMIN_MAN_DIR = x ; then ··· 1665 1752 fi]) 1666 1753 1667 1754 # Test for the ability of xmlto to generate a text target 1755 + # 1756 + # NOTE: xmlto 0.0.27 or higher return a non-zero return code in the 1757 + # following test for empty XML docbook files. 1758 + # For compatibility reasons use the following empty XML docbook file and if 1759 + # it fails try it again with a non-empty XML file. 1668 1760 have_xmlto_text=no 1669 1761 cat > conftest.xml << "EOF" 1670 1762 EOF 1671 1763 AS_IF([test "$have_xmlto" = yes], 1672 1764 [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 1673 1765 [have_xmlto_text=yes], 1674 - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) 1766 + [# Try it again with a non-empty XML file. 1767 + cat > conftest.xml << "EOF" 1768 + <x></x> 1769 + EOF 1770 + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 1771 + [have_xmlto_text=yes], 1772 + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) 1675 1773 rm -f conftest.xml 1676 1774 AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) 1677 1775 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ··· 3067 3165 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 3068 3166 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 3069 3167 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 3070 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 3071 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 3168 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 3169 + touch \$(top_srcdir)/INSTALL; \ 3170 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 3072 3171 AC_SUBST([INSTALL_CMD]) 3073 3172 ]) # XORG_INSTALL 3074 3173 dnl Copyright 2005 Red Hat, Inc ··· 3129 3228 # 3130 3229 # 3131 3230 AC_DEFUN([XORG_CHANGELOG], [ 3132 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 3231 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 3133 3232 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 3134 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 3135 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 3233 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 3234 + touch \$(top_srcdir)/ChangeLog; \ 3235 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 3136 3236 AC_SUBST([CHANGELOG_CMD]) 3137 3237 ]) # XORG_CHANGELOG 3138 3238
+8 -8
app/xgc/choice.c
··· 52 52 ** toggle widget is selected. */ 53 53 54 54 /* ArgList for the label widget */ 55 - static Arg labelargs[] = { 56 - {XtNborderWidth, (XtArgVal) 0}, 55 + static Arg labelargs[] = { 56 + {XtNborderWidth, (XtArgVal) 0}, 57 57 {XtNjustify, (XtArgVal) XtJustifyRight}, 58 58 {XtNvertDistance, (XtArgVal) 4} 59 59 }; ··· 76 76 77 77 /* Allocate space for the widgets and initialize choice */ 78 78 choice = (ChoiceDesc *) XtMalloc(sizeof(ChoiceDesc)); 79 - choice->widgets = (WidgetList) XtMalloc(sizeof(Widget) * 79 + choice->widgets = (WidgetList) XtMalloc(sizeof(Widget) * 80 80 info->choice.num_toggles); 81 81 choice->size = info->choice.num_toggles; 82 82 choice->label = XtCreateManagedWidget(info->choice.name,labelWidgetClass,w, ··· 97 97 else { 98 98 toggleargs[4].value = (XtArgVal) choice->widgets[0]; 99 99 /* are we starting a new row? */ 100 - if (info->choice.columns > 0 && 101 - i > 1 && 100 + if (info->choice.columns > 0 && 101 + i > 1 && 102 102 (i % (info->choice.columns) == 0)) { 103 103 toggleargs[0].value = (XtArgVal) choice->label; 104 104 /* under the appropriate toggle */ ··· 130 130 strcat(text, (info->data)[i].text); 131 131 strcat(text, "\n"); 132 132 callbacklist[0].closure = (caddr_t) text; 133 - 133 + 134 134 /* Create it finally */ 135 - choice->widgets[i] = XtCreateManagedWidget((info->data[i]).name, 135 + choice->widgets[i] = XtCreateManagedWidget((info->data[i]).name, 136 136 toggleWidgetClass, 137 137 w, 138 138 toggleargs, 139 139 XtNumber(toggleargs)); 140 140 } 141 - 141 + 142 142 /* The toggle widgets have all been created; 143 143 ** now make the all the same width if that's 144 144 ** what we want to do. */
+9 -8
app/xgc/compile
··· 1 1 #! /bin/sh 2 2 # Wrapper for compilers which do not understand '-c -o'. 3 3 4 - scriptversion=2012-10-14.11; # UTC 4 + scriptversion=2018-03-07.03; # UTC 5 5 6 - # Copyright (C) 1999-2014 Free Software Foundation, Inc. 6 + # Copyright (C) 1999-2021 Free Software Foundation, Inc. 7 7 # Written by Tom Tromey <tromey@cygnus.com>. 8 8 # 9 9 # This program is free software; you can redistribute it and/or modify ··· 17 17 # GNU General Public License for more details. 18 18 # 19 19 # You should have received a copy of the GNU General Public License 20 - # along with this program. If not, see <http://www.gnu.org/licenses/>. 20 + # along with this program. If not, see <https://www.gnu.org/licenses/>. 21 21 22 22 # As a special exception to the GNU General Public License, if you 23 23 # distribute this file as part of a program that contains a ··· 53 53 MINGW*) 54 54 file_conv=mingw 55 55 ;; 56 - CYGWIN*) 56 + CYGWIN* | MSYS*) 57 57 file_conv=cygwin 58 58 ;; 59 59 *) ··· 67 67 mingw/*) 68 68 file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` 69 69 ;; 70 - cygwin/*) 70 + cygwin/* | msys/*) 71 71 file=`cygpath -m "$file" || echo "$file"` 72 72 ;; 73 73 wine/*) ··· 255 255 echo "compile $scriptversion" 256 256 exit $? 257 257 ;; 258 - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) 258 + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ 259 + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) 259 260 func_cl_wrapper "$@" # Doesn't return... 260 261 ;; 261 262 esac ··· 339 340 # Local Variables: 340 341 # mode: shell-script 341 342 # sh-indentation: 2 342 - # eval: (add-hook 'write-file-hooks 'time-stamp) 343 + # eval: (add-hook 'before-save-hook 'time-stamp) 343 344 # time-stamp-start: "scriptversion=" 344 345 # time-stamp-format: "%:y-%02m-%02d.%02H" 345 - # time-stamp-time-zone: "UTC" 346 + # time-stamp-time-zone: "UTC0" 346 347 # time-stamp-end: "; # UTC" 347 348 # End: 348 349 #! /bin/sh
+81 -37
app/xgc/configure
··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 - # Generated by GNU Autoconf 2.69 for xgc 1.0.5. 3 + # Generated by GNU Autoconf 2.69 for xgc 1.0.6. 4 4 # 5 - # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 5 + # Report bugs to <https://gitlab.freedesktop.org/xorg/app/xgc/-/issues>. 6 6 # 7 7 # 8 8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ··· 267 267 $as_echo "$0: be upgraded to zsh 4.3.4 or later." 268 268 else 269 269 $as_echo "$0: Please tell bug-autoconf@gnu.org and 270 - $0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 270 + $0: https://gitlab.freedesktop.org/xorg/app/xgc/-/issues 271 271 $0: about your system, including any error possibly output 272 272 $0: before this message. Then install a modern shell, or 273 273 $0: manually run the script under such a shell if you do ··· 581 581 # Identity of this package. 582 582 PACKAGE_NAME='xgc' 583 583 PACKAGE_TARNAME='xgc' 584 - PACKAGE_VERSION='1.0.5' 585 - PACKAGE_STRING='xgc 1.0.5' 586 - PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' 584 + PACKAGE_VERSION='1.0.6' 585 + PACKAGE_STRING='xgc 1.0.6' 586 + PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xgc/-/issues' 587 587 PACKAGE_URL='' 588 588 589 589 ac_unique_file="Makefile.am" ··· 736 736 docdir 737 737 oldincludedir 738 738 includedir 739 + runstatedir 739 740 localstatedir 740 741 sharedstatedir 741 742 sysconfdir ··· 819 820 sysconfdir='${prefix}/etc' 820 821 sharedstatedir='${prefix}/com' 821 822 localstatedir='${prefix}/var' 823 + runstatedir='${localstatedir}/run' 822 824 includedir='${prefix}/include' 823 825 oldincludedir='/usr/include' 824 826 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ··· 1071 1073 | -silent | --silent | --silen | --sile | --sil) 1072 1074 silent=yes ;; 1073 1075 1076 + -runstatedir | --runstatedir | --runstatedi | --runstated \ 1077 + | --runstate | --runstat | --runsta | --runst | --runs \ 1078 + | --run | --ru | --r) 1079 + ac_prev=runstatedir ;; 1080 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 1081 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 1082 + | --run=* | --ru=* | --r=*) 1083 + runstatedir=$ac_optarg ;; 1084 + 1074 1085 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1075 1086 ac_prev=sbindir ;; 1076 1087 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ··· 1208 1219 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1209 1220 datadir sysconfdir sharedstatedir localstatedir includedir \ 1210 1221 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1211 - libdir localedir mandir 1222 + libdir localedir mandir runstatedir 1212 1223 do 1213 1224 eval ac_val=\$$ac_var 1214 1225 # Remove trailing slashes. ··· 1321 1332 # Omit some internal or obsolete options to make the list less imposing. 1322 1333 # This message is too long to be a string in the A/UX 3.1 sh. 1323 1334 cat <<_ACEOF 1324 - \`configure' configures xgc 1.0.5 to adapt to many kinds of systems. 1335 + \`configure' configures xgc 1.0.6 to adapt to many kinds of systems. 1325 1336 1326 1337 Usage: $0 [OPTION]... [VAR=VALUE]... 1327 1338 ··· 1361 1372 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1362 1373 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1363 1374 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1375 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 1364 1376 --libdir=DIR object code libraries [EPREFIX/lib] 1365 1377 --includedir=DIR C header files [PREFIX/include] 1366 1378 --oldincludedir=DIR C header files for non-gcc [/usr/include] ··· 1391 1403 1392 1404 if test -n "$ac_init_help"; then 1393 1405 case $ac_init_help in 1394 - short | recursive ) echo "Configuration of xgc 1.0.5:";; 1406 + short | recursive ) echo "Configuration of xgc 1.0.6:";; 1395 1407 esac 1396 1408 cat <<\_ACEOF 1397 1409 ··· 1448 1460 Use these variables to override the choices made by `configure' or to help 1449 1461 it to find libraries and programs with nonstandard names/locations. 1450 1462 1451 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 1463 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/xgc/-/issues>. 1452 1464 _ACEOF 1453 1465 ac_status=$? 1454 1466 fi ··· 1511 1523 test -n "$ac_init_help" && exit $ac_status 1512 1524 if $ac_init_version; then 1513 1525 cat <<\_ACEOF 1514 - xgc configure 1.0.5 1526 + xgc configure 1.0.6 1515 1527 generated by GNU Autoconf 2.69 1516 1528 1517 1529 Copyright (C) 2012 Free Software Foundation, Inc. ··· 1768 1780 This file contains any messages produced by compilers while 1769 1781 running configure, to aid debugging if configure makes a mistake. 1770 1782 1771 - It was created by xgc $as_me 1.0.5, which was 1783 + It was created by xgc $as_me 1.0.6, which was 1772 1784 generated by GNU Autoconf 2.69. Invocation command line was 1773 1785 1774 1786 $ $0 $@ ··· 2597 2609 2598 2610 # Define the identity of the package. 2599 2611 PACKAGE='xgc' 2600 - VERSION='1.0.5' 2612 + VERSION='1.0.6' 2601 2613 2602 2614 2603 2615 cat >>confdefs.h <<_ACEOF ··· 10241 10253 10242 10254 10243 10255 10244 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 10256 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 10245 10257 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 10246 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 10247 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 10258 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 10259 + touch \$(top_srcdir)/ChangeLog; \ 10260 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 10248 10261 10249 10262 10250 10263 ··· 10252 10265 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 10253 10266 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 10254 10267 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 10255 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 10256 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 10268 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 10269 + touch \$(top_srcdir)/INSTALL; \ 10270 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 10257 10271 10258 10272 10259 10273 10260 10274 10261 10275 10262 10276 10277 + case $host_os in 10278 + solaris*) 10279 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 10280 + # check for a man page file found in later versions that use 10281 + # traditional section numbers instead 10282 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 10283 + $as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } 10284 + if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : 10285 + $as_echo_n "(cached) " >&6 10286 + else 10287 + test "$cross_compiling" = yes && 10288 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 10289 + if test -r "/usr/share/man/man7/attributes.7"; then 10290 + ac_cv_file__usr_share_man_man7_attributes_7=yes 10291 + else 10292 + ac_cv_file__usr_share_man_man7_attributes_7=no 10293 + fi 10294 + fi 10295 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 10296 + $as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } 10297 + if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : 10298 + SYSV_MAN_SECTIONS=false 10299 + else 10300 + SYSV_MAN_SECTIONS=true 10301 + fi 10302 + 10303 + ;; 10304 + *) SYSV_MAN_SECTIONS=false ;; 10305 + esac 10306 + 10263 10307 if test x$APP_MAN_SUFFIX = x ; then 10264 10308 APP_MAN_SUFFIX=1 10265 10309 fi ··· 10275 10319 fi 10276 10320 10277 10321 if test x$FILE_MAN_SUFFIX = x ; then 10278 - case $host_os in 10279 - solaris*) FILE_MAN_SUFFIX=4 ;; 10280 - *) FILE_MAN_SUFFIX=5 ;; 10322 + case $SYSV_MAN_SECTIONS in 10323 + true) FILE_MAN_SUFFIX=4 ;; 10324 + *) FILE_MAN_SUFFIX=5 ;; 10281 10325 esac 10282 10326 fi 10283 10327 if test x$FILE_MAN_DIR = x ; then ··· 10285 10329 fi 10286 10330 10287 10331 if test x$MISC_MAN_SUFFIX = x ; then 10288 - case $host_os in 10289 - solaris*) MISC_MAN_SUFFIX=5 ;; 10290 - *) MISC_MAN_SUFFIX=7 ;; 10332 + case $SYSV_MAN_SECTIONS in 10333 + true) MISC_MAN_SUFFIX=5 ;; 10334 + *) MISC_MAN_SUFFIX=7 ;; 10291 10335 esac 10292 10336 fi 10293 10337 if test x$MISC_MAN_DIR = x ; then ··· 10295 10339 fi 10296 10340 10297 10341 if test x$DRIVER_MAN_SUFFIX = x ; then 10298 - case $host_os in 10299 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 10300 - *) DRIVER_MAN_SUFFIX=4 ;; 10342 + case $SYSV_MAN_SECTIONS in 10343 + true) DRIVER_MAN_SUFFIX=7 ;; 10344 + *) DRIVER_MAN_SUFFIX=4 ;; 10301 10345 esac 10302 10346 fi 10303 10347 if test x$DRIVER_MAN_DIR = x ; then ··· 10305 10349 fi 10306 10350 10307 10351 if test x$ADMIN_MAN_SUFFIX = x ; then 10308 - case $host_os in 10309 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 10310 - *) ADMIN_MAN_SUFFIX=8 ;; 10352 + case $SYSV_MAN_SECTIONS in 10353 + true) ADMIN_MAN_SUFFIX=1m ;; 10354 + *) ADMIN_MAN_SUFFIX=8 ;; 10311 10355 esac 10312 10356 fi 10313 10357 if test x$ADMIN_MAN_DIR = x ; then ··· 10637 10681 10638 10682 10639 10683 pkg_failed=no 10640 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGC" >&5 10641 - $as_echo_n "checking for XGC... " >&6; } 10684 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw7 xt" >&5 10685 + $as_echo_n "checking for xaw7 xt... " >&6; } 10642 10686 10643 10687 if test -n "$XGC_CFLAGS"; then 10644 10688 pkg_cv_XGC_CFLAGS="$XGC_CFLAGS" ··· 10678 10722 10679 10723 10680 10724 if test $pkg_failed = yes; then 10681 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10725 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10682 10726 $as_echo "no" >&6; } 10683 10727 10684 10728 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 10705 10749 and XGC_LIBS to avoid the need to call pkg-config. 10706 10750 See the pkg-config man page for more details." "$LINENO" 5 10707 10751 elif test $pkg_failed = untried; then 10708 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10752 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10709 10753 $as_echo "no" >&6; } 10710 10754 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 10711 10755 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 11273 11317 # report actual input values of CONFIG_FILES etc. instead of their 11274 11318 # values after options handling. 11275 11319 ac_log=" 11276 - This file was extended by xgc $as_me 1.0.5, which was 11320 + This file was extended by xgc $as_me 1.0.6, which was 11277 11321 generated by GNU Autoconf 2.69. Invocation command line was 11278 11322 11279 11323 CONFIG_FILES = $CONFIG_FILES ··· 11333 11377 Configuration commands: 11334 11378 $config_commands 11335 11379 11336 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." 11380 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/xgc/-/issues>." 11337 11381 11338 11382 _ACEOF 11339 11383 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 11340 11384 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 11341 11385 ac_cs_version="\\ 11342 - xgc config.status 1.0.5 11386 + xgc config.status 1.0.6 11343 11387 configured by $0, generated by GNU Autoconf 2.69, 11344 11388 with options \\"\$ac_cs_config\\" 11345 11389
+5 -5
app/xgc/configure.ac
··· 1 1 dnl Copyright 2005 Red Hat, Inc. 2 - dnl 2 + dnl 3 3 dnl Permission to use, copy, modify, distribute, and sell this software and its 4 4 dnl documentation for any purpose is hereby granted without fee, provided that 5 5 dnl the above copyright notice appear in all copies and that both that ··· 9 9 dnl specific, written prior permission. Red Hat makes no 10 10 dnl representations about the suitability of this software for any purpose. It 11 11 dnl is provided "as is" without express or implied warranty. 12 - dnl 12 + dnl 13 13 dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 14 14 dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO 15 15 dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR ··· 22 22 23 23 # Initialize Autoconf 24 24 AC_PREREQ([2.60]) 25 - AC_INIT([xgc], [1.0.5], 26 - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xgc]) 25 + AC_INIT([xgc], [1.0.6], 26 + [https://gitlab.freedesktop.org/xorg/app/xgc/-/issues], [xgc]) 27 27 AC_CONFIG_SRCDIR([Makefile.am]) 28 28 AC_CONFIG_HEADERS([config.h]) 29 29 30 30 # Initialize Automake 31 - AM_INIT_AUTOMAKE([foreign dist-bzip2]) 31 + AM_INIT_AUTOMAKE([foreign dist-xz]) 32 32 33 33 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS 34 34 m4_ifndef([XORG_MACROS_VERSION],
+1 -1
app/xgc/constants.h
··· 21 21 22 22 #define MAXCHOICES 16 /* Max # of choices for any option */ 23 23 24 - #define Black BlackPixel(X.dpy,0) 24 + #define Black BlackPixel(X.dpy,0) 25 25 #define White WhitePixel(X.dpy,0) 26 26 27 27 #define CopyArea 0 /* different tests */
+5 -5
app/xgc/dashlist.c
··· 136 136 XtGetValues(w,args,XtNumber(args)); 137 137 138 138 /* modify the dashlist as appropriate. */ 139 - if (on) { 140 - dashlist |= 1<<num; 139 + if (on) { 140 + dashlist |= 1<<num; 141 141 } 142 - else { 143 - dashlist &= ~(1<<num); 142 + else { 143 + dashlist &= ~(1<<num); 144 144 } 145 145 146 146 /* now tell interpret() about it */ 147 - snprintf(buf, sizeof buf, "dashlist %d\n",dashlist); 147 + snprintf(buf, sizeof buf, "dashlist %d\n",dashlist); 148 148 interpret(buf); 149 149 } 150 150
+3 -3
app/xgc/getfile.c
··· 39 39 ** confirm the user's choice. Other keys which would move out of 40 40 ** the range of a one-line window are disabled. */ 41 41 42 - static const char *translationtable = 42 + static const char *translationtable = 43 43 "Ctrl<Key>J: KillPopup() Done()\n\ 44 44 Ctrl<Key>M: KillPopup() Done()\n\ 45 45 <Key>Linefeed: KillPopup() Done()\n\ ··· 99 99 100 100 (void) XQueryPointer(X.dpy,XtWindow(topform),&dummy1,&dummy2,&x1,&y1, 101 101 &x2,&y2,&mask); 102 - 102 + 103 103 popupshellargs[0].value = (XtArgVal) x2; 104 104 popupshellargs[1].value = (XtArgVal) y2; 105 - 105 + 106 106 popupshell = XtCreatePopupShell("popup",overrideShellWidgetClass, 107 107 topform,popupshellargs,XtNumber(popupshellargs)); 108 108
+9 -9
app/xgc/gram.y
··· 46 46 ; 47 47 48 48 stmt : error 49 - | RUN 50 - { run_test(); } 51 - | TEST TESTTYPE 49 + | RUN 50 + { run_test(); } 51 + | TEST TESTTYPE 52 52 { change_test ($2, TRUE); } 53 - | FUNCTION FUNCTIONTYPE 53 + | FUNCTION FUNCTIONTYPE 54 54 { GC_change_function ($2, TRUE); } 55 - | LINESTYLE LINESTYLETYPE 55 + | LINESTYLE LINESTYLETYPE 56 56 { GC_change_linestyle ($2, TRUE); } 57 57 | LINESTYLE SOLID 58 58 { GC_change_linestyle (LineSolid, TRUE); } 59 - | CAPSTYLE CAPSTYLETYPE 59 + | CAPSTYLE CAPSTYLETYPE 60 60 { GC_change_capstyle ($2, TRUE); } 61 - | CAPSTYLE ROUND 61 + | CAPSTYLE ROUND 62 62 { GC_change_capstyle (CapRound, TRUE); } 63 - | JOINSTYLE JOINSTYLETYPE 63 + | JOINSTYLE JOINSTYLETYPE 64 64 { GC_change_joinstyle ($2, TRUE); } 65 - | JOINSTYLE ROUND 65 + | JOINSTYLE ROUND 66 66 { GC_change_joinstyle (JoinRound, TRUE); } 67 67 | FILLSTYLE FILLSTYLETYPE 68 68 { GC_change_fillstyle ($2, TRUE); }
+9 -9
app/xgc/interpret.c
··· 38 38 39 39 /* So word1 is the first word on the line and word2 is the second. 40 40 Now the fun begins... */ 41 - 41 + 42 42 if (!strcmp(word1,TestStuff.choice.text)) { 43 43 for (i=0;i<NUM_TESTS;++i) { 44 44 if (!strcmp(word2,(TestStuff.data)[i].text)) { ··· 105 105 } 106 106 } 107 107 } 108 - else if (!strcmp(word1,"planemask")) 108 + else if (!strcmp(word1,"planemask")) 109 109 GC_change_planemask((unsigned long) atoi(word2),FALSE); 110 110 else if (!strcmp(word1,"dashlist")) 111 111 GC_change_dashlist(atoi(word2),FALSE); ··· 126 126 interpret(const char *instring) 127 127 { 128 128 FILE *inend; 129 - 129 + 130 130 print_if_recording(instring); 131 131 yyin = outend; 132 132 inend = fdopen(fildes[1],"w"); ··· 264 264 */ 265 265 266 266 void 267 - GC_change_dashlist(int dashlist, Boolean feedback) 267 + GC_change_dashlist(int dashlist, Boolean feedback) 268 268 { 269 - char dasharray[DASHLENGTH]; /* what we're gonna pass to XSetDashes */ 269 + char dasharray[DASHLENGTH]; /* what we're going to pass to XSetDashes */ 270 270 int dashnumber = 0; /* which element of dasharray we're currently 271 271 modifying */ 272 272 int i; /* which bit of the dashlist we're on */ 273 273 int state = 1; /* whether the list bit we checked was 274 274 on (1) or off (0) */ 275 - 275 + 276 276 /* Initialize the dasharray */ 277 277 278 278 for (i = 0; i < DASHLENGTH; ++i) dasharray[i] = 0; ··· 294 294 295 295 if (((dashlist&1<<i) && state) || (!(dashlist&1<<i) && !state)) 296 296 ++dasharray[dashnumber]; 297 - else { 297 + else { 298 298 state = state^1; /* reverse the state */ 299 299 ++dasharray[++dashnumber]; /* start a new dash */ 300 300 } 301 - } 301 + } 302 302 303 303 XSetDashes(X.dpy,X.gc,0,dasharray,dashnumber+1); 304 304 X.gcv.dashes = dashlist; ··· 315 315 } 316 316 317 317 void 318 - change_test(int test, Boolean feedback) 318 + change_test(int test, Boolean feedback) 319 319 { 320 320 X.test = test; 321 321 if (feedback) select_button(testchoicedesc,test);
+8 -8
app/xgc/main.c
··· 79 79 {"orInverted", "orInverted", GXorInverted}, 80 80 {"nand", "nand", GXnand}, 81 81 {"set", "set", GXset} 82 - }; 82 + }; 83 83 84 84 /* The two rows in the XgcStuff structure are: 85 85 ** name of label, xgc syntax text, # of toggles, # of columns of toggles ··· 252 252 {XtNinput, (XtArgVal) True} 253 253 }; 254 254 255 - static Arg testformargs[] = { 255 + static Arg testformargs[] = { 256 256 {XtNfromVert, (XtArgVal) NULL} /* put it under GCform */ 257 257 }; 258 258 ··· 377 377 backgroundchoice = XtCreateManagedWidget("background",formWidgetClass,GCform, 378 378 gcchoiceargs,XtNumber(gcchoiceargs)); 379 379 backgroundtext = create_text_choice(backgroundchoice,TBackground,9,50); 380 - 380 + 381 381 gcchoiceargs[1].value = (XtArgVal) NULL; 382 382 gcchoiceargs[0].value = (XtArgVal) foregroundchoice; 383 383 percentchoice = XtCreateManagedWidget("testpercent",formWidgetClass,GCform, ··· 392 392 testformargs[0].value = (XtArgVal) GCform; 393 393 Testform = XtCreateManagedWidget("Testform",formWidgetClass,topform, 394 394 testformargs,XtNumber(testformargs)); 395 - 395 + 396 396 testchoiceform = XtCreateManagedWidget("testchoiceform",formWidgetClass, 397 397 Testform,testchoiceargs,XtNumber(testchoiceargs)); 398 398 testchoicedesc = create_choice(testchoiceform,Everything[CTest]); ··· 445 445 446 446 choose_defaults(GCdescs,(int)XtNumber(GCdescs)); 447 447 choose_defaults(&testchoicedesc,1); 448 - 448 + 449 449 /* Loop forever, dealing with events */ 450 450 451 451 XtAppMainLoop(appcontext); ··· 553 553 quitargs[1].value = (XtArgVal) keyinputbutton; /* under */ 554 554 (void) XtCreateManagedWidget("Quit",commandWidgetClass, 555 555 w,quitargs,XtNumber(quitargs)); 556 - 557 - } 556 + 557 + } 558 558 /* quit() 559 559 ** ------ 560 560 ** Leave the program nicely. ··· 571 571 { 572 572 if (e->type == ClientMessage && e->xclient.data.l[0] != wm_delete_window) 573 573 XBell(XtDisplay(w), 0); 574 - else 574 + else 575 575 quit(); 576 576 } 577 577
+1
app/xgc/man/Makefile.in
··· 230 230 prefix = @prefix@ 231 231 program_transform_name = @program_transform_name@ 232 232 psdir = @psdir@ 233 + runstatedir = @runstatedir@ 233 234 sbindir = @sbindir@ 234 235 sharedstatedir = @sharedstatedir@ 235 236 srcdir = @srcdir@
+2 -2
app/xgc/planemask.c
··· 20 20 21 21 static void choose_plane(Widget, caddr_t, caddr_t); 22 22 23 - static unsigned long planemask; 23 + static unsigned long planemask; 24 24 static Widget *pm; 25 25 26 26 /* create_planemask_choice(w) ··· 67 67 int i, num_planes; 68 68 69 69 char buf[40]; 70 - char name[12]; 70 + char name[20]; 71 71 72 72 num_planes = PlanesOfScreen(X.scr); 73 73
+8 -8
app/xgc/record.c
··· 42 42 static Arg recordargs[] = { 43 43 {XtNlabel, (XtArgVal) NULL} 44 44 }; 45 - 45 + 46 46 char tmp[20]; /* new label */ 47 - 47 + 48 48 if (!recording) { 49 49 start_recording(); 50 50 } ··· 65 65 */ 66 66 67 67 static void 68 - start_recording(void) 68 + start_recording(void) 69 69 { 70 70 get_filename(done_choosing_filename,cancel_record); 71 71 } ··· 76 76 */ 77 77 78 78 static void 79 - stop_recording(void) 79 + stop_recording(void) 80 80 { 81 81 fclose(recordfile); 82 82 } ··· 87 87 */ 88 88 89 89 static void 90 - cancel_record(void) 90 + cancel_record(void) 91 91 { 92 92 } 93 93 ··· 99 99 */ 100 100 101 101 static void 102 - done_choosing_filename(void) 102 + done_choosing_filename(void) 103 103 { 104 104 static Arg recordargs[] = { 105 105 {XtNlabel, (XtArgVal) NULL}, ··· 138 138 ** If we're recording, stop. 139 139 */ 140 140 141 - void 141 + void 142 142 close_file_if_recording(void) 143 143 { 144 144 if (recording) ··· 217 217 fprintf(recordfile,"planemask %ld\n",X.gcv.plane_mask); 218 218 fprintf(recordfile,"dashlist %d\n",X.gcv.dashes); 219 219 fprintf(recordfile,"font %s\n",X.fontname); 220 - } 220 + } 221 221 222 222 /********************************************/ 223 223
+3 -3
app/xgc/testfrac.c
··· 50 50 ** hits the end of the scrollbar, not the left edge. When the right edge 51 51 ** is at 1.0, the left edge is at 1.0 - SLIDER_LENGTH. Normalize 52 52 ** accordingly. */ 53 - 53 + 54 54 newpercent = oldpercent / (1.0 - SLIDER_LENGTH); 55 55 56 56 /* If the slider's partially out of the scrollbar, move it back in. */ ··· 73 73 74 74 /* slider_scroll(w,data,position) 75 75 ** ------------------------------ 76 - ** This function is called when the user does incremental scrolling, 76 + ** This function is called when the user does incremental scrolling, 77 77 ** generally with the left or right button. Right now it just ignores it. 78 78 */ 79 79 ··· 144 144 {XtNjumpProc, (XtArgVal) NULL}, 145 145 {XtNscrollProc, (XtArgVal) NULL} 146 146 }; 147 - 147 + 148 148 static const char *translationtable = "<Leave>: Update()"; 149 149 150 150 static XtActionsRec actiontable[] = {
+9 -9
app/xgc/tests.c
··· 52 52 53 53 switch (flag) { 54 54 case StartTimer: /* store initial values */ 55 - gettimeofday(&starttime,&tz); 55 + gettimeofday(&starttime,&tz); 56 56 #if !defined(__UNIXOS2__) && !defined(QNX4) 57 57 getrusage(RUSAGE_SELF,&startusage); 58 58 #endif ··· 63 63 getrusage(RUSAGE_SELF,&endusage); 64 64 #endif 65 65 66 - /* all the following line does is use the formula 67 - elapsed time = ending time - starting time, but there are three 66 + /* all the following line does is use the formula 67 + elapsed time = ending time - starting time, but there are three 68 68 different timers and two different units of time, ack... */ 69 69 70 70 #if !defined(__UNIXOS2__) && !defined(QNX4) ··· 79 79 elapsedtime = (long)( ((long)endtime.tv_sec-(long)starttime.tv_sec)*1000000 80 80 +((long)endtime.tv_usec-(long)starttime.tv_usec)); 81 81 #endif 82 - return(elapsedtime); 82 + return(elapsedtime); 83 83 84 - default: 84 + default: 85 85 fprintf(stderr,"Invalid flag in timer()\n"); 86 86 return((long) NULL); 87 87 } 88 88 #else 89 89 static time_t starttime; 90 - 90 + 91 91 switch (flag) { 92 92 case StartTimer: 93 93 time(&starttime); ··· 233 233 XDrawSegments(X.dpy,X.win,X.gc,segments,num_segments); 234 234 XSync(X.dpy,0); 235 235 totaltime = end_timer(); 236 - 236 + 237 237 snprintf(buf,sizeof buf,"%d segments in %.3f seconds.",num_segments, 238 238 (double)totaltime/1000000.); 239 239 show_result(buf); ··· 249 249 long totaltime; 250 250 char buf[80]; 251 251 int i; 252 - 252 + 253 253 num_points *= X.percent; 254 254 255 255 points = (XPoint *) malloc(sizeof(XPoint) * num_points); ··· 586 586 XClearWindow(X.dpy,X.win); 587 587 588 588 print_if_recording("run\n"); 589 - 589 + 590 590 switch (X.test) { 591 591 case CopyArea: copyarea_test(); break; 592 592 case CopyPlane: copyplane_test(); break;
+3 -3
app/xgc/text.c
··· 98 98 /* label uses type to find out what its title is */ 99 99 label = XtCreateManagedWidget(labels[type],labelWidgetClass,w, 100 100 labelargs,XtNumber(labelargs)); 101 - 101 + 102 102 /* text uses type to find out what its string is */ 103 103 switch (type) { 104 104 case TForeground: 105 - snprintf(textstrings[type],sizeof textstrings[type], 105 + snprintf(textstrings[type],sizeof textstrings[type], 106 106 "%d",(int) X.gcv.foreground); 107 107 snprintf(oldtextstrings[type],sizeof oldtextstrings[type], 108 108 "%d",(int) X.gcv.foreground); ··· 153 153 } 154 154 if (strcmp(textstrings[type],oldtextstrings[type])) { 155 155 strcpy(oldtextstrings[type],textstrings[type]); 156 - snprintf(mbuf,sizeof mbuf,"%s%s\n", 156 + snprintf(mbuf,sizeof mbuf,"%s%s\n", 157 157 names[type], /* the right first half */ 158 158 textstrings[type]); /* the right second half */ 159 159 interpret(mbuf); /* send it off */
+1 -1
app/xgc/xgc.h
··· 36 36 char name[40]; /* name as it will appear on the screen */ 37 37 char text[40]; /* Xgc command it translates to */ 38 38 } command_data[MAXCHOICES]; 39 - } ChoiceStuff; /* All the info needed to deal with a 39 + } ChoiceStuff; /* All the info needed to deal with a 40 40 choice widget */ 41 41 typedef struct { 42 42 const char *name;