Commit graph

55 commits

Author SHA1 Message Date
James Cloos
d8fe979fc9 Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11 2007-08-20 15:34:50 -04:00
James Cloos
21ca953337 Fix typo
The code <U1000000D> was used where <U10000DC> was obviously intended.

It is possible that <Udiaeresis> should be used instead, if that will
not break anyone’s setup.
2007-08-20 15:34:03 -04:00
James Cloos
4ec1723fff Add compose file for Ethiopic to match new keyboard in xkeyboard-config
From bug report:

  https://bugs.freedesktop.org/show_bug.cgi?id=11307
2007-08-20 15:25:48 -04:00
James Cloos
eff33ae525 Patch for Catalan locales
From bugzilla bug 10943¹:

  There are several Catalan locale codes which presently can
  be used in X11 systems; especially after they were accepted
  in belocs-locale-data².

  In the following patches, I³ add ca_AD, ca_FR and ca_IT Catalan
  locale codes.  For instance, without this, using ca_AD (actually
  a quite used locale⁴) some applications (eg. Emacs or Skype)
  cannot display Catalan diacritic marks as you type them.

1] https://bugs.freedesktop.org/show_bug.cgi?id=10943
2] http://lists.debian.org/debian-devel-changes/2005/07/msg01429.html
3] Toni Hermoso Pulido <toniher@softcatala.org>
4] https://launchpad.net/~ubuntu.cat/+members
2007-08-18 17:58:23 -04:00
James Cloos
1f980cb7d0 Add additional Euro signs to compose
Inspired by bug 7419¹ make all of:

    C=, =C, c=, =c, E=, =E, e=, E=

after <Multi_key> generate € U+20AC EURO SIGN.

1] https://bugs.freedesktop.org/show_bug.cgi?id=7419
2007-08-18 17:47:04 -04:00
James Cloos
4b0a145214 Compose fix for Latin-1 (from Debian)
The description from bugzilla bug 7417¹ is:

  We've been shipping this patch for some time in Debian now. The
  problem description from the patch header is reproduced below. You
  may want to note the licensing issue mentioned below, but we've been
  shipping it because the method by which this particular patch was
  generated and updated was also given below.

  This patch by Denis Barbier.

  The X11 protocol states that Unicode keysyms are in the range
  0x01000100 - 0x0110FFFF.  If the result of composing characters is a
  Unicode codepoint, X returns the corresponding Unicode keysym, which
  is its Unicode codepoint augmented by 0x01000000.  Latin-1
  characters must not appear with their Unicode codepoints in compose
  files, otherwise the returned composed character lies in the range
  0x01000000 - 0x010000FF which is not valid.

  There are two solutions: either fix composing routines to return
  0xZZ instead of 0x010000ZZ (where Z is an hexadecimal digit), or
  replace U00ZZ by their corresponding keysyms in compose files.  The
  latter is more logical and less error prone, so compose files will
  be patched.  Many applications accept these invalid Unicode keysyms,
  but few of them don't, most notably xemacs.  Only UTF-8 locales are
  affected.

  This has been fixed very recently in XFree86 CVS (but not xorg), but
  for licensing reasons, this patch is not grabbed.  Instead automatic
  conversion is performed by:

    sed -e '/XK_LATIN1/,/XK_LATIN1/!d' /usr/include/X11/keysymdef.h \
    | grep -v deprecated | grep 0x0 \
    | sed -e 's/0x0/U0/' -e 's/XK_//' \
    | awk '{ printf "s/\\b%s\\b/%s/ig\n", $3, $2; }' > sedfile
    for f in nls/*.UTF-8/Compose.pre
    do
      sed -f sedfile $f > $f.tmp && mv $f.tmp $f
    done

[I edited the quoted script to update it for the current location of
the installed keysymdef.h and the current layout of the libX11
repo. -JimC]

I applied the script, not the patch attached to the bugreport.

1] https://bugs.freedesktop.org/show_bug.cgi?id=7417
2007-08-18 17:29:08 -04:00
James Cloos
5cf5bc7664 Add some compose sequences
Add some compose sequences from the patch in bug 5371 (attachment 4122).

Cf:

https://bugs.freedesktop.org/show_bug.cgi?id=5371
https://bugs.freedesktop.org/attachment.cgi?id=4122
2007-08-18 17:13:41 -04:00
James Cloos
d4002e389d Fix SMP Compose targets
The compose targets from the SMP (plane 1) were incorrect.

At some point the 0x10000 bit had been lost.
2007-08-18 13:57:31 -04:00
Jan Willem Stumpel
c76d30253f Update el_GR.UTF-8/Compose.pre to match changes in xkeyboard-config cvs
Cf:

  https://bugs.freedesktop.org/show_bug.cgi?id=10851
  https://bugs.freedesktop.org/show_bug.cgi?id=10824
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=386385

The greek keyboard definition was changed to replace dead_horn and
dead_ogonek with U0313 COMBINING COMMA ABOVE (aka Psili) and U0314
COMBINING REVERSED COMMA ABOVE (aka Dasia).

This patch modifies the Greek Compose.pre to match.

It is generated by the script Jan Willem Stumpel <jstumpel@planet.nl>
posted to 386385@bugs.debian.org:

#!/usr/bin/perl
while (<>) {
  print $_;
  if (/dead_horn/) {
    s/dead_horn/U0313/;
    print $_;
  }
  elsif (/dead_ogonek/) {
    s/dead_ogonek/U0314/;
    print $_;
  }
}
2007-05-04 12:00:49 -07:00
Benno Schulenberg
a6f4bbf7b1 nls (en_US): remove long compositions that override shorter (bug #2286)
Remove long compositions that override (or get overriden by) later shorter
compositions, e.g. a four-key compose sequence that gets overriden by a
later three-key compose sequence.
2006-10-29 03:10:30 +03:00
Benno Schulenberg
0280bf11ef nls: remove shadowed compose entries (bug #2286)
Remove compose entries shadowed by others later on.
2006-10-29 03:08:36 +03:00
Benno Schulenberg
d118f2b1ef nls: remove duplicate compose entries (bug #2286)
Remove a bunch of duplicate entries from various Compose files.
2006-10-29 03:07:15 +03:00
Tollef Fog Heen
a61936fc4e nls: use _XlcUtf8Loader for en_US (bug #7982)
Use _XlcUtf8Loader instead of _XlcUnicodeLoade,r bringing it into line with
every other locale.
2006-08-30 00:05:54 +03:00
Mayank Jain
8f2be66089 add Indian language locales
Add as, kn, ml, or, ur, and te locales.
2006-07-11 19:42:47 +01:00
Daniel Stone
f1bd315235 Bug #2186: Add cs_CZ.iso8859-2 alias. 2006-06-03 12:57:55 +03:00
Daniel Stone
2b1b79d90d nls: Serbian (sr_CS) update (#5575)
Bug #5575: 'Yugoslavia' has changed to Serbia & Montenegro, along with a
corresponding locale change.  Update compose.dir.pre, locale.alias.pre,
and locale.dir.pre.  (Milos Komarcevic)
2006-06-02 02:46:29 +03:00
Daniel Stone
cf7d9f9e46 en_US.UTF-8 Compose.pre: updates from Simos (#5129)
Bug #5129: Numerous updates from Simos Xenitellis, fixing Unicode keysyms,
adding Unicode character names, removing duplicate entries, et al.
2006-06-02 01:50:24 +03:00
Daniel Stone
332d45fce9 nls: fix use of non-keysym dead_space (#5107)
Bug #5107: Change users of dead_space to space.
2006-06-02 01:44:53 +03:00
Daniel Stone
22a5255b80 locale.alias.pre: bg_BG typo fix
Fix typo (be_BG.UTF-8 rather than bg_BG.UTF-8) in locale.alias.pre.
2006-05-10 14:51:37 +03:00
Jamey Sharp
e741b70ed2 Update .gitignores for *.o and nls/locale.dir*. 2006-02-19 12:29:27 -08:00
Jamey Sharp
f25b4b00e1 Move .cvsignore to .gitignore. 2006-02-19 12:28:41 -08:00
Eric Anholt
93cf3747f9 Add/improve libs .cvsignores. 2005-11-20 23:17:39 +00:00
Kevin E Martin
91ed79852e Clean up generated files
Add missing dist tarball files
2005-10-07 15:00:00 +00:00
Søren Sandmann Pedersen
440399b470 Add el_GR.UTF-8 compose file 2005-10-05 18:27:10 +00:00
Daniel Stone
010f0647e2 Bug #2609: Add Kyrgyz locale (Ilyas Bakirov). 2005-09-30 07:52:46 +00:00
Daniel Stone
3ef2fb67bd Bug #1640: Kinyarwanda locale support. (Steve Murphy) 2005-09-30 07:47:55 +00:00
Daniel Stone
4ae0decabe Bug #2268: Add South African locales (Dwayne Bailey). Some whitespace cleanups, as the parser is a little touchy. 2005-09-30 07:40:03 +00:00
Daniel Stone
3f79eb4c99 Generate locale.alias and compose.dir exactly like we do in the monolith, which fixes non-UTF-8 locales in particular (so we get foo: bar, as well as foo bar). Switch to generating locale.dir the same way. 2005-09-30 07:11:19 +00:00
Kristian Høgsberg
3eb9f2d693 Use $(X11_LOCALEDATADIR) instead of @X11_LOCALEDATADIR@ so this install destination can be overridden at make install time. 2005-09-01 19:24:13 +00:00
Alan Coopersmith
afe34b9586 //bugs.freedesktop.org/show_bug.cgi?id=1887> Patch #3005 <https://bugs.freedesktop.org/attachment.cgi?id=3005> libX11 locale defs severely adrift from glibc: adding new aliases (From Debian via Nathanael Nerode) 2005-08-04 02:55:49 +00:00
Alan Coopersmith
3979a0b88e //bugs.freedesktop.org/show_bug.cgi?id=1887> Patch #3002 <https://bugs.freedesktop.org/attachment.cgi?id=3002> libX11 locale defs severely adrift from glibc: locales bugfix for bs_BA (From Debian via Nathanael Nerode) 2005-08-04 02:51:30 +00:00
Keith Packard
6e752ea120 Enable loadable i18n modules, making them configurable on the configure command line.
Clean up conditionals for XKB, XCMS, XLOCALEDIR
Create new lib directory for locale modules in ${X11_LIBDIR}/locale/lib. Add this to the default XLOCALEDIR search path.
Create separate X11_LOCALEDATADIR variable pointing at ${datadir}/X11/locale for installing locale data.
Split out xcms, xkb, xlibi18n sources from main xlib bits so they can be conditionally included more easily. Lots of source files have been moved with this step; the result seems like it might be easier to maintain.
Display message at end of configure script with selected options.
Fix manual building with cpp to add -traditional in cpprules.in. This isn't conditionalized at all, so it will break on systems not using GNU cpp.
2005-07-11 08:29:18 +00:00
Alan Coopersmith
3939ac4410 - Since all but one line of all the nls/*/Makefile.am files are identical, move common bits to nls/localerules.in for easier updating and use automake includes to include in all the nls/*/Makefile.am files
- Don't assume $(CPP) can take gcc-only -traditional flag
- CPP process man pages as is done in the monolithic tree
2005-07-09 18:44:14 +00:00
Keith Packard
19ba9d0df8 Clean up .cvsignore files 2005-07-09 06:01:49 +00:00
Keith Packard
86fa88dc59 Create and install XlibConf.h to provide external users of Xlibint.h the defines necessary to correctly use the library. Xlibint.h should #include this new file.
Add a bunch of .cvsignore files
2005-07-08 06:57:06 +00:00
Eric Anholt
55328bb6ca Avoid a gmake-specific construct, and instead just write the name of the current directory into each Makefile.am. 2005-07-03 10:17:38 +00:00
Daniel Stone
197697c92a Fix objdir != srcdir, as well as make distcheck.
Don't attempt to create Compose.pre files; formatting fixes.
Added if not already present.
2005-07-01 22:13:35 +00:00
Søren Sandmann Pedersen
c162d60ad8 Apply these patches from Theo van Klaveren:
lib-dmx.patch lib-FS.patch lib-X11.patch lib-XRes.patch lib-XScrnSaver.patch lib-xtrans.patch
to make the libraries distcheck.
2005-06-22 22:46:31 +00:00
Alexander Gottwald
1a0de49da1 Use $(srcdir) for Compose.pre and XLC_LOCALE.pre 2005-06-09 21:30:15 +00:00
Matthieu Herrb
ca93c76155 Don't use $< in explicit rules. This only works with GNU make. <https://bugs.freedesktop.org/show_bug.cgi?id=3383> 2005-05-28 01:02:32 +00:00
23198d2bfb Make Xdmcp unconditionally required, require various protocol modules.
Mon May 16 17:48:03 2005 Søren Sandmann <sandmann@redhat.com>
Check for kbproto if using XKB.
Require xextproto rather than xextensions
Remove the entries from the xlibs tree, as they are not relevant here.
2005-05-16 22:35:27 +00:00
Søren Sandmann Pedersen
7eee605e3a - For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in <X11/...>
- For Xcomposite and Xdamage, don't link the build system out of the xc tree
- Link the public X11 headers into their own directory
- Add links to XKeysymDB and XErrorDB
- Add links to all the Xlib man pages
- Add links to the lcUniConv subdirectory
- Conditionally include config.h in Xlib source
2005-05-13 22:53:36 +00:00
Roland Mainz
3b9e8ece93 xc/nls/Compose/iso8859-2
xc/nls/Compose/iso8859-3
xc/nls/Compose/iso8859-9
//bugs.freedesktop.org/show_bug.cgi?id=2592) attachment #2156 (https://bugs.freedesktop.org/attachment.cgi?id=2156) Fix a couple of typos in ISO8859-* Compose files ("asciicircum" instead "of asciicirum"). Patch by Matthias Hopf <mhopf@suse.de>.
2005-03-19 22:04:55 +00:00
Roland Mainz
df341cd2f2 xc/nls/Compose/pt_BR.UTF-8
//bugs.freedesktop.org/show_bug.cgi?id=2400) attachment #1762 (https://bugs.freedesktop.org/attachment.cgi?id=1762): Fix build bustage caused by broken patch for brazillian locale support (see Bugzilla #1896). Patch by Kevin E. Martin <kem@freedesktop.org>.
2005-02-01 03:12:28 +00:00
Roland Mainz
f234188a4c xc/nls/compose.dir
xc/nls/locale.dir
xc/nls/Compose/Imakefile
xc/nls/Compose/pt_BR.UTF-8
xc/nls/XI18N_OBJS/Imakefile
xc/nls/XI18N_OBJS/pt_BR.UTF-8
xc/nls/XLC_LOCALE/Imakefile
xc/nls/XLC_LOCALE/pt_BR.UTF-8
//bugs.freedesktop.org/show_bug.cgi?id=1896) attachment #1675 (https://bugs.freedesktop.org/attachment.cgi?id=1675): Add support for pt_BR.UTF-8 locale. Patch by Gustavo Noronha Silva, Branden Robinson, Julien Lafon.
2005-01-19 01:53:55 +00:00
Roland Mainz
5557d47fcf xc/nls/compose.dir
xc/nls/locale.alias
xc/nls/locale.dir
//bugs.freedesktop.org/show_bug.cgi?id=1830) attachment #1674 (https://bugs.freedesktop.org/attachment.cgi?id=1674): Adding support for the bs_BA (bs, bs_BA, bs_BA.iso88592, bs_BA.ISO-8859-2, bs_BA.ISO_8859-2, bs_BA.UTF-8) locale. Patch by Vedran Ljubovic <vljubovic@smartnet.ba>.
2005-01-14 04:59:05 +00:00
Roland Mainz
bf2e6ef66b xc/nls/compose.dir
xc/nls/locale.alias
xc/nls/locale.dir
//freedesktop.org/bugzilla/show_bug.cgi?id=1544): Adding support for the si_LK (si, sinhala, si_LK, si_LK.UTF-8) locale. Patch by Anuradha Ratnaweera <gnu.slash.linux@gmail.com>.
2004-11-09 00:56:56 +00:00
Roland Mainz
443890ceef xc/nls/compose.dir
xc/nls/locale.alias
xc/nls/locale.dir
Adding some of the major indic locales (bn_IN.UTF-8, bn_IN.utf8, gu_IN.UTF-8, gu_IN.utf8, pa_IN.UTF-8, pa_IN.utf8) to X. Patch by Leon Ho <llch@redhat.com>.
2004-11-05 00:58:49 +00:00
Egbert Eich
af7467ec73 Correcting font encodings for GB18030, GBK and BIG5-HKSCS. Adding nls support for those encodings (Bugzilla 1573, James Su). 2004-10-18 17:29:03 +00:00
Egbert Eich
1b900b59cb Made handling of DevelDrivers for x86-64 more conformant to other platforms.
Compress all font encodings (Stefan Dirsch).
Fixed warnings.
Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and Root mode (bugzilla #1580, James Su).
Added another compose key combination for the Euro symbol (Stefan Dirsch).
Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian). This is the encoding that is also used by glibc. We may break other libcs - lets see who complains.
Added explanation for DESTDIR to install to a different directory than /.
Added some early bailouts to atiprobe if PCI structure pointer is NULL to prevent sig11.
XV support doesn't depend on 2D acceleration any more. This patch removes this limitation from the NSC driver. This is a patch that I have committed to XFree86 a while ago but never ported over to X.Org. Matthieu Herrb contributed some build fixes.
Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate timer. This takes advantage of the fact that TimerSet() with a timeout argument 0 behaves like TimerCanel().
Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
Changed comment to mention xorg.
Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If you don't like it we can change it back (original author unkown).
Added 'pic' to the man page rendering command pipeline (Werner Fink).
Added missing return value (Stefan Dirsch, Roland Mainz)
2004-10-18 14:21:45 +00:00