~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/e16-bindings: Dislodge transparency to `C-5-c'.
[profile]
/
dot
/
xinitrc
diff --git
a/dot/xinitrc
b/dot/xinitrc
index
a1f6e06
..
5b7cd61
100755
(executable)
--- a/
dot/xinitrc
+++ b/
dot/xinitrc
@@
-108,7
+108,11
@@
fi
### Iniitial settings.
## Assume X sessions are secure.
### Iniitial settings.
## Assume X sessions are secure.
-export __mdw_sechost="`hostname`"
+export __mdw_sechost="$(hostname)"
+
+## Tell things that XFCE is in charge. This is the most desktoppy thing that
+## I run, so it's not entirely wrong.
+: ${XDG_CURRENT_DESKTOP=XFCE}; export XDG_CURRENT_DESKTOP
## Obtain the screen dimensions.
case ",$XWIDTH,$XHEIGHT," in
## Obtain the screen dimensions.
case ",$XWIDTH,$XHEIGHT," in
@@
-217,11
+221,15
@@
start-clients () {
## Choose appropriate clients.
emacs=$(pick_program emacs \
## Choose appropriate clients.
emacs=$(pick_program emacs \
- emacs2
3-lucid emacs24-lucid emacs23 emacs24
emacs22 emacs21 emacs)
+ emacs2
4-lucid emacs23-lucid emacs24 emacs23
emacs22 emacs21 emacs)
term=$(pick_program terminal pterm Eterm xterm)
## Emacs window measurements.
##
term=$(pick_program terminal pterm Eterm xterm)
## Emacs window measurements.
##
+## e_colsz = width of a column in characters (from `emacs-width' metaconfig)
+## e_charwd = width of a character in pixels (assume `6x13')
+## e_colextra = additional per-column overhead in pixels
+## e_colextrachars = additional per-column overhead in character units
## e_colwd = basic width of a column in pixels
## e_hextra = extra horizontal width in pixels
## Width of an N-column Emacs frame in pixels will be
## e_colwd = basic width of a column in pixels
## e_hextra = extra horizontal width in pixels
## Width of an N-column Emacs frame in pixels will be
@@
-233,7
+241,8
@@
term=$(pick_program terminal pterm Eterm xterm)
## e_lineht = height of a character line in pixels
## e_vextra = number of additional vertical cruft pixels
## So an N-line Emacs frame takes N*e_lineht + e_vextra pixels
## e_lineht = height of a character line in pixels
## e_vextra = number of additional vertical cruft pixels
## So an N-line Emacs frame takes N*e_lineht + e_vextra pixels
-e_colwd=492 e_colchars=82 e_lineht=13
+e_colsz=$(mdw-conf emacs-width 77) e_charwd=6
+e_colextra=30 e_colextrachars=5 e_lineht=13
case "$emacs" in
emacs21 | emacs) e_hextra=34 e_cextra=-2 e_vextra=52 ;;
emacs22 | emacs23) e_hextra=8 e_cextra=-6 e_vextra=46 ;;
case "$emacs" in
emacs21 | emacs) e_hextra=34 e_cextra=-2 e_vextra=52 ;;
emacs22 | emacs23) e_hextra=8 e_cextra=-6 e_vextra=46 ;;
@@
-241,6
+250,8
@@
case "$emacs" in
emacs23-lucid) e_hextra=7 e_cextra=-6 e_vextra=48 ;;
emacs24-lucid) e_hextra=7 e_cextra=-5 e_vextra=48 ;;
esac
emacs23-lucid) e_hextra=7 e_cextra=-6 e_vextra=48 ;;
emacs24-lucid) e_hextra=7 e_cextra=-5 e_vextra=48 ;;
esac
+e_colwd=$(( e_colsz*e_charwd + e_colextra ))
+e_colchars=$(( e_colsz + e_colextrachars ))
## Terminal window measurements.
##
## Terminal window measurements.
##
@@
-285,7
+296,8
@@
declare -i \
start-emacs () {
GDK_NATIVE_WINDOWS=1 run bgclients noip \
start-emacs () {
GDK_NATIVE_WINDOWS=1 run bgclients noip \
- $emacs -bg black -geometry ${emacsx}x${emacsy}+${XSCR0_X}+${XSCR0_Y}
+ $emacs -bg black -geometry ${emacsx}x${emacsy}+${XSCR0_X}+${XSCR0_Y} \
+ --mdw-splashy-startup
}
## Now place some xterms.
}
## Now place some xterms.