summaryrefslogtreecommitdiff
path: root/japanese/kterm/files
diff options
context:
space:
mode:
Diffstat (limited to 'japanese/kterm/files')
-rw-r--r--japanese/kterm/files/patch-Imakefile37
-rw-r--r--japanese/kterm/files/patch-KTerm.ad92
-rw-r--r--japanese/kterm/files/patch-VTPrsTbl.c11
-rw-r--r--japanese/kterm/files/patch-VTparse.h7
-rw-r--r--japanese/kterm/files/patch-charproc.c26
-rw-r--r--japanese/kterm/files/patch-main.c148
-rw-r--r--japanese/kterm/files/patch-menu.c26
-rw-r--r--japanese/kterm/files/patch-scrollbar.c26
-rw-r--r--japanese/kterm/files/patch-util.c65
9 files changed, 73 insertions, 365 deletions
diff --git a/japanese/kterm/files/patch-Imakefile b/japanese/kterm/files/patch-Imakefile
index f12653a87eeb..244f894c7ec7 100644
--- a/japanese/kterm/files/patch-Imakefile
+++ b/japanese/kterm/files/patch-Imakefile
@@ -1,37 +1,10 @@
---- Imakefile.orig 2016-11-04 21:41:21 UTC
+--- Imakefile.orig 2024-02-02 17:45:34 UTC
+++ Imakefile
-@@ -13,6 +13,16 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan
- XPOLL_DEF = -DNO_XPOLL_H
+@@ -23,6 +23,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan
+ PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */
+ PTYLIB = -lpucc
#endif
++ PTYLIB += -lutil
-+#ifdef USE_XAW3DLIB
-+#undef XawClientLibs
-+#define XawClientLibs -lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB)
-+#endif
-+
-+#ifdef USE_NEXTAWLIB
-+#undef XawClientLibs
-+#define XawClientLibs -lneXtaw $(XMULIB) $(XTOOLLIB) $(XLIB)
-+#endif
-+
- /*
- * add -DWTMP and -DLASTLOG if you want them.
- */
-@@ -27,7 +37,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
-
-- MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \
-+ MAIN_DEFINES = $(TTYGROUPDEF) $(PUCCPTYDDEF) \
- -DOSMAJORVERSION=$(OSMAJORVERSION) \
- -DOSMINORVERSION=$(OSMINORVERSION)
- MISC_DEFINES = /* -DALLOWLOGFILEEXEC */
-@@ -72,7 +82,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan
- #endif
- #endif
-
-- TERMCAPLIB = TermcapLibrary
-+ TERMCAPLIB = TermcapLibrary -lutil
-
- AllTarget($(PROGRAMS))
-
diff --git a/japanese/kterm/files/patch-KTerm.ad b/japanese/kterm/files/patch-KTerm.ad
deleted file mode 100644
index 94c638f11184..000000000000
--- a/japanese/kterm/files/patch-KTerm.ad
+++ /dev/null
@@ -1,92 +0,0 @@
---- KTerm.ad.orig 2016-11-04 21:41:21 UTC
-+++ KTerm.ad
-@@ -52,37 +52,43 @@ KTerm.JoinSession:False
-
- *fontMenu.Label: VT Fonts
- *fontMenu*fontdefault*Label: Default
--*VT100*fontList: -*-fixed-medium-r-normal--14-*,\
-- -*-gothic-medium-r-normal--14-*,\
-- -*-mincho-medium-r-normal--14-*
--!*VT100*boldFontList: -*-fixed-bold-r-normal--14-*,\
--! -*-gothic-bold-r-normal--14-*,\
--! -*-mincho-bold-r-normal--14-*
-+*VT100*fontList: -alias-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\
-+ -*-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\
-+ -*-gothic-medium-r-normal--14-*-*-*-c-*-*-*,\
-+ -*-mincho-medium-r-normal--14-*-*-*-c-*-*-*
-+!*VT100*boldFontList: -*-fixed-bold-r-normal--14-*-c-*,\
-+! -*-gothic-bold-r-normal--14-*-c-*,\
-+! -*-mincho-bold-r-normal--14-*-c-*
- *fontMenu*font1*Label: Unreadable
--*VT100*fontList1: -*-fixed-medium-r-normal--2-*,\
-- -*-gothic-medium-r-normal--2-*,\
-- -*-mincho-medium-r-normal--2-*
--*VT100*font1: -misc-nil-medium-r-normal--2-*-misc-fontspecific
-+*VT100*fontList1: -*-fixed-medium-r-normal--2-*-c-*,\
-+ -*-gothic-medium-r-normal--2-*-c-*,\
-+ -*-mincho-medium-r-normal--2-*-c-*
-+*VT100*font1: -misc-nil-medium-r-normal--2-*-c-*-misc-fontspecific
- *fontMenu*font2*Label: Tiny
--*VT100*fontList2: -*-fixed-medium-r-normal--14-*,\
-- -*-gothic-medium-r-normal--14-*,\
-- -*-mincho-medium-r-normal--14-*
-+*VT100*fontList2: -alias-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\
-+ -*-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\
-+ -*-gothic-medium-r-normal--8-*-*-*-c-*-*-*,\
-+ -*-mincho-medium-r-normal--8-*-*-*-c-*-*-*
- *fontMenu*font3*Label: Small
--*VT100*fontList3: -*-fixed-medium-r-normal--16-*,\
-- -*-gothic-medium-r-normal--16-*,\
-- -*-mincho-medium-r-normal--16-*
-+*VT100*fontList3: -alias-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\
-+ -*-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\
-+ -*-gothic-medium-r-normal--12-*-*-*-c-*-*-*,\
-+ -*-mincho-medium-r-normal--12-*-*-*-c-*-*-*
- *fontMenu*font4*Label: Medium
--*VT100*fontList4: -*-fixed-medium-r-normal--18-*,\
-- -*-gothic-medium-r-normal--18-*,\
-- -*-mincho-medium-r-normal--18-*
-+*VT100*fontList4: -alias-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\
-+ -*-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\
-+ -*-gothic-medium-r-normal--16-*-*-*-c-*-*-*,\
-+ -*-mincho-medium-r-normal--16-*-*-*-c-*-*-*
- *fontMenu*font5*Label: Large
--*VT100*fontList5: -*-fixed-medium-r-normal--24-*,\
-- -*-gothic-medium-r-normal--24-*,\
-- -*-mincho-medium-r-normal--24-*
-+*VT100*fontList5: -alias-fixed-medium-r-normal--20-*-*-*-c-*-*-*,\
-+ -*-fixed-medium-r-normal--20-*-*-*-c-*-*-*,\
-+ -*-gothic-medium-r-normal--20-*-*-*-c-*-*-*,\
-+ -*-mincho-medium-r-normal--20-*-*-*-c-*-*-*
- *fontMenu*font6*Label: Huge
--*VT100*fontList6: -*-fixed-medium-r-normal--26-*,\
-- -*-gothic-medium-r-normal--26-*,\
-- -*-mincho-medium-r-normal--26-*
-+*VT100*fontList6: -alias-fixed-medium-r-normal--24-*-*-*-c-*-*-*,\
-+ -*-fixed-medium-r-normal--24-*-*-*-c-*-*-*,\
-+ -*-gothic-medium-r-normal--24-*-*-*-c-*-*-*,\
-+ -*-mincho-medium-r-normal--24-*-*-*-c-*-*-*
- *fontMenu*fontescape*Label: Escape Sequence
- *fontMenu*fontsel*Label: Selection
- !fontescape and fontsel overridden by application
-@@ -132,5 +138,18 @@ KTerm.JoinSession:False
- *tek4014*font3: 6x13
- *tek4014*fontSmall: 6x10
-
--*VT100*translations: #override Shift<Key>space: \
-- begin-conversion(_JAPANESE_CONVERSION)
-+!This can be useful if you have an IntelliMouse. It maps the button
-+!events generated by the wheel
-+*VT100*Translations: #override \
-+ !Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\
-+ !Lock Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\
-+ !Lock @Num_Lock Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\
-+ ! @Num_Lock Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\
-+ <Btn4Down>: scroll-back(5,line) \n\
-+ !Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\
-+ !Lock Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\
-+ !Lock @Num_Lock Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\
-+ ! @Num_Lock Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\
-+ <Btn5Down>: scroll-forw(5,line)
-+*VT100.translations: #override \
-+ Shift<Key>space: begin-conversion(_JAPANESE_CONVERSION)
diff --git a/japanese/kterm/files/patch-VTPrsTbl.c b/japanese/kterm/files/patch-VTPrsTbl.c
deleted file mode 100644
index 2c72f8dc42d5..000000000000
--- a/japanese/kterm/files/patch-VTPrsTbl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- VTPrsTbl.c.orig 2016-11-04 21:41:21 UTC
-+++ VTPrsTbl.c
-@@ -490,7 +490,7 @@ CASE_GROUND_STATE,
- CASE_GROUND_STATE,
- CASE_GROUND_STATE,
- /* X Y Z [ */
--CASE_GROUND_STATE,
-+CASE_ECH,
- CASE_GROUND_STATE,
- CASE_GROUND_STATE,
- CASE_GROUND_STATE,
diff --git a/japanese/kterm/files/patch-VTparse.h b/japanese/kterm/files/patch-VTparse.h
deleted file mode 100644
index 43d8d4ee7340..000000000000
--- a/japanese/kterm/files/patch-VTparse.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- VTparse.h.orig 2016-11-04 21:41:21 UTC
-+++ VTparse.h
-@@ -118,3 +118,4 @@
- #define CASE_SCS_STATE 77
- #define CASE_GSET_VERSION_STATE 78
- #define CASE_GSET_VERSION 79
-+#define CASE_ECH 80
diff --git a/japanese/kterm/files/patch-charproc.c b/japanese/kterm/files/patch-charproc.c
deleted file mode 100644
index f2686d39232d..000000000000
--- a/japanese/kterm/files/patch-charproc.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- charproc.c.orig 2016-11-04 21:41:21 UTC
-+++ charproc.c
-@@ -103,8 +103,8 @@ extern jmp_buf VTend;
- extern XtAppContext app_con;
- extern Widget toplevel;
- extern void exit();
--extern char *malloc();
--extern char *realloc();
-+extern void *malloc();
-+extern void *realloc();
- extern fd_set Select_mask;
- extern fd_set X_mask;
- extern fd_set pty_mask;
-@@ -1974,6 +1974,12 @@ static void VTparse()
- }
- parsestate = groundtable;
- break;
-+
-+ case CASE_ECH:
-+ /* ECH */
-+ ClearRightN(screen, param[0] < 1 ? 1 : param[0]);
-+ parsestate = groundtable;
-+ break;
-
- case CASE_IL:
- /* IL */
diff --git a/japanese/kterm/files/patch-main.c b/japanese/kterm/files/patch-main.c
index 720d727b0c18..6867c22aeeed 100644
--- a/japanese/kterm/files/patch-main.c
+++ b/japanese/kterm/files/patch-main.c
@@ -1,91 +1,79 @@
---- main.c.orig 2016-11-04 21:41:21 UTC
+--- main.c.orig 2024-02-02 17:45:34 UTC
+++ main.c
-@@ -211,7 +211,9 @@ static Bool IsPts = False;
- #undef FIOCLEX
- #undef FIONCLEX
- #define setpgrp2 setpgrp
-+#ifndef USE_POSIX_TERMIOS
- #include <sgtty.h>
-+#endif
- #include <sys/resource.h>
- #endif
- #ifdef sco
-@@ -237,7 +239,7 @@ static Bool IsPts = False;
- #define HAS_UTMP_UT_HOST
+@@ -143,6 +143,10 @@ static Bool IsPts = False;
+ #define WTMP
#endif
- #else /* } !SYSV { */ /* BSD systems */
--#ifndef linux
-+#if !defined(linux) && !defined(USE_POSIX_TERMIOS)
- #include <sgtty.h>
- #endif
- #include <sys/resource.h>
-@@ -294,7 +296,7 @@ extern Time_t time ();
- #define ttyslot() 1
- #endif /* apollo */
++#if defined(__FreeBSD__)
++#define USE_SYSV_UTMP
++#endif
++
+ /* from xterm-200 */
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || defined(__APPLE__)
+ #ifndef USE_POSIX_TERMIOS
+@@ -2374,7 +2378,7 @@ spawn ()
+ #endif /* sun */
+ struct passwd *pw = NULL;
+ #ifdef UTMP
-#ifdef SVR4
+#if defined(SVR4) || (defined(__FreeBSD__) && __FreeBSD_version >= 900007)
- #include <utmpx.h>
- #define setutent setutxent
- #define getutent getutxent
-@@ -320,6 +322,10 @@ extern struct utmp *getutid __((struct utmp *_Id));
- int Ptyfd;
- #endif /* PUCC_PTYD */
+ struct utmpx utmp;
+ #else
+ struct utmp utmp;
+@@ -3286,7 +3290,7 @@ spawn ()
-+#ifdef __FreeBSD__
-+#include <libutil.h> /* openpty() */
-+#endif
-+
- #ifdef sequent
- #define USE_GET_PSEUDOTTY
+ /* set up the new entry */
+ utmp.ut_type = USER_PROCESS;
+-#ifndef linux
++#if !defined(linux) && !defined(__FreeBSD__)
+ utmp.ut_exit.e_exit = 2;
+ #endif
+ (void) strncpy(utmp.ut_user,
+@@ -3314,8 +3318,13 @@ spawn ()
#endif
-@@ -1360,6 +1366,8 @@ char **argv;
- d_tio.c_cc[VDISCARD] = CFLUSH;
- d_tio.c_cc[VWERASE] = CWERASE;
- d_tio.c_cc[VLNEXT] = CLNEXT;
-+ d_tio.c_cc[VMIN] = 1;
-+ d_tio.c_cc[VTIME] = 0;
- #endif /* } */
- #ifdef TIOCSLTC /* { */
- d_ltc.t_suspc = CSUSP; /* t_suspc */
-@@ -1408,6 +1416,8 @@ char **argv;
- d_tio.c_cc[VQUIT] = CQUIT; /* '^\' */
- d_tio.c_cc[VEOF] = CEOF; /* '^D' */
- d_tio.c_cc[VEOL] = CEOL; /* '^@' */
-+ d_tio.c_cc[VMIN] = 1;
-+ d_tio.c_cc[VTIME] = 0;
- #ifdef VSWTCH
- d_tio.c_cc[VSWTCH] = CSWTCH; /* usually '^Z' */
+ (void) strncpy(utmp.ut_host, buf, sizeof(utmp.ut_host));
#endif
-@@ -1722,11 +1732,11 @@ char **argv;
- case 'u': case 'U':
- term->flags |= UTF8_KANJI;
- update_utf8mode();
-- make_unicode_map();
- break;
- default:
- break;
- }
-+ make_unicode_map();
- }
- #endif /* KTERM_KANJIMODE */
++#if defined(__FreeBSD__)
++ (void) strncpy(utmp.ut_user, pw->pw_name,
++ sizeof(utmp.ut_user));
++#else
+ (void) strncpy(utmp.ut_name, pw->pw_name,
+ sizeof(utmp.ut_name));
++#endif
-@@ -1973,6 +1983,10 @@ char *name;
- get_pty (pty)
- int *pty;
- {
-+#if 1
-+ int tty;
-+ return (openpty(pty, &tty, ttydev, NULL, NULL));
+ utmp.ut_pid = getpid();
+ #ifdef SVR4
+@@ -3323,8 +3332,12 @@ spawn ()
+ utmp.ut_xtime = time ((Time_t *) 0);
+ utmp.ut_tv.tv_usec = 0;
+ #else
++#if defined(__FreeBSD__)
++ utmp.ut_tv.tv_usec = 0;
+#else
- #ifdef __osf__
- int tty;
- return (openpty(pty, &tty, ttydev, NULL, NULL));
-@@ -2076,6 +2090,7 @@ get_pty (pty)
- #endif /* __sgi or umips else */
- #endif /* USE_GET_PSEUDOTTY else */
- #endif /* ATT else */
-+#endif /* !0 */
- }
+ utmp.ut_time = time ((Time_t *) 0);
+ #endif
++#endif
- /*
+ /* write out the entry */
+ if (!resource.utmpInhibit)
+@@ -3728,7 +3741,7 @@ Exit(n)
+ int pty = term->screen.respond; /* file descriptor of pty */
+ #ifdef UTMP
+ #ifdef USE_SYSV_UTMP
+-#ifdef SVR4
++#if defined(SVR4) || (defined(__FreeBSD__) && __FreeBSD_version >= 900007)
+ struct utmpx utmp;
+ struct utmpx *utptr;
+ #else
+@@ -3774,7 +3787,11 @@ Exit(n)
+ utmp.ut_xtime = time ((Time_t *) 0);
+ utmp.ut_tv.tv_usec = 0;
+ #else
++#if defined(__FreeBSD__)
++ utmp.ut_tv.tv_usec = 0;
++#else
+ utptr->ut_time = time((Time_t *) 0);
++#endif
+ #endif
+ (void) pututline(utptr);
+ #ifdef WTMP
diff --git a/japanese/kterm/files/patch-menu.c b/japanese/kterm/files/patch-menu.c
deleted file mode 100644
index a04c3b8a9e93..000000000000
--- a/japanese/kterm/files/patch-menu.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- menu.c.orig 2016-11-04 21:41:21 UTC
-+++ menu.c
-@@ -843,6 +843,7 @@ static void do_jismode (gw, closure, data)
- update_eucmode();
- update_sjismode();
- update_utf8mode();
-+ make_unicode_map();
- }
-
-
-@@ -867,6 +868,7 @@ static void do_eucmode (gw, closure, data)
- update_eucmode();
- update_sjismode();
- update_utf8mode();
-+ make_unicode_map();
- }
- }
-
-@@ -891,6 +893,7 @@ static void do_sjismode (gw, closure, data)
- update_eucmode();
- update_sjismode();
- update_utf8mode();
-+ make_unicode_map();
- }
- }
-
diff --git a/japanese/kterm/files/patch-scrollbar.c b/japanese/kterm/files/patch-scrollbar.c
deleted file mode 100644
index 947a78548e30..000000000000
--- a/japanese/kterm/files/patch-scrollbar.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- scrollbar.c.orig 2016-11-04 21:41:21 UTC
-+++ scrollbar.c
-@@ -49,6 +49,7 @@ extern int BackgroundPixmapIsOn;
- static void ScrollTextTo();
- static void ScrollTextUpDownBy();
-
-+extern Boolean SendMousePosition();
-
- /* resize the text window for a terminal screen, modifying the
- * appropriate WM_SIZE_HINTS and taking advantage of bit gravity.
-@@ -555,6 +556,7 @@ void HandleScrollForward (gw, event, params, nparams)
- XtermWidget w = (XtermWidget) gw;
- register TScreen *screen = &w->screen;
-
-+ if (SendMousePosition(gw, event)) return;
- ScrollTextUpDownBy (gw, (XtPointer) NULL,
- (XtPointer)params_to_pixels (screen, params, (int) *nparams));
- return;
-@@ -571,6 +573,7 @@ void HandleScrollBack (gw, event, params, nparams)
- XtermWidget w = (XtermWidget) gw;
- register TScreen *screen = &w->screen;
-
-+ if (SendMousePosition(gw, event)) return;
- ScrollTextUpDownBy (gw, (XtPointer) NULL,
- (XtPointer)-params_to_pixels (screen, params, (int) *nparams));
- return;
diff --git a/japanese/kterm/files/patch-util.c b/japanese/kterm/files/patch-util.c
deleted file mode 100644
index f0877f9d9c5d..000000000000
--- a/japanese/kterm/files/patch-util.c
+++ /dev/null
@@ -1,65 +0,0 @@
---- util.c.orig 2016-11-04 21:41:21 UTC
-+++ util.c
-@@ -36,6 +36,7 @@
-
- #include <stdio.h>
-
-+static void ClearInLine(TScreen *screen, int row, int col, int len);
- static void horizontal_copy_area();
- static void vertical_copy_area();
-
-@@ -706,6 +707,54 @@ register TScreen *screen;
- /*
- * Clear last part of cursor's line, inclusive.
- */
-+ClearRightN (screen, n)
-+register TScreen *screen;
-+register int n;
-+{
-+ int i;
-+ int len = (screen->max_col - screen->cur_col + 1);
-+
-+ if (n < 0) /* the remainder of the line */
-+ n = screen->max_col + 1;
-+ if (n == 0) /* default for 'ECH' */
-+ n = 1;
-+
-+ if (len > n)
-+ len = n;
-+
-+ ClearInLine(screen, screen->cur_row, screen->cur_col, len);
-+}
-+
-+/*
-+ * Clear the given row, for the given range of columns.
-+ */
-+static void
-+ClearInLine(TScreen *screen, int row, int col, int len)
-+{
-+ if (col + len >= screen->max_col + 1) {
-+ len = screen->max_col + 1 - col;
-+ }
-+
-+ if (screen->cursor_state)
-+ HideCursor();
-+
-+ screen->do_wrap = 0;
-+
-+ if (row - screen->topline <= screen->max_row) {
-+ if (!AddToRefresh(screen)) {
-+ if (screen->scroll_amt)
-+ FlushScroll(screen);
-+ XClearArea(screen->display,
-+ VWindow(screen),
-+ CursorX (screen, col),
-+ CursorY (screen, row),
-+ len * FontWidth(screen),
-+ FontHeight(screen),
-+ FALSE);
-+ }
-+ }
-+}
-+
- ClearRight (screen)
- register TScreen *screen;
- {
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-29 03:59:20 +0000