Merge branch 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile

* 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile:
  e16-config: Remove.
  xinitrc and friends: Embed prompt-and-run functionality in xinitrc.
  gitconfig: Use magical hacked 6x13 font.
  fonts.conf: New configuration file.

Conflicts:

	e16-bindings

diff --git a/e16-bindings b/e16-bindings
index 86ed4ea5c2be55619bec160944d2b05f4f99cbfd..e3ff6292e1d501810fc2c448f0381ae904d1b08e 100644 (file)
--- a/e16-bindings
+++ b/e16-bindings
@@ -34,7 +34,8 @@ KeyDown   S5       Up area move 0 -1
 KeyDown   S5     Left area move -1 0
 KeyDown   S5    Right area move 1 0
 KeyDown    5       F8 exec xatom set XINIT_COMMAND :terminal
-KeyDown    5       F9 exec xrun
+KeyDown    5       F9 exec xatom set XINIT_COMMAND :ask-run
+KeyDown           5      F10 exec xatom set XINIT_COMMAND :ask-command
 KeyDown           5      F11 exec xscreensaver-command -lock
 KeyDown    5      F12 exec xshutdown
 KeyDown    5      Tab focus next

diff --git a/e16-config b/e16-config
deleted file mode 100644 (file)
index eb405e1..0000000
--- a/e16-config
+++ /dev/null
@@ -1,161 +0,0 @@
-backgrounds.hiquality = 1
-backgrounds.user = 1
-backgrounds.timeout = 240
-compmgr.enable = 0
-compmgr.mode = 0
-compmgr.shadows.mode = 0
-compmgr.shadows.offset_x = 3
-compmgr.shadows.offset_y = 5
-compmgr.shadows.blur.radius = 5
-compmgr.shadows.blur.opacity = 75
-compmgr.shadows.sharp.opacity = 30
-compmgr.resize_fix_enable = 0
-compmgr.use_name_pixmap = 0
-compmgr.use_cow = 1
-compmgr.fading.enable = 0
-compmgr.fading.time = 0
-compmgr.override_redirect.mode = 1
-compmgr.override_redirect.opacity = 90
-desktops.num = 1
-desktops.dragdir = 2
-desktops.dragbar_width = 0
-desktops.dragbar_length = 0
-desktops.dragbar_ordering = 1
-desktops.desks_wraparound = 0
-desktops.slidein = 0
-desktops.slidespeed = 0
-desktops.areas_nx = 1
-desktops.areas_ny = 5
-desktops.areas_wraparound = 0
-desktops.edge_flip_mode = 0
-desktops.edge_flip_resistance = 25
-effects.ripples.enabled = 0
-effects.waves.enabled = 0
-focus.mode = 1
-focus.clickraises = 0
-focus.transientsfollowleader = 0
-focus.switchfortransientmap = 0
-focus.all_new_windows_get_focus = 0
-focus.new_transients_get_focus = 0
-focus.new_transients_get_focus_if_group_focused = 1
-focus.raise_on_next = 0
-focus.warp_on_next = 0
-focus.warp_always = 0
-focus.autoraise.enable = 0
-focus.autoraise.delay = 500
-groups.dflt.iconify = 1
-groups.dflt.kill = 0
-groups.dflt.mirror = 1
-groups.dflt.move = 1
-groups.dflt.raise = 0
-groups.dflt.set_border = 1
-groups.dflt.stick = 1
-groups.dflt.shade = 1
-groups.swapmove = 1
-iconboxes.anim_time = 250
-locale.internal = 
-locale.exported = 
-menus.animate = 0
-menus.onscreen = 1
-menus.warp = 1
-menus.show_icons = 1
-menus.icon_size = 16
-menus.key.left = 0xff51
-menus.key.right = 0xff53
-menus.key.up = 0xff52
-menus.key.down = 0xff54
-menus.key.escape = 0xff1b
-menus.key.ret = 0xff0d
-misc.animation.step = 10
-misc.buttons.move_resistance = 10
-misc.dialogs.headers = 1
-misc.dialogs.button_image = 0
-misc.dock.enable = 1
-misc.dock.sticky = 1
-misc.dock.dirmode = 3
-misc.dock.startx = 0
-misc.dock.starty = 0
-misc.hints.set_xroot_info_on_root_window = 1
-misc.movres.mode_move = 0
-misc.movres.mode_resize = 0
-misc.movres.mode_info = 1
-misc.movres.mode_maximize_default = 1
-misc.movres.color = 0xff0000
-misc.movres.avoid_server_grab = 1
-misc.movres.update_while_moving = 0
-misc.movres.enable_sync_request = 0
-misc.opacity.menus = 85
-misc.opacity.movres = 60
-misc.opacity.tooltips = 80
-misc.place.manual = 0
-misc.place.manual_mouse_pointer = 0
-misc.place.slidein = 0
-misc.place.cleanupslide = 0
-misc.place.slidemode = 0
-misc.place.slidespeedmap = 6000
-misc.place.slidespeedcleanup = 8000
-misc.place.ignore_struts = 0
-misc.place.raise_fullscreen = 0
-misc.session.enable_script = 0
-misc.session.script = $EROOT/scripts/session.sh
-misc.session.enable_logout_dialog = 1
-misc.session.enable_reboot_halt = 0
-misc.session.cmd_reboot = reboot
-misc.session.cmd_halt = poweroff
-misc.shading.animate = 0
-misc.shading.speed = 8000
-misc.snap.enable = 1
-misc.snap.edge_snap_dist = 8
-misc.snap.screen_snap_dist = 32
-misc.startup.firsttime = 0
-misc.startup.animate = 1
-misc.testing.argb_internal_objects = 0
-misc.testing.argb_internal_clients = 0
-misc.testing.argb_clients = 0
-misc.testing.argb_clients_inherit_attr = 0
-misc.testing.enable_startup_id = 1
-misc.testing.image_cache_size = -1
-misc.testing.mask_alpha_threshold = 8
-misc.autosave = 1
-misc.memory_paranoia = 1
-misc.save_under = 0
-pagers.enable = 1
-pagers.zoom = 0
-pagers.title = 1
-pagers.hiq = 1
-pagers.mode = 2
-pagers.scanspeed = 10
-pagers.sel_button = 2
-pagers.win_button = 1
-pagers.menu_button = 3
-sound.enable = 0
-sound.theme = 
-theme.localise = 0
-theme.name = BrushedMetal-Tigert
-theme.extra_path = 
-theme.ttfont_path = 
-theme.use_alt_font_cfg = 1
-theme.font_cfg = fonts.cfg.xft
-tooltips.enable = 0
-tooltips.showroottooltip = 0
-tooltips.delay = 1500
-transparency.alpha = 0
-transparency.menu = 1
-transparency.menu_item = 1
-transparency.tooltip = 2
-transparency.widget = 1
-transparency.hilight = 0
-transparency.border = 1
-transparency.iconbox = 1
-transparency.dialog = 1
-transparency.pager = 1
-transparency.warplist = 1
-warplist.enable = 1
-warplist.showsticky = 1
-warplist.showshaded = 1
-warplist.showiconified = 1
-warplist.showalldesks = 0
-warplist.warpfocused = 1
-warplist.raise_on_select = 0
-warplist.warp_on_select = 0
-warplist.icon_mode = 3

diff --git a/fonts.conf b/fonts.conf
new file mode 100644 (file)
index 0000000..c6afc8b
--- /dev/null
+++ b/fonts.conf
@@ -0,0 +1,48 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+
+<fontconfig>
+
+  <!-- Hacking for the fixed font.
+    
+       After many half-hearted attempts to make this work properly, I'm
+       finally settling on this approach: define MiscFixed6x13 as a
+       magic name for the right font, and then hack configuration files
+       as necessary to make them use it.
+    -->
+  <match target="pattern">
+    <test name="family"><string>MiscFixed6x13</string></test>
+    <!--test name="size"><double>12</double</test-->
+    <edit name="style"><string>SemiCondensed</string></edit>
+    <edit name="family"><string>Fixed</string></edit>
+    <edit name="foundry"><string>Misc</string></edit>
+    <edit name="dpi"><int>75</int></edit>
+    <edit mode="assign" name="pixelsize"> <double>13</double> </edit>
+  </match>
+
+  <!-- Hacking for the symbol font.
+    
+       This seems to be necessary to get Iceweasel/Firefox to do the
+       right thing with MathML and suchlike.
+    -->
+  <match target="pattern">
+    <test name="family">
+      <string>symbol</string>
+    </test>
+    <edit binding="strong" mode="append" name="family">
+      <string>Standard Symbols L</string>
+    </edit>
+  </match>
+
+  <!-- KDE put this here, but it seems worthwhile.
+    
+       Modified so as to force slight hinting rather than medium,
+       because that actually seems to produce more legible characters.
+    -->
+  <match target="font">
+    <edit mode="assign" name="rgba"><const>none</const></edit>
+    <edit mode="assign" name="hinting"><bool>true</bool></edit>
+    <edit mode="assign" name="hintstyle"><const>hintslight</const></edit>
+    <edit mode="assign" name="antialias"><bool>true</bool></edit>
+  </match>
+</fontconfig>

diff --git a/gitconfig b/gitconfig
index ade16c43f0ce6bd6b8dbb230099dc2879ee569ae..d74e60b367d5479b0e98fd51bb499bbdc892da07 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -75,5 +75,5 @@
        signedoffcc = yes
 
 [gui]
-       fontui = -family sans -size 10
-       fontdiff = -family monospace -size 10
+       fontui = -family Sans -size 10
+       fontdiff = -family MiscFixed6x13 -size 10

diff --git a/setup b/setup
index 183ea64a22cef0cda5427b488d9382adab0881df..da71b34dc1cb69568d022364c4d2d59a78045128 100755 (executable)
--- a/setup
+++ b/setup
@@ -144,12 +144,12 @@ dotfiles="
   dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
   xinitrc xsession Xdefaults vncrc vncsession
+  fonts.conf
   putty-defaults:.putty/sessions/Default%20Settings
   eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg
   e-keybindings.cfg:.enlightenment/keybindings.cfg
   evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg
   e16-bindings:.e16/bindings.cfg
-  e16-config:.e16/e_config--1.0.cfg
   jue-peek.jpg:.enlightenment/backgrounds/jue-peek.jpg
   jue-peek.jpg:.e16/backgrounds/jue-peek.jpg"
 echo "Installing dotfiles..."
@@ -194,7 +194,7 @@ scripts="
   svnwrap
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
-  xrun
+  xinitcmd
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin

diff --git a/xinitcmd b/xinitcmd
new file mode 100755 (executable)
index 0000000..2bac08e
--- /dev/null
+++ b/xinitcmd
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec xatom set XINIT_COMMAND "$*"

diff --git a/xinitrc b/xinitrc
index 1d3a83cc87e4296c4afc4d6e6c52d0b2bb994b4f..1de812bef95346d8388bef43c337cb813a3f16ba 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -241,6 +241,15 @@ start-xterms () {
   done
 }
 
+###--------------------------------------------------------------------------
+### Requesters.
+
+req () {
+  declare title=$1 hist=$2; shift 2
+  cmd=$(xgetline -t "$title" -p "Command:" -Hl "$HOME/$hist") &&
+  exec "$@" "$cmd"
+}
+
 ###--------------------------------------------------------------------------
 ### Final waiting.
 
@@ -258,6 +267,7 @@ xwait () {
        xmsg -I -t "xinitrc help" -d "xinitrc commands" - <<EOF &
 :help
 :emacs :xterms :window-manager :clients
+:ask-run :ask-command
 :init
 :terminal
 ! SHELL-COMMAND
@@ -277,6 +287,12 @@ EOF
        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'" &
        ;;

diff --git a/xrun b/xrun
deleted file mode 100755 (executable)
index 7562b04..0000000
--- a/xrun
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-cmd=`xgetline -t "Shell command" -p "Command:" -Hl $HOME/.cmd.hist` &&
-  exec xcatch -- sh -c "$cmd"