svn merge ^/branches/released .

1 files changed, 291 insertions, 0 deletions

diff --git a/apps/xwininfo/ChangeLog b/apps/xwininfo/ChangeLog
index 2c55c1453..0f3413a34 100644
--- a/apps/xwininfo/ChangeLog
+++ b/apps/xwininfo/ChangeLog
@@ -1,3 +1,294 @@
+commit aac89e8e81faca5d6eb830cd65591619a26ec17a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Sep 26 18:35:40 2010 -0700
+
+    xwininfo 1.1.0
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit abcf5e76c7dfc951832fda6845ace426b9ddebce
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Sep 26 18:30:08 2010 -0700
+
+    config: upgrade to util-macros 1.8 for additional man page support
+    
+    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+    The value of MAN_SUBST is the same for all X.Org packages.
+    
+    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+    Enables use of platform appropriate version of sed.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b6c84ba0aab5b95883a4f5759ec100b387314ec5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Jul 20 18:45:18 2010 -0400
+
+    config: update AC_PREREQ statement to 2.60
+    
+    Unrelated to the previous patches, the new value simply reflects
+    the reality that the minimum level for autoconf to configure
+    all x.org modules is 2.60 dated June 2006.
+    
+    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8263f19cf9002c7b5f2967a2bde7af4ed117c1e5
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Sat Jul 10 10:19:14 2010 -0700
+
+    strnlen: Fix building on systems without strnlen(3)
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3fa31068bcae6a5bee7fbd41788e13d6d56da8c0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Jun 30 18:38:57 2010 -0700
+
+    Make iconv() usage optional
+    
+    Allows building without iconv, though character set conversion will not
+    be supported in that case.
+    
+    Handles UTF8_STRING validation and output for UTF-8 locales without iconv
+    (using is_valid_utf8() function copied from X.Org's app/xprop/xprop.c)
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit 6a4f77d4ac1737dd49f3462d98e0f7e41e50ab18
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jun 29 22:51:38 2010 -0700
+
+    Add some EWMH hints to the -wm output
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit baf759d33b4b360fef2b2c61094ef109bec708fa
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jun 29 17:56:07 2010 -0700
+
+    Handle non-latin-1 window names
+    
+    Uses _NET_WM_NAME to get UTF-8 encoding, iconv to convert to current locale
+    Warns that COMPOUND_TEXT WM_NAMEs aren't supported if _NET_WM_NAME isn't set
+    Adds local atom caching code to dsimple.c and uses it in all three *.c
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit 6ec3573d7876fa62d2a81057ce0d16ed328fad1f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Jun 25 21:41:21 2010 -0700
+
+    Make xcb-icccm dependency be optional and off-by-default
+    
+    Changes to the xcb-icccm API/ABI are under discussion, so for now default
+    to using local property handling code modeled after the current API, with
+    a --with-xcb-icccm to enable use of the API for testing/development.
+    
+    Once the API/ABI is stable & released, this set of changes should be
+    removed and the xcb-icccm API just used directly.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit 96f19bade9ce4940642d580f4c52e2bc0e3539ab
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jun 13 12:42:34 2010 -0700
+
+    Convert from Xlib to xcb
+    
+    Testing was done with a simple GNOME 2.28 session with a number of
+    applications open (gnome-terminal, VirtualBox, Firefox).
+    
+    Primary test case was xwininfo -root -all, which listed 114 children of
+    the root window.   Output was identical to Xlib version (after applying
+    the fix to libxcb_icccm for always null-terminating wm_class properties).
+    
+    Over a local connection on the same machine:
+    
+    Xlib:	0.00u 0.01s 0:00.05 20.0%
+    xcb:	0.00u 0.00s 0:00.02 0.0%
+    
+    (i.e. barely measurable difference - I had more variation between
+     repeated runs of the command)
+    
+    Introducing latency by running over ssh -X from California to Beijing
+    and back:
+    
+    Xlib:	0.03u 0.02s 8:19.12 0.0%
+    xcb:	0.00u 0.00s 0:45.26 0.0%
+    
+    Memory size when exit() is called:
+    
+    Xlib:
+     Address  Kbytes     RSS    Anon  Locked Mode   Mapped File
+    08043000      20      20      20       - rw---    [ stack ]
+    08400000     144     144     144       - rw---    [ heap ]
+    total Kb    8972    8640     316       -
+    
+    xcb:
+     Address  Kbytes     RSS    Anon  Locked Mode   Mapped File
+    08045000      12      12      12       - rwx--    [ stack ]
+    0806C000     100     100     100       - rwx--    [ heap ]
+    total Kb    7980    7692     288       -
+    
+    Bytes sent & received (counted by proxying via xscope):
+    
+    Xlib: Client --> Server: 21380 bytes   Client <-- Server:  54124 bytes
+    xcb:  Client --> Server: 21114 bytes   Client <-- Server:  53160 bytes
+    
+    (The Xlib code didn't save any replies, so re-requested a couple of things
+     when running with -all - I fixed that while porting to xcb, but the same
+     could be done with Xlib easily too.)
+    
+    Not yet handled: WM_NAME properties that need to be converted from another
+    character encoding.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: James Cloos <cloos@jhcloos.com>
+
+commit 123ff05c2e2bbdb9d7d6d958d9f096cf854b8360
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Jun 7 01:00:33 2010 -0700
+
+    Delay generating unknown code string until we know we need it
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 369c37a62cdd2841a3e8778674029841231f45ad
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jun 6 16:57:22 2010 -0700
+
+    Use _X_NORETURN from xproto 7.0.17
+    
+    Also throw in _X_ATTRIBUTE_PRINTF while we're here.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c72551c9e8805d44ee76f6723cada6843657031b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jun 6 16:06:07 2010 -0700
+
+    Make spacing more consistent
+    
+    Different functions had 2, 4, 6, or 8 spaces per indent level,
+    standardized on 4 spaces.   Also more consistenly put spaces before parens.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6001e8721f232aa1f8b584d903edcea148b0ebc5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jun 6 14:16:39 2010 -0700
+
+    Remove #ifdef NO_I18N code branches
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 44a6d871e2baec9724f131778887c834133a4dc5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jun 6 14:12:24 2010 -0700
+
+    Remove RCS/CVS id tags
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 98bb85ea5fd3e2b5e077d89c6bf6e16b8829481a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jun 6 14:11:13 2010 -0700
+
+    mark window_id_format as a const string
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 725c5bbb58e6fb2c8775512d194367e3d677ee43
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jun 6 14:05:53 2010 -0700
+
+    Collapse some series of multiline printfs into single strings/calls
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 969b179b3bfe2dd11f3426fc30cab3ac337b84d5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 15 13:10:39 2010 -0800
+
+    Update Sun license notices to current X.Org standard form
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit b0c1a61df072c92db646257b1048798df0f1c64d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Nov 26 09:19:55 2009 -0500
+
+    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+    
+    Now that the INSTALL file is generated.
+    Allows running make maintainer-clean.
+
+commit 414b61fcc45836ea0739b32abd0eff8c4a863f8d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Oct 28 14:09:09 2009 -0400
+
+    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+    
+    Add missing INSTALL file. Use standard GNU file on building tarball
+    README may have been updated
+    Remove AUTHORS file as it is empty and no content available yet.
+    Remove NEWS file as it is empty and no content available yet.
+
+commit 458d8ae3b990c64630b0ca56f88a2955c9470681
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Oct 26 22:08:39 2009 -0400
+
+    Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+    
+    ChangeLog filename is known to Automake and requires no further
+    coding in the makefile.
+
+commit dd4df8d8ec6a4cb34af8ddfd65277ae602d6cdc8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Oct 22 12:34:16 2009 -0400
+
+    .gitignore: use common defaults with custom section # 24239
+    
+    Using common defaults will reduce errors and maintenance.
+    Only the very small or inexistent custom section need periodic maintenance
+    when the structure of the component changes. Do not edit defaults.
+
+commit d245ffee6e947b275b21a7a47716410c41154d4a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Sep 27 15:41:05 2009 -0400
+
+    Makefile.am: do not include autogen.sh in distribution #24183
+    
+    This is a private build script that should not be distributed
+
+commit a61af405625b9a284497d7b4e56ef9719d3ae14f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 21 12:47:22 2009 -0700
+
+    This is not a GNU project, so declare it foreign.
+    
+    On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+    > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+    > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+    > > was quite annoying to work around since 'autoreconf -fvi' replaces
+    > > it and git wants to commit it.  Should these files even be in git?
+    > > Can I nuke them for the betterment of humanity and since they get
+    > > created by autoreconf anyways?
+    >
+    > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+    
+    As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+    AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+    of the INSTALL file. It is also part of the 24206 solution.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
 commit 1569f4d692443bf0658dbe12902f995693b13dcf
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Oct 12 16:08:57 2009 -0700