xmessage 1.0.2

2007-09-16 16:57:45 +00:00 · 2007-09-16 16:57:45 +00:00 · 29e2756ff0
commit 29e2756ff0
parent 8aee380437
4 changed files with 283 additions and 21 deletions
--- a/app/xmessage/ChangeLog
+++ b/app/xmessage/ChangeLog
@ -1,31 +1,228 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 24f1760790a9d2f73cac94bc00d8137fefac9f38
+Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date:   Fri Aug 10 11:18:12 2007 +0200

-	* configure.ac:
-	Update package version for X11R7 release.
+    Bump version

-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit db559a38a8bc954c6fd54866193a683d5c78bffa
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Tue Apr 24 22:07:48 2007 +0200

-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    fill in this generated file.

-2005-12-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit aabd047545359c82eb0035f8aa77864b362e7f0e
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Tue Apr 24 22:04:09 2007 +0200

-	* Makefile.am:
-	* configure.ac:
-	Change to use the app-defaults default dir configured in libXt.
+    Add rules to generate ChangeLog.
+    
+    (this file was missed in a previous commit - sorry).

-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 821d4603d701efcb09fcbdd246d6f7d9c3a24f28
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Apr 15 19:13:36 2007 +0200

-	* Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Untabify message before inserting it.
+    
+    From Kevin Ryde in Debian BTS, via bugzilla #10575, Brice Goglin.

-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit ed3f8aa0b66e5829836b576e6096bd645e87c50e
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Apr 15 19:05:45 2007 +0200

-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Add emacs droppings to the list of ignored files.

-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 1635803a5f719b0f8b5af8208819d63166990c5b
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Apr 15 19:04:51 2007 +0200

-	* configure.ac:
-	Update package version number for RC1 release.
+    Modernize build
+    
+    - replace ChangeLog by a generated file
+    - rename .cvsignore -> .gitignore

+commit 238767cb31e02d75bb7880f0b9c79e27992c3155
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:52 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit 6b7b94f799c71278065bbf589108f1e2f7b25671
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:46 2005 +0000
+
+    Stub COPYING files
+
+commit ffde028f5a2f865a411b6b63c9785e339c4d9a3c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:09 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit ff03086d9069fcd5f2b952709737dae7d51d80ef
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 7 16:18:01 2005 +0000
+
+    Change to use the app-defaults default dir configured in libXt.
+
+commit c3dddcf94c8ec3c4d483e1d568ea8fb69aa468a0
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:24 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit bab54eda6bb0b6680580b27ee0b5e268b97cb8ad
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:26 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 94622fedb20d9454d728628f190cf5280ed9a066
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:44 2005 +0000
+
+    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 5464c0f2adf34213f21137d1f819254ed50626e5
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:35:05 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 4d5dfb99f50bd1d9577d17426d1cabe8ea29a2a0
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:54 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit b71de113e311e10e59c3b6fbdc1ff63c90c8324d
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:56 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit b70f6692231e994bb57b4e51c09ab5535241713c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Oct 18 00:32:55 2005 +0000
+
+    Change default install dir for app-default files from
+        $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
+        the monolith & allow localization
+
+commit 630e728f987a8fcd53d1a0076bca0834d45e132f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:24 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit 557c649ffb5bbfed8533b3d93ea1dbedaa0fc0ac
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:47 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit eb77492515f7944b530550950a0143c8fb5b45cf
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:30 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit 28253816f0a35c12ba6e5eea660e6d89424a78be
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:36 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit fa1d1593fe790d08a2e6e1f4e16f86f923b7aeb5
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Jul 26 15:44:03 2005 +0000
+
+    Replace more GNU make-ism's with more portable macros
+
+commit a4ea5c92e64b3cf7a0df17705c27e8a7abdb2f8b
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Jul 24 10:26:39 2005 +0000
+
+    fix GNU-make only app-defaults rule
+
+commit 48a77ca80a31851bf02cec6ab510d9f1458311a5
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:32:02 2005 +0000
+
+    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+        configure cache, you cache it, and the cached value is probably wrong.
+
+commit 665ba4b9cf9a7c94782637051eb8e0d735bbaf7c
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Tue Jul 5 22:51:11 2005 +0000
+
+    Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,
+        xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable
+        xaw_use_xprint symlink.sh: add some extra files for xgc, xinit,
+        xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c:
+        Conditionalize use of xprint
+
+commit 78f5d29fcde2813dfed4474a3cce4ef77c592580
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:58 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit e5660a70027feb61532e8ab84d41ea6eed085cab
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:35:40 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 39acb07c37ed1df6d3ee3f332c9d817018b2c2e5
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:13:15 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 7879a743821a3984c29c0172450c1eedf6a4d730
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:26 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 795b4a0de2c473b11901107585f7d8a85abfd193
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:24:14 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 9ba02b5d7b34eba8356dfcb83694698dbc550073
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:15 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 6dcad3b7ba5983633e4303c22446c3de8922c003
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:15 2003 +0000
+
+    Initial revision
+
+commit 0e47985a1de54c6ac4f09831a7a81c83c43fc577
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:23 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit e87b0d408c8bef387afb069e25028d9a52c58a62
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:23 2003 +0000
+
+    Initial revision
--- a/app/xmessage/Makefile.am
+++ b/app/xmessage/Makefile.am
@ -60,7 +60,8 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)

 EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES += $(appman_DATA) ChangeLog
+MAINTAINERCLEANFILES = ChangeLog

 SED = sed

@ -85,3 +86,10 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man

 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
--- a/app/xmessage/configure.ac
+++ b/app/xmessage/configure.ac
@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.

 AC_PREREQ([2.57])
-AC_INIT(xmessage,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmessage)
+AC_INIT(xmessage,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmessage)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE

--- a/app/xmessage/xmessage.c
+++ b/app/xmessage/xmessage.c
@ -30,6 +30,7 @@ from the X Consortium.
 */
 /* $XFree86: xc/programs/xmessage/xmessage.c,v 1.4 2000/02/17 16:53:03 dawes Exp $ */

+#include <assert.h>
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
@ -154,6 +155,60 @@ default_exit_action(Widget w, XEvent *event, String *params,
 	exit(default_exitstatus);
 }

+/* Convert tabs to spaces in *messagep,*lengthp, copying to a new block of
+   memory.  */
+void
+detab (char **messagep, int *lengthp)
+{
+  int   i, n, col, psize;
+  char  *p;
+  
+  /* count how many tabs there are */
+  n = 0;
+  for (i = 0; i < *lengthp; i++)
+    if ((*messagep)[i] == '\t')
+      n++;
+
+  /* length increases by at most seven extra spaces for each tab */
+  psize = *lengthp + n*7 + 1;
+  p = XtMalloc (psize);
+
+  /* convert tabs to spaces, copying into p */
+  n = 0;
+  col = 0;
+  for (i = 0; i < *lengthp; i++)
+    {
+      switch ((*messagep)[i]) {
+      case '\n':
+        p[n++] = '\n';
+        col = 0;
+        break;
+      case '\t':
+        do
+          {
+            p[n++] = ' ';
+            col++;
+          }
+        while ((col % 8) != 0);
+        break;
+      default:
+        p[n++] = (*messagep)[i];
+        col++;
+        break;
+      }
+    }
+
+  assert (n < psize);
+
+  /* null-terminator needed by Label widget */
+  p[n] = '\0';
+
+  free (*messagep);
+
+  *messagep = p;
+  *lengthp = n;
+}
+
 static XtActionsRec actions_list[] = {
    {"exit", exit_action},
    {"default-exit", default_exit_action},
@ -304,6 +359,8 @@ main (int argc, char *argv[])
    XtAppAddActions(app_con, actions_list, XtNumber(actions_list));
    XtOverrideTranslations(top, XtParseTranslationTable(top_trans));

+    detab (&message_str, &message_len);
+
    /*
     * create the query form; this is where most of the real work is done
     */