~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mdw-pager: New hack for pager support.
[profile]
/
xinitrc
diff --git
a/xinitrc
b/xinitrc
index
588dac6
..
f1252d6
100755
(executable)
--- a/
xinitrc
+++ b/
xinitrc
@@
-125,14
+125,6
@@
start-clients () {
## System monitor.
case $vnc in no) run bginit gkrellm ;; esac
## System monitor.
case $vnc in no) run bginit gkrellm ;; esac
- ## Screensaver.
- case $vnc in
- no)
- run init xscreensaver-command -exit
- run bginit xscreensaver -no-splash
- ;;
- esac
-
## Panel.
case $vnc in no) run bginit gnome-panel ;; esac
## Panel.
case $vnc in no) run bginit gnome-panel ;; esac
@@
-163,7
+155,7
@@
esac
## Terminal window measurements.
case "$term" in
## Terminal window measurements.
case "$term" in
- pterm) t_wd=50
3
t_lineht=13 t_vextra=23 geom=-geometry;;
+ pterm) t_wd=50
4
t_lineht=13 t_vextra=23 geom=-geometry;;
Eterm) t_wd=504 t_lineht=13 t_vextra=23 geom=-g;;
xterm) t_wd=507 t_lineht=13 t_vextra=27 geom=-geometry;;
esac
Eterm) t_wd=504 t_lineht=13 t_vextra=23 geom=-g;;
xterm) t_wd=507 t_lineht=13 t_vextra=27 geom=-geometry;;
esac
@@
-208,7
+200,7
@@
start-emacs () {
start-xterms () {
## Initialize some parameters.
start-xterms () {
## Initialize some parameters.
- declare -i x="ecols * e_colwd + e_hextra"
+ declare -i x="ecols * e_colwd + e_hextra"
xb=xbound
declare -i n=0 pgx=0 l h y ht
declare -i hstd="35 * t_lineht + t_vextra" hmin="25 * t_lineht + t_vextra"
declare -i n=0 pgx=0 l h y ht
declare -i hstd="35 * t_lineht + t_vextra" hmin="25 * t_lineht + t_vextra"
@@
-216,9
+208,9
@@
start-xterms () {
while :; do
## Start a new iteration.
while :; do
## Start a new iteration.
- if ((x + t_wd > xb
ound
)); then
+ if ((x + t_wd > xb)); then
if ((n >= 3)); then break; fi
if ((n >= 3)); then break; fi
- x="pgx + XWIDTH" pgx="pgx + XWIDTH" xb
ound="xbound
+ XWIDTH"
+ x="pgx + XWIDTH" pgx="pgx + XWIDTH" xb
="xb
+ XWIDTH"
fi
## Make large xterms.
fi
## Make large xterms.
@@
-242,6
+234,15
@@
start-xterms () {
}
###--------------------------------------------------------------------------
}
###--------------------------------------------------------------------------
+### Requesters.
+
+req () {
+ declare title=$1 hist=$2; shift 2
+ cmd=$(xgetline -t "$title" -p "Command:" -Hl "$HOME/$hist") &&
+ exec "$@" "$cmd"
+}
+
+###--------------------------------------------------------------------------
### Final waiting.
atom=XINIT_COMMAND$atomtag
### Final waiting.
atom=XINIT_COMMAND$atomtag
@@
-258,6
+259,7
@@
xwait () {
xmsg -I -t "xinitrc help" -d "xinitrc commands" - <<EOF &
:help
:emacs :xterms :window-manager :clients
xmsg -I -t "xinitrc help" -d "xinitrc commands" - <<EOF &
:help
:emacs :xterms :window-manager :clients
+:ask-run :ask-command
:init
:terminal
! SHELL-COMMAND
:init
:terminal
! SHELL-COMMAND
@@
-277,6
+279,12
@@
EOF
info "restarting xinitrc"
exec "$0" wait nostart
;;
info "restarting xinitrc"
exec "$0" wait nostart
;;
+ :ask-run)
+ req "Shell command" .cmd.hist xcatch -FMiscFixed6x13 -- sh -c&
+ ;;
+ :ask-command)
+ req "xinit command" .xinit.hist xatom set XINIT_COMMAND$atomtag&
+ ;;
:*)
xmsg -E -t "xinitrc error" "Unknown command \`$line'" &
;;
:*)
xmsg -E -t "xinitrc error" "Unknown command \`$line'" &
;;