Fix selection: selscroll
This commit is contained in:
parent
e3a567ed79
commit
0ade2e6268
|
@ -1,4 +1,4 @@
|
||||||
Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.8.3 (7857b3, 2020-05-09) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more.
|
Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.8.3 (d66111, 2020-05-09) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more.
|
||||||
|
|
||||||
For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/st-flexipatch/blob/master/patches.def.h):
|
For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/st-flexipatch/blob/master/patches.def.h):
|
||||||
```c
|
```c
|
||||||
|
@ -15,7 +15,7 @@ Refer to [https://st.suckless.org/](https://st.suckless.org/) for details on the
|
||||||
|
|
||||||
### Changelog:
|
### Changelog:
|
||||||
|
|
||||||
2020-05-20 - Upgrade to 7857b3, 2020-05-09, removed visualbell 1, 2, 3 patches and force redraw after keypress due to incompatibility
|
2020-05-20 - Upgrade to d66111, 2020-05-09, removed visualbell 1, 2, 3 patches and force redraw after keypress due to incompatibility
|
||||||
|
|
||||||
2020-04-20 - Upgrade to c279f5, 2020-04-19, and added the force redraw on pselect after key is pressed patch and the externalpipein patch
|
2020-04-20 - Upgrade to c279f5, 2020-04-19, and added the force redraw on pselect after key is pressed patch and the externalpipein patch
|
||||||
|
|
||||||
|
|
26
st.c
26
st.c
|
@ -1234,28 +1234,18 @@ selscroll(int orig, int n)
|
||||||
if (sel.ob.x == -1)
|
if (sel.ob.x == -1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
|
if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
|
||||||
if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
|
selclear();
|
||||||
|
} else if (BETWEEN(sel.nb.y, orig, term.bot)) {
|
||||||
|
sel.ob.y += n;
|
||||||
|
sel.oe.y += n;
|
||||||
|
if (sel.ob.y < term.top || sel.ob.y > term.bot ||
|
||||||
|
sel.oe.y < term.top || sel.oe.y > term.bot) {
|
||||||
selclear();
|
selclear();
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (sel.type == SEL_RECTANGULAR) {
|
|
||||||
if (sel.ob.y < term.top)
|
|
||||||
sel.ob.y = term.top;
|
|
||||||
if (sel.oe.y > term.bot)
|
|
||||||
sel.oe.y = term.bot;
|
|
||||||
} else {
|
} else {
|
||||||
if (sel.ob.y < term.top) {
|
|
||||||
sel.ob.y = term.top;
|
|
||||||
sel.ob.x = 0;
|
|
||||||
}
|
|
||||||
if (sel.oe.y > term.bot) {
|
|
||||||
sel.oe.y = term.bot;
|
|
||||||
sel.oe.x = term.col;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
selnormalize();
|
selnormalize();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue