Merge branch 'release/v12.37.0'v12.37.0

* release/v12.37.0: (21 commits)
  Forego padding around tray icons
  Use em-dash as i3 status separator
  Switch to non-monospace font for i3
  Add title to some xterm windows from sxhkd
  Lean on default path for i3 status config
  Remove battery display in i3bar for now
  Remove unneeded settings for i3bar
  Use Ubuntu Mono for i3 font
  Stop hiding i3 borders for sole windows
  Be strict about modifiers for xterm copy/paste
  Revert "Let's try using an Xft font in xterm fo...
  Let's try using an Xft font in xterm for a bit
  Specify Ubuntu Mono as terminal font
  Don't scroll on terminal output, do scroll on key
  Block mouse operations in terminal applications
  Use consistent title for xterm windows
  Correct alphabetical ordering of .Xresources
  Adjust a comment in .Xresources
  Have rofi grab keyboard immediately for passwords
  ...

9 files changed, 56 insertions, 53 deletions

diff --git a/Makefile b/Makefile
index f557e50c..9f98ce20 100644
--- a/Makefile
+++ b/Makefile
@@ -456,7 +456,8 @@ install-gnupg: gnupg/profile.d/gnupg.sh install-sh
 install-i3: install-x
 	mkdir -p -- $(XDG_CONFIG_HOME)/i3
 	cp -p -- i3/config $(XDG_CONFIG_HOME)/i3
-	cp -p -- i3/status $(XDG_CONFIG_HOME)/i3
+	mkdir -p -- $(XDG_CONFIG_HOME)/i3status
+	cp -p -- i3/status $(XDG_CONFIG_HOME)/i3status/config
 
 install-init:
 	if test -d /run/systemd/system ; then make install-systemd ; fi
diff --git a/VERSION b/VERSION
index 04793b1a..f80964d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v12.36.0
-Thu, 06 Apr 2023 04:11:32 +0000
+tejr dotfiles v12.37.0
+Wed, 12 Apr 2023 23:40:33 +0000
diff --git a/i3/config b/i3/config
index 1fe8e336..1e641b9f 100644
--- a/i3/config
+++ b/i3/config
@@ -4,11 +4,8 @@ set $mod Mod4
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# If the window is the only one on the workspace, forego the borders
-hide_edge_borders smart
-
-# Use a Unicode-capable font that should be available
-font pango:Liberation Mono 8
+# Use a nice Unicode-aware condensed font
+font pango:Noto Sans 10
 
 # Mod+Shift+r restarts i3wm
 bindsym $mod+Shift+r restart
@@ -87,17 +84,10 @@ mode "resize" {
 
 # i3bar at bottom of screen
 bar {
-	position bottom
-	status_command i3status --config ~/.config/i3/status
-	workspace_buttons yes
-
+	separator_symbol "—"
+	status_command i3status
+	tray_padding 0
 	colors {
 		background #111111
-		statusline #eeeeee
-
-		focused_workspace #ffffff #285577
-		active_workspace #ffffff #333333
-		inactive_workspace #888888 #222222
-		urgent_workspace #ffffff #900000
 	}
 }
diff --git a/i3/status b/i3/status
index 9c9b60d6..534b1f8f 100644
--- a/i3/status
+++ b/i3/status
@@ -2,7 +2,6 @@
 
 order += "load"
 order += "tztime local"
-order += "battery 0"
 
 load {
 	format = "%1min/%5min/%15min"
@@ -10,8 +9,3 @@ load {
 tztime local {
 	format = "%Y-%m-%d %H:%M:%S"
 }
-battery 0 {
-	format = "%status %percentage %remaining %emptytime"
-	path = "/sys/class/power_supply/BAT%d/uevent"
-	low_threshold = 15
-}
diff --git a/rofi/bin/rofi_pass.sh b/rofi/bin/rofi_pass.sh
index 1f768164..99b5e3e4 100644
--- a/rofi/bin/rofi_pass.sh
+++ b/rofi/bin/rofi_pass.sh
@@ -53,7 +53,7 @@ get_password() {
 # Apply rofi -dmenu to pick a password name.  Use case-insensitive matching,
 # and don't accept arbitrary input.
 #
-name=$(get_names | rofi -dmenu -i -only_match -p pass) || exit
+name=$(get_names | rofi -dmenu -i -no-lazy-grab -only_match -p pass) || exit
 [ -n "$name" ] || exit
 
 # Retrieve the chosen password by name; check that we actually got something
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 0e682dce..0e54d4fb 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -17,7 +17,7 @@ super + i
 	exec gimp
 
 super + m
-	exec x-terminal-emulator -e tm
+	exec x-terminal-emulator -title tm -e tm
 
 super + p
 	exec rofi_pass
@@ -26,7 +26,7 @@ super + t
 	exec thunar
 
 super + v
-	exec x-terminal-emulator -e "$VISUAL"
+	exec x-terminal-emulator -title "$VISUAL" -e "$VISUAL"
 
 Print
 	exec xsnap
@@ -47,4 +47,4 @@ XF86Audio{Lower,Raise}Volume
 	exec pactl set-sink-volume @DEFAULT_SINK@ {-5%,+5%}
 
 XF86Calculator
-	exec x-terminal-emulator -e bcq
+	exec x-terminal-emulator -title bcq -e bcq
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 818ccb6b..4b0a5702 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -472,10 +472,6 @@ augroup filetypedetect
   autocmd BufNewFile,BufRead
         \ ?*.ti
         \ setfiletype terminfo
-  " TextEditorAnywhere text field
-  autocmd BufNewFile,BufRead
-        \ TextEditorAnywhere_??_??_??.txt
-        \ setfiletype textarea
   " Tidy config
   autocmd BufNewFile,BufRead
         \ .tidyrc
diff --git a/vim/ftplugin/textarea.vim b/vim/ftplugin/textarea.vim
deleted file mode 100644
index 4db97b58..00000000
--- a/vim/ftplugin/textarea.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-" Set mail message as an alternative filetype
-if !exists('b:alternate_filetypes')
-  let b:alternate_filetypes = [&filetype, 'mail']
-endif
-
-" Stop here if the user doesn't want ftplugin mappings
-if exists('no_plugin_maps') || exists('no_textarea_maps')
-  finish
-endif
-
-" #s expands to the #signature tag used in Cerb
-inoreabbrev #s #signature
diff --git a/x/Xresources b/x/Xresources
index 1c6ab1aa..672fc214 100644
--- a/x/Xresources
+++ b/x/Xresources
@@ -1,7 +1,26 @@
 /* Declare our xterms have 256 colors */
 XTerm.termName: xterm-256color
 
-/* Don't munge 8th bit of characters with Alt, send an Escape prefix instead */
+/**
+ * Just use "xterm" as the title, no need to complicate it with the name of the
+ * actual binary called.
+ */
+XTerm.title: xterm
+
+/**
+ * Don't pass mouse events to applications, even if they ask for it; mouse
+ * interaction with command-line tools isn't normally very well-written anyway.
+ * Better just to treat it as text.
+ */
+XTerm.vt100.allowMouseOps: false
+
+/**
+ * Don't let applications set the window title; it's usually more confusing
+ * than helpful, with things like command wrappers getting in the way.
+ */
+XTerm.vt100.allowTitleOps: false
+
+/* Don't munge characters' 8th bit with Alt, send Escape prefix instead */
 XTerm.vt100.altIsNotMeta: true
 XTerm.vt100.altSendsEscape: true
 
@@ -22,12 +41,6 @@ XTerm.vt100.charClass: \
 	63-126:48
 
 /**
- * Put the terminal text contents flush against the edges of the window,
- * otherwise things like tmux look awkward.
- */
-XTerm.vt100.internalBorder: 0
-
-/**
  * Set some less harsh colors than the xterm defaults; I think I got these from
  * somewhere else and tweaked them, but I can't remember where it was now.
  */
@@ -51,12 +64,33 @@ XTerm.vt100.color14: rgb:34/e2/e2
 XTerm.vt100.color15: rgb:ee/ee/ec
 
 /**
+ * Use Ubuntu Mono as a TrueType font if I decide to switch to it, but default
+ * to using the default bitmap font.
+ */
+XTerm.vt100.faceName: xft:Ubuntu Mono
+XTerm.vt100.faceSize: 9
+XTerm.vt100.renderFont: defaultOff
+
+/**
+ * Put the terminal text contents flush against the edges of the window,
+ * otherwise things like tmux look awkward.
+ */
+XTerm.vt100.internalBorder: 0
+
+/**
+ * Don't jump to the bottom of the window just because of new output, but do so
+ * if I actually type something.  (Weird that the defaults are the opposite.)
+ */
+XTerm.vt100.scrollTtyOutput: false
+XTerm.vt100.scrollKey: true
+
+/**
  * Bind extra keys to copy/paste to/from CLIPBOARD rather than PRIMARY, as
  * a simple selection does.
  */
 XTerm.vt100.translations: #override \n\
-	Ctrl Shift <Key>C: copy-selection(CLIPBOARD) \n\
-	Ctrl Shift <Key>V: insert-selection(CLIPBOARD)
+	! Ctrl Shift <Key>C: copy-selection(CLIPBOARD) \n\
+	! Ctrl Shift <Key>V: insert-selection(CLIPBOARD)
 
 /**
  * Trim trailing spaces from selections; if I'm copying text from a terminal