diff --git a/X11/xresources b/X11/xresources index d188f2a..6c547a8 100644 --- a/X11/xresources +++ b/X11/xresources @@ -36,4 +36,5 @@ Xft.hinting: true Xft.hintstyle: hintfull Xft.lcdfilter: lcddefault +Xcursor.size: 16 Xcursor.theme: Breeze_Obsidian diff --git a/gtk-2.0/settings.ini b/gtk-2.0/settings.ini index 0520055..f96e997 100644 --- a/gtk-2.0/settings.ini +++ b/gtk-2.0/settings.ini @@ -3,9 +3,9 @@ gtk-theme-name="Arc-Dark" gtk-icon-theme-name="Xenlism-Wildfire" -gtk-font-name="Noto Sans 9" +gtk-font-name="sans 9" gtk-cursor-theme-name="Breeze_Obsidian" -gtk-cursor-theme-size=0 +gtk-cursor-theme-size=16 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=1 diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index dfb7c66..d986ecf 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -2,9 +2,9 @@ gtk-theme-name=Arc-Dark gtk-icon-theme-name=Xenlism-Wildfire gtk-application-prefer-dark-theme=true -gtk-font-name=Noto Sans 9 +gtk-font-name=sans 9 gtk-cursor-theme-name=Breeze_Obsidian -gtk-cursor-theme-size=0 +gtk-cursor-theme-size=16 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=1 diff --git a/scripts/dpi b/scripts/dpi index 1533f25..77b8763 100755 --- a/scripts/dpi +++ b/scripts/dpi @@ -9,43 +9,57 @@ xrdbget() { xrdb -query | grep -i -m1 "$1" | sed 's/^.*:\s//g' || echo "$2" } -dpi=$1 +xsetting_bool() { + case "$1" in + true) echo 1;; + false) echo 0;; + default) echo -1;; + *) echo -1;; + esac +} -if [ -z "$1" ]; then - >&2 printf "Usage\n\t%s: " "$(basename "$0")" + +if [ -z "$1" ] || [ "$1" -gt 200 ] || [ "$1" -lt 96 ]; then + >&2 printf "Usage\n\t%s: value\n\n value\t Value must be within 96-200 inclusive\n" "$(basename "$0")" exit 1 fi -# Update picom and xorg -sed -i "s/strength =.*$/strength = $(( dpi*8/96 ));/" "$CONF_DIR/picom/picom.conf" & -xrandr --dpi "$dpi" & - +dpi=$1 scale=$(( dpi/96 )) cursor=$(( dpi/6 )) +# Update picom scale +sed -i -e "s/strength =.*$/strength = $(( dpi*8/96 ));/" \ + -e "s/corner-radius =.*$/corner-radius = $(( dpi/13 ));/" \ + "$CONF_DIR/picom/picom.conf" & + # Build xsettingsd.conf mkdir -p "$CONF_DIR/xsettingsd" { - cat "$CONF_DIR/xsettingsd.local" 2>/dev/null || true + cat "$CONF_DIR/xsettingsd.local" 2>/dev/null || : echo "Xcursor/size $cursor" echo "Gtk/CursorThemeSize $cursor" echo "Gtk/CursorThemeName \"$(xrdbget Xcursor.theme Adwaita)\"" echo "Xft/HintStyle \"$(xrdbget Xft.hintstyle hintfull)\"" - echo "Xft/Hinting \"$(xrdbget Xft.hinting -1)\"" + echo "Xft/Hinting $(xsetting_bool "$(xrdbget Xft.hinting default)")" echo "Xft/RGBA \"$(xrdbget Xft.rgba rgb)\"" echo "Xft/DPI $(( dpi*1024 ))" echo "Gdk/WindowScalingFactor $scale" echo "Gdk/UnscaledDPI $(( dpi*1024/scale ))" } > "$CONF_DIR/xsettingsd/xsettingsd.conf" -{ - echo "Xft.dpi: $dpi" - echo "Xcursor.size: $cursor" -} | xrdb -merge & - +xrdb -merge <