Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package editres for openSUSE:Factory checked in at 2026-04-19 14:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/editres (Old) and /work/SRC/openSUSE:Factory/.editres.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "editres" Sun Apr 19 14:20:58 2026 rev:11 rq:1348001 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/editres/editres.changes 2024-03-04 21:25:14.110611433 +0100 +++ /work/SRC/openSUSE:Factory/.editres.new.11940/editres.changes 2026-04-19 14:21:26.330276745 +0200 @@ -1,0 +2,10 @@ +Sun Apr 19 09:23:50 UTC 2026 - Stefan Dirsch <[email protected]> + +- update to version 1.1.0 + * This release updates to version 6 of the editres protocol, introduced + in version 1.3.0 of libXmu (which is required to build this version), + providing support for 64-bit pointers to windows & widgets. + * This release adds support for building with meson as well as autoconf. +- switched to meson + +------------------------------------------------------------------- Old: ---- editres-1.0.9.tar.xz New: ---- editres-1.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ editres.spec ++++++ --- /var/tmp/diff_new_pack.fnj7wj/_old 2026-04-19 14:21:26.814296426 +0200 +++ /var/tmp/diff_new_pack.fnj7wj/_new 2026-04-19 14:21:26.814296426 +0200 @@ -1,7 +1,7 @@ # # spec file for package editres # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,14 @@ Name: editres -Version: 1.0.9 +Version: 1.1.0 Release: 0 Summary: Dynamic resource editor for X Toolkit applications License: X11 Group: System/X11/Utilities URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +BuildRequires: meson BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) @@ -44,15 +45,16 @@ %setup -q %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS ChangeLog +%license COPYING %{_bindir}/editres %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/Editres ++++++ editres-1.0.9.tar.xz -> editres-1.1.0.tar.xz ++++++ ++++ 10734 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/ChangeLog new/editres-1.1.0/ChangeLog --- old/editres-1.0.9/ChangeLog 2024-03-03 18:40:39.000000000 +0100 +++ new/editres-1.1.0/ChangeLog 2026-04-18 23:30:32.000000000 +0200 @@ -1,3 +1,84 @@ +commit f9adfdd58e2d405d273bfd65840f2264d8aed16c +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 18 14:24:57 2026 -0700 + + editres 1.1.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 2dc9a3e28f0ad591b97edc743b4cb6e4ecc22304 +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 8 15:52:55 2026 -0700 + + meson: Add option to build with meson + + Also updates the gitlab CI config to test both build types + and compare the generated output/installed files. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/9> + +commit 9d50619a86a01f217328a120a5473db5720d4ab7 +Author: Tim Hentenaar <[email protected]> +Date: Sun Jan 25 06:02:54 2026 -0500 + + gitlab-ci: Drop the ci-fairy check-mr job + + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/7> + +commit 3c7dd560793437f5413d6da6d333e1cf4a5ab6cb +Author: Tim Hentenaar <[email protected]> +Date: Sat Jan 24 19:12:00 2026 -0500 + + configure.ac: Bump required libxmu version to >= 1.3.0 + + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/7> + +commit 1ad2fdb6d2c1e44ac5b28266970dc8f3889d5a69 +Author: Tim Hentenaar <[email protected]> +Date: Fri Jul 11 10:50:30 2025 -0400 + + Bump the proto to v6, Widget / Window values are 64-bits + + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/7> + +commit 036fe3307bad567e38dead3964e043314b8a3840 +Author: Tim Hentenaar <[email protected]> +Date: Fri Jul 11 10:27:55 2025 -0400 + + comm: Avoid an endless loop on protocol mismatch + + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/7> + +commit 18cd58b7fe3b3de39ba4e65fe37796f53684f586 +Author: Tim Hentenaar <[email protected]> +Date: Fri Jul 11 10:02:03 2025 -0400 + + utils: Format the protocol verison number proper to avoid confusion + + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/7> + +commit 7dcd7b6325464459a859c67f1eb269dcdafa1192 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 26 12:36:34 2025 -0700 + + man pages: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: man1/editres.1:426:2: WARNING: skipping paragraph macro: PP empty + an.tmac:man1/editres.1:440: style: .BR expects at least 2 arguments, got 1 + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/6> + +commit 3e495f5f34bd6c7e3a87618452859eb59440996d +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 29 15:15:08 2025 -0700 + + Improve man page formatting + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/5> + commit 6013f24444d576ad263004c45edd52b4e8cec632 Author: Alan Coopersmith <[email protected]> Date: Sun Mar 3 09:37:16 2024 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/Makefile.am new/editres-1.1.0/Makefile.am --- old/editres-1.0.9/Makefile.am 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/Makefile.am 2026-04-18 23:30:21.000000000 +0200 @@ -61,4 +61,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build meson.options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/app-defaults/Editres new/editres-1.1.0/app-defaults/Editres --- old/editres-1.0.9/app-defaults/Editres 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/app-defaults/Editres 2026-04-18 23:30:21.000000000 +0200 @@ -89,7 +89,7 @@ *label33: Internal Error: Unknown activate type. *label34: Only one Resource Box can be active at a time. *label35: Unable to unpack protocol request. -*label36: This version of editres uses protocol version %s,\nbut the client speaks version %s. +*label36: This version of editres uses protocol version %d,\nbut the client speaks version %d. ! Xt Messages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/comm.c new/editres-1.1.0/comm.c --- old/editres-1.0.9/comm.c 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/comm.c 2026-04-18 23:30:21.000000000 +0200 @@ -411,11 +411,6 @@ switch ((int) error_code) { case PartialSuccess: -/***** - if (global_client.command == LocalSendWidgetTree && - global_effective_protocol_version < CURRENT_PROTOCOL_VERSION) - ++global_effective_protocol_version; -*****/ if ((event = BuildEvent(stream)) != NULL) { error_str = DispatchEvent(event); FreeEvent(event); @@ -430,7 +425,8 @@ break; case ProtocolMismatch: error_str = ProtocolFailure(stream); - --global_effective_protocol_version; + if (!--global_effective_protocol_version) + break; /* normally protocol version is reset to current during a SendWidgetTree * request, however, after a protocol failure this is skipped once for * a retry. @@ -567,7 +563,7 @@ if (!(_XEditResGetWidgetInfo(stream, &(info->widgets)) && _XEditResGetString8(stream, &(info->name)) && _XEditResGetString8(stream, &(info->class)) && - _XEditResGet32(stream, &(info->window)))) + _XEditResGet64(stream, &(info->window)))) { goto done; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/compile new/editres-1.1.0/compile --- old/editres-1.0.9/compile 2024-03-03 18:40:34.000000000 +0100 +++ new/editres-1.1.0/compile 2026-04-18 23:30:26.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -37,11 +37,11 @@ file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` @@ -143,7 +156,7 @@ # 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 +261,17 @@ right script to run: please start by reading the file 'INSTALL'. Report bugs to <[email protected]>. +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... ;; @@ -340,9 +356,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/configure.ac new/editres-1.1.0/configure.ac --- old/editres-1.0.9/configure.ac 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/configure.ac 2026-04-18 23:30:21.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([editres], [1.0.9], +AC_INIT([editres], [1.1.0], [https://gitlab.freedesktop.org/xorg/app/editres/-/issues], [editres]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -48,7 +48,7 @@ fi # Obtain compiler/linker options from dependencies -PKG_CHECK_MODULES(EDITRES, [xaw7 x11 xt >= 1.0.99.1 xmu xproto >= 7.0.17 ${XKBMODULE}]) +PKG_CHECK_MODULES(EDITRES, [xaw7 x11 xt >= 1.0.99.1 xmu >= 1.3.0 xproto >= 7.0.17 ${XKBMODULE}]) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/editresP.h new/editres-1.1.0/editresP.h --- old/editres-1.0.9/editresP.h 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/editresP.h 2026-04-18 23:30:21.000000000 +0200 @@ -29,6 +29,7 @@ #include <X11/Xmu/EditresP.h> #include <X11/Xresource.h> #include <X11/Xfuncproto.h> +#include <X11/Xmd.h> #define DEBUG @@ -38,13 +39,11 @@ # define CLIENT_TIME_OUT 5000 /* wait five seconds for the client. */ #endif /* DEBUG */ -#define PROTOCOL_VERSION_ONE_POINT_ONE 5 /* version 1.1 */ -#define ONE_POINT_ONE_STRING "1.1" -#define PROTOCOL_VERSION_ONE_POINT_ZERO 4 /* version 1.0 */ -#define ONE_POINT_ZERO_STRING "1.0" ONE_POINT_ONE_STRING - -#define CURRENT_PROTOCOL_VERSION PROTOCOL_VERSION_ONE_POINT_ONE -#define CURRENT_PROTOCOL_VERSION_STRING ONE_POINT_ONE_STRING +/** + * Current version of the editres protocol. Must be kept in sync with + * libXmu. + */ +#define CURRENT_PROTOCOL_VERSION 6 #define FLASH_TIME 1000 /* Default flash time in microseconds */ #define NUM_FLASHES 3 /* Default number of flashes. */ @@ -223,7 +222,7 @@ WidgetInfo widgets; char * name; char * class; - unsigned long window; + CARD64 window; } WidgetTreeInfo; typedef struct _SendWidgetTreeEvent { @@ -373,7 +372,7 @@ extern void DisplayChild ( Event * event ); extern void DumpTreeToFile ( Widget w, XtPointer junk, XtPointer garbage ); extern void ExecuteOverAllNodes ( WNode * top_node, void (*func)(WNode *, XtPointer), XtPointer data ); -extern WNode * FindNode ( WNode *top_node, unsigned long * ids, Cardinal number ); +extern WNode * FindNode ( WNode *top_node, CARD64 *ids, Cardinal number ); extern void FindWidget ( Widget w, XtPointer client_data, XtPointer call_data ); extern WNode * FindWidgetFromWindow ( TreeInfo * tree_info, Window win ); extern void FlashActiveWidgets ( Widget w, XtPointer junk, XtPointer garbage ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/handler.c new/editres-1.1.0/handler.c --- old/editres-1.0.9/handler.c 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/handler.c 2026-04-18 23:30:21.000000000 +0200 @@ -521,8 +521,7 @@ SetResourceString(list, node_ptr, junk); /* get the resource value from the application */ - if (global_effective_protocol_version >= - PROTOCOL_VERSION_ONE_POINT_ONE && do_get_values) { + if (global_effective_protocol_version >= 5 && do_get_values) { ObtainResource(node_ptr); do_get_values = False; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/man/editres.man new/editres-1.1.0/man/editres.man --- old/editres-1.0.9/man/editres.man 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/man/editres.man 2026-04-18 23:30:21.000000000 +0200 @@ -30,12 +30,12 @@ .SH SYNTAX \fBeditres\fP [ \fI\-toolkitoption\fP .\|.\|. ] [\fB\-help\fP] [\fB\-version\fP] .SH OPTIONS -.I Editres -accepts all of the standard X Toolkit command line -options (see \fIX(__miscmansuffix__)\fP). The order of the command line options is -not important. +.B Editres +accepts all of the standard X Toolkit command line options (see +.BR X (__miscmansuffix__)). +The order of the command line options is not important. .PP -.I Editres +.B Editres also accepts the following additional options: .TP 12 .B \-help @@ -44,88 +44,98 @@ .B \-version Prints version info and exits. .SH DESCRIPTION -Editres is a tool that allows users and application developers to view +.B Editres +is a tool that allows users and application developers to view the full widget hierarchy of any X Toolkit application that speaks the -Editres protocol. In addition, editres will help the user construct -resource specifications, allow the user to apply the resource to -the application and view the results dynamically. Once the user is -happy with a resource specification editres will append the resource -string to the user's X Resources file. +Editres protocol. +In addition, +.B editres +will help the user construct resource specifications, +allow the user to apply the resource to the application +and view the results dynamically. +Once the user is happy with a resource specification +.B editres +will append the resource string to the user's X Resources file. .SH USING EDITRES -.I Editres +.B Editres provides a window consisting of the following four areas: .IP "Menu Bar" 25 -A set of popup menus that allow you full access to editres's features. +A set of popup menus that allow you full access to \fBeditres\fP's features. .IP "Panner" The panner allows a more intuitive way to scroll the application tree display. .IP "Message Area" -Displays information to the user about the action that editres expects +Displays information to the user about the action that \fBeditres\fP expects of her. .IP "Application Widget Tree" 25 This area will be used to display the selected application's widget tree. .LP -To begin an editres session select the \fBGet Widget Tree\fP menu item from -the command menu. This will change the pointer cursor to cross hair. +To begin an \fBeditres\fP session select the \fBGet Widget Tree\fP menu item +from the command menu. +This will change the pointer cursor to a cross hair. You should now select the application you wish look at by clicking on -any of its windows. If this application understands the editres -protocol then editres will display the application's widget tree in its -tree window. If -the application does not understand the editres protocol editres will -inform you of this fact in the message area after a few seconds delay. +any of its windows. +If this application understands the editres protocol then \fBeditres\fP +will display the application's widget tree in its tree window. +If the application does not understand the editres protocol \fBeditres\fP +will inform you of this fact in the message area after a few seconds delay. .LP -Once you have a widget tree you may now select any of the other menu -options. The effect of each of these is described below. +Once you have a widget tree you may now select any of the other menu options. +The effect of each of these is described below. .SH COMMANDS .IP "Get Widget Tree" 8 Allows the user to click on any application that speaks the editres protocol and receive its widget tree. .IP "Refresh Current Widget Tree" -Editres only knows about the widgets that exist at the present time. -Many applications create and destroy widgets on the fly. Selecting -this menu item will cause editres to ask the application to resend its -widget tree, thus updating its information to the new state of the application. +\fBEditres\fP only knows about the widgets that exist at the present time. +Many applications create and destroy widgets on the fly. +Selecting this menu item will cause \fBeditres\fP +to ask the application to resend its widget tree, +thus updating its information to the new state of the application. .IP -For example, -xman only creates the widgets for its \fItopbox\fP when it -starts up. None of the widgets for the manual page window are created -until the user actually clicks on the \fIManual Page\fP button. If -you retrieved -xman's widget tree before the the manual page is active, you may -wish to refresh the widget tree after the manual page has been -displayed. This will allow you to also edit the manual page's resources. +For example, \fBxman\fP only creates the widgets for its \fItopbox\fP when it +starts up. +None of the widgets for the manual page window are created +until the user actually clicks on the \fIManual Page\fP button. +If you retrieved \fBxman\fP's widget tree before the the manual page is active, +you may wish to refresh the widget tree after the manual page has been displayed. +This will allow you to also edit the manual page's resources. .IP "Dump Widget Tree to a File" For documenting applications it is often useful to be able to -dump the entire application widget tree to an ASCII file. This file -can then be included in the manual page. When this menu item is selected -a popup dialog is activated. Type the name of the file in this -dialog, and either select \fIokay\fP, or type a carriage-return. Editres -will now dump the widget tree to this file. To cancel the file dialog, -select the \fIcancel\fP button. +dump the entire application widget tree to an ASCII file. +This file can then be included in the manual page. +When this menu item is selected a popup dialog is activated. +Type the name of the file in this dialog, and either select \fIokay\fP, +or type a carriage-return. +\fBEditres\fP will now dump the widget tree to this file. +To cancel the file dialog, select the \fIcancel\fP button. .IP "Show Resource Box" -This command will popup a resource box for the current application. This -resource box (described in detail below) will allow the user to see +This command will popup a resource box for the current application. +This resource box (described in detail below) will allow the user to see exactly which resources can be set for the widget that is currently -selected in the widget tree display. Only one widget may be currently -selected; if greater or fewer are selected editres will refuse to +selected in the widget tree display. +Only one widget may be currently selected; +if greater or fewer are selected \fBeditres\fP will refuse to pop up the resource box and put an error message in the \fBMessage Area\fP. .IP "Set Resource" This command will popup a simple dialog box for setting an arbitrary -resource on all selected widgets. You must type in the resource name, -as well as the value. You can use the Tab key to switch between the -resource name field the resource value field. +resource on all selected widgets. +You must type in the resource name, as well as the value. +You can use the Tab key to switch between the resource name field +and the resource value field. .IP "Quit" -Exits editres. +Exits +.BR editres . .SH TREE COMMANDS The \fBTree\fP menu contains several commands that allow operations to be performed on the widget tree. .IP "Select Widget in Client" -This menu item allows you to select any widget in the application; editres +This menu item allows you to select any widget in the application; \fBeditres\fP will then highlight the corresponding element the widget tree display. -Once -this menu item is selected the pointer cursor will again turn to a +Once this menu item is selected the pointer cursor will again turn to a crosshair, and you must click any pointer button in the widget you -wish to have displayed. Since some widgets are fully obscured by -their children, it is not possible to get to every widget this way, +wish to have displayed. +Since some widgets are fully obscured by their children, +it is not possible to get to every widget this way, but this mechanism does give very useful feedback between the elements in the widget tree and those in the actual application. .IP "Select All" @@ -151,20 +161,19 @@ class name, IDs, or window associated with each widget in the application. The widget IDs, and windows are shown as hex numbers. .LP -In addition there are keyboard accelerators for each of the -Tree operations. If the input focus is over an individual widget in -the tree, then that operation will only effect that widget. If the -input focus is in the Tree background it will have -exactly the same effect as the corresponding menu item. +In addition there are keyboard accelerators for each of the Tree operations. +If the input focus is over an individual widget in the tree, +then that operation will only effect that widget. +If the input focus is in the Tree background +it will have exactly the same effect as the corresponding menu item. .LP -The translation -entries shown may be applied to any widget in the application. If -that widget is a child of the Tree widget, then it will only affect that -widget, otherwise it will have the same effect as the commands in the -tree menu. +The translation entries shown may be applied to any widget in the application. +If that widget is a child of the Tree widget, +then it will only affect that widget, +otherwise it will have the same effect as the commands in the tree menu. .IP "Flash Active Widgets" -This command is the inverse of the \fBSelect Widget in Client\fP -command, it will show the user each widget that is currently selected in +This command is the inverse of the \fBSelect Widget in Client\fP command, +it will show the user each widget that is currently selected in the widget tree, by flashing the corresponding widget in the application \fInumFlashes\fP (three by default) times in the \fIflashColor\fP. @@ -204,10 +213,11 @@ apply it. .IP "The Widget Names and Classes" This area allows you to select exactly which widgets this resource will -apply to. The area contains four lines, the first contains the -name of the selected widget and all its ancestors, and the more restrictive -dot (\fB.\fP) separator. The second line contains less specific the -Class names +apply to. +The area contains four lines, +the first contains the name of the selected widget and all its ancestors, +and the more restrictive dot (\fB.\fP) separator. +The second line contains less specific the Class names of each widget, and well as the less restrictive star (\fB*\fP) separator. The third line contains a set of special buttons called \fBAny Widget\fP which will generalize this level to match any widget. @@ -216,22 +226,24 @@ matches zero or more levels. .sp The initial state of this area is the most restrictive, using the -resource names and the dot separator. By selecting the other buttons -in this area you can ease the restrictions to allow more and more widgets -to match the specification. The extreme case is to select all the -\fBAny Widget Chain\fP buttons, which will match every widget in the -application. As you select different buttons the tree display will update +resource names and the dot separator. +By selecting the other buttons in this area you can ease the restrictions +to allow more and more widgets to match the specification. +The extreme case is to select all the \fBAny Widget Chain\fP buttons, +which will match every widget in the application. +As you select different buttons the tree display will update to show you exactly which widgets will be effected by the current resource specification. .IP "Normal and Constraint Resources" The next area allows you to select the name of the normal or -constraint resources you wish to set. Some widgets may not have constraint -resources, so that area will not appear. +constraint resources you wish to set. +Some widgets may not have constraint resources, so that area will not appear. .IP "Resource Value" -This next area allows you to enter the resource value. This value -should be entered exactly as you would type a line into your resource file. -Thus it should contain no unescaped new-lines. There are a few -special character sequences for this file: +This next area allows you to enter the resource value. +This value should be entered exactly as you would type a line +into your resource file. +Thus it should contain no unescaped new-lines. +There are a few special character sequences for this file: .sp \\n - This will be replaced with a newline. .sp @@ -244,51 +256,54 @@ .sp \\\\ - This will compress to a single backslash. .IP "Command Area" -This area contains several command buttons, described in -this section. +This area contains several command buttons, described in this section. .IP "Set Save File" -This button allows the user to modify file that the resources -will be saved to. This button will bring up a dialog box that will -ask you for a filename; once the filename has been entered, either hit -carriage-return or click on the \fIokay\fP button. To pop down the -dialog box without changing the save file, click the \fIcancel\fP button. +This button allows the user to modify file that the resources will be saved to. +This button will bring up a dialog box that will ask you for a filename; +once the filename has been entered, +either hit carriage-return or click on the \fIokay\fP button. +To pop down the dialog box without changing the save file, +click the \fIcancel\fP button. .IP "Save" This button will append the \fBresource line\fP described above to the -end of the current save file. If no save file has been set the \fBSet -Save File\fP dialog box will be popped up to prompt the user for a filename. +end of the current save file. +If no save file has been set the \fBSet Save File\fP dialog box will be +popped up to prompt the user for a filename. .IP "Apply" This button attempts to perform a XtSetValues call on all widgets -that match the \fBresource line\fP described above. The value specified -is applied directly to all matching widgets. This behavior is an attempt -to give a dynamic feel to the resource editor. Since this feature allows -users to put an application in states it may not be willing to handle, +that match the \fBresource line\fP described above. +The value specified is applied directly to all matching widgets. +This behavior is an attempt to give a dynamic feel to the resource editor. +Since this feature allows users to put an application in states it may not +be willing to handle, a hook has been provided to allow specific applications to -block these SetValues -requests (see \fBBlocking Editres Requests\fP below). +block these SetValues requests (see \fBBlocking Editres Requests\fP below). .sp Unfortunately due to design constraints imposed on the widgets by the X Toolkit and the Resource Manager, trying to coerce an inherently -static system into dynamic behavior can cause strange results. There -is no guarantee that the results of an apply will be the same as what +static system into dynamic behavior can cause strange results. +There is no guarantee that the results of an apply will be the same as what will happen when you save the value and restart the application. This functionality is provided to try to give you a rough feel for what your changes will accomplish, and the results obtained should be considered -suspect at best. Having said that, this is one of the neatest -features of editres, and I strongly suggest that you play with it, and -see what it can do. +suspect at best. +Having said that, this is one of the neatest features of editres, +and I strongly suggest that you play with it, and see what it can do. .IP "Save and Apply" This button combines the Save and Apply actions described above into one button. .IP "Popdown Resource Box" This button will remove the resource box from the display. .SH BLOCKING EDITRES REQUESTS -The editres protocol has been built into the Athena Widget set. This allows -all applications that are linked against Xaw to be able to speak to the -resource editor. While this provides great flexibility, and is a -useful tool, it can quite easily be abused. It is therefore possible -for any Xaw application to specify a value for the \fBeditresBlock\fP -resource described below, to keep editres from divulging information -about its internals, or to disable the \fBSetValues\fP part of the protocol. +The editres protocol has been built into the Athena Widget set. +This allows all applications that are linked against Xaw to be able to speak +to the resource editor. +While this provides great flexibility, and is a useful tool, +it can quite easily be abused. +It is therefore possible for any Xaw application to specify a value for the +\fBeditresBlock\fP resource described below, +to keep \fBeditres\fP from divulging information about its internals, +or to disable the \fBSetValues\fP part of the protocol. .TP 8 .B editresBlock (\fPClass\fB EditresBlock) Specifies which type of blocking this application wishes to impose on the @@ -298,18 +313,19 @@ .IP all 15 Block all requests. .IP setValues -Block all SetValues requests. As this is the only editres request that -actually modifies the application, this is in effect stating that the -application is read-only. +Block all SetValues requests. +As this is the only editres request that actually modifies the application, +this is in effect stating that the application is read-only. .IP none Allow all editres requests. .LP -Remember that these resources are set on any Xaw application, \fBnot -editres\fP. They allow individual applications to keep all or some -of the requests editres makes from ever succeeding. Of course, -editres is also an Xaw application, so it may also be viewed and modified -by editres (rather recursive, I know), these commands can be blocked -by setting the \fBeditresBlock\fP resource on editres itself. +Remember that these resources are set on any Xaw application, \fBnot editres\fP. +They allow individual applications to keep all or some +of the requests editres makes from ever succeeding. +Of course, \fBeditres\fP is also an Xaw application, +so it may also be viewed and modified by \fBeditres\fP +(rather recursive, I know), these commands can be blocked +by setting the \fBeditresBlock\fP resource on \fBeditres\fP itself. .SH RESOURCES For \fIeditres\fP the available application resources are: .TP 8 @@ -330,7 +346,7 @@ button activated in the resource box. .SH WIDGETS In order to specify resources, it is useful to know the hierarchy of -the widgets which compose \fIeditres\fP. In the notation below, +the widgets which compose \fBeditres\fP. In the notation below, indentation indicates hierarchical structure. The widget class name is given first, followed by the widget instance name. .sp @@ -407,24 +423,23 @@ .fi .sp .SH ENVIRONMENT -.PP .TP 8 .B DISPLAY to get the default host and display number. .TP 8 .B XENVIRONMENT to get the name of a resource file that overrides the global resources -stored in the RESOURCE_MANAGER property. +stored in the \fBRESOURCE_MANAGER\fP property. .SH FILES .TP -.I __apploaddir__/Editres +.B __apploaddir__/Editres specifies required resources .SH SEE ALSO -X(__miscmansuffix__), xrdb(__appmansuffix__), Athena Widget Set +.BR X (__miscmansuffix__), +.BR xrdb (__appmansuffix__), +.I Athena Widget Set .SH RESTRICTIONS This is a prototype, there are lots of nifty features I would love to add, -but I hope this will give you some ideas about what a resource editor -can do. +but I hope this will give you some ideas about what a resource editor can do. .SH AUTHOR Chris D. Peterson, formerly MIT X Consortium - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/meson.build new/editres-1.1.0/meson.build --- old/editres-1.0.9/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/editres-1.1.0/meson.build 2026-04-18 23:30:21.000000000 +0200 @@ -0,0 +1,123 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2026, Oracle and/or its affiliates. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +project( + 'editres', + 'c', + version: '1.1.0', + license: 'MIT-open-group', + license_files: 'COPYING', + meson_version: '>= 1.1.0', +) + +conf = configuration_data() +package_string = ' '.join(meson.project_name(), meson.project_version()) +conf.set_quoted('PACKAGE_STRING', package_string) + +cc = meson.get_compiler('c') + +# Replacement for XORG_DEFAULT_OPTIONS +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Required dependencies +dep_libxaw = dependency('xaw7', required: true) +dep_libx11 = dependency('x11', required: true) +dep_libxt = dependency('xt', required: true, version: '>= 1.0.99.1') +dep_libxmu = dependency('xmu', required: true, version: '>= 1.3.0') +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.17') +deps = [dep_libxaw, dep_libx11, dep_libxt, dep_libxmu, dep_xproto] + +# Optional dependencies +if get_option('xkb').enabled() + dep_libxkbfile = dependency('xkbfile', required: true) + deps += dep_libxkbfile +endif +conf.set('XKB', get_option('xkb').enabled() ? 1 : false, + description: 'Define to use XkbStdBell') +summary('xkb', get_option('xkb').enabled()) + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +add_project_arguments('-D_CONST_X_STRING', language: ['c']) + +editres_sources = [ + config_h, + 'actions.c', + 'comm.c', + 'editres.c', + 'editresP.h', + 'geometry.c', + 'handler.c', + 'setvalues.c', + 'svpopup.c', + 'utils.c', + 'widgets.c', + 'wtree.c', +] + +executable( + 'editres', + editres_sources, + dependencies: deps, + install: true +) + +# Find directory for installing app-defaults files +appdefaultdir = get_option('appdefaultdir') +if appdefaultdir == '' + dep_libxt = dependency('xt', required: true) + appdefaultdir = dep_libxt.get_variable('appdefaultdir') +endif +summary('appdefaultdir', appdefaultdir) + +# App default files (*.ad) +install_data( + ['app-defaults/Editres', 'app-defaults/Editres-color'], + install_dir: appdefaultdir, + install_tag: 'runtime', +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'editres.man', + input: 'man/editres.man', + output: 'editres.1', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '-e', 's/__appmansuffix__/1/g', + '-e', 's/__miscmansuffix__/7/g', + '-e', f's|__apploaddir__|@appdefaultdir@|g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', + install_tag: 'man', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/meson.options new/editres-1.1.0/meson.options --- old/editres-1.0.9/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/editres-1.1.0/meson.options 2026-04-18 23:30:21.000000000 +0200 @@ -0,0 +1,12 @@ +option( + 'appdefaultdir', + type: 'string', + description: 'directory for app-defaults files (default is autodetected)', +) + +option( + 'xkb', + type: 'feature', + value : 'enabled', + description: 'Use XKB to sound bells (default is enabled)', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/missing new/editres-1.1.0/missing --- old/editres-1.0.9/missing 2024-03-03 18:40:34.000000000 +0100 +++ new/editres-1.1.0/missing 2026-04-18 23:30:26.000000000 +0200 @@ -1,9 +1,11 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common wrapper for a few potentially missing GNU and other programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells + +# Copyright (C) 1996-2025 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -54,18 +56,20 @@ -v, --version output version information and exit Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man +aclocal autoconf autogen autoheader autom4te automake autoreconf +bison flex help2man lex makeinfo perl yacc Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. -Send bug reports to <[email protected]>." +Report bugs to <[email protected]>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>." exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" + echo "missing (GNU Automake) $scriptversion" exit $? ;; @@ -108,7 +112,7 @@ program_details () { case $1 in - aclocal|automake) + aclocal|automake|autoreconf) echo "The '$1' program is part of the GNU Automake package:" echo "<$gnu_software_URL/automake>" echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" @@ -123,6 +127,9 @@ echo "<$gnu_software_URL/m4/>" echo "<$perl_URL>" ;; + *) + : + ;; esac } @@ -137,48 +144,55 @@ printf '%s\n' "'$1' is $msg." configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + autoheader_deps="'acconfig.h'" + automake_deps="'Makefile.am'" + aclocal_deps="'acinclude.m4'" case $normalized_program in + aclocal*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$configure_deps." + ;; autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' + echo "You should only need it if you modified $configure_deps." + ;; + autogen*) + echo "You should only need it if you modified a '.def' or '.tpl' file." + echo "You may want to install the GNU AutoGen package:" + echo "<$gnu_software_URL/autogen/>" ;; autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" + echo "You should only need it if you modified $autoheader_deps or" echo "$configure_deps." - program_details 'autoheader' ;; automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" + echo "You should only need it if you modified $automake_deps or" echo "$configure_deps." - program_details 'aclocal' ;; - autom4te*) + autom4te*) echo "You might have modified some maintainer files that require" echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' + ;; + autoreconf*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$automake_deps or $autoheader_deps or $automake_deps or" + echo "$configure_deps." ;; bison*|yacc*) echo "You should only need it if you modified a '.y' file." echo "You may want to install the GNU Bison package:" echo "<$gnu_software_URL/bison/>" ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; help2man*) echo "You should only need it if you modified a dependency" \ "of a man page." echo "You may want to install the GNU Help2man package:" echo "<$gnu_software_URL/help2man/>" ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; makeinfo*) echo "You should only need it if you modified a '.texi' file, or" echo "any other file indirectly affecting the aspect of the manual." @@ -189,6 +203,12 @@ echo "want to install GNU make:" echo "<$gnu_software_URL/make/>" ;; + perl*) + echo "You should only need it to run GNU Autoconf, GNU Automake, " + echo " assorted other tools, or if you modified a Perl source file." + echo "You may want to install the Perl 5 language interpreter:" + echo "<$perl_URL>" + ;; *) echo "You might have modified some files without having the proper" echo "tools for further handling them. Check the 'README' file, it" @@ -197,6 +217,7 @@ echo "case some other package contains this missing '$1' program." ;; esac + program_details "$normalized_program" } give_advice "$1" | sed -e '1s/^/WARNING: /' \ @@ -207,9 +228,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/editres-1.0.9/utils.c new/editres-1.1.0/utils.c --- old/editres-1.0.9/utils.c 2024-03-03 18:40:29.000000000 +0100 +++ new/editres-1.1.0/utils.c 2026-04-18 23:30:21.000000000 +0200 @@ -804,14 +804,13 @@ InsertWidgetFromNode(ProtocolStream *stream, WNode *node) { WNode *temp; - unsigned long * widget_list; + CARD64 *widget_list; register int i, num_widgets; for (temp = node, i = 0; temp != NULL; temp = temp->parent, i++) {} num_widgets = i; - widget_list = (unsigned long *) - XtMalloc(sizeof(unsigned long) * num_widgets); + widget_list = (CARD64 *)XtMalloc(sizeof(CARD64) * num_widgets); /* * Put the widgets into the list. @@ -823,7 +822,7 @@ _XEditResPut16(stream, num_widgets); /* insert number of widgets. */ for (i = 0; i < num_widgets; i++) /* insert Widgets themselves. */ - _XEditResPut32(stream, widget_list[i]); + _XEditResPut64(stream, widget_list[i]); XtFree((char *)widget_list); } @@ -855,20 +854,14 @@ char * ProtocolFailure(ProtocolStream *stream) { - char buf[BUFSIZ]; + char buf[128]; unsigned char version; - const char* old_version_string; if (!_XEditResGet8(stream, &version)) return(XtNewString(res_labels[35])); - switch ((int)version) { - case PROTOCOL_VERSION_ONE_POINT_ZERO: old_version_string = "1.0"; break; - default: old_version_string = "1.0"; - } - snprintf(buf, sizeof(buf), res_labels[36], - CURRENT_PROTOCOL_VERSION_STRING, old_version_string); + CURRENT_PROTOCOL_VERSION, version); return(XtNewString(buf)); }
