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

- Move hardcoded xsetroot background color to fallback cases (#205901).

Browse Source
This commit is contained in:
Kristian Høgsberg 2006-09-25 17:30:37 +00:00
parent 8079f98009
commit c9d9a42a33
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xclients
View File

@ -46,6 +46,8 @@ rm -f $HOME/Xrootenv.0
{ {
# gosh, neither fvwm95 nor fvwm2 is available; # gosh, neither fvwm95 nor fvwm2 is available;
# fall back to failsafe settings # fall back to failsafe settings
[ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
if [ -x /usr/bin/xclock ] ; then if [ -x /usr/bin/xclock ] ; then
/usr/bin/xclock -geometry 100x100-5+5 & /usr/bin/xclock -geometry 100x100-5+5 &
elif [ -x /usr/bin/xclock ] ; then elif [ -x /usr/bin/xclock ] ; then

1
xinitrc
View File

@ -26,6 +26,7 @@ elif [ -f /etc/X11/xinit/Xclients ]; then
else else
# Failsafe settings. Although we should never get here # Failsafe settings. Although we should never get here
# (we provide fallbacks in Xclients as well) it can't hurt. # (we provide fallbacks in Xclients as well) it can't hurt.
[ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
[ -x /usr/bin/xclock ] && /usr/bin/xclock -geometry 100x100-5+5 & [ -x /usr/bin/xclock ] && /usr/bin/xclock -geometry 100x100-5+5 &
[ -x /usr/bin/xterm ] && xterm -geometry 80x50-50+150 & [ -x /usr/bin/xterm ] && xterm -geometry 80x50-50+150 &
[ -x /usr/bin/twm ] && /usr/bin/twm [ -x /usr/bin/twm ] && /usr/bin/twm

2
xinitrc-common
View File

@ -18,8 +18,6 @@ if [ -r /etc/profile.d/lang.sh ]; then
. /etc/profile.d/lang.sh . /etc/profile.d/lang.sh
fi fi
[ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
userresources=$HOME/.Xresources userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap usermodmap=$HOME/.Xmodmap
userxkbmap=$HOME/.Xkbmap userxkbmap=$HOME/.Xkbmap

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: 9%{?dist} Release: 10%{?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
@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xinit.1x* %{_mandir}/man1/xinit.1x*
%changelog %changelog
* Mon Sep 25 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-10.fc6
- Move hardcoded xsetroot background color to fallback cases (#205901).
* Thu Aug 17 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-9.fc6 * Thu Aug 17 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-9.fc6
- Start ssh-agent for startx also (#169259). - Start ssh-agent for startx also (#169259).