Module Name: xsrc
Committed By: mrg
Date: Fri May 31 07:21:57 UTC 2013
Modified Files:
xsrc/external/mit/xinit/dist: startx.cpp
xsrc/external/mit/xinput/dist/src: xinput.c
Removed Files:
xsrc/external/mit/xcalc/dist: autogen.sh xcalc.man
xsrc/external/mit/xfd/dist: xfd.man
xsrc/external/mit/xfd/dist/m4: ax_define_dir.m4
xsrc/external/mit/xfontsel/dist: xfontsel.man
xsrc/external/mit/xfsinfo/dist: xfsinfo.man
xsrc/external/mit/xgamma/dist: xgamma.man
xsrc/external/mit/xgc/dist: xgc.man
xsrc/external/mit/xhost/dist: xhost.man
Log Message:
merge xcalc 1.0.5, xfd 1.1.1, xfontsel 1.0.5, xfsinfo 1.0.4, xgamma 1.0.5,
xgc 1.0.4, and xhost 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcalc/dist/autogen.sh
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xcalc/dist/xcalc.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfd/dist/xfd.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfd/dist/m4/ax_define_dir.m4
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfontsel/dist/xfontsel.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfsinfo/dist/xfsinfo.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xgamma/dist/xgamma.man
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xgc/dist/xgc.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xhost/dist/xhost.man
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinit/dist/startx.cpp
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinput/dist/src/xinput.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinit/dist/startx.cpp
diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.2 xsrc/external/mit/xinit/dist/startx.cpp:1.3
--- xsrc/external/mit/xinit/dist/startx.cpp:1.2 Sat Feb 18 08:54:21 2012
+++ xsrc/external/mit/xinit/dist/startx.cpp Fri May 31 07:21:57 2013
@@ -130,6 +130,11 @@ if defaults read $X11_PREFS_DOMAIN dpi >
defaultserverargs="$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`"
fi
+#else
+enable_xauth=1
+#endif
+
+XCOMM Automatically determine an unused $DISPLAY
d=0
while true ; do
[ -e /tmp/.X$d-lock ] || break
@@ -138,10 +143,6 @@ done
defaultdisplay=":$d"
unset d
-#else
-enable_xauth=1
-#endif
-
#if defined(__SCO__) || defined(__UNIXWARE__)
XCOMM SCO -t option: do not start an X server
@@ -200,7 +201,7 @@ XCOMM process client arguments
if [ x"$client" = x ]; then
client=$defaultclient
- XCOMM if no client arguments either, use rc file instead
+ XCOMM For compatibility reasons, only use startxrc if there were no client command line arguments
if [ x"$clientargs" = x ]; then
if [ -f "$userclientrc" ]; then
client=$userclientrc
@@ -213,29 +214,38 @@ if [ x"$client" = x ]; then
client=$scosysclientrc
#endif
fi
-
- clientargs=$defaultclientargs
fi
fi
+XCOMM if no client arguments, use defaults
+if [ x"$clientargs" = x ]; then
+ clientargs=$defaultclientargs
+fi
+
XCOMM process server arguments
if [ x"$server" = x ]; then
server=$defaultserver
- XCOMM if no server arguments or display either, use defaults
+ XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ x"$serverargs" = x -a x"$display" = x ]; then
- XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ -f "$userserverrc" ]; then
server=$userserverrc
elif [ -f "$sysserverrc" ]; then
server=$sysserverrc
fi
-
- serverargs=$defaultserverargs
- display=$defaultdisplay
fi
fi
+XCOMM if no server arguments, use defaults
+if [ x"$serverargs" = x ]; then
+ serverargs=$defaultserverargs
+fi
+
+XCOMM if no display, use default
+if [ x"$display" = x ]; then
+ display=$defaultdisplay
+fi
+
if [ x"$enable_xauth" = x1 ] ; then
if [ x"$XAUTHORITY" = x ]; then
XAUTHORITY=$HOME/.Xauthority
Index: xsrc/external/mit/xinput/dist/src/xinput.c
diff -u xsrc/external/mit/xinput/dist/src/xinput.c:1.2 xsrc/external/mit/xinput/dist/src/xinput.c:1.3
--- xsrc/external/mit/xinput/dist/src/xinput.c:1.2 Thu Aug 11 22:35:10 2011
+++ xsrc/external/mit/xinput/dist/src/xinput.c Fri May 31 07:21:57 2013
@@ -68,7 +68,7 @@ static entry drivers[] =
set_mode
},
{"list",
- "[--short || --long] [<device name>...]",
+ "[--short || --long || --name-only || --id-only] [<device name>...]",
list
},
{"query-state",
@@ -104,6 +104,10 @@ static entry drivers[] =
"<device>",
test_xi2,
},
+ { "map-to-output",
+ "<device> <output name>",
+ map_to_output,
+ },
#endif
{ "list-props",
"<device> [<device> ...]",
@@ -133,13 +137,23 @@ static entry drivers[] =
"<device> [--type=atom|float|int] [--format=8|16|32] <property> <val> [<val> ...]",
set_prop
},
+ {
+ "disable",
+ "<device>",
+ disable,
+ },
+ {
+ "enable",
+ "<device>",
+ enable,
+ },
{NULL, NULL, NULL
}
};
static const char version_id[] = VERSION;
-int
+static int
print_version(void)
{
XExtensionVersion *version;
@@ -184,6 +198,23 @@ xinput_version(Display *display)
XFree(version);
}
+#if HAVE_XI2
+ /* Announce our supported version so the server treats us correctly. */
+ if (vers >= XI_2_Major)
+ {
+ int maj = 2,
+ min = 0;
+
+#if HAVE_XI21
+ min = 1;
+#elif HAVE_XI22
+ min = 2;
+#endif
+
+ XIQueryVersion(display, &maj, &min);
+ }
+#endif
+
return vers;
}
@@ -219,7 +250,7 @@ find_device_info(Display *display,
(is_id && devices[loop].id == id))) {
if (found) {
fprintf(stderr,
- "Warning: There are multiple devices named \"%s\".\n"
+ "Warning: There are multiple devices named '%s'.\n"
"To ensure the correct one is selected, please use "
"the device ID instead.\n\n", name);
return NULL;
@@ -327,33 +358,37 @@ main(int argc, char * argv[])
char *func;
int event, error;
- if (argc < 2) {
- usage();
- return EXIT_FAILURE;
+ if (argc > 1) {
+ func = argv[1];
+ while(func[0] == '-') func++;
+ } else {
+ func = "list";
}
- func = argv[1];
- while((*func) == '-') func++;
-
if (strcmp("version", func) == 0) {
return print_version();
}
+ if (strcmp("help", func) == 0) {
+ usage();
+ return 0;
+ }
+
display = XOpenDisplay(NULL);
if (display == NULL) {
fprintf(stderr, "Unable to connect to X server\n");
- return EXIT_FAILURE;
+ goto out;
}
if (!XQueryExtension(display, "XInputExtension", &xi_opcode, &event, &error)) {
printf("X Input extension not available.\n");
- return EXIT_FAILURE;
+ goto out;
}
if (!xinput_version(display)) {
fprintf(stderr, "%s extension not available\n", INAME);
- return EXIT_FAILURE;
+ goto out;
}
while(driver->func_name) {
@@ -369,6 +404,9 @@ main(int argc, char * argv[])
usage();
+out:
+ if (display)
+ XCloseDisplay(display);
return EXIT_FAILURE;
}
