rpms/xorg-x11-xinit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Implemented changes to xinput.sh based on suggestions from (#194458)

Browse Source
This commit is contained in:
mharris 2006-07-05 06:46:08 +00:00
parent e8ebcf94b8
commit e06f2b35e2
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1 +1,3 @@
xinit-1.0.2.tar.bz2 *.tar.bz2
*.tar.gz
clog

19
xinput.sh
View File

@ -10,6 +10,9 @@
# #
# X Input method setup script # X Input method setup script
USER_XINPUTRC="$HOME/.xinputrc"
SYS_XINPUTRC="/etc/X11/xinit/xinputrc"
# Load up the user and system locale settings # Load up the user and system locale settings
oldterm=$TERM oldterm=$TERM
unset TERM unset TERM
@ -20,18 +23,14 @@ fi
tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}} tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
## try to source ~/.xinput.d/ll_CC or /etc/X11/xinit/xinput.d/ll_CC to
## setup the input method for locale (CC is needed for Chinese for example)
# unset env vars to be safe # unset env vars to be safe
unset XIM XIM_PROGRAM XIM_ARGS XMODIFIERS GTK_IM_MODULE QT_IM_MODULE unset XIM XIM_PROGRAM XIM_ARGS XMODIFIERS GTK_IM_MODULE QT_IM_MODULE
lang_region=$(echo $tmplang | sed -e 's/\..*//')
for f in $HOME/.xinput.d/${lang_region} \ if [ -r "$USER_XINPUTRC" ]; then
$HOME/.xinput.d/default \ source "$USER_XINPUTRC"
/etc/X11/xinit/xinput.d/${lang_region} \ elif [ -r "$SYS_XINPUTRC" ]; then
/etc/X11/xinit/xinput.d/default ; do source "$SYS_XINPUTRC"
[ -r $f ] && source $f && break fi
done
unset lang_region
[ -n "$GTK_IM_MODULE" ] && export GTK_IM_MODULE [ -n "$GTK_IM_MODULE" ] && export GTK_IM_MODULE
[ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE [ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE

5
xorg-x11-xinit.spec
View File

@ -4,7 +4,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: %{xinitver} Version: %{xinitver}
Release: 4 Release: 5%{?dist}
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xinit.1x* %{_mandir}/man1/xinit.1x*
%changelog %changelog
* Wed Jul 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-5.fc6
- Implemented changes to xinput.sh based on suggestions from (#194458)
* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-4 * Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-4
- Added documentation to doc macro. - Added documentation to doc macro.