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 --- src/usr.bin/fmt/patch-single-space | 21 +++++++++ usr/src/usr.bin/fmt/patch-single-space | 21 --------- .../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 ---------------------- xsrc/external/mit/xterm/dist/patch-scroll-bottom | 49 +++++++++++++++++++++ .../mit/xterm/dist/patch-scroll-lock-altscreen | 17 ++++++++ .../mit/xterm/dist/patch-scroll-lock-scrollkey | 14 ++++++ xsrc/external/mit/xterm/dist/patch-scroll-top | 50 ++++++++++++++++++++++ 10 files changed, 151 insertions(+), 151 deletions(-) create mode 100644 src/usr.bin/fmt/patch-single-space delete mode 100644 usr/src/usr.bin/fmt/patch-single-space 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 create mode 100644 xsrc/external/mit/xterm/dist/patch-scroll-bottom create mode 100644 xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen create mode 100644 xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey create mode 100644 xsrc/external/mit/xterm/dist/patch-scroll-top diff --git a/src/usr.bin/fmt/patch-single-space b/src/usr.bin/fmt/patch-single-space new file mode 100644 index 0000000..592fa4d --- /dev/null +++ b/src/usr.bin/fmt/patch-single-space @@ -0,0 +1,21 @@ +$NetBSD$ + +(Build with `USETOOLS=never make'.) + +--- fmt.c.orig 2017-10-13 00:11:56.000000000 +0000 ++++ fmt.c +@@ -402,13 +402,10 @@ split(const wchar_t line[], int add_spac + } + + /* +- * Guarantee a space at end of line. Two spaces after end of +- * sentence punctuation. ++ * Guarantee a space at end of line. + */ + if (*cp == '\0' && add_space) { + buf_putc(&word, ' '); +- if (strchr(".:!", cp[-1])) +- buf_putc(&word, ' '); + } + while (*cp == ' ') + buf_putc(&word, *cp++); diff --git a/usr/src/usr.bin/fmt/patch-single-space b/usr/src/usr.bin/fmt/patch-single-space deleted file mode 100644 index 592fa4d..0000000 --- a/usr/src/usr.bin/fmt/patch-single-space +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD$ - -(Build with `USETOOLS=never make'.) - ---- fmt.c.orig 2017-10-13 00:11:56.000000000 +0000 -+++ fmt.c -@@ -402,13 +402,10 @@ split(const wchar_t line[], int add_spac - } - - /* -- * Guarantee a space at end of line. Two spaces after end of -- * sentence punctuation. -+ * Guarantee a space at end of line. - */ - if (*cp == '\0' && add_space) { - buf_putc(&word, ' '); -- if (strchr(".:!", cp[-1])) -- buf_putc(&word, ' '); - } - while (*cp == ' ') - buf_putc(&word, *cp++); 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 */); diff --git a/xsrc/external/mit/xterm/dist/patch-scroll-bottom b/xsrc/external/mit/xterm/dist/patch-scroll-bottom new file mode 100644 index 0000000..865bac8 --- /dev/null +++ b/xsrc/external/mit/xterm/dist/patch-scroll-bottom @@ -0,0 +1,49 @@ +$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/xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen b/xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen new file mode 100644 index 0000000..2091460 --- /dev/null +++ b/xsrc/external/mit/xterm/dist/patch-scroll-lock-altscreen @@ -0,0 +1,17 @@ +$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/xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey b/xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey new file mode 100644 index 0000000..56c6e1c --- /dev/null +++ b/xsrc/external/mit/xterm/dist/patch-scroll-lock-scrollkey @@ -0,0 +1,14 @@ +$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/xsrc/external/mit/xterm/dist/patch-scroll-top b/xsrc/external/mit/xterm/dist/patch-scroll-top new file mode 100644 index 0000000..54c8004 --- /dev/null +++ b/xsrc/external/mit/xterm/dist/patch-scroll-top @@ -0,0 +1,50 @@ +$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