Resolved conflict, indulging new file layout

1 files changed, 17 insertions, 0 deletions

diff --git a/archive/st/patch/scrollback.h b/archive/st/patch/scrollback.h
new file mode 100644
index 0000000..08940f0
--- /dev/null
+++ b/archive/st/patch/scrollback.h
@@ -0,0 +1,17 @@
+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
+                     term.scr + HISTSIZE + 1) % HISTSIZE] : \
+                     term.line[(y) - term.scr])
+
+void kscrolldown(const Arg *);
+void kscrollup(const Arg *);
+
+#if SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH
+typedef struct {
+	 uint b;
+	 uint mask;
+	 void (*func)(const Arg *);
+	 const Arg arg;
+} MouseKey;
+
+extern MouseKey mkeys[];
+#endif // SCROLLBACK_MOUSE_PATCH / SCROLLBACK_MOUSE_ALTSCREEN_PATCH