55 changed files with 2516 additions and 208 deletions
Unified View
Diff Options
-
+19 -3arch-setup/AUR.txt
-
+2 -0arch-setup/chroot.sh
-
+1 -1arch-setup/fetch_keys.sh
-
+99 -3arch-setup/nonAUR.txt
-
+6 -6config/X11/xinitrc
-
+1 -1config/tmux/tmux.conf
-
+0 -4config/zathura/a
-
+0 -1config/zathura/zathurarc
-
+1823 -0config/zsh/.zcompdump.tatooine.345706
-
+1 -1config/zsh/profile
-
+3 -10install.sh
-
+1 -1local/bin/daily-update
-
+1 -1local/bin/devmon
-
+1 -1local/bin/dmenu-udevil
-
+1 -1local/bin/dmenu-wallabag
-
+1 -1local/bin/dmenu_surf
-
+1 -1local/bin/fastfetch
-
+1 -1local/bin/kbmap_toggle
-
+1 -1local/bin/keyboard
-
+1 -1local/bin/lock
-
+1 -1local/bin/menu-surfraw
-
+1 -1local/bin/newmail.sh
-
+1 -1local/bin/nextcloud-sync
-
+1 -1local/bin/nm_sendmail.sh
-
+1 -1local/bin/pacontrol.sh
-
+1 -1local/bin/password_manager
-
+1 -1local/bin/purge_hist
-
+1 -1local/bin/start-spotifyd
-
+1 -1local/bin/status-bar/bluetooth
-
+1 -1local/bin/status-bar/clipboard
-
+1 -1local/bin/status-bar/dunst
-
+1 -1local/bin/status-bar/keyboard
-
+1 -1local/bin/status-bar/mail
-
+1 -1local/bin/status-bar/mconnect
-
+1 -1local/bin/status-bar/memory
-
+1 -1local/bin/status-bar/screensaver
-
+1 -1local/bin/status-bar/volume
-
+1 -1local/bin/stop-spotifyd
-
+1 -1local/bin/tedportal
-
+1 -1local/bin/toggle_monitor.sh
-
+1 -1local/bin/toggle_touchpad.sh
-
+1 -1local/bin/update_events.sh
-
+1 -1local/bin/weechat_start
-
+1 -1local/bin/ytfzf_dmenu
-
+1 -1local/bin/zaread
-
+5 -5root/kdialog
-
+12 -2suckless/slock/config.h
-
+33 -0suckless/slock/slock.c
-
+13 -12suckless/st/config.h
-
+351 -0suckless/st/patches/st-scrollback-0.8.4.diff
-
+13 -0suckless/st/patches/st-scrollback-mouse-20191024-a2c479c.diff
-
+0 -90suckless/st/patches/st-universcroll-0.8.4.diff
-
+98 -32suckless/st/st.c
-
+2 -1suckless/st/st.h
-
+0 -2suckless/st/x.c
+ 19
- 3
arch-setup/AUR.txt
View File
+ 2
- 0
arch-setup/chroot.sh
View File
+ 1
- 1
arch-setup/fetch_keys.sh
View File
+ 99
- 3
arch-setup/nonAUR.txt
View File
+ 6
- 6
config/X11/xinitrc
View File
+ 1
- 1
config/tmux/tmux.conf
View File
+ 0
- 4
config/zathura/a
View File
| @ -1,4 +0,0 @@ | |||||
| set synctex true | |||||
| set synctex-editor-command "vim +%{line} %{input}" | |||||
| map <C-i> recolor | |||||
+ 0
- 1
config/zathura/zathurarc
View File
+ 1823
- 0
config/zsh/.zcompdump.tatooine.345706
File diff suppressed because it is too large
View File
+ 1
- 1
config/zsh/profile
View File
+ 3
- 10
install.sh
View File
+ 1
- 1
local/bin/daily-update
View File
+ 1
- 1
local/bin/devmon
View File
+ 1
- 1
local/bin/dmenu-udevil
View File
+ 1
- 1
local/bin/dmenu-wallabag
View File
+ 1
- 1
local/bin/dmenu_surf
View File
+ 1
- 1
local/bin/fastfetch
View File
+ 1
- 1
local/bin/kbmap_toggle
View File
+ 1
- 1
local/bin/keyboard
View File
| @ -1,4 +1,4 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| setxkbmap "us,tr" -option caps:escape # Set keyboard layout. map CapsLock to Esc | setxkbmap "us,tr" -option caps:escape # Set keyboard layout. map CapsLock to Esc | ||||
| xset r rate 180 40 | xset r rate 180 40 | ||||
+ 1
- 1
local/bin/lock
View File
+ 1
- 1
local/bin/menu-surfraw
View File
+ 1
- 1
local/bin/newmail.sh
View File
| @ -1,4 +1,4 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| mbsync $1 | mbsync $1 | ||||
| notmuch new | notmuch new | ||||
| notmuch tag --batch --input=/home/yigit/.notmuch_tag | notmuch tag --batch --input=/home/yigit/.notmuch_tag | ||||
+ 1
- 1
local/bin/nextcloud-sync
View File
+ 1
- 1
local/bin/nm_sendmail.sh
View File
+ 1
- 1
local/bin/pacontrol.sh
View File
+ 1
- 1
local/bin/password_manager
View File
| @ -1,3 +1,3 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| bitwarden-dmenu --dmenu-args='-i -l 10' --dmenu-pswd-args="-P -nf white" --clear-clipboard 30 --session-timeout 96600 --sync-vault-after 48300 --on-error 'xargs notify-send --urgency=low' | bitwarden-dmenu --dmenu-args='-i -l 10' --dmenu-pswd-args="-P -nf white" --clear-clipboard 30 --session-timeout 96600 --sync-vault-after 48300 --on-error 'xargs notify-send --urgency=low' | ||||
+ 1
- 1
local/bin/purge_hist
View File
| @ -1,4 +1,4 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| cat ~/.surf/history.txt > ~/.surf/history.txt | cat ~/.surf/history.txt > ~/.surf/history.txt | ||||
| cat ~/.surf/history.txt | sort | uniq >~/.surf/history.txt | cat ~/.surf/history.txt | sort | uniq >~/.surf/history.txt | ||||
+ 1
- 1
local/bin/start-spotifyd
View File
| @ -1,3 +1,3 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| systemctl start --user spotifyd | systemctl start --user spotifyd | ||||
+ 1
- 1
local/bin/status-bar/bluetooth
View File
+ 1
- 1
local/bin/status-bar/clipboard
View File
| @ -1,4 +1,4 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| clp=$(sselp) | clp=$(sselp) | ||||
+ 1
- 1
local/bin/status-bar/dunst
View File
+ 1
- 1
local/bin/status-bar/keyboard
View File
+ 1
- 1
local/bin/status-bar/mail
View File
+ 1
- 1
local/bin/status-bar/mconnect
View File
+ 1
- 1
local/bin/status-bar/memory
View File
+ 1
- 1
local/bin/status-bar/screensaver
View File
+ 1
- 1
local/bin/status-bar/volume
View File
+ 1
- 1
local/bin/stop-spotifyd
View File
| @ -1,3 +1,3 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| systemctl stop --user spotifyd | systemctl stop --user spotifyd | ||||
+ 1
- 1
local/bin/tedportal
View File
+ 1
- 1
local/bin/toggle_monitor.sh
View File
+ 1
- 1
local/bin/toggle_touchpad.sh
View File
+ 1
- 1
local/bin/update_events.sh
View File
| @ -1,3 +1,3 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| echo $((($(khal list -f \"{uid}\" | wc -l) - 1))) > /home/yigit/.cache/events | echo $((($(khal list -f \"{uid}\" | wc -l) - 1))) > /home/yigit/.cache/events | ||||
+ 1
- 1
local/bin/weechat_start
View File
| @ -1,3 +1,3 @@ | |||||
| #!/bin/bash | |||||
| #!/bin/sh | |||||
| st -e weechat | st -e weechat | ||||
+ 1
- 1
local/bin/ytfzf_dmenu
View File
+ 1
- 1
local/bin/zaread
View File
+ 5
- 5
root/kdialog
View File
+ 12
- 2
suckless/slock/config.h
View File
+ 33
- 0
suckless/slock/slock.c
View File
+ 13
- 12
suckless/st/config.h
View File
+ 351
- 0
suckless/st/patches/st-scrollback-0.8.4.diff
View File
| @ -0,0 +1,351 @@ | |||||
| diff --git a/config.def.h b/config.def.h | |||||
| index 6f05dce..93cbcc0 100644 | |||||
| --- a/config.def.h | |||||
| +++ b/config.def.h | |||||
| @@ -199,6 +199,8 @@ static Shortcut shortcuts[] = { | |||||
| { TERMMOD, XK_Y, selpaste, {.i = 0} }, | |||||
| { ShiftMask, XK_Insert, selpaste, {.i = 0} }, | |||||
| { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, | |||||
| + { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, | |||||
| + { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, | |||||
| }; | |||||
| /* | |||||
| diff --git a/st.c b/st.c | |||||
| index 76b7e0d..edec064 100644 | |||||
| --- a/st.c | |||||
| +++ b/st.c | |||||
| @@ -35,6 +35,7 @@ | |||||
| #define ESC_ARG_SIZ 16 | |||||
| #define STR_BUF_SIZ ESC_BUF_SIZ | |||||
| #define STR_ARG_SIZ ESC_ARG_SIZ | |||||
| +#define HISTSIZE 2000 | |||||
| /* macros */ | |||||
| #define IS_SET(flag) ((term.mode & (flag)) != 0) | |||||
| @@ -42,6 +43,9 @@ | |||||
| #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) | |||||
| #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) | |||||
| #define ISDELIM(u) (u && wcschr(worddelimiters, u)) | |||||
| +#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \ | |||||
| + term.scr + HISTSIZE + 1) % HISTSIZE] : \ | |||||
| + term.line[(y) - term.scr]) | |||||
| enum term_mode { | |||||
| MODE_WRAP = 1 << 0, | |||||
| @@ -115,6 +119,9 @@ typedef struct { | |||||
| int col; /* nb col */ | |||||
| Line *line; /* screen */ | |||||
| Line *alt; /* alternate screen */ | |||||
| + Line hist[HISTSIZE]; /* history buffer */ | |||||
| + int histi; /* history index */ | |||||
| + int scr; /* scroll back */ | |||||
| int *dirty; /* dirtyness of lines */ | |||||
| TCursor c; /* cursor */ | |||||
| int ocx; /* old cursor col */ | |||||
| @@ -184,8 +191,8 @@ static void tnewline(int); | |||||
| static void tputtab(int); | |||||
| static void tputc(Rune); | |||||
| static void treset(void); | |||||
| -static void tscrollup(int, int); | |||||
| -static void tscrolldown(int, int); | |||||
| +static void tscrollup(int, int, int); | |||||
| +static void tscrolldown(int, int, int); | |||||
| static void tsetattr(int *, int); | |||||
| static void tsetchar(Rune, Glyph *, int, int); | |||||
| static void tsetdirt(int, int); | |||||
| @@ -414,10 +421,10 @@ tlinelen(int y) | |||||
| { | |||||
| int i = term.col; | |||||
| - if (term.line[y][i - 1].mode & ATTR_WRAP) | |||||
| + if (TLINE(y)[i - 1].mode & ATTR_WRAP) | |||||
| return i; | |||||
| - while (i > 0 && term.line[y][i - 1].u == ' ') | |||||
| + while (i > 0 && TLINE(y)[i - 1].u == ' ') | |||||
| --i; | |||||
| return i; | |||||
| @@ -526,7 +533,7 @@ selsnap(int *x, int *y, int direction) | |||||
| * Snap around if the word wraps around at the end or | |||||
| * beginning of a line. | |||||
| */ | |||||
| - prevgp = &term.line[*y][*x]; | |||||
| + prevgp = &TLINE(*y)[*x]; | |||||
| prevdelim = ISDELIM(prevgp->u); | |||||
| for (;;) { | |||||
| newx = *x + direction; | |||||
| @@ -541,14 +548,14 @@ selsnap(int *x, int *y, int direction) | |||||
| yt = *y, xt = *x; | |||||
| else | |||||
| yt = newy, xt = newx; | |||||
| - if (!(term.line[yt][xt].mode & ATTR_WRAP)) | |||||
| + if (!(TLINE(yt)[xt].mode & ATTR_WRAP)) | |||||
| break; | |||||
| } | |||||
| if (newx >= tlinelen(newy)) | |||||
| break; | |||||
| - gp = &term.line[newy][newx]; | |||||
| + gp = &TLINE(newy)[newx]; | |||||
| delim = ISDELIM(gp->u); | |||||
| if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim | |||||
| || (delim && gp->u != prevgp->u))) | |||||
| @@ -569,14 +576,14 @@ selsnap(int *x, int *y, int direction) | |||||
| *x = (direction < 0) ? 0 : term.col - 1; | |||||
| if (direction < 0) { | |||||
| for (; *y > 0; *y += direction) { | |||||
| - if (!(term.line[*y-1][term.col-1].mode | |||||
| + if (!(TLINE(*y-1)[term.col-1].mode | |||||
| & ATTR_WRAP)) { | |||||
| break; | |||||
| } | |||||
| } | |||||
| } else if (direction > 0) { | |||||
| for (; *y < term.row-1; *y += direction) { | |||||
| - if (!(term.line[*y][term.col-1].mode | |||||
| + if (!(TLINE(*y)[term.col-1].mode | |||||
| & ATTR_WRAP)) { | |||||
| break; | |||||
| } | |||||
| @@ -607,13 +614,13 @@ getsel(void) | |||||
| } | |||||
| if (sel.type == SEL_RECTANGULAR) { | |||||
| - gp = &term.line[y][sel.nb.x]; | |||||
| + gp = &TLINE(y)[sel.nb.x]; | |||||
| lastx = sel.ne.x; | |||||
| } else { | |||||
| - gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; | |||||
| + gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; | |||||
| lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; | |||||
| } | |||||
| - last = &term.line[y][MIN(lastx, linelen-1)]; | |||||
| + last = &TLINE(y)[MIN(lastx, linelen-1)]; | |||||
| while (last >= gp && last->u == ' ') | |||||
| --last; | |||||
| @@ -848,6 +855,9 @@ void | |||||
| ttywrite(const char *s, size_t n, int may_echo) | |||||
| { | |||||
| const char *next; | |||||
| + Arg arg = (Arg) { .i = term.scr }; | |||||
| + | |||||
| + kscrolldown(&arg); | |||||
| if (may_echo && IS_SET(MODE_ECHO)) | |||||
| twrite(s, n, 1); | |||||
| @@ -1059,13 +1069,53 @@ tswapscreen(void) | |||||
| } | |||||
| void | |||||
| -tscrolldown(int orig, int n) | |||||
| +kscrolldown(const Arg* a) | |||||
| +{ | |||||
| + int n = a->i; | |||||
| + | |||||
| + if (n < 0) | |||||
| + n = term.row + n; | |||||
| + | |||||
| + if (n > term.scr) | |||||
| + n = term.scr; | |||||
| + | |||||
| + if (term.scr > 0) { | |||||
| + term.scr -= n; | |||||
| + selscroll(0, -n); | |||||
| + tfulldirt(); | |||||
| + } | |||||
| +} | |||||
| + | |||||
| +void | |||||
| +kscrollup(const Arg* a) | |||||
| +{ | |||||
| + int n = a->i; | |||||
| + | |||||
| + if (n < 0) | |||||
| + n = term.row + n; | |||||
| + | |||||
| + if (term.scr <= HISTSIZE-n) { | |||||
| + term.scr += n; | |||||
| + selscroll(0, n); | |||||
| + tfulldirt(); | |||||
| + } | |||||
| +} | |||||
| + | |||||
| +void | |||||
| +tscrolldown(int orig, int n, int copyhist) | |||||
| { | |||||
| int i; | |||||
| Line temp; | |||||
| LIMIT(n, 0, term.bot-orig+1); | |||||
| + if (copyhist) { | |||||
| + term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE; | |||||
| + temp = term.hist[term.histi]; | |||||
| + term.hist[term.histi] = term.line[term.bot]; | |||||
| + term.line[term.bot] = temp; | |||||
| + } | |||||
| + | |||||
| tsetdirt(orig, term.bot-n); | |||||
| tclearregion(0, term.bot-n+1, term.col-1, term.bot); | |||||
| @@ -1075,17 +1125,28 @@ tscrolldown(int orig, int n) | |||||
| term.line[i-n] = temp; | |||||
| } | |||||
| - selscroll(orig, n); | |||||
| + if (term.scr == 0) | |||||
| + selscroll(orig, n); | |||||
| } | |||||
| void | |||||
| -tscrollup(int orig, int n) | |||||
| +tscrollup(int orig, int n, int copyhist) | |||||
| { | |||||
| int i; | |||||
| Line temp; | |||||
| LIMIT(n, 0, term.bot-orig+1); | |||||
| + if (copyhist) { | |||||
| + term.histi = (term.histi + 1) % HISTSIZE; | |||||
| + temp = term.hist[term.histi]; | |||||
| + term.hist[term.histi] = term.line[orig]; | |||||
| + term.line[orig] = temp; | |||||
| + } | |||||
| + | |||||
| + if (term.scr > 0 && term.scr < HISTSIZE) | |||||
| + term.scr = MIN(term.scr + n, HISTSIZE-1); | |||||
| + | |||||
| tclearregion(0, orig, term.col-1, orig+n-1); | |||||
| tsetdirt(orig+n, term.bot); | |||||
| @@ -1095,7 +1156,8 @@ tscrollup(int orig, int n) | |||||
| term.line[i+n] = temp; | |||||
| } | |||||
| - selscroll(orig, -n); | |||||
| + if (term.scr == 0) | |||||
| + selscroll(orig, -n); | |||||
| } | |||||
| void | |||||
| @@ -1124,7 +1186,7 @@ tnewline(int first_col) | |||||
| int y = term.c.y; | |||||
| if (y == term.bot) { | |||||
| - tscrollup(term.top, 1); | |||||
| + tscrollup(term.top, 1, 1); | |||||
| } else { | |||||
| y++; | |||||
| } | |||||
| @@ -1289,14 +1351,14 @@ void | |||||
| tinsertblankline(int n) | |||||
| { | |||||
| if (BETWEEN(term.c.y, term.top, term.bot)) | |||||
| - tscrolldown(term.c.y, n); | |||||
| + tscrolldown(term.c.y, n, 0); | |||||
| } | |||||
| void | |||||
| tdeleteline(int n) | |||||
| { | |||||
| if (BETWEEN(term.c.y, term.top, term.bot)) | |||||
| - tscrollup(term.c.y, n); | |||||
| + tscrollup(term.c.y, n, 0); | |||||
| } | |||||
| int32_t | |||||
| @@ -1733,11 +1795,11 @@ csihandle(void) | |||||
| break; | |||||
| case 'S': /* SU -- Scroll <n> line up */ | |||||
| DEFAULT(csiescseq.arg[0], 1); | |||||
| - tscrollup(term.top, csiescseq.arg[0]); | |||||
| + tscrollup(term.top, csiescseq.arg[0], 0); | |||||
| break; | |||||
| case 'T': /* SD -- Scroll <n> line down */ | |||||
| DEFAULT(csiescseq.arg[0], 1); | |||||
| - tscrolldown(term.top, csiescseq.arg[0]); | |||||
| + tscrolldown(term.top, csiescseq.arg[0], 0); | |||||
| break; | |||||
| case 'L': /* IL -- Insert <n> blank lines */ | |||||
| DEFAULT(csiescseq.arg[0], 1); | |||||
| @@ -2241,7 +2303,7 @@ eschandle(uchar ascii) | |||||
| return 0; | |||||
| case 'D': /* IND -- Linefeed */ | |||||
| if (term.c.y == term.bot) { | |||||
| - tscrollup(term.top, 1); | |||||
| + tscrollup(term.top, 1, 1); | |||||
| } else { | |||||
| tmoveto(term.c.x, term.c.y+1); | |||||
| } | |||||
| @@ -2254,7 +2316,7 @@ eschandle(uchar ascii) | |||||
| break; | |||||
| case 'M': /* RI -- Reverse index */ | |||||
| if (term.c.y == term.top) { | |||||
| - tscrolldown(term.top, 1); | |||||
| + tscrolldown(term.top, 1, 1); | |||||
| } else { | |||||
| tmoveto(term.c.x, term.c.y-1); | |||||
| } | |||||
| @@ -2464,7 +2526,7 @@ twrite(const char *buf, int buflen, int show_ctrl) | |||||
| void | |||||
| tresize(int col, int row) | |||||
| { | |||||
| - int i; | |||||
| + int i, j; | |||||
| int minrow = MIN(row, term.row); | |||||
| int mincol = MIN(col, term.col); | |||||
| int *bp; | |||||
| @@ -2501,6 +2563,14 @@ tresize(int col, int row) | |||||
| term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); | |||||
| term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); | |||||
| + for (i = 0; i < HISTSIZE; i++) { | |||||
| + term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); | |||||
| + for (j = mincol; j < col; j++) { | |||||
| + term.hist[i][j] = term.c.attr; | |||||
| + term.hist[i][j].u = ' '; | |||||
| + } | |||||
| + } | |||||
| + | |||||
| /* resize each row to new width, zero-pad if needed */ | |||||
| for (i = 0; i < minrow; i++) { | |||||
| term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); | |||||
| @@ -2559,7 +2629,7 @@ drawregion(int x1, int y1, int x2, int y2) | |||||
| continue; | |||||
| term.dirty[y] = 0; | |||||
| - xdrawline(term.line[y], x1, y, x2); | |||||
| + xdrawline(TLINE(y), x1, y, x2); | |||||
| } | |||||
| } | |||||
| @@ -2580,8 +2650,9 @@ draw(void) | |||||
| cx--; | |||||
| drawregion(0, 0, term.col, term.row); | |||||
| - xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], | |||||
| - term.ocx, term.ocy, term.line[term.ocy][term.ocx]); | |||||
| + if (term.scr == 0) | |||||
| + xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], | |||||
| + term.ocx, term.ocy, term.line[term.ocy][term.ocx]); | |||||
| term.ocx = cx; | |||||
| term.ocy = term.c.y; | |||||
| xfinishdraw(); | |||||
| diff --git a/st.h b/st.h | |||||
| index 3d351b6..f44e1d3 100644 | |||||
| --- a/st.h | |||||
| +++ b/st.h | |||||
| @@ -81,6 +81,8 @@ void die(const char *, ...); | |||||
| void redraw(void); | |||||
| void draw(void); | |||||
| +void kscrolldown(const Arg *); | |||||
| +void kscrollup(const Arg *); | |||||
| void printscreen(const Arg *); | |||||
| void printsel(const Arg *); | |||||
| void sendbreak(const Arg *); | |||||
+ 13
- 0
suckless/st/patches/st-scrollback-mouse-20191024-a2c479c.diff
View File
| @ -0,0 +1,13 @@ | |||||
| diff --git a/config.def.h b/config.def.h | |||||
| index ec1b576..4b3bf15 100644 | |||||
| --- a/config.def.h | |||||
| +++ b/config.def.h | |||||
| @@ -163,6 +163,8 @@ static uint forcemousemod = ShiftMask; | |||||
| */ | |||||
| static MouseShortcut mshortcuts[] = { | |||||
| /* mask button function argument release */ | |||||
| + { ShiftMask, Button4, kscrollup, {.i = 1} }, | |||||
| + { ShiftMask, Button5, kscrolldown, {.i = 1} }, | |||||
| { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, | |||||
| { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, | |||||
| { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, | |||||
+ 0
- 90
suckless/st/patches/st-universcroll-0.8.4.diff
View File
| @ -1,90 +0,0 @@ | |||||
| From 9726b1e58352126252412e101432e64d46fc51ca Mon Sep 17 00:00:00 2001 | |||||
| From: Dennis Lee <dennis@dennislee.xyz> | |||||
| Date: Sun, 28 Jun 2020 23:01:03 -0700 | |||||
| Subject: [PATCH] universcroll: mouse wheel only scroll in all modes | |||||
| Scroll normally via scroll(1), without Shift, when outside of | |||||
| `MODE_ALTSCREEN`. Inside an alt screen, continue to scroll normally | |||||
| without Shift; in this mode, your scrolling is automatically translated | |||||
| into ^Y and ^E. It just werks! | |||||
| Based on the existing mouse-altscreen patch | |||||
| https://st.suckless.org/patches/scrollback/ | |||||
| adapted for st(1) 0.8.4 and scroll(1). | |||||
| --- | |||||
| config.def.h | 10 +++++----- | |||||
| st.c | 5 +++++ | |||||
| st.h | 1 + | |||||
| x.c | 2 ++ | |||||
| 4 files changed, 13 insertions(+), 5 deletions(-) | |||||
| diff --git a/config.def.h b/config.def.h | |||||
| index 6f05dce..62e87da 100644 | |||||
| --- a/config.def.h | |||||
| +++ b/config.def.h | |||||
| @@ -173,11 +173,11 @@ static uint forcemousemod = ShiftMask; | |||||
| * Beware that overloading Button1 will disable the selection. | |||||
| */ | |||||
| static MouseShortcut mshortcuts[] = { | |||||
| - /* mask button function argument release */ | |||||
| - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, | |||||
| - { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, | |||||
| + /* mask button function argument release alt */ | |||||
| + { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, | |||||
| + { XK_ANY_MOD, Button4, ttysend, {.s = "\033[5;2~"}, 0, -1 }, | |||||
| { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, | |||||
| - { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, | |||||
| + { XK_ANY_MOD, Button5, ttysend, {.s = "\033[6;2~"}, 0, -1 }, | |||||
| { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, | |||||
| }; | |||||
| diff --git a/st.c b/st.c | |||||
| index 76b7e0d..1f65453 100644 | |||||
| --- a/st.c | |||||
| +++ b/st.c | |||||
| @@ -1047,6 +1047,11 @@ tnew(int col, int row) | |||||
| treset(); | |||||
| } | |||||
| +int tisaltscr(void) | |||||
| +{ | |||||
| + return IS_SET(MODE_ALTSCREEN); | |||||
| +} | |||||
| + | |||||
| void | |||||
| tswapscreen(void) | |||||
| { | |||||
| diff --git a/st.h b/st.h | |||||
| index 3d351b6..39cc054 100644 | |||||
| --- a/st.h | |||||
| +++ b/st.h | |||||
| @@ -87,6 +87,7 @@ void sendbreak(const Arg *); | |||||
| void toggleprinter(const Arg *); | |||||
| int tattrset(int); | |||||
| +int tisaltscr(void); | |||||
| void tnew(int, int); | |||||
| void tresize(int, int); | |||||
| void tsetdirtattr(int); | |||||
| diff --git a/x.c b/x.c | |||||
| index 210f184..210dde9 100644 | |||||
| --- a/x.c | |||||
| +++ b/x.c | |||||
| @@ -34,6 +34,7 @@ typedef struct { | |||||
| void (*func)(const Arg *); | |||||
| const Arg arg; | |||||
| uint release; | |||||
| + int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */ | |||||
| } MouseShortcut; | |||||
| typedef struct { | |||||
| @@ -446,6 +447,7 @@ mouseaction(XEvent *e, uint release) | |||||
| for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { | |||||
| if (ms->release == release && | |||||
| ms->button == e->xbutton.button && | |||||
| + (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) && | |||||
| (match(ms->mod, state) || /* exact or forced */ | |||||
| match(ms->mod, state & ~forcemousemod))) { | |||||
| ms->func(&(ms->arg)); | |||||
| -- | |||||
| 2.27.0 | |||||