Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge xeyes 1.2.0, xrdb 1.2.1, and xwd 1.0.8.
details: https://anonhg.NetBSD.org/xsrc/rev/fb0223e626e1
branches: trunk
changeset: 10788:fb0223e626e1
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Aug 23 21:28:58 2021 +0000
description:
merge xeyes 1.2.0, xrdb 1.2.1, and xwd 1.0.8.
diffstat:
external/mit/xeyes/dist/README | 25 -------------------------
external/mit/xeyes/dist/compile | 17 +++++++++--------
external/mit/xrdb/dist/xrdb.c | 31 ++++++++++++++++++++++++++++---
external/mit/xwd/dist/README | 25 -------------------------
4 files changed, 37 insertions(+), 61 deletions(-)
diffs (219 lines):
diff -r 49fd8ad0bfcb -r fb0223e626e1 external/mit/xeyes/dist/README
--- a/external/mit/xeyes/dist/README Mon Aug 23 21:27:58 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-xeyes - a follow the mouse X demo, using the X SHAPE extension
-
-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/xeyes
-
- http://cgit.freedesktop.org/xorg/app/xeyes
-
-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
-
diff -r 49fd8ad0bfcb -r fb0223e626e1 external/mit/xeyes/dist/compile
--- a/external/mit/xeyes/dist/compile Mon Aug 23 21:27:58 2021 +0000
+++ b/external/mit/xeyes/dist/compile Mon Aug 23 21:28:58 2021 +0000
@@ -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@localhost>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# 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 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@
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,9 +340,9 @@
# 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:
diff -r 49fd8ad0bfcb -r fb0223e626e1 external/mit/xrdb/dist/xrdb.c
--- a/external/mit/xrdb/dist/xrdb.c Mon Aug 23 21:27:58 2021 +0000
+++ b/external/mit/xrdb/dist/xrdb.c Mon Aug 23 21:28:58 2021 +0000
@@ -48,6 +48,7 @@
#include <X11/Xatom.h>
#include <X11/Xos.h>
#include <X11/Xmu/SysUtil.h>
+#include <X11/Xresource.h>
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
@@ -84,6 +85,7 @@
#define OPLOAD 4
#define OPMERGE 5
#define OPOVERRIDE 6
+#define OPGET 7
#define BACKUP_SUFFIX ".bak" /* for editing */
@@ -126,6 +128,7 @@
static const char *cpp_program = NULL;
static const char * const cpp_locations[] = { CPP };
static const char *backup_suffix = BACKUP_SUFFIX;
+static const char *resource_name = NULL;
static Bool dont_execute = False;
static Bool show_cpp = False;
static String defines;
@@ -745,6 +748,8 @@
buff[0] = '\0';
if (!fgets(buff, BUFSIZ, in))
goto cleanup;
+ if (buff[0] == '\0')
+ continue;
AppendToBuffer(&b, buff, strlen(buff));
c = &b.buff[b.used - 1];
if ((*(c--) == '\n') && (b.used == 1 || *c != '\\'))
@@ -784,6 +789,7 @@
" -nocpp do not use a preprocessor\n"
" -E show preprocessor command & processed input file\n"
" -query query resources\n"
+ " -get name get the content of a resource\n"
" -load load resources from file [default]\n"
" -override add in resources from file\n"
" -merge merge resources from file & sort\n"
@@ -982,6 +988,13 @@
oper = OPQUERY;
continue;
}
+ else if (isabbreviation("-get", arg, 2)) {
+ oper = OPGET;
+ if (++i >= argc)
+ Syntax("-get requires an argument");
+ resource_name = argv[i];
+ continue;
+ }
else if (isabbreviation("-load", arg, 2)) {
oper = OPLOAD;
continue;
@@ -1055,7 +1068,7 @@
}
else if (!strcmp("-undef", arg)) {
if (num_cmd_defines < MAX_CMD_DEFINES) {
- cmd_defines[num_cmd_defines++] = "-undef";
+ cmd_defines[num_cmd_defines++] = (char *) "-undef";
}
else {
fatal("%s: Too many cpp arguments\n", ProgramName);
@@ -1282,7 +1295,19 @@
}
else if (oper == OPQUERY) {
if (xdefs)
- printf("%s", xdefs); /* fputs broken in SunOS 4.0 */
+ fputs(xdefs, stdout);
+ }
+ else if (oper == OPGET) {
+ if (xdefs && resource_name != NULL) {
+ char *type = NULL;
+ XrmValue value;
+ XrmDatabase xrdb = XrmGetStringDatabase(xdefs);
+ Bool found = XrmGetResource(xrdb, resource_name,
+ resource_name, &type, &value);
+ if (found == True && value.addr != NULL)
+ printf("%s\n", value.addr);
+ XrmDestroyDatabase(xrdb);
+ }
}
else if (oper == OPREMOVE) {
if (xdefs)
@@ -1454,7 +1479,7 @@
}
if (execute)
FreeEntries(&newDB);
- if (doScreen && xdefs)
+ if (doScreen)
XFree(xdefs);
}
diff -r 49fd8ad0bfcb -r fb0223e626e1 external/mit/xwd/dist/README
--- a/external/mit/xwd/dist/README Mon Aug 23 21:27:58 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-xwd - dump an image of an X window
-
-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/xwd
-
- http://cgit.freedesktop.org/xorg/app/xwd
-
-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
-
Home |
Main Index |
Thread Index |
Old Index