Module Name: xsrc
Committed By: mrg
Date: Sat Nov 16 03:57:51 UTC 2024
Modified Files:
xsrc/external/mit/xclipboard/dist: compile
xsrc/external/mit/xlogo/dist: compile
xsrc/external/mit/xmag/dist: Scale.c xmag.c
xsrc/external/mit/xprop/include: config.h
Log Message:
merge xclipboard 1.1.5, xlogo 1.0.7, xmag 1.0.8, and xprop 1.2.8.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xclipboard/dist/compile
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xlogo/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmag/dist/Scale.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmag/dist/xmag.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xprop/include/config.h
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/xclipboard/dist/compile
diff -u xsrc/external/mit/xclipboard/dist/compile:1.4 xsrc/external/mit/xclipboard/dist/compile:1.5
--- xsrc/external/mit/xclipboard/dist/compile:1.4 Mon Jul 11 08:03:31 2022
+++ xsrc/external/mit/xclipboard/dist/compile Sat Nov 16 03:57:51 2024
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -143,7 +143,7 @@ func_cl_wrapper ()
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
- *.o | *.[oO][bB][jJ])
+ *.o | *.lo | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
@@ -248,14 +248,17 @@ If you are trying to build a whole packa
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-autom...@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
EOF
exit $?
;;
-v | --v*)
- echo "compile $scriptversion"
+ echo "compile (GNU Automake) $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
Index: xsrc/external/mit/xlogo/dist/compile
diff -u xsrc/external/mit/xlogo/dist/compile:1.4 xsrc/external/mit/xlogo/dist/compile:1.5
--- xsrc/external/mit/xlogo/dist/compile:1.4 Sun Nov 13 05:24:24 2022
+++ xsrc/external/mit/xlogo/dist/compile Sat Nov 16 03:57:51 2024
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -143,7 +143,7 @@ func_cl_wrapper ()
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
- *.o | *.[oO][bB][jJ])
+ *.o | *.lo | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
@@ -248,14 +248,17 @@ If you are trying to build a whole packa
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-autom...@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
EOF
exit $?
;;
-v | --v*)
- echo "compile $scriptversion"
+ echo "compile (GNU Automake) $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
Index: xsrc/external/mit/xmag/dist/Scale.c
diff -u xsrc/external/mit/xmag/dist/Scale.c:1.2 xsrc/external/mit/xmag/dist/Scale.c:1.3
--- xsrc/external/mit/xmag/dist/Scale.c:1.2 Mon Jul 20 23:49:02 2015
+++ xsrc/external/mit/xmag/dist/Scale.c Sat Nov 16 03:57:51 2024
@@ -266,9 +266,9 @@ GetRectangleBuffer(ScaleWidget sw, Cardi
-/* ARGSUSED */
static void
-Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
+Initialize(_X_UNUSED Widget request, Widget new,
+ _X_UNUSED ArgList args, _X_UNUSED Cardinal *num_args)
{
ScaleWidget new_sw = (ScaleWidget) new;
@@ -543,9 +543,8 @@ SWGetImagePixel(Widget w, Position x, Po
-/* ARGSUSED */
static void
-Redisplay(Widget w, XEvent *event, Region region)
+Redisplay(Widget w, XEvent *event, _X_UNUSED Region region)
{
ScaleWidget sw = (ScaleWidget) w;
Position x, y, img_x, img_y;
@@ -573,12 +572,10 @@ Redisplay(Widget w, XEvent *event, Regio
height = event->xexpose.height;
}
- img_x = min(max((Position) floor((float) x
- / (float) sw->scale.scale_x), 0),
+ img_x = min(max((Position) floor(x / sw->scale.scale_x), 0),
(Position) sw->scale.image->width - 1);
- img_y = min(max((Position) floor((float) y
- / (float) sw->scale.scale_y), 0),
+ img_y = min(max((Position) floor(y / sw->scale.scale_y), 0),
(Position) sw->scale.image->height - 1);
if (sw->core.visible) {
@@ -586,9 +583,9 @@ Redisplay(Widget w, XEvent *event, Regio
img_x, img_y,
sw->scale.x + sw->scale.table.x[(int) img_x],
sw->scale.y + sw->scale.table.y[(int) img_y],
- (Dimension) ceil((float) width
+ (Dimension) ceil(width
/ sw->scale.scale_x) + 1,
- (Dimension) ceil((float) height
+ (Dimension) ceil(height
/ sw->scale.scale_y) + 1);
}
}
@@ -638,7 +635,7 @@ Precision(ScaleWidget sw)
static void
Proportional(ScaleWidget sw)
{
- float scale_x, scale_y;
+ double scale_x, scale_y;
scale_x = sw->scale.scale_y / sw->scale.aspect_ratio;
scale_y = sw->scale.scale_x * sw->scale.aspect_ratio;
@@ -654,7 +651,7 @@ Proportional(ScaleWidget sw)
else if (scale_y <= sw->scale.scale_y)
sw->scale.scale_y = scale_y;
else {
- float x_ratio, y_ratio;
+ double x_ratio, y_ratio;
x_ratio = scale_x / sw->scale.scale_x;
y_ratio = scale_y / sw->scale.scale_y;
@@ -691,12 +688,12 @@ GetScaleValues(ScaleWidget sw)
*/
sw->scale.scale_x =
- (float) max((int)(sw->core.width - 2 * sw->scale.internal_width), 1)
- / (float) sw->scale.image->width;
+ max((int)(sw->core.width - 2 * sw->scale.internal_width), 1)
+ / sw->scale.image->width;
sw->scale.scale_y =
- (float) max((int)(sw->core.height - 2 * sw->scale.internal_height), 1)
- / (float) sw->scale.image->height;
+ max((int)(sw->core.height - 2 * sw->scale.internal_height), 1)
+ / sw->scale.image->height;
}
@@ -771,7 +768,7 @@ Realize(Widget wid, Mask *vmask, XSetWin
{
ScaleWidget sw = (ScaleWidget) wid;
XtCreateWindow(wid, (unsigned int) InputOutput,
- (Visual *) sw->scale.visual, *vmask, attr);
+ sw->scale.visual, *vmask, attr);
}
@@ -795,9 +792,8 @@ Destroy(Widget w)
-/* ARGSUSED */
static Boolean
-SetValues(Widget current, Widget request, Widget new,
+SetValues(Widget current, _X_UNUSED Widget request, Widget new,
ArgList args, Cardinal *num_args)
{
ScaleWidget cur_sw = (ScaleWidget) current;
@@ -941,7 +937,8 @@ SetValues(Widget current, Widget request
void
-SWUnscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
+SWUnscale(Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
ScaleWidget sw = (ScaleWidget) w;
@@ -953,7 +950,8 @@ SWUnscale(Widget w, XEvent *event, Strin
void
-SWAutoscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
+SWAutoscale(Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
ScaleWidget sw = (ScaleWidget) w;
@@ -965,7 +963,8 @@ SWAutoscale(Widget w, XEvent *event, Str
void
-SWInitialSize(Widget w, XEvent *event, String *params, Cardinal *num_params)
+SWInitialSize(Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
ScaleWidget sw = (ScaleWidget) w;
@@ -998,7 +997,8 @@ SWSetImage(Widget w, XImage *image)
void
-RequestSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
+RequestSelection(Widget w, XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
SWRequestSelection(w, event->xbutton.time);
}
@@ -1006,7 +1006,8 @@ RequestSelection(Widget w, XEvent *event
void
-GrabSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
+GrabSelection(Widget w, XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
SWGrabSelection(w, event->xbutton.time);
}
Index: xsrc/external/mit/xmag/dist/xmag.c
diff -u xsrc/external/mit/xmag/dist/xmag.c:1.3 xsrc/external/mit/xmag/dist/xmag.c:1.4
--- xsrc/external/mit/xmag/dist/xmag.c:1.3 Wed Jul 13 19:02:09 2022
+++ xsrc/external/mit/xmag/dist/xmag.c Sat Nov 16 03:57:51 2024
@@ -202,9 +202,9 @@ static XtActionsRec actions_table[] = {
* area that contains bits of different depths.
*/
static int
-Error(Display *dpy, XErrorEvent *err)
+Error(Display *display, XErrorEvent *err)
{
- (void) XmuPrintDefaultErrorMessage (dpy, err, stderr);
+ (void) XmuPrintDefaultErrorMessage (display, err, stderr);
return 0;
}
@@ -213,8 +213,9 @@ Error(Display *dpy, XErrorEvent *err)
* CloseAP() -- Close this dialog. If its the last one exit the program.
*
*/
-static void /* ARGSUSED */
-CloseAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+CloseAP(Widget w, XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
Arg wargs[2]; int n; hlPtr data;
if (!--numXmags) exit(0);
@@ -234,8 +235,9 @@ CloseAP(Widget w, XEvent *event, String
* SetCmapPropsAP() -- Put the scale widget first in WM_COLORMAP_WINDOWS
*
*/
-static void /* ARGSUSED */
-SetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+SetCmapPropsAP(Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
Arg wargs[2]; int n; hlPtr data;
n = 0; /* get user data */
@@ -254,8 +256,9 @@ SetCmapPropsAP(Widget w, XEvent *event,
* UnsetCmapPropsAP() -- Put the shell first in WM_COLORMAP_WINDOWS
*
*/
-static void /* ARGSUSED */
-UnsetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+UnsetCmapPropsAP(Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
Arg wargs[2]; int n; hlPtr data;
n = 0; /* get user data */
@@ -274,8 +277,9 @@ UnsetCmapPropsAP(Widget w, XEvent *event
* NewAP() -- Create an additional xmag dialog. THIS IS A COPY OF NewEH
* FIND A BETTER WAY....
*/
-static void /* ARGSUSED */
-NewAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+NewAP(_X_UNUSED Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
StartRootPtrGrab(True, NULL);
}
@@ -285,8 +289,9 @@ NewAP(Widget w, XEvent *event, String *p
/*
* ReplaceAP() -- Replace this particular xmag dialog.
*/
-static void /* ARGSUSED */
-ReplaceAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+ReplaceAP(Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
Arg wargs[2]; int n; hlPtr data;
n = 0; /* get user data */
@@ -300,8 +305,9 @@ ReplaceAP(Widget w, XEvent *event, Strin
/*
* PopupPixelAP() -- Show pixel information.
*/
-static void /* ARGSUSED */
-PopupPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+PopupPixelAP(Widget w, XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
Position scale_x, scale_y;
Dimension scale_height;
@@ -348,8 +354,9 @@ PopupPixelAP(Widget w, XEvent *event, St
/*
* UpdatePixelAP() -- Update pixel information.
*/
-static void /* ARGSUSED */
-UpdatePixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+UpdatePixelAP(Widget w, XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
Position x, y;
Pixel pixel;
@@ -384,8 +391,9 @@ UpdatePixelAP(Widget w, XEvent *event, S
/*
* PopdownPixelAP() -- Remove pixel info.
*/
-static void /* ARGSUSED */
-PopdownPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+PopdownPixelAP(Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
int n;
Arg wargs[3];
@@ -401,8 +409,9 @@ PopdownPixelAP(Widget w, XEvent *event,
-static void /* ARGSUSED */
-SelectRegionAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+SelectRegionAP(_X_UNUSED Widget w, _X_UNUSED XEvent *event,
+ _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
{
/***** NOT SURE WHAT TO DO WITH THIS
if (app_resources.unmap)
@@ -451,7 +460,7 @@ CheckPoints(Position *x1, Position *x2,
* HighlightTO() -- Timer to highlight the selection box
*/
static void
-HighlightTO(XtPointer closure, XtIntervalId *id) /* ARGSUSED */
+HighlightTO(XtPointer closure, _X_UNUSED XtIntervalId *id)
{
hlPtr data = (hlPtr)closure;
XGrabServer(dpy);
@@ -487,8 +496,8 @@ HighlightTO(XtPointer closure, XtInterva
* CloseCB() -- Delete this xmag dialog. If its the only one on the screen
* then exit.
*/
-static void /* ARGSUSED */
-CloseCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+CloseCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
{
Widget shell = (Widget)clientData;
if (!--numXmags) exit(0);
@@ -501,8 +510,8 @@ CloseCB(Widget w, XtPointer clientData,
/*
* ReplaceCB() -- Replace this particular xmag dialog.
*/
-static void /* ARGSUSED */
-ReplaceCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+ReplaceCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
{
hlPtr data = (hlPtr)clientData;
StartRootPtrGrab(False, data);
@@ -513,8 +522,8 @@ ReplaceCB(Widget w, XtPointer clientData
/*
* NewCB() -- Create an additional xmag dialog.
*/
-static void /* ARGSUSED */
-NewCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+NewCB(_X_UNUSED Widget w, _X_UNUSED XtPointer clientData, _X_UNUSED XtPointer callData)
{
StartRootPtrGrab(True, NULL);
}
@@ -524,8 +533,8 @@ NewCB(Widget w, XtPointer clientData, Xt
/*
* SelectCB() -- Own the primary selection.
*/
-static void /* ARGSUSED */
-SelectCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+SelectCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
{
hlPtr data = (hlPtr)clientData;
SWGrabSelection(data->scaleInstance, XtLastTimestampProcessed(dpy));
@@ -536,8 +545,8 @@ SelectCB(Widget w, XtPointer clientData,
/*
* PasteCB() -- Paste from the primary selection into xmag.
*/
-static void /* ARGSUSED */
-PasteCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+PasteCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
{
hlPtr data = (hlPtr)clientData;
SWRequestSelection(data->scaleInstance, XtLastTimestampProcessed(dpy));
@@ -596,7 +605,7 @@ FindWindow(int x, int y) /* Location of
*/
static void
ResizeEH(Widget w, XtPointer closure, XEvent *event,
- Boolean *continue_to_dispatch) /* ARGSUSED */
+ _X_UNUSED Boolean *continue_to_dispatch)
{
hlPtr data = (hlPtr)closure;
switch (event->type) {
@@ -635,7 +644,7 @@ ResizeEH(Widget w, XtPointer closure, XE
*/
static void
DragEH(Widget w, XtPointer closure, XEvent *event,
- Boolean *continue_to_dispatch) /* ARGSUSED */
+ _X_UNUSED Boolean *continue_to_dispatch)
{
hlPtr data = (hlPtr)closure;
switch (event->type) {
@@ -743,7 +752,7 @@ CreateRoot(void)
if (XValue & srcStat && YValue &srcStat) {
numXmags = 1;
data = (hlPtr)XtMalloc(sizeof(hlStruct));
- data = data;
+
data->newScale = True;
data->selectMode = drag;
data->x = srcX;
@@ -1105,15 +1114,40 @@ ParseSourceGeom(void)
+static void _X_NORETURN
+usage(const char *progname, int exitval)
+{
+ fprintf (stderr,
+ "usage: %s [-source geom] [-mag magfactor] [-toolkitoption]\n"
+ " %s [-help|-version]\n",
+ progname, progname);
+ exit (exitval);
+}
+
/*
* Main program.
*/
int
main(int argc, char *argv[])
{
+ /* Handle args that don't require opening a display */
+ for (int n = 1; n < argc; n++) {
+ const char *argn = argv[n];
+ /* accept single or double dash for -help & -version */
+ if (argn[0] == '-' && argn[1] == '-') {
+ argn++;
+ }
+ if (strcmp(argn, "-help") == 0) {
+ usage(argv[0], 0);
+ }
+ if (strcmp(argn, "-version") == 0) {
+ puts(PACKAGE_STRING);
+ exit(0);
+ }
+ }
+
XSetErrorHandler(Error);
- /* SUPPRESS 594 */
toplevel = XtAppInitialize(&app, "Xmag", optionDesc, XtNumber(optionDesc),
&argc, argv, NULL,
NULL, 0);
@@ -1123,9 +1157,12 @@ main(int argc, char *argv[])
XtGetApplicationResources(toplevel, (XtPointer) &options, resources,
XtNumber(resources), NULL, 0);
if (argc != 1) {
- fprintf (stderr,
- "usage: xmag [-source geom] [-mag magfactor] [-toolkitoption]\n");
- exit(1);
+ fputs("Unknown argument(s):", stderr);
+ for (int n = 1; n < argc; n++) {
+ fprintf(stderr, " %s", argv[n]);
+ }
+ fputs("\n\n", stderr);
+ usage(argv[0], 1);
}
Index: xsrc/external/mit/xprop/include/config.h
diff -u xsrc/external/mit/xprop/include/config.h:1.8 xsrc/external/mit/xprop/include/config.h:1.9
--- xsrc/external/mit/xprop/include/config.h:1.8 Sun Jan 8 09:59:51 2023
+++ xsrc/external/mit/xprop/include/config.h Sat Nov 16 03:57:51 2024
@@ -47,7 +47,7 @@
#define PACKAGE_NAME "xprop"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xprop 1.2.6"
+#define PACKAGE_STRING "xprop 1.2.8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xprop"
@@ -56,7 +56,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.6"
+#define PACKAGE_VERSION "1.2.8"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -65,10 +65,10 @@
#define PACKAGE_VERSION_MINOR 2
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 6
+#define PACKAGE_VERSION_PATCHLEVEL 8
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.2.6"
+#define VERSION "1.2.8"
