Update xgc to version 1.0.6
matthieu
parent
37cbb79096
commit
4d445a6d54
|
|
@ -1,3 +1,123 @@
|
|||
commit 7883d1c27a12320b2c3a03aeca573259cb60b3b0
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Oct 15 10:17:34 2022 -0700
|
||||
|
||||
xgc 1.0.6
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit f3424f4c7c7e1aba33d0a117ea90dd5412530f45
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Apr 3 16:08:14 2022 -0700
|
||||
|
||||
Fix -Wformat-truncation warning
|
||||
|
||||
planemask.c: In function ‘create_planemask_choice’:
|
||||
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=]
|
||||
snprintf(name, sizeof name, "planemask%d",i);
|
||||
^~
|
||||
planemask.c:109:33: note: directive argument in the range [0, 2147483647]
|
||||
snprintf(name, sizeof name, "planemask%d",i);
|
||||
^~~~~~~~~~~~~
|
||||
planemask.c:109:5: note: ‘snprintf’ output between 11 and 20 bytes into a destination of size 12
|
||||
snprintf(name, sizeof name, "planemask%d",i);
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit c3e109f0bb814f2a0e3385bdada58a52473397ac
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Apr 3 16:04:34 2022 -0700
|
||||
|
||||
Use _CONST_X_STRING to make libXt declare String as const char *
|
||||
|
||||
Clears 57 out of 61 -Wdiscarded-qualifiers warnings from gcc
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 609dfb80abafeea1d4e757403f1cef90c87cde02
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Mon Dec 6 12:45:35 2021 -0800
|
||||
|
||||
Build xz tarballs instead of bzip2
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 949a0d32c94b54ecfaad80ea90dc8bbf74bb04d7
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Mon Dec 6 12:45:31 2021 -0800
|
||||
|
||||
gitlab CI: add a basic build test
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 684e4321fa7e96a61f45dc133816ab92a173a52d
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Nov 28 14:40:19 2021 -0800
|
||||
|
||||
Trim trailing whitespace from lines
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 63e7fce72d704036016258b2cb55c5624f571d92
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Nov 28 14:39:06 2021 -0800
|
||||
|
||||
Fix spelling/wording issues
|
||||
|
||||
Found by using:
|
||||
codespell --builtin clear,rare,usage,informal,code,names
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 233611e5a2bc11cb0a965040166c2e4787b946a4
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Wed Nov 21 17:06:08 2018 -0800
|
||||
|
||||
Update configure.ac bug URL for gitlab migration
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 4786164fba556c753ba8ba2b1ffd98c1f1c70322
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Nov 16 22:14:35 2018 -0800
|
||||
|
||||
Update README for gitlab migration
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 4c03e97932752295558f0f64c76bd23d26423e26
|
||||
Author: Mihail Konev <k.mvc@ya.ru>
|
||||
Date: Thu Jan 26 14:00:21 2017 +1000
|
||||
|
||||
autogen: add default patch prefix
|
||||
|
||||
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
|
||||
|
||||
commit 0d35119c5015fb47c2ec96e102f5c8dab1ead026
|
||||
Author: Emil Velikov <emil.l.velikov@gmail.com>
|
||||
Date: Mon Mar 9 12:00:52 2015 +0000
|
||||
|
||||
autogen.sh: use quoted string variables
|
||||
|
||||
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
|
||||
fall-outs, when they contain space.
|
||||
|
||||
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit d1757a5d69fbc11121bb84739359599964d13efb
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue Jan 24 10:32:07 2017 +1000
|
||||
|
||||
autogen.sh: use exec instead of waiting for configure to finish
|
||||
|
||||
Syncs the invocation of configure with the one from the server.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
||||
|
||||
commit 54f109228e566759799894ff4d6ef4bac74c9aac
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Thu Apr 16 23:25:45 2015 -0700
|
||||
|
|
@ -582,13 +702,13 @@ Date: Wed Jul 20 19:31:57 2005 +0000
|
|||
configure cache, you cache it, and the cached value is probably wrong.
|
||||
|
||||
commit 23e06fb205c2494dc8c44e976e27ca0a30c30ed2
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Thu Jul 14 22:40:16 2005 +0000
|
||||
|
||||
Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
|
||||
|
||||
commit 07ed043059d5fc7e8d694f6814eb1ba63946d646
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue Jul 5 21:11:37 2005 +0000
|
||||
|
||||
Add build system for xgc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
#
|
||||
# Copyright 2005 Red Hat, Inc.
|
||||
#
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
|
|
@ -24,6 +24,7 @@ AM_YFLAGS = -d
|
|||
SUBDIRS = man
|
||||
bin_PROGRAMS = xgc
|
||||
|
||||
AM_CPPFLAGS = -D_CONST_X_STRING
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XGC_CFLAGS) -D_BSD_SOURCE
|
||||
xgc_LDADD = $(XGC_LIBS) -lm
|
||||
|
||||
|
|
@ -57,6 +58,7 @@ dist_appdefault_DATA = \
|
|||
app-defaults/Xgc-color
|
||||
|
||||
EXTRA_DIST = tile Bugs \
|
||||
README.md \
|
||||
Written/FilledRects \
|
||||
Written/Interface \
|
||||
Written/Jim \
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
|
||||
@SET_MAKE@
|
||||
|
||||
#
|
||||
#
|
||||
# Copyright 2005 Red Hat, Inc.
|
||||
#
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
|
|
@ -74,7 +74,7 @@ build_triplet = @build@
|
|||
host_triplet = @host@
|
||||
bin_PROGRAMS = xgc$(EXEEXT)
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
|
||||
DIST_COMMON = $(am__configure_deps) $(dist_appdefault_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(srcdir)/config.h.in $(top_srcdir)/configure COPYING \
|
||||
ChangeLog INSTALL compile config.guess config.sub depcomp \
|
||||
|
|
@ -227,9 +227,9 @@ am__relativize = \
|
|||
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
||||
done; \
|
||||
reldir="$$dir2"
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
|
||||
GZIP_ENV = --best
|
||||
DIST_TARGETS = dist-bzip2 dist-gzip
|
||||
DIST_TARGETS = dist-xz dist-gzip
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
||||
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
|
||||
|
|
@ -354,6 +354,7 @@ pdfdir = @pdfdir@
|
|||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
|
|
@ -364,6 +365,7 @@ top_builddir = @top_builddir@
|
|||
top_srcdir = @top_srcdir@
|
||||
AM_YFLAGS = -d
|
||||
SUBDIRS = man
|
||||
AM_CPPFLAGS = -D_CONST_X_STRING
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XGC_CFLAGS) -D_BSD_SOURCE
|
||||
xgc_LDADD = $(XGC_LIBS) -lm
|
||||
xgc_SOURCES = \
|
||||
|
|
@ -392,6 +394,7 @@ dist_appdefault_DATA = \
|
|||
app-defaults/Xgc-color
|
||||
|
||||
EXTRA_DIST = tile Bugs \
|
||||
README.md \
|
||||
Written/FilledRects \
|
||||
Written/Interface \
|
||||
Written/Jim \
|
||||
|
|
@ -767,6 +770,7 @@ distdir: $(DISTFILES)
|
|||
dist-gzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-bzip2: distdir
|
||||
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
||||
$(am__post_remove_distdir)
|
||||
|
|
@ -774,7 +778,6 @@ dist-bzip2: distdir
|
|||
dist-lzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-xz: distdir
|
||||
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
|
||||
$(am__post_remove_distdir)
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
xgc is an X11 graphics demo that shows various features of the X11
|
||||
core protocol graphics primitives.
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
Please submit bug reports to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/app/xgc
|
||||
|
||||
http://cgit.freedesktop.org/xorg/app/xgc
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
xgc is an X11 graphics demo that shows various features of the X11
|
||||
core protocol graphics primitives.
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
https://lists.x.org/mailman/listinfo/xorg
|
||||
|
||||
The primary development code repository can be found at:
|
||||
|
||||
https://gitlab.freedesktop.org/xorg/app/xgc
|
||||
|
||||
Please submit bug reports and requests to merge patches there.
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
https://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
|
|
@ -26,11 +26,11 @@ Things to look for:
|
|||
Otherwise, the speed of a single rectangle should be about
|
||||
equal to its size.
|
||||
|
||||
Data:
|
||||
Data:
|
||||
Pixels per second.
|
||||
Average size of rectangle.
|
||||
|
||||
GC fields:
|
||||
GC fields:
|
||||
function:
|
||||
Tiling: likely to be a lot slower, although for whole words
|
||||
you're just setting it to a certain value, rather than 0.
|
||||
|
|
@ -58,7 +58,7 @@ GC fields:
|
|||
more thought has to be given to what is drawn or not.
|
||||
Software vs. hardware, I suppose.
|
||||
|
||||
Possibly
|
||||
Possibly
|
||||
foreground: similar to plane-mask in its effect, I would think.
|
||||
|
||||
tile: "nice" width tiles would probably be better. A width which
|
||||
|
|
@ -72,7 +72,7 @@ Possibly
|
|||
stipple: like tile
|
||||
|
||||
Other:
|
||||
alignment on word bounaries: fastest when one is changing whole
|
||||
alignment on word boundaries: fastest when one is changing whole
|
||||
words at a time. That way, you're just setting whole words to
|
||||
0 or ~0 and not doing any computation. A 32x1 rectangle should
|
||||
be much faster than a 1x32 rectangle.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
The command buttons at the top -
|
||||
|
||||
Benchmark Options, Graphics Options, etc.
|
||||
Benchmark Options, Graphics Options, etc.
|
||||
|
||||
should just bring up the window, not force you to use it.
|
||||
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@ document.
|
|||
|
||||
The Graphics Options area would contain the following entries:
|
||||
|
||||
Function - one-of { clear, and, andReverse, copy, andInverted, noop, xor,
|
||||
or, nor, equiv, invert, orReverse, copyInverted,
|
||||
Function - one-of { clear, and, andReverse, copy, andInverted, noop, xor,
|
||||
or, nor, equiv, invert, orReverse, copyInverted,
|
||||
orInverted, nand, set }
|
||||
PlaneMask - unsigned value or many-of-n representing bits
|
||||
Foreground - unsigned value in range 0..2^nplanes
|
||||
|
|
@ -158,7 +158,7 @@ sophisticated as what is provided in many UIMS's, it would be nice to keep
|
|||
the application section of the benchmark as separate as possible from the
|
||||
user interface.
|
||||
|
||||
test { CopyArea, CopyPlane, PolyPoint, PolyLine, PolySegment,
|
||||
test { CopyArea, CopyPlane, PolyPoint, PolyLine, PolySegment,
|
||||
PolyRectangle, PolyArc, FillPolygon, PolyFillRect, PolyFillArc,
|
||||
PutImage, GetImage, ImageText8, PolyText8, ImageText16,
|
||||
PolyText16 }
|
||||
|
|
@ -177,7 +177,7 @@ user interface.
|
|||
- specifies the name of the file into which commands are recorded.
|
||||
|
||||
describe BOOLEAN
|
||||
- indicates whether or not a description of the test should be
|
||||
- indicates whether or not a description of the test should be
|
||||
displayed whenever a test is selected (or when this option is
|
||||
specified).
|
||||
|
||||
|
|
@ -194,11 +194,11 @@ user interface.
|
|||
colormap is being used, the RGB value for this slot may be changed.
|
||||
|
||||
forecolor COLORNAME
|
||||
- specifies the RGB value or name of the color to be used for the
|
||||
- specifies the RGB value or name of the color to be used for the
|
||||
foreground pixel, if settable.
|
||||
|
||||
backcolor COLORNAME
|
||||
- specifies the RGB value or name of the color to be used for the
|
||||
- specifies the RGB value or name of the color to be used for the
|
||||
background pixel, if settable.
|
||||
|
||||
linewidth NUMBER
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ credit to servers for optimizing small ones.
|
|||
|
||||
Data: Pixels per second.
|
||||
Breaking that down into large and small areas would probably not
|
||||
be userful.
|
||||
|
||||
be useful.
|
||||
|
||||
GC Fields: None.
|
||||
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ We probably want to see what happens when the source area is clipped,
|
|||
as that as mentioned specifically in the protocol document.
|
||||
|
||||
Data: Pixels per second.
|
||||
|
||||
|
||||
GC Fields: function (*)
|
||||
plane-mask
|
||||
subwindow-mode
|
||||
|
|
@ -64,7 +64,7 @@ Data: Lines per second.
|
|||
Pixels per second (is this valid - do lines that are twice as
|
||||
long take twice as long to draw? Also, is it valid to compare
|
||||
thin lines and fat lines?)
|
||||
|
||||
|
||||
GC fields: function (*)
|
||||
plane-mask
|
||||
line-width (*)
|
||||
|
|
|
|||
|
|
@ -19,50 +19,50 @@
|
|||
| | | | | | | | | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
function |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX| | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
plane_mask |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
foreground | | |XX|**|**|**|**|**|**|**|**| |**|**|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
background | | | |**|**|**|**|**|**|**|**| |**|**|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
line_width | | | |XX|XX|XX|XX| | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
line_style | | | |XX|XX|XX|XX| | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
cap_style | | | |XX|XX| |XX| | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
join_style | | | |XX| |XX|XX| | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
fill_style | | | |XX|XX|XX|XX|XX|XX|XX| | |XX|XX| | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
fill_rule | | | | | | | |XX| | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
arc_mode | | | | | | | | | |XX| | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
tile | | | |**|**|**|**|**|**|**| | |**|**| | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
stipple | | | |**|**|**|**|**|**|**| | |**|**| | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
ts_x_origin | | | |**|**|**|**|**|**|**| | |**|**| | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
ts_y_origin | | | |**|**|**|**|**|**|**| | |**|**| | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
font | | | | | | | | | | | | |XX|XX|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
subwindow_mode |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
exposures |XX| | | | | | | | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
clip_x_origin |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
clip_y_origin |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
clip_mask |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX|
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
dash_offset | | | |**|**|**|**| | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
dashes | | | |**|**|**|**| | | | | | | | | |
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ MenuLine contains these Commands:
|
|||
- read from file until EOF
|
||||
Quit
|
||||
- quit
|
||||
|
||||
|
||||
The toggling command buttons exist in pairs, of which only one is visible at
|
||||
any one point. This makes callbacks/names of buttons easier to implement.
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ BenchmarkOptions contains:
|
|||
- call disable_gc_choices() with the GC field flags
|
||||
Iterations (text) the number of times to run.
|
||||
- put "iterations <>" in buffer
|
||||
|
||||
|
||||
---
|
||||
|
||||
GraphicsOptions (form) describing graphics options (owned by Toplevel?)
|
||||
|
|
@ -134,9 +134,9 @@ Description (text) describing the current test (owned by Toplevel?)
|
|||
I really need to find out how to use sources and sinks for Text widgets -
|
||||
the documentation does not say how to do it.
|
||||
|
||||
Every test will have a block of text associated with it. When a new
|
||||
Every test will have a block of text associated with it. When a new
|
||||
benchmark is chosen, its associated text will become the source for the
|
||||
Description widget. Note that we don't have to worry about whether
|
||||
Description widget. Note that we don't have to worry about whether
|
||||
Description is mapped or not; we're just setting a source.
|
||||
|
||||
---
|
||||
|
|
@ -165,9 +165,9 @@ When the user presses Playback, pretty much all we have to do is to
|
|||
1) change the buffer to the file that he wants, and 2) start reading.
|
||||
The rest should be taken care of the buffer-interpreting module.
|
||||
|
||||
RecordingOn changes the output buffer _and_ the input buffer to the
|
||||
RecordingOn changes the output buffer _and_ the input buffer to the
|
||||
desired file.
|
||||
|
||||
|
||||
RecordingOff changes them both back to the usual.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
What we need is a widget which presents a collection of buttons. The user
|
||||
can select only one of them at a time. When one is selected, its
|
||||
can select only one of them at a time. When one is selected, its
|
||||
foreground and background colors should be reversed and stay that way
|
||||
until another one is selected. Exactly one button can be selected at
|
||||
any one time.
|
||||
|
|
|
|||
|
|
@ -19,32 +19,63 @@ You have another version of autoconf. It may work, but is not guaranteed to.
|
|||
If you have problems, you may need to regenerate the build system entirely.
|
||||
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
||||
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 1 (pkg-config-0.24)
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 12 (pkg-config-0.29.2)
|
||||
|
||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
# ----------------------------------
|
||||
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
|
||||
dnl
|
||||
dnl This program is free software; you can redistribute it and/or modify
|
||||
dnl it under the terms of the GNU General Public License as published by
|
||||
dnl the Free Software Foundation; either version 2 of the License, or
|
||||
dnl (at your option) any later version.
|
||||
dnl
|
||||
dnl This program is distributed in the hope that it will be useful, but
|
||||
dnl WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
dnl General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU General Public License
|
||||
dnl along with this program; if not, write to the Free Software
|
||||
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
dnl 02111-1307, USA.
|
||||
dnl
|
||||
dnl As a special exception to the GNU General Public License, if you
|
||||
dnl distribute this file as part of a program that contains a
|
||||
dnl configuration script generated by Autoconf, you may include it under
|
||||
dnl the same distribution terms that you use for the rest of that
|
||||
dnl program.
|
||||
|
||||
dnl PKG_PREREQ(MIN-VERSION)
|
||||
dnl -----------------------
|
||||
dnl Since: 0.29
|
||||
dnl
|
||||
dnl Verify that the version of the pkg-config macros are at least
|
||||
dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
|
||||
dnl installed version of pkg-config, this checks the developer's version
|
||||
dnl of pkg.m4 when generating configure.
|
||||
dnl
|
||||
dnl To ensure that this macro is defined, also add:
|
||||
dnl m4_ifndef([PKG_PREREQ],
|
||||
dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
|
||||
dnl
|
||||
dnl See the "Since" comment for each macro you use to see what version
|
||||
dnl of the macros you require.
|
||||
m4_defun([PKG_PREREQ],
|
||||
[m4_define([PKG_MACROS_VERSION], [0.29.2])
|
||||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
|
||||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
|
||||
])dnl PKG_PREREQ
|
||||
|
||||
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
dnl ----------------------------------
|
||||
dnl Since: 0.16
|
||||
dnl
|
||||
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
|
||||
dnl first found in the path. Checks that the version of pkg-config found
|
||||
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
|
||||
dnl used since that's the first version where most current features of
|
||||
dnl pkg-config existed.
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
||||
|
|
@ -66,18 +97,19 @@ if test -n "$PKG_CONFIG"; then
|
|||
PKG_CONFIG=""
|
||||
fi
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
])dnl PKG_PROG_PKG_CONFIG
|
||||
|
||||
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
# only at the first occurence in configure.ac, so if the first place
|
||||
# it's called might be skipped (such as if it is within an "if", you
|
||||
# have to call PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
dnl -------------------------------------------------------------------
|
||||
dnl Since: 0.18
|
||||
dnl
|
||||
dnl Check to see whether a particular set of modules exists. Similar to
|
||||
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
dnl
|
||||
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
dnl only at the first occurence in configure.ac, so if the first place
|
||||
dnl it's called might be skipped (such as if it is within an "if", you
|
||||
dnl have to call PKG_CHECK_EXISTS manually
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
|
|
@ -87,8 +119,10 @@ m4_ifvaln([$3], [else
|
|||
$3])dnl
|
||||
fi])
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
dnl ---------------------------------------------
|
||||
dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
|
||||
dnl pkg_failed based on the result.
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
|
|
@ -100,10 +134,11 @@ m4_define([_PKG_CONFIG],
|
|||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
])dnl _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
dnl _PKG_SHORT_ERRORS_SUPPORTED
|
||||
dnl ---------------------------
|
||||
dnl Internal check to see if pkg-config supports short errors.
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
|
|
@ -111,26 +146,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
])dnl _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
#
|
||||
# Note that if there is a possibility the first call to
|
||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
#
|
||||
#
|
||||
# --------------------------------------------------------------
|
||||
dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
dnl [ACTION-IF-NOT-FOUND])
|
||||
dnl --------------------------------------------------------------
|
||||
dnl Since: 0.4.0
|
||||
dnl
|
||||
dnl Note that if there is a possibility the first call to
|
||||
dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
AC_DEFUN([PKG_CHECK_MODULES],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
AC_MSG_CHECKING([for $2])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
|
@ -140,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
|
|||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
|
|
@ -161,7 +194,7 @@ installed software in a non-standard prefix.
|
|||
_PKG_TEXT])[]dnl
|
||||
])
|
||||
elif test $pkg_failed = untried; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
|
|
@ -177,16 +210,40 @@ else
|
|||
AC_MSG_RESULT([yes])
|
||||
$3
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
])dnl PKG_CHECK_MODULES
|
||||
|
||||
|
||||
# PKG_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable pkgconfigdir as the location where a module
|
||||
# should install pkg-config .pc files. By default the directory is
|
||||
# $libdir/pkgconfig, but the default can be changed by passing
|
||||
# DIRECTORY. The user can override through the --with-pkgconfigdir
|
||||
# parameter.
|
||||
dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
dnl [ACTION-IF-NOT-FOUND])
|
||||
dnl ---------------------------------------------------------------------
|
||||
dnl Since: 0.29
|
||||
dnl
|
||||
dnl Checks for existence of MODULES and gathers its build flags with
|
||||
dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
|
||||
dnl and VARIABLE-PREFIX_LIBS from --libs.
|
||||
dnl
|
||||
dnl Note that if there is a possibility the first call to
|
||||
dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
|
||||
dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
|
||||
dnl configure.ac.
|
||||
AC_DEFUN([PKG_CHECK_MODULES_STATIC],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
_save_PKG_CONFIG=$PKG_CONFIG
|
||||
PKG_CONFIG="$PKG_CONFIG --static"
|
||||
PKG_CHECK_MODULES($@)
|
||||
PKG_CONFIG=$_save_PKG_CONFIG[]dnl
|
||||
])dnl PKG_CHECK_MODULES_STATIC
|
||||
|
||||
|
||||
dnl PKG_INSTALLDIR([DIRECTORY])
|
||||
dnl -------------------------
|
||||
dnl Since: 0.27
|
||||
dnl
|
||||
dnl Substitutes the variable pkgconfigdir as the location where a module
|
||||
dnl should install pkg-config .pc files. By default the directory is
|
||||
dnl $libdir/pkgconfig, but the default can be changed by passing
|
||||
dnl DIRECTORY. The user can override through the --with-pkgconfigdir
|
||||
dnl parameter.
|
||||
AC_DEFUN([PKG_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
|
|
@ -197,16 +254,18 @@ AC_ARG_WITH([pkgconfigdir],
|
|||
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_INSTALLDIR
|
||||
])dnl PKG_INSTALLDIR
|
||||
|
||||
|
||||
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
# module should install arch-independent pkg-config .pc files. By
|
||||
# default the directory is $datadir/pkgconfig, but the default can be
|
||||
# changed by passing DIRECTORY. The user can override through the
|
||||
# --with-noarch-pkgconfigdir parameter.
|
||||
dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
|
||||
dnl --------------------------------
|
||||
dnl Since: 0.27
|
||||
dnl
|
||||
dnl Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
dnl module should install arch-independent pkg-config .pc files. By
|
||||
dnl default the directory is $datadir/pkgconfig, but the default can be
|
||||
dnl changed by passing DIRECTORY. The user can override through the
|
||||
dnl --with-noarch-pkgconfigdir parameter.
|
||||
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
|
|
@ -217,7 +276,24 @@ AC_ARG_WITH([noarch-pkgconfigdir],
|
|||
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_NOARCH_INSTALLDIR
|
||||
])dnl PKG_NOARCH_INSTALLDIR
|
||||
|
||||
|
||||
dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
|
||||
dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
dnl -------------------------------------------
|
||||
dnl Since: 0.28
|
||||
dnl
|
||||
dnl Retrieves the value of the pkg-config variable for the given module.
|
||||
AC_DEFUN([PKG_CHECK_VAR],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
|
||||
|
||||
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
|
||||
AS_VAR_COPY([$1], [pkg_cv_][$1])
|
||||
|
||||
AS_VAR_IF([$1], [""], [$5], [$4])dnl
|
||||
])dnl PKG_CHECK_VAR
|
||||
|
||||
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
|
||||
#
|
||||
|
|
@ -1242,7 +1318,7 @@ AC_SUBST([am__untar])
|
|||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl
|
||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||
dnl copy of this software and associated documentation files (the "Software"),
|
||||
|
|
@ -1279,7 +1355,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
|||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.19.0])
|
||||
m4_define([vers_have], [1.19.2])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
|
|
@ -1357,6 +1433,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
|||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
|
||||
case $host_os in
|
||||
solaris*)
|
||||
# Solaris 2.0 - 11.3 use SysV man page section numbers, so we
|
||||
# check for a man page file found in later versions that use
|
||||
# traditional section numbers instead
|
||||
AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
|
||||
[SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
|
||||
;;
|
||||
*) SYSV_MAN_SECTIONS=false ;;
|
||||
esac
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
fi
|
||||
|
|
@ -1372,9 +1459,9 @@ if test x$LIB_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$FILE_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$FILE_MAN_DIR = x ; then
|
||||
|
|
@ -1382,9 +1469,9 @@ if test x$FILE_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$MISC_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$MISC_MAN_DIR = x ; then
|
||||
|
|
@ -1392,9 +1479,9 @@ if test x$MISC_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$DRIVER_MAN_DIR = x ; then
|
||||
|
|
@ -1402,9 +1489,9 @@ if test x$DRIVER_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$ADMIN_MAN_DIR = x ; then
|
||||
|
|
@ -1665,13 +1752,24 @@ m4_ifval([$1],
|
|||
fi])
|
||||
|
||||
# Test for the ability of xmlto to generate a text target
|
||||
#
|
||||
# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
|
||||
# following test for empty XML docbook files.
|
||||
# For compatibility reasons use the following empty XML docbook file and if
|
||||
# it fails try it again with a non-empty XML file.
|
||||
have_xmlto_text=no
|
||||
cat > conftest.xml << "EOF"
|
||||
EOF
|
||||
AS_IF([test "$have_xmlto" = yes],
|
||||
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
|
||||
[# Try it again with a non-empty XML file.
|
||||
cat > conftest.xml << "EOF"
|
||||
<x></x>
|
||||
EOF
|
||||
AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])
|
||||
rm -f conftest.xml
|
||||
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
|
|
@ -3067,8 +3165,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
|
||||
touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
|
||||
AC_SUBST([INSTALL_CMD])
|
||||
]) # XORG_INSTALL
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
|
|
@ -3129,10 +3228,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
|||
#
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ create_choice(Widget w, XgcStuff *info)
|
|||
** toggle widget is selected. */
|
||||
|
||||
/* ArgList for the label widget */
|
||||
static Arg labelargs[] = {
|
||||
{XtNborderWidth, (XtArgVal) 0},
|
||||
static Arg labelargs[] = {
|
||||
{XtNborderWidth, (XtArgVal) 0},
|
||||
{XtNjustify, (XtArgVal) XtJustifyRight},
|
||||
{XtNvertDistance, (XtArgVal) 4}
|
||||
};
|
||||
|
|
@ -76,7 +76,7 @@ create_choice(Widget w, XgcStuff *info)
|
|||
|
||||
/* Allocate space for the widgets and initialize choice */
|
||||
choice = (ChoiceDesc *) XtMalloc(sizeof(ChoiceDesc));
|
||||
choice->widgets = (WidgetList) XtMalloc(sizeof(Widget) *
|
||||
choice->widgets = (WidgetList) XtMalloc(sizeof(Widget) *
|
||||
info->choice.num_toggles);
|
||||
choice->size = info->choice.num_toggles;
|
||||
choice->label = XtCreateManagedWidget(info->choice.name,labelWidgetClass,w,
|
||||
|
|
@ -97,8 +97,8 @@ create_choice(Widget w, XgcStuff *info)
|
|||
else {
|
||||
toggleargs[4].value = (XtArgVal) choice->widgets[0];
|
||||
/* are we starting a new row? */
|
||||
if (info->choice.columns > 0 &&
|
||||
i > 1 &&
|
||||
if (info->choice.columns > 0 &&
|
||||
i > 1 &&
|
||||
(i % (info->choice.columns) == 0)) {
|
||||
toggleargs[0].value = (XtArgVal) choice->label;
|
||||
/* under the appropriate toggle */
|
||||
|
|
@ -130,15 +130,15 @@ create_choice(Widget w, XgcStuff *info)
|
|||
strcat(text, (info->data)[i].text);
|
||||
strcat(text, "\n");
|
||||
callbacklist[0].closure = (caddr_t) text;
|
||||
|
||||
|
||||
/* Create it finally */
|
||||
choice->widgets[i] = XtCreateManagedWidget((info->data[i]).name,
|
||||
choice->widgets[i] = XtCreateManagedWidget((info->data[i]).name,
|
||||
toggleWidgetClass,
|
||||
w,
|
||||
toggleargs,
|
||||
XtNumber(toggleargs));
|
||||
}
|
||||
|
||||
|
||||
/* The toggle widgets have all been created;
|
||||
** now make the all the same width if that's
|
||||
** what we want to do. */
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand '-c -o'.
|
||||
|
||||
scriptversion=2012-10-14.11; # UTC
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
|
|||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
|
@ -53,7 +53,7 @@ func_file_conv ()
|
|||
MINGW*)
|
||||
file_conv=mingw
|
||||
;;
|
||||
CYGWIN*)
|
||||
CYGWIN* | MSYS*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
*)
|
||||
|
|
@ -67,7 +67,7 @@ func_file_conv ()
|
|||
mingw/*)
|
||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
||||
;;
|
||||
cygwin/*)
|
||||
cygwin/* | msys/*)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
wine/*)
|
||||
|
|
@ -255,7 +255,8 @@ EOF
|
|||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
|
||||
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
|
||||
func_cl_wrapper "$@" # Doesn't return...
|
||||
;;
|
||||
esac
|
||||
|
|
@ -339,10 +340,10 @@ exit $ret
|
|||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
#! /bin/sh
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for xgc 1.0.5.
|
||||
# Generated by GNU Autoconf 2.69 for xgc 1.0.6.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xgc/-/issues>.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
|
|
@ -267,7 +267,7 @@ fi
|
|||
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
||||
else
|
||||
$as_echo "$0: Please tell bug-autoconf@gnu.org and
|
||||
$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
$0: https://gitlab.freedesktop.org/xorg/app/xgc/-/issues
|
||||
$0: about your system, including any error possibly output
|
||||
$0: before this message. Then install a modern shell, or
|
||||
$0: manually run the script under such a shell if you do
|
||||
|
|
@ -581,9 +581,9 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='xgc'
|
||||
PACKAGE_TARNAME='xgc'
|
||||
PACKAGE_VERSION='1.0.5'
|
||||
PACKAGE_STRING='xgc 1.0.5'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
PACKAGE_VERSION='1.0.6'
|
||||
PACKAGE_STRING='xgc 1.0.6'
|
||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xgc/-/issues'
|
||||
PACKAGE_URL=''
|
||||
|
||||
ac_unique_file="Makefile.am"
|
||||
|
|
@ -736,6 +736,7 @@ infodir
|
|||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
|
|
@ -819,6 +820,7 @@ datadir='${datarootdir}'
|
|||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
|
|
@ -1071,6 +1073,15 @@ do
|
|||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
|
|
@ -1208,7 +1219,7 @@ fi
|
|||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
|
|
@ -1321,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures xgc 1.0.5 to adapt to many kinds of systems.
|
||||
\`configure' configures xgc 1.0.6 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1361,6 +1372,7 @@ Fine tuning of the installation directories:
|
|||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
|
|
@ -1391,7 +1403,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xgc 1.0.5:";;
|
||||
short | recursive ) echo "Configuration of xgc 1.0.6:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1448,7 +1460,7 @@ Some influential environment variables:
|
|||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
||||
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xgc/-/issues>.
|
||||
_ACEOF
|
||||
ac_status=$?
|
||||
fi
|
||||
|
|
@ -1511,7 +1523,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xgc configure 1.0.5
|
||||
xgc configure 1.0.6
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -1768,7 +1780,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xgc $as_me 1.0.5, which was
|
||||
It was created by xgc $as_me 1.0.6, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2597,7 +2609,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xgc'
|
||||
VERSION='1.0.5'
|
||||
VERSION='1.0.6'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -10241,10 +10253,11 @@ _ACEOF
|
|||
|
||||
|
||||
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
|
||||
|
||||
|
||||
|
|
@ -10252,14 +10265,45 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
|||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
|
||||
touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
case $host_os in
|
||||
solaris*)
|
||||
# Solaris 2.0 - 11.3 use SysV man page section numbers, so we
|
||||
# check for a man page file found in later versions that use
|
||||
# traditional section numbers instead
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5
|
||||
$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; }
|
||||
if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
test "$cross_compiling" = yes &&
|
||||
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
|
||||
if test -r "/usr/share/man/man7/attributes.7"; then
|
||||
ac_cv_file__usr_share_man_man7_attributes_7=yes
|
||||
else
|
||||
ac_cv_file__usr_share_man_man7_attributes_7=no
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5
|
||||
$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; }
|
||||
if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then :
|
||||
SYSV_MAN_SECTIONS=false
|
||||
else
|
||||
SYSV_MAN_SECTIONS=true
|
||||
fi
|
||||
|
||||
;;
|
||||
*) SYSV_MAN_SECTIONS=false ;;
|
||||
esac
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
fi
|
||||
|
|
@ -10275,9 +10319,9 @@ if test x$LIB_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$FILE_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$FILE_MAN_DIR = x ; then
|
||||
|
|
@ -10285,9 +10329,9 @@ if test x$FILE_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$MISC_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$MISC_MAN_DIR = x ; then
|
||||
|
|
@ -10295,9 +10339,9 @@ if test x$MISC_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$DRIVER_MAN_DIR = x ; then
|
||||
|
|
@ -10305,9 +10349,9 @@ if test x$DRIVER_MAN_DIR = x ; then
|
|||
fi
|
||||
|
||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$ADMIN_MAN_DIR = x ; then
|
||||
|
|
@ -10637,8 +10681,8 @@ fi
|
|||
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGC" >&5
|
||||
$as_echo_n "checking for XGC... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw7 xt" >&5
|
||||
$as_echo_n "checking for xaw7 xt... " >&6; }
|
||||
|
||||
if test -n "$XGC_CFLAGS"; then
|
||||
pkg_cv_XGC_CFLAGS="$XGC_CFLAGS"
|
||||
|
|
@ -10678,7 +10722,7 @@ fi
|
|||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
|
|
@ -10705,7 +10749,7 @@ Alternatively, you may set the environment variables XGC_CFLAGS
|
|||
and XGC_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details." "$LINENO" 5
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
|
|
@ -11273,7 +11317,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by xgc $as_me 1.0.5, which was
|
||||
This file was extended by xgc $as_me 1.0.6, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -11333,13 +11377,13 @@ $config_headers
|
|||
Configuration commands:
|
||||
$config_commands
|
||||
|
||||
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xgc/-/issues>."
|
||||
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
xgc config.status 1.0.5
|
||||
xgc config.status 1.0.6
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
dnl Copyright 2005 Red Hat, Inc.
|
||||
dnl
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
|
|
@ -9,7 +9,7 @@ dnl advertising or publicity pertaining to distribution of the software without
|
|||
dnl specific, written prior permission. Red Hat makes no
|
||||
dnl representations about the suitability of this software for any purpose. It
|
||||
dnl is provided "as is" without express or implied warranty.
|
||||
dnl
|
||||
dnl
|
||||
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
|
|
@ -22,13 +22,13 @@ dnl Process this file with autoconf to create configure.
|
|||
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xgc], [1.0.5],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xgc])
|
||||
AC_INIT([xgc], [1.0.6],
|
||||
[https://gitlab.freedesktop.org/xorg/app/xgc/-/issues], [xgc])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_INIT_AUTOMAKE([foreign dist-xz])
|
||||
|
||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#define MAXCHOICES 16 /* Max # of choices for any option */
|
||||
|
||||
#define Black BlackPixel(X.dpy,0)
|
||||
#define Black BlackPixel(X.dpy,0)
|
||||
#define White WhitePixel(X.dpy,0)
|
||||
|
||||
#define CopyArea 0 /* different tests */
|
||||
|
|
|
|||
|
|
@ -136,15 +136,15 @@ change_dashlist(Widget w, caddr_t closure, caddr_t call_data)
|
|||
XtGetValues(w,args,XtNumber(args));
|
||||
|
||||
/* modify the dashlist as appropriate. */
|
||||
if (on) {
|
||||
dashlist |= 1<<num;
|
||||
if (on) {
|
||||
dashlist |= 1<<num;
|
||||
}
|
||||
else {
|
||||
dashlist &= ~(1<<num);
|
||||
else {
|
||||
dashlist &= ~(1<<num);
|
||||
}
|
||||
|
||||
/* now tell interpret() about it */
|
||||
snprintf(buf, sizeof buf, "dashlist %d\n",dashlist);
|
||||
snprintf(buf, sizeof buf, "dashlist %d\n",dashlist);
|
||||
interpret(buf);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ get_filename(
|
|||
** confirm the user's choice. Other keys which would move out of
|
||||
** the range of a one-line window are disabled. */
|
||||
|
||||
static const char *translationtable =
|
||||
static const char *translationtable =
|
||||
"Ctrl<Key>J: KillPopup() Done()\n\
|
||||
Ctrl<Key>M: KillPopup() Done()\n\
|
||||
<Key>Linefeed: KillPopup() Done()\n\
|
||||
|
|
@ -99,10 +99,10 @@ get_filename(
|
|||
|
||||
(void) XQueryPointer(X.dpy,XtWindow(topform),&dummy1,&dummy2,&x1,&y1,
|
||||
&x2,&y2,&mask);
|
||||
|
||||
|
||||
popupshellargs[0].value = (XtArgVal) x2;
|
||||
popupshellargs[1].value = (XtArgVal) y2;
|
||||
|
||||
|
||||
popupshell = XtCreatePopupShell("popup",overrideShellWidgetClass,
|
||||
topform,popupshellargs,XtNumber(popupshellargs));
|
||||
|
||||
|
|
|
|||
|
|
@ -46,23 +46,23 @@ stmts : /* empty */
|
|||
;
|
||||
|
||||
stmt : error
|
||||
| RUN
|
||||
{ run_test(); }
|
||||
| TEST TESTTYPE
|
||||
| RUN
|
||||
{ run_test(); }
|
||||
| TEST TESTTYPE
|
||||
{ change_test ($2, TRUE); }
|
||||
| FUNCTION FUNCTIONTYPE
|
||||
| FUNCTION FUNCTIONTYPE
|
||||
{ GC_change_function ($2, TRUE); }
|
||||
| LINESTYLE LINESTYLETYPE
|
||||
| LINESTYLE LINESTYLETYPE
|
||||
{ GC_change_linestyle ($2, TRUE); }
|
||||
| LINESTYLE SOLID
|
||||
{ GC_change_linestyle (LineSolid, TRUE); }
|
||||
| CAPSTYLE CAPSTYLETYPE
|
||||
| CAPSTYLE CAPSTYLETYPE
|
||||
{ GC_change_capstyle ($2, TRUE); }
|
||||
| CAPSTYLE ROUND
|
||||
| CAPSTYLE ROUND
|
||||
{ GC_change_capstyle (CapRound, TRUE); }
|
||||
| JOINSTYLE JOINSTYLETYPE
|
||||
| JOINSTYLE JOINSTYLETYPE
|
||||
{ GC_change_joinstyle ($2, TRUE); }
|
||||
| JOINSTYLE ROUND
|
||||
| JOINSTYLE ROUND
|
||||
{ GC_change_joinstyle (JoinRound, TRUE); }
|
||||
| FILLSTYLE FILLSTYLETYPE
|
||||
{ GC_change_fillstyle ($2, TRUE); }
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ interpret(const char *string)
|
|||
|
||||
/* So word1 is the first word on the line and word2 is the second.
|
||||
Now the fun begins... */
|
||||
|
||||
|
||||
if (!strcmp(word1,TestStuff.choice.text)) {
|
||||
for (i=0;i<NUM_TESTS;++i) {
|
||||
if (!strcmp(word2,(TestStuff.data)[i].text)) {
|
||||
|
|
@ -105,7 +105,7 @@ interpret(const char *string)
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (!strcmp(word1,"planemask"))
|
||||
else if (!strcmp(word1,"planemask"))
|
||||
GC_change_planemask((unsigned long) atoi(word2),FALSE);
|
||||
else if (!strcmp(word1,"dashlist"))
|
||||
GC_change_dashlist(atoi(word2),FALSE);
|
||||
|
|
@ -126,7 +126,7 @@ void
|
|||
interpret(const char *instring)
|
||||
{
|
||||
FILE *inend;
|
||||
|
||||
|
||||
print_if_recording(instring);
|
||||
yyin = outend;
|
||||
inend = fdopen(fildes[1],"w");
|
||||
|
|
@ -264,15 +264,15 @@ GC_change_arcmode(int arcmode, Boolean feedback)
|
|||
*/
|
||||
|
||||
void
|
||||
GC_change_dashlist(int dashlist, Boolean feedback)
|
||||
GC_change_dashlist(int dashlist, Boolean feedback)
|
||||
{
|
||||
char dasharray[DASHLENGTH]; /* what we're gonna pass to XSetDashes */
|
||||
char dasharray[DASHLENGTH]; /* what we're going to pass to XSetDashes */
|
||||
int dashnumber = 0; /* which element of dasharray we're currently
|
||||
modifying */
|
||||
int i; /* which bit of the dashlist we're on */
|
||||
int state = 1; /* whether the list bit we checked was
|
||||
on (1) or off (0) */
|
||||
|
||||
|
||||
/* Initialize the dasharray */
|
||||
|
||||
for (i = 0; i < DASHLENGTH; ++i) dasharray[i] = 0;
|
||||
|
|
@ -294,11 +294,11 @@ GC_change_dashlist(int dashlist, Boolean feedback)
|
|||
|
||||
if (((dashlist&1<<i) && state) || (!(dashlist&1<<i) && !state))
|
||||
++dasharray[dashnumber];
|
||||
else {
|
||||
else {
|
||||
state = state^1; /* reverse the state */
|
||||
++dasharray[++dashnumber]; /* start a new dash */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
XSetDashes(X.dpy,X.gc,0,dasharray,dashnumber+1);
|
||||
X.gcv.dashes = dashlist;
|
||||
|
|
@ -315,7 +315,7 @@ GC_change_planemask(unsigned long planemask, Boolean feedback)
|
|||
}
|
||||
|
||||
void
|
||||
change_test(int test, Boolean feedback)
|
||||
change_test(int test, Boolean feedback)
|
||||
{
|
||||
X.test = test;
|
||||
if (feedback) select_button(testchoicedesc,test);
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ static XgcData FunctionData[NUM_FUNCTIONS] = {
|
|||
{"orInverted", "orInverted", GXorInverted},
|
||||
{"nand", "nand", GXnand},
|
||||
{"set", "set", GXset}
|
||||
};
|
||||
};
|
||||
|
||||
/* The two rows in the XgcStuff structure are:
|
||||
** name of label, xgc syntax text, # of toggles, # of columns of toggles
|
||||
|
|
@ -252,7 +252,7 @@ main(int argc, char *argv[])
|
|||
{XtNinput, (XtArgVal) True}
|
||||
};
|
||||
|
||||
static Arg testformargs[] = {
|
||||
static Arg testformargs[] = {
|
||||
{XtNfromVert, (XtArgVal) NULL} /* put it under GCform */
|
||||
};
|
||||
|
||||
|
|
@ -377,7 +377,7 @@ main(int argc, char *argv[])
|
|||
backgroundchoice = XtCreateManagedWidget("background",formWidgetClass,GCform,
|
||||
gcchoiceargs,XtNumber(gcchoiceargs));
|
||||
backgroundtext = create_text_choice(backgroundchoice,TBackground,9,50);
|
||||
|
||||
|
||||
gcchoiceargs[1].value = (XtArgVal) NULL;
|
||||
gcchoiceargs[0].value = (XtArgVal) foregroundchoice;
|
||||
percentchoice = XtCreateManagedWidget("testpercent",formWidgetClass,GCform,
|
||||
|
|
@ -392,7 +392,7 @@ main(int argc, char *argv[])
|
|||
testformargs[0].value = (XtArgVal) GCform;
|
||||
Testform = XtCreateManagedWidget("Testform",formWidgetClass,topform,
|
||||
testformargs,XtNumber(testformargs));
|
||||
|
||||
|
||||
testchoiceform = XtCreateManagedWidget("testchoiceform",formWidgetClass,
|
||||
Testform,testchoiceargs,XtNumber(testchoiceargs));
|
||||
testchoicedesc = create_choice(testchoiceform,Everything[CTest]);
|
||||
|
|
@ -445,7 +445,7 @@ main(int argc, char *argv[])
|
|||
|
||||
choose_defaults(GCdescs,(int)XtNumber(GCdescs));
|
||||
choose_defaults(&testchoicedesc,1);
|
||||
|
||||
|
||||
/* Loop forever, dealing with events */
|
||||
|
||||
XtAppMainLoop(appcontext);
|
||||
|
|
@ -553,8 +553,8 @@ fill_up_commandform(Widget w)
|
|||
quitargs[1].value = (XtArgVal) keyinputbutton; /* under */
|
||||
(void) XtCreateManagedWidget("Quit",commandWidgetClass,
|
||||
w,quitargs,XtNumber(quitargs));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
/* quit()
|
||||
** ------
|
||||
** Leave the program nicely.
|
||||
|
|
@ -571,7 +571,7 @@ static void quitAction(Widget w, XEvent *e, String *p, Cardinal *n)
|
|||
{
|
||||
if (e->type == ClientMessage && e->xclient.data.l[0] != wm_delete_window)
|
||||
XBell(XtDisplay(w), 0);
|
||||
else
|
||||
else
|
||||
quit();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -230,6 +230,7 @@ pdfdir = @pdfdir@
|
|||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
static void choose_plane(Widget, caddr_t, caddr_t);
|
||||
|
||||
static unsigned long planemask;
|
||||
static unsigned long planemask;
|
||||
static Widget *pm;
|
||||
|
||||
/* create_planemask_choice(w)
|
||||
|
|
@ -67,7 +67,7 @@ create_planemask_choice(Widget w)
|
|||
int i, num_planes;
|
||||
|
||||
char buf[40];
|
||||
char name[12];
|
||||
char name[20];
|
||||
|
||||
num_planes = PlanesOfScreen(X.scr);
|
||||
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ toggle_recordbutton(Widget w, caddr_t closure, caddr_t call_data)
|
|||
static Arg recordargs[] = {
|
||||
{XtNlabel, (XtArgVal) NULL}
|
||||
};
|
||||
|
||||
|
||||
char tmp[20]; /* new label */
|
||||
|
||||
|
||||
if (!recording) {
|
||||
start_recording();
|
||||
}
|
||||
|
|
@ -65,7 +65,7 @@ toggle_recordbutton(Widget w, caddr_t closure, caddr_t call_data)
|
|||
*/
|
||||
|
||||
static void
|
||||
start_recording(void)
|
||||
start_recording(void)
|
||||
{
|
||||
get_filename(done_choosing_filename,cancel_record);
|
||||
}
|
||||
|
|
@ -76,7 +76,7 @@ start_recording(void)
|
|||
*/
|
||||
|
||||
static void
|
||||
stop_recording(void)
|
||||
stop_recording(void)
|
||||
{
|
||||
fclose(recordfile);
|
||||
}
|
||||
|
|
@ -87,7 +87,7 @@ stop_recording(void)
|
|||
*/
|
||||
|
||||
static void
|
||||
cancel_record(void)
|
||||
cancel_record(void)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ cancel_record(void)
|
|||
*/
|
||||
|
||||
static void
|
||||
done_choosing_filename(void)
|
||||
done_choosing_filename(void)
|
||||
{
|
||||
static Arg recordargs[] = {
|
||||
{XtNlabel, (XtArgVal) NULL},
|
||||
|
|
@ -138,7 +138,7 @@ print_if_recording(const char *str)
|
|||
** If we're recording, stop.
|
||||
*/
|
||||
|
||||
void
|
||||
void
|
||||
close_file_if_recording(void)
|
||||
{
|
||||
if (recording)
|
||||
|
|
@ -217,7 +217,7 @@ print_out_gc_values(void)
|
|||
fprintf(recordfile,"planemask %ld\n",X.gcv.plane_mask);
|
||||
fprintf(recordfile,"dashlist %d\n",X.gcv.dashes);
|
||||
fprintf(recordfile,"font %s\n",X.fontname);
|
||||
}
|
||||
}
|
||||
|
||||
/********************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ slider_jump(Widget w, caddr_t data, caddr_t position)
|
|||
** hits the end of the scrollbar, not the left edge. When the right edge
|
||||
** is at 1.0, the left edge is at 1.0 - SLIDER_LENGTH. Normalize
|
||||
** accordingly. */
|
||||
|
||||
|
||||
newpercent = oldpercent / (1.0 - SLIDER_LENGTH);
|
||||
|
||||
/* If the slider's partially out of the scrollbar, move it back in. */
|
||||
|
|
@ -73,7 +73,7 @@ slider_jump(Widget w, caddr_t data, caddr_t position)
|
|||
|
||||
/* slider_scroll(w,data,position)
|
||||
** ------------------------------
|
||||
** This function is called when the user does incremental scrolling,
|
||||
** This function is called when the user does incremental scrolling,
|
||||
** generally with the left or right button. Right now it just ignores it.
|
||||
*/
|
||||
|
||||
|
|
@ -144,7 +144,7 @@ create_testfrac_choice(Widget w)
|
|||
{XtNjumpProc, (XtArgVal) NULL},
|
||||
{XtNscrollProc, (XtArgVal) NULL}
|
||||
};
|
||||
|
||||
|
||||
static const char *translationtable = "<Leave>: Update()";
|
||||
|
||||
static XtActionsRec actiontable[] = {
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ timer(int flag)
|
|||
|
||||
switch (flag) {
|
||||
case StartTimer: /* store initial values */
|
||||
gettimeofday(&starttime,&tz);
|
||||
gettimeofday(&starttime,&tz);
|
||||
#if !defined(__UNIXOS2__) && !defined(QNX4)
|
||||
getrusage(RUSAGE_SELF,&startusage);
|
||||
#endif
|
||||
|
|
@ -63,8 +63,8 @@ timer(int flag)
|
|||
getrusage(RUSAGE_SELF,&endusage);
|
||||
#endif
|
||||
|
||||
/* all the following line does is use the formula
|
||||
elapsed time = ending time - starting time, but there are three
|
||||
/* all the following line does is use the formula
|
||||
elapsed time = ending time - starting time, but there are three
|
||||
different timers and two different units of time, ack... */
|
||||
|
||||
#if !defined(__UNIXOS2__) && !defined(QNX4)
|
||||
|
|
@ -79,15 +79,15 @@ timer(int flag)
|
|||
elapsedtime = (long)( ((long)endtime.tv_sec-(long)starttime.tv_sec)*1000000
|
||||
+((long)endtime.tv_usec-(long)starttime.tv_usec));
|
||||
#endif
|
||||
return(elapsedtime);
|
||||
return(elapsedtime);
|
||||
|
||||
default:
|
||||
default:
|
||||
fprintf(stderr,"Invalid flag in timer()\n");
|
||||
return((long) NULL);
|
||||
}
|
||||
#else
|
||||
static time_t starttime;
|
||||
|
||||
|
||||
switch (flag) {
|
||||
case StartTimer:
|
||||
time(&starttime);
|
||||
|
|
@ -233,7 +233,7 @@ polysegment_test(void)
|
|||
XDrawSegments(X.dpy,X.win,X.gc,segments,num_segments);
|
||||
XSync(X.dpy,0);
|
||||
totaltime = end_timer();
|
||||
|
||||
|
||||
snprintf(buf,sizeof buf,"%d segments in %.3f seconds.",num_segments,
|
||||
(double)totaltime/1000000.);
|
||||
show_result(buf);
|
||||
|
|
@ -249,7 +249,7 @@ polypoint_test(void)
|
|||
long totaltime;
|
||||
char buf[80];
|
||||
int i;
|
||||
|
||||
|
||||
num_points *= X.percent;
|
||||
|
||||
points = (XPoint *) malloc(sizeof(XPoint) * num_points);
|
||||
|
|
@ -586,7 +586,7 @@ run_test(void)
|
|||
XClearWindow(X.dpy,X.win);
|
||||
|
||||
print_if_recording("run\n");
|
||||
|
||||
|
||||
switch (X.test) {
|
||||
case CopyArea: copyarea_test(); break;
|
||||
case CopyPlane: copyplane_test(); break;
|
||||
|
|
|
|||
|
|
@ -98,11 +98,11 @@ create_text_choice(Widget w, int type, int length, int width)
|
|||
/* label uses type to find out what its title is */
|
||||
label = XtCreateManagedWidget(labels[type],labelWidgetClass,w,
|
||||
labelargs,XtNumber(labelargs));
|
||||
|
||||
|
||||
/* text uses type to find out what its string is */
|
||||
switch (type) {
|
||||
case TForeground:
|
||||
snprintf(textstrings[type],sizeof textstrings[type],
|
||||
snprintf(textstrings[type],sizeof textstrings[type],
|
||||
"%d",(int) X.gcv.foreground);
|
||||
snprintf(oldtextstrings[type],sizeof oldtextstrings[type],
|
||||
"%d",(int) X.gcv.foreground);
|
||||
|
|
@ -153,7 +153,7 @@ WriteText(Widget w, XEvent *event, String *params, Cardinal *num_params)
|
|||
}
|
||||
if (strcmp(textstrings[type],oldtextstrings[type])) {
|
||||
strcpy(oldtextstrings[type],textstrings[type]);
|
||||
snprintf(mbuf,sizeof mbuf,"%s%s\n",
|
||||
snprintf(mbuf,sizeof mbuf,"%s%s\n",
|
||||
names[type], /* the right first half */
|
||||
textstrings[type]); /* the right second half */
|
||||
interpret(mbuf); /* send it off */
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ typedef struct {
|
|||
char name[40]; /* name as it will appear on the screen */
|
||||
char text[40]; /* Xgc command it translates to */
|
||||
} command_data[MAXCHOICES];
|
||||
} ChoiceStuff; /* All the info needed to deal with a
|
||||
} ChoiceStuff; /* All the info needed to deal with a
|
||||
choice widget */
|
||||
typedef struct {
|
||||
const char *name;
|
||||
|
|
|
|||
Loading…
Reference in New Issue