diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2023-02-11 05:53:32 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2023-02-11 05:57:37 +1300 |
commit | 5b16cb16d24d302bb247375a7babc3549964b36f (patch) | |
tree | a42cef551ee17da45d29b0c53c868bea14426aaa | |
parent | Remove 8-bit/meta key xterm settings (diff) | |
download | dotfiles-5b16cb16d24d302bb247375a7babc3549964b36f.tar.gz dotfiles-5b16cb16d24d302bb247375a7babc3549964b36f.zip |
Remove urxvt support
I've switched back to xterm; rxvt's not worth the periodic
incompatibilities, especially with mosh.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 16 | ||||
-rw-r--r-- | README.md | 12 | ||||
-rw-r--r-- | check/urxvt.sh | 3 | ||||
-rw-r--r-- | lint/urxvt.sh | 5 | ||||
-rw-r--r-- | man/man1/xrq.1df | 4 | ||||
-rw-r--r-- | man/man7/dotfiles.7df | 17 | ||||
-rw-r--r-- | urxvt/ext/select.pl | 85 | ||||
-rw-r--r-- | urxvt/xsession.d/urxvt.sh | 2 | ||||
-rw-r--r-- | x/Xresources | 33 |
10 files changed, 2 insertions, 176 deletions
@@ -188,5 +188,4 @@ /mutt/filters/markdown-to-html /mutt/muttrc.d/src /tmux/bin/tmux -/urxvt/ext/select /x/xsession @@ -50,7 +50,6 @@ install-terminfo \ install-tidy \ install-tmux \ - install-urxvt \ install-vim \ install-vim-gui \ install-vint \ @@ -68,7 +67,6 @@ check-login-shell \ check-man \ check-sh \ - check-urxvt \ check-x \ check-xsession \ check-zsh \ @@ -79,7 +77,6 @@ lint-git-template-hooks \ lint-ksh \ lint-sh \ - lint-urxvt \ lint-vim \ lint-x \ lint-xsession @@ -303,7 +300,6 @@ clean distclean: mutt/filters/markdown-to-html \ mutt/muttrc.d/src \ tmux/bin/tmux \ - urxvt/ext/select \ x/xsession .awk: @@ -629,11 +625,6 @@ install-tmux: tmux/bin/tmux tmux/tmux.conf install-systemd install-terminfo cp -p -- tmux/systemd/user/tmux.service \ $(XDG_DATA_HOME)/systemd/user -install-urxvt: urxvt/ext/select install-x - mkdir -p -- $(HOME)/.urxvt/ext - cp -p -- urxvt/ext/select $(HOME)/.urxvt/ext - cp -p -- urxvt/xsession.d/urxvt.sh $(HOME)/.xsession.d - VIM = vim VIMDIR = $(HOME)/.vim VIMRC = $(VIMDIR)/vimrc @@ -722,9 +713,6 @@ check-login-shell: check-sh: sh check/sh.sh -check-urxvt: urxvt/ext/select - sh check/urxvt.sh - check-x: sh check/x.sh @@ -740,7 +728,6 @@ lint: lint-bash \ lint-git-template-hooks \ lint-ksh \ lint-sh \ - lint-urxvt \ lint-vim \ lint-x @@ -762,9 +749,6 @@ lint-ksh: check-ksh lint-sh: check-sh sh lint/sh.sh -lint-urxvt: check-urxvt - sh lint/urxvt.sh - lint-vim: sh lint/vim.sh @@ -321,16 +321,6 @@ appealing. You'll need Abook installed if you want to use the `query_command` I have defined, and msmtp for the `sendmail` command. -### rxvt-unicode - -I've butchered the URxvt Perl extensions `selection-to-clipboard` and -`selection` into a single `select` extension in `~/.urxvt/ext`, which is the -only extension I define in `~/.Xresources`. - -The included `.Xresources` file assumes that `urxvt` can use 256 colors and -Perl extensions. If you're missing functionality, try changing -`perl-ext-common` to `default`. - ### tmux These are just generally vi-friendly settings, and there isn't much out of the @@ -654,8 +644,6 @@ available to run them: - `lint-ksh` - `lint-sh` - `lint-x` -- Perl::Critic: - - `lint-urxvt` - [Vint](https://github.com/Kuniwak/vint): - `lint-vim` diff --git a/check/urxvt.sh b/check/urxvt.sh deleted file mode 100644 index e64ba1e5..00000000 --- a/check/urxvt.sh +++ /dev/null @@ -1,3 +0,0 @@ -for perl in urxvt/ext/*.pl ; do - perl -c "${perl%.pl}" || exit -done diff --git a/lint/urxvt.sh b/lint/urxvt.sh deleted file mode 100644 index 6e5fb503..00000000 --- a/lint/urxvt.sh +++ /dev/null @@ -1,5 +0,0 @@ -set -- -for pl in urxvt/ext/*.pl ; do - set -- "$@" "${pl%.pl}" -done -perlcritic --brutal -- "${pl%.pl}" diff --git a/man/man1/xrq.1df b/man/man1/xrq.1df index 9dd7f0d1..184aa186 100644 --- a/man/man1/xrq.1df +++ b/man/man1/xrq.1df @@ -1,4 +1,4 @@ -.TH XRQ 1df "January 2017" "Manual page for xrq" +.TH XRQ 1df "February 2023" "Manual page for xrq" .SH NAME .B xrq \- query X resource values @@ -7,7 +7,7 @@ Xft.hintstyle .br .B xrq -URxvt.color0 URxvt.color9 +XTerm.vt100.color0 XTerm.vt100.color9 .SH DESCRIPTION .B xrq runs xrdb(1) with the -query option and filters for the values of the named diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index 61d7cef6..a290d9d6 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -468,17 +468,6 @@ sounds appealing. You\[cq]ll need Abook installed if you want to use the \f[C]query_command\f[R] I have defined, and msmtp for the \f[C]sendmail\f[R] command. -.SS rxvt-unicode -.PP -I\[cq]ve butchered the URxvt Perl extensions -\f[C]selection-to-clipboard\f[R] and \f[C]selection\f[R] into a single -\f[C]select\f[R] extension in \f[C]\[ti]/.urxvt/ext\f[R], which is the -only extension I define in \f[C]\[ti]/.Xresources\f[R]. -.PP -The included \f[C].Xresources\f[R] file assumes that \f[C]urxvt\f[R] can -use 256 colors and Perl extensions. -If you\[cq]re missing functionality, try changing -\f[C]perl-ext-common\f[R] to \f[C]default\f[R]. .SS tmux .PP These are just generally vi-friendly settings, and there isn\[cq]t much @@ -1040,12 +1029,6 @@ ShellCheck (https://www.shellcheck.net/): \f[C]lint-x\f[R] .RE .IP \[bu] 2 -Perl::Critic: -.RS 2 -.IP \[bu] 2 -\f[C]lint-urxvt\f[R] -.RE -.IP \[bu] 2 Vint (https://github.com/Kuniwak/vint): .RS 2 .IP \[bu] 2 diff --git a/urxvt/ext/select.pl b/urxvt/ext/select.pl deleted file mode 100644 index 7701e963..00000000 --- a/urxvt/ext/select.pl +++ /dev/null @@ -1,85 +0,0 @@ -# Tom Ryder's choice of selection behaviours for urxvt, butchered from included -# URxvt extension scripts. - -# Force me to write this properly -use strict; -use warnings; -use utf8; - -# Require at least this version of Perl -use 5.006; - -# Use plain-English variable names -use English qw(-no_match_vars); - -# Set version of this extension -our $VERSION = 1.0; - -# On creation, read all of cutchars into a list of regex-quoted patterns -sub on_init { - my ($self) = @_; - if ( defined( my $res = $self->resource('cutchars') ) ) { - $res = $self->locale_decode($res); - push @{ $self->{patterns} }, - qr{\G [\Q$res\E[:space:]]* ([^\Q$res\E[:space:]]+) }msx; - } - return (); -} - -# Handle multiple-clicking selection extension -sub on_sel_extend { - my ($self) = @_; - - # Get attributes of the current selection - my ( $row, $col ) = $self->selection_mark; - my $line = $self->line($row); - my $text = $line->t; - my $markofs = $line->offset_of( $row, $col ); - my $curlen = - $line->offset_of( $self->selection_end ) - - $line->offset_of( $self->selection_beg ); - - # Find all the possible matches - my @matches; - if ( $markofs < $line->l ) { - - # `perldoc -f study` says this does nothing useful anymore since - # version 5.16 - study $text; - - for my $regex ( @{ $self->{patterns} } ) { - while ( $text =~ m{$regex}gmsx ) { - if ( $LAST_MATCH_START[1] <= $markofs - and $markofs <= $LAST_MATCH_END[1] ) - { - my $ofs = $LAST_MATCH_START[1]; - my $match = $1; - - push @matches, [ $ofs, length $match ]; - } - } - } - } - - # If no more clever patterns matched, just snarf the whole line - push @matches, [ 0, ( $line->end - $line->beg + 1 ) * $self->ncol ]; - - # Iterate over the matches to choose the shortest one - MATCH: - for ( - sort { ## no critic (ProhibitReverseSortBlock) - $a->[1] <=> $b->[1] - or $b->[0] <=> $a->[0] - } @matches - ) - { - my ( $ofs, $len ) = @{$_}; - next MATCH if $len <= $curlen; - $self->selection_beg( $line->coord_of($ofs) ); - $self->selection_end( $line->coord_of( $ofs + $len ) ); - return 1; - } - - # Done - return (); -} diff --git a/urxvt/xsession.d/urxvt.sh b/urxvt/xsession.d/urxvt.sh deleted file mode 100644 index 766c2939..00000000 --- a/urxvt/xsession.d/urxvt.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Start X terminator emulator daemon -urxvtd --fork --opendisplay diff --git a/x/Xresources b/x/Xresources index e70922a9..c9be5f41 100644 --- a/x/Xresources +++ b/x/Xresources @@ -21,36 +21,3 @@ XTerm.vt100.color12: #729FCF XTerm.vt100.color13: #AD7FA8 XTerm.vt100.color14: #34E2E2 XTerm.vt100.color15: #EEEEEC - -! URxvt -URxvt.cursorBlink: on -URxvt.cutchars: <>│ -URxvt.internalBorder: 0 -URxvt.iso14755: false -URxvt.iso14755_52: false -URxvt.perl-ext-common: select -URxvt.pointerBlank: true -URxvt.saveLines: 10000 -URxvt.scrollBar: false -URxvt.scrollTTyKeypress: true -URxvt.scrollTTyOutput: false -URxvt.secondaryScroll: true -URxvt.urgentOnBell: true -URxvt.background: #030303 -URxvt.foreground: #E0E0E0 -URxvt.color0: #030303 -URxvt.color1: #CC0000 -URxvt.color2: #3EAA06 -URxvt.color3: #C4A000 -URxvt.color4: #3465A4 -URxvt.color5: #75507B -URxvt.color6: #06989A -URxvt.color7: #D3D7CF -URxvt.color8: #303030 -URxvt.color9: #EF2929 -URxvt.color10: #7AF234 -URxvt.color11: #FCE94F -URxvt.color12: #729FCF -URxvt.color13: #AD7FA8 -URxvt.color14: #34E2E2 -URxvt.color15: #EEEEEC |