From 5adcb533e5910bc612665f79d73f7772688f17bf Mon Sep 17 00:00:00 2001
From: k1574 <k1574@yandex.ru>
Date: Wed, 3 Mar 2021 05:36:10 +0500
Subject: [PATCH] xonotic: new bindings; sam&xresources: unified fonts.

---
 dot/file/samrc                   | 10 ++---
 dot/file/xonotic/data/config.cfg | 12 +++---
 xresources                       | 67 ++++++++++++--------------------
 3 files changed, 35 insertions(+), 54 deletions(-)

diff --git a/dot/file/samrc b/dot/file/samrc
index 2fe287f..6e7d50c 100644
--- a/dot/file/samrc
+++ b/dot/file/samrc
@@ -10,9 +10,9 @@ bind C l command charright
 bind C j command linedown
 bind C k command lineup
 
-# Scrolling as in "less".
-bind C f command scrolldown
-bind C b command scrollup
+# Scrolling as in "less" but with Shift.
+bind CS f command scrolldown
+bind CS b command scrollup
 
 # Control-Space highlights recent text
 bind C space command escape
@@ -57,11 +57,11 @@ bind C s command write
 bind CS s command send X w
 
 # Control-N does a search, Control-Shift-N does a look
-bind C n command search
+#bind C n command search
 bind CS n command look
 
 # Font.
-font Consolas:size=12
+font DeJavu Sans Mono:size=12:antialias=true:autohint=true
 
 # Use black for text and borders, and an angry fruit salad for backgrounds.
 foreground black
diff --git a/dot/file/xonotic/data/config.cfg b/dot/file/xonotic/data/config.cfg
index 51b87b5..4cb3d67 100644
--- a/dot/file/xonotic/data/config.cfg
+++ b/dot/file/xonotic/data/config.cfg
@@ -101,7 +101,7 @@ seta "_hud_panelorder" "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 18 19 20 21
 "bgmvolume" "0"
 seta "cl_allow_uid2name" "1"
 seta "cl_autoswitch" "0"
-"cl_backspeed" "425"
+"cl_backspeed" "360"
 seta "cl_damageeffect" "0"
 seta "cl_damagetext_2d" "1"
 seta "cl_damagetext_2d_alpha_lifetime" "1.29999995"
@@ -118,15 +118,15 @@ seta "cl_damagetext_size" "8"
 seta "cl_damagetext_velocity_screen" "0 0 0"
 seta "cl_damagetext_velocity_world" "0 0 20"
 seta "cl_eventchase_death" "0"
-"cl_forwardspeed" "425"
-seta "cl_matchcount" "416"
+"cl_forwardspeed" "360"
+seta "cl_matchcount" "422"
 "cl_movement_track_canjump" "1"
 "cl_particles_quality" "0.4"
-"cl_sidespeed" "425"
+"cl_sidespeed" "360"
 "cl_smoothviewheight" "0"
 seta "cl_spawn_point_particles" "0"
-seta "cl_startcount" "83"
-"cl_upspeed" "425"
+seta "cl_startcount" "84"
+"cl_upspeed" "360"
 seta "cl_zoomsensitivity" "1"
 seta "cl_zoomspeed" "-1"
 "con_chat" "10"
diff --git a/xresources b/xresources
index 97db6fd..ee812eb 100644
--- a/xresources
+++ b/xresources
@@ -1,57 +1,38 @@
-*utf8Title : true
-*utf8 : 2
-*locale : true
-*faceName : Consolas
-*.font: Consolas:pixelsize=12:antialias=true:autohint=true
-*.boldFont : Consolas:pixelsize=12:antialias=true:autohint=true:weight=bold
-*.italicFont : Consolas:pixelsize=12:antialias=true:autohint=true:slant=italic
-*faceSize : 10
-*fontSize : 10
-*.alternateScroll: false
-*.vt100.geometry: 80x30
-*eightBitInput: true
-*metaSendsEscape: true
-xterm*boldMode: true
-*dynamicColors: on
-*colorMode: on
-*saveLines: 10000
-*visualBell: false
-*.bellIsUrgent: false
-*cursorBlink: false
-*.metaSendsEscape: true
+Xft.antialias : true
+Xft.rgba : rgb
+Xft.hinting : true
+Xft.hintstyle : hintslight
 
-*background : rgb:00/00/00
-*foreground : rgb:FF/FF/FF
-*cursorColor : rgb:FF/FF/FF
+xterm*faceName : DejaVu Sans Mono:size=11:antialias=true:autohint=true
+xterm*background : rgb:00/00/00
+xterm*foreground : rgb:FF/FF/FF
+xterm*cursorColor : rgb:FF/FF/FF
 ! Black.
-*color0 : rgb:00/00/00
-*color8 : rgb:66/66/66
+xterm*color0 : rgb:00/00/00
+xterm*color8 : rgb:66/66/66
 ! Red.
-*color1 : rgb:DD/22/22
-*color9 : rgb:FF/00/00
-
+xterm*color1 : rgb:DD/22/22
+xterm*color9 : rgb:FF/00/00
 ! Green.
-*color2 : rgb:67/E3/00
-*color10 : rgb:A9/F1/6C
+xterm*color2 : rgb:67/E3/00
+xterm*color10 : rgb:A9/F1/6C
 ! Yellow.
-*color3 : rgb:F7/FF/00
-*color11 : rgb:EB/F2/2C
+xterm*color3 : rgb:F7/FF/00
+xterm*color11 : rgb:EB/F2/2C
 ! Blue.
-*color4 : rgb:51/90/D0
-*color12 : rgb:34/6A/A1
+xterm*color4 : rgb:51/90/D0
+xterm*color12 : rgb:34/6A/A1
 ! Madgenta.
-*color5 : rgb:FF/6E/00
-*color13 : rgb:DE/60/00
+xterm*color5 : rgb:FF/6E/00
+xterm*color13 : rgb:DE/60/00
 ! Cyan.
-*color6 : rgb:00/FF/FF
-*color14 : rgb:17/FF/FF
+xterm*color6 : rgb:00/FF/FF
+xterm*color14 : rgb:17/FF/FF
 ! White.
-*color7 : rgb:DD/DD/DD
-*color15 : rgb:FF/FF/FF
+xterm*color7 : rgb:DD/DD/DD
+xterm*color15 : rgb:FF/FF/FF
 
 
-! }}} # xterm, urxvt and other terminals that use Xresources.
-
 ! prog yeahconsole {{{
 yeahconsole*term : st
 yeahconsole*transparent : false