From 06b5f05bd242e0f8e9d12dcb5f99552d14c85a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Sun, 18 Jul 2021 18:50:22 +0200 Subject: Move usr/*src to *src --- .../external/mit/xterm/dist/patch-scroll-bottom | 49 --------------------- .../mit/xterm/dist/patch-scroll-lock-altscreen | 17 -------- .../mit/xterm/dist/patch-scroll-lock-scrollkey | 14 ------ usr/xsrc/external/mit/xterm/dist/patch-scroll-top | 50 ---------------------- 4 files changed, 130 deletions(-) delete mode 100644 usr/xsrc/external/mit/xterm/dist/patch-scroll-bottom delete mode 100644 usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen delete mode 100644 usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey delete mode 100644 usr/xsrc/external/mit/xterm/dist/patch-scroll-top (limited to 'usr/xsrc/external/mit') diff --git a/usr/xsrc/external/mit/xterm/dist/patch-scroll-bottom b/usr/xsrc/external/mit/xterm/dist/patch-scroll-bottom deleted file mode 100644 index 865bac8..0000000 --- a/usr/xsrc/external/mit/xterm/dist/patch-scroll-bottom +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD$ - -Add scroll-bottom action. - ---- charproc.c.orig 2018-03-14 06:04:22.000000000 +0000 -+++ charproc.c -@@ -259,6 +259,7 @@ static XtActionsRec actionsList[] = { - { "quit", HandleQuit }, - { "redraw", HandleRedraw }, - { "scroll-back", HandleScrollBack }, -+ { "scroll-bottom", HandleScrollBottom }, - { "scroll-forw", HandleScrollForward }, - { "secure", HandleSecure }, - { "select-cursor-end", HandleKeyboardSelectEnd }, - ---- scrollbar.c.orig 2021-07-16 07:44:23.160211555 +0000 -+++ scrollbar.c -@@ -757,6 +757,20 @@ HandleScrollBack( - } - } - -+/*ARGSUSED*/ -+void -+HandleScrollBottom( -+ Widget xw, -+ XEvent *event GCC_UNUSED, -+ String *params, -+ Cardinal *nparams) -+{ -+ XtermWidget xtw; -+ -+ if ((xtw = getXtermWidget(xw)) != 0) -+ WindowScroll(xtw, 0, True); -+} -+ - #if OPT_SCROLL_LOCK - #define SCROLL_LOCK_LED 3 - - ---- xterm.h.orig 2019-07-11 08:08:47.000000000 +0000 -+++ xterm.h -@@ -1346,6 +1346,7 @@ extern void deleteScrollback (TScreen * - /* scrollbar.c */ - extern void DoResizeScreen (XtermWidget /* xw */); - extern void HandleScrollBack PROTO_XT_ACTIONS_ARGS; -+extern void HandleScrollBottom PROTO_XT_ACTIONS_ARGS; - extern void HandleScrollForward PROTO_XT_ACTIONS_ARGS; - extern void ResizeScrollBar (XtermWidget /* xw */); - extern void ScrollBarDrawThumb (Widget /* scrollWidget */); diff --git a/usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen b/usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen deleted file mode 100644 index 2091460..0000000 --- a/usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD$ - -Disable Scroll Lock-specific behavior in the alternate screen. -This makes visual programs like vi (that make use of the alternate -screen) behave normally even if Scroll Lock is active. - ---- util.c.orig 2018-03-14 06:04:22.000000000 +0000 -+++ util.c -@@ -570,7 +570,7 @@ xtermScroll(XtermWidget xw, int amount) - amount = i; - - #if OPT_SCROLL_LOCK -- if (screen->allowScrollLock && screen->scroll_lock) { -+ if (screen->allowScrollLock && screen->scroll_lock && !screen->whichBuf) { - refreshheight = 0; - screen->scroll_amt = 0; - screen->refresh_amt = 0; diff --git a/usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey b/usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey deleted file mode 100644 index 56c6e1c..0000000 --- a/usr/xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD$ - ---- input.c.orig 2021-07-17 15:01:03.290490780 +0000 -+++ input.c -@@ -1376,6 +1376,9 @@ Input(XtermWidget xw, - } - unparse_end(xw); - -+ if (screen->scrollkey && kd.keysym != XK_Return) -+ SetScrollLock(screen, False); -+ - if (key && !TEK4014_ACTIVE(xw)) - AdjustAfterInput(xw); - diff --git a/usr/xsrc/external/mit/xterm/dist/patch-scroll-top b/usr/xsrc/external/mit/xterm/dist/patch-scroll-top deleted file mode 100644 index 54c8004..0000000 --- a/usr/xsrc/external/mit/xterm/dist/patch-scroll-top +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD$ - -Add scroll-top action. - ---- charproc.c.orig 2018-03-14 06:04:22.000000000 +0000 -+++ charproc.c -@@ -259,7 +259,8 @@ static XtActionsRec actionsList[] = { - { "quit", HandleQuit }, - { "redraw", HandleRedraw }, - { "scroll-back", HandleScrollBack }, - { "scroll-forw", HandleScrollForward }, -+ { "scroll-top", HandleScrollTop }, - { "secure", HandleSecure }, - { "select-cursor-end", HandleKeyboardSelectEnd }, - { "select-cursor-extend", HandleKeyboardSelectExtend }, - ---- scrollbar.c.orig 2021-07-16 07:44:23.160211555 +0000 -+++ scrollbar.c -@@ -757,6 +757,20 @@ HandleScrollBack( - } - } - -+/*ARGSUSED*/ -+void -+HandleScrollTop( -+ Widget xw, -+ XEvent *event GCC_UNUSED, -+ String *params, -+ Cardinal *nparams) -+{ -+ float topPercent; -+ -+ topPercent = 0; -+ ScrollTextTo(xw, NULL, &topPercent); -+} -+ - #if OPT_SCROLL_LOCK - #define SCROLL_LOCK_LED 3 - ---- xterm.h.orig 2019-07-11 08:08:47.000000000 +0000 -+++ xterm.h -@@ -1346,7 +1346,8 @@ extern void deleteScrollback (TScreen * - /* scrollbar.c */ - extern void DoResizeScreen (XtermWidget /* xw */); - extern void HandleScrollBack PROTO_XT_ACTIONS_ARGS; - extern void HandleScrollForward PROTO_XT_ACTIONS_ARGS; -+extern void HandleScrollTop PROTO_XT_ACTIONS_ARGS; - extern void ResizeScrollBar (XtermWidget /* xw */); - extern void ScrollBarDrawThumb (Widget /* scrollWidget */); - extern void ScrollBarOff (XtermWidget /* xw */); -- cgit v1.2.3