diff --git a/none b/none index 53d3895..a9f1295 100644 --- a/none +++ b/none @@ -1,8 +1,40 @@ -echo "Dummy input method \"none\" (do not use any input method at all by default)" +echo "Dummy input method \"none\" (do not use any fancy input method by default)" -export XMODIFIERS=@im=local # use "Compose" -export GTK_IM_MODULE=xim -export QT_IM_SWITCHER=imsw-none # disable input method switching in Qt -export QT_IM_MODULE=xim +# set XMODIFIERS="@im=local". +# "@im=local" means "use compose and dead-keys" and +# some programs will use compose and dead-keys only if XMODIFIERS +# is set to either "@im=local" or "@im=none". + +export XMODIFIERS="@im=local" # use "Compose" + +# Input of German umlauts in acroread doesn’t work if GTK_IM_MODULE is +# unset. Make sure that it is set here. +# +# Setting it to "xim" is a reasonable setting together with +# XMODIFIERS="@im=local" because Compose support then works exactly +# as defined in the X11 Compose file. +# +# But this still causes problems when saving files +# with non-ASCII characters in the file name from acroread 8.x because +# xim support in acroread 8.x is very buggy +# (see http://bugzilla.novell.com/show_bug.cgi?id=370330) +# +# Apart from problems in acroread, xim is generally +# known to be quite buggy. Therefore a better choice is probably +# GTK_IM_MODULE=cedilla. This changes 6 Compose key sequences to +# produce U+00C7 (LATIN CAPITAL LETTER C WITH CEDILLA) and +# LATIN_SMALL_LETTER_C_WITH_CEDILLA which produce +# U+00E7 (LATIN SMALL LETTER C WITH CEDILLA) instead of +# U+0106 (LATIN CAPITAL LETTER C WITH ACUTE) and +# U+0107 (LATIN SMALL LETTER C WITH ACUTE). +# Most users won’t notice that small change, and for those who do notice +# it is probably even useful. +# For details see http://bugzilla.novell.com/show_bug.cgi?id=413879#c27 + +export GTK_IM_MODULE=cedilla + +export QT_IM_MODULE=xim # to make Compose work as expected in Qt +#export QT_IM_SWITCHER=imsw-none # disable input method switching in Qt +export QT_IM_SWITCHER=imsw-multi # enable input method switching in Qt return 0 diff --git a/x11-tools.changes b/x11-tools.changes index 883e77a..d459dcc 100644 --- a/x11-tools.changes +++ b/x11-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 14 16:05:59 CET 2008 - mfabian@suse.de + +- bnc#413879: use GTK_IM_MODULE=cedilla instead of + GTK_IM_MODULE=xim in the case when no fancy input method is + started. +- add BuildArch: noarch + ------------------------------------------------------------------- Mon Nov 03 14:00:08 CET 2008 - mfabian@suse.de diff --git a/x11-tools.spec b/x11-tools.spec index ac32fbf..2dd72b1 100644 --- a/x11-tools.spec +++ b/x11-tools.spec @@ -26,7 +26,7 @@ Provides: xf86tools Obsoletes: xf86tools AutoReqProv: on Version: 0.1 -Release: 166 +Release: 167 Summary: Tools for the X Window System Source2: xf86debug Source6: wmlist @@ -35,6 +35,7 @@ Source31: xim Source32: xim.template Source33: none Source34: sysconfig.language-%{name} +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,6 +80,11 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var /var/adm/fillup-templates/sysconfig.language-%{name} %changelog +* Fri Nov 14 2008 mfabian@suse.de +- bnc#413879: use GTK_IM_MODULE=cedilla instead of + GTK_IM_MODULE=xim in the case when no fancy input method is + started. +- add BuildArch: noarch * Mon Nov 03 2008 mfabian@suse.de - bnc#440371: /etc/X11/xim: if gdm passes the language to Xsession as the second argument, we should not override this @@ -188,7 +194,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var since the nVidia X driver now does mknod(2) itself to create the device files when it is going to need them. The OpenGL clients then use the device files that were created by X. -* Fri Jun 03 2005 sndirsch@suse.de +* Thu Jun 02 2005 sndirsch@suse.de - updated nvidia driver to release 1.0-7664 (IA32 and AMD64) * Thu May 19 2005 sndirsch@suse.de - added link-fglrx-module; script, which links fglrx kernel @@ -207,7 +213,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var This is required by a dynamic udev, since nVidia is no longer allowed to use the udev interface (Bug #70957). mknvidiadevs creates devices, which are required by the nVidia driver. -* Fri Apr 01 2005 sndirsch@suse.de +* Thu Mar 31 2005 sndirsch@suse.de - updated nvidia driver to release 1.0-7174 (IA32 and AMD64) * obsoletes NVIDIA_kernel-1.0-7167-1237815.diff.txt * obsoletes NVIDIA_kernel-1.0-7167-1233959.diff.txt @@ -295,7 +301,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var * Thu Aug 12 2004 sndirsch@suse.de - updated to call-browser of SLES9/NLD; added desktop-launch symlink to it -* Fri Aug 06 2004 sndirsch@suse.de +* Thu Aug 05 2004 sndirsch@suse.de - updated nvidia driver to release 1.0-6111 (IA32 and AMD64) - updated nvidia installer to release 1.0.7 * Sat Jul 24 2004 sndirsch@suse.de @@ -306,7 +312,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var * Wed Jun 09 2004 sndirsch@suse.de - call-browser: * Mozilla was used as browser even in KDE (Bug #41827) -* Thu May 06 2004 sndirsch@suse.de +* Wed May 05 2004 sndirsch@suse.de - splitted off package fonts-config * Wed May 05 2004 sndirsch@suse.de - depmod needs to be called with "-a " @@ -386,13 +392,13 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var - link-nvidia-modules: * remove /lib/modules/precompiled/ completely when called with option "--preun" -* Mon Jan 26 2004 sndirsch@suse.de +* Sun Jan 25 2004 sndirsch@suse.de - fixed build with usermode kernel * Sat Jan 24 2004 sndirsch@suse.de - (hopefully) finally fixed build with kernel 2.6 * Sat Jan 24 2004 sndirsch@suse.de - udpated nvidia kernel module sources (IA32) to release 1.0-5336 -* Sat Jan 24 2004 sndirsch@suse.de +* Fri Jan 23 2004 sndirsch@suse.de - (hopefully) fixed build with kernel 2.6 * Fri Jan 23 2004 sndirsch@suse.de - cleanup for kernel 2.4 build @@ -525,10 +531,10 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var - updated nvidia installer (1.0.1 --> 1.0.2) * Wed Jun 25 2003 hvogel@suse.de - added fluxbox to wmlist -* Thu May 29 2003 sndirsch@suse.de +* Wed May 28 2003 sndirsch@suse.de - fonts-config: * improve explanation of fc-cache in man-page -* Mon Apr 28 2003 sndirsch@suse.de +* Sun Apr 27 2003 sndirsch@suse.de - added nvidia installer; useful for uninstalling cleanly nvidia driver during an update :-) * Sun Apr 27 2003 sndirsch@suse.de @@ -592,7 +598,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var * add aliases for GB18030 fonts * prefer "AR PL SungtiL" and "AR PL Mingti2L Big5" for monospace over "AR PL KaitiM GB" and "AR PL KaitiM Big5" -* Mon Mar 10 2003 sndirsch@suse.de +* Sun Mar 09 2003 sndirsch@suse.de - fonts-config: *.bdf fonts currently don't work with Xft2, add to @blacklist_globs to remove them from fonts.cache-1 files @@ -615,7 +621,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var outlines and don't work with X11, add them to the blacklist (Bug #24272) - removed fetchmsttfonts; should only be available via YOU -* Sat Feb 15 2003 sndirsch@suse.de +* Fri Feb 14 2003 sndirsch@suse.de - fonts-config: * don't create symlinks .pfa -> .gsf.pfa * Thu Feb 13 2003 sndirsch@suse.de diff --git a/xim b/xim index 7ae0af6..e0bb241 100644 --- a/xim +++ b/xim @@ -160,17 +160,10 @@ else echo "All default input methods tried for the current locale failed." fi -# If there is no default input method for the current locale, set -# XMODIFIERS="@im=local". "@im=local" means "use compose and dead-keys" and -# some programs will use compose and dead-keys only if XMODIFIERS -# is set to either "@im=local" or "@im=none". - -export XMODIFIERS="@im=local" +# If there is no default input method for the current locale, source +# the dummy input method "none" to get reasonable default settings +# of the relevant environment variables: -# Input of German umlauts in acroread doesn’t work if GTK_IM_MODULE is -# unset. Make sure that it is set here, setting it to "xim" is -# a reasonable setting together with XMODIFIERS="@im=local". See also -# http://bugzilla.novell.com/show_bug.cgi?id=413879 +source /etc/X11/xim.d/none -export GTK_IM_MODULE=xim