head 1.10; access; symbols pkgsrc-2026Q1:1.10.0.60 pkgsrc-2026Q1-base:1.10 pkgsrc-2025Q4:1.10.0.58 pkgsrc-2025Q4-base:1.10 pkgsrc-2025Q3:1.10.0.56 pkgsrc-2025Q3-base:1.10 pkgsrc-2025Q2:1.10.0.54 pkgsrc-2025Q2-base:1.10 pkgsrc-2025Q1:1.10.0.52 pkgsrc-2025Q1-base:1.10 pkgsrc-2024Q4:1.10.0.50 pkgsrc-2024Q4-base:1.10 pkgsrc-2024Q3:1.10.0.48 pkgsrc-2024Q3-base:1.10 pkgsrc-2024Q2:1.10.0.46 pkgsrc-2024Q2-base:1.10 pkgsrc-2024Q1:1.10.0.44 pkgsrc-2024Q1-base:1.10 pkgsrc-2023Q4:1.10.0.42 pkgsrc-2023Q4-base:1.10 pkgsrc-2023Q3:1.10.0.40 pkgsrc-2023Q3-base:1.10 pkgsrc-2023Q2:1.10.0.38 pkgsrc-2023Q2-base:1.10 pkgsrc-2023Q1:1.10.0.36 pkgsrc-2023Q1-base:1.10 pkgsrc-2022Q4:1.10.0.34 pkgsrc-2022Q4-base:1.10 pkgsrc-2022Q3:1.10.0.32 pkgsrc-2022Q3-base:1.10 pkgsrc-2022Q2:1.10.0.30 pkgsrc-2022Q2-base:1.10 pkgsrc-2022Q1:1.10.0.28 pkgsrc-2022Q1-base:1.10 pkgsrc-2021Q4:1.10.0.26 pkgsrc-2021Q4-base:1.10 pkgsrc-2021Q3:1.10.0.24 pkgsrc-2021Q3-base:1.10 pkgsrc-2021Q2:1.10.0.22 pkgsrc-2021Q2-base:1.10 pkgsrc-2021Q1:1.10.0.20 pkgsrc-2021Q1-base:1.10 pkgsrc-2020Q4:1.10.0.18 pkgsrc-2020Q4-base:1.10 pkgsrc-2020Q3:1.10.0.16 pkgsrc-2020Q3-base:1.10 pkgsrc-2020Q2:1.10.0.14 pkgsrc-2020Q2-base:1.10 pkgsrc-2020Q1:1.10.0.10 pkgsrc-2020Q1-base:1.10 pkgsrc-2019Q4:1.10.0.12 pkgsrc-2019Q4-base:1.10 pkgsrc-2019Q3:1.10.0.8 pkgsrc-2019Q3-base:1.10 pkgsrc-2019Q2:1.10.0.6 pkgsrc-2019Q2-base:1.10 pkgsrc-2019Q1:1.10.0.4 pkgsrc-2019Q1-base:1.10 pkgsrc-2018Q4:1.10.0.2 pkgsrc-2018Q4-base:1.10 pkgsrc-2018Q3:1.8.0.22 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.20 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.18 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.16 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.14 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.10 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.8 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.6 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.4 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.2 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.7.0.30 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.28 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.26 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.24 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.22 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.20 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.18 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.16 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.14 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.12 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.10 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.8 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.6 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.4 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.2 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.6.0.48 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.46 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.44 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.42 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.40 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.38 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.36 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.34 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.32 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.30 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.28 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.26 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.24 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.22 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.20 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.18 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.16 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.14 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.12 pkgsrc-2008Q1:1.6.0.10 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.8 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.6 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.4 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.2 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.5.0.8 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.6 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.4 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.4.0.8 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.6 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.4 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 buildlink2-base:1.1 buildlink2:1.1.0.2 netbsd-1-6:1.1.0.4 netbsd-1-6-RELEASE-base:1.1; locks; strict; comment @# @; 1.10 date 2018.11.30.17.30.24; author nia; state Exp; branches; next 1.9; commitid HwSoMTWd8uA7zZ1B; 1.9 date 2018.11.30.17.25.05; author nia; state Exp; branches; next 1.8; commitid KC36Zugumb7UwZ1B; 1.8 date 2016.05.01.19.56.40; author dholland; state Exp; branches; next 1.7; commitid 2xvmdIkLb2VyGO4z; 1.7 date 2012.09.29.17.59.34; author asau; state Exp; branches; next 1.6; 1.6 date 2007.01.19.08.02.33; author rillig; state Exp; branches; next 1.5; 1.5 date 2006.01.01.12.58.00; author xtraeme; state dead; branches; next 1.4; 1.4 date 2005.02.14.15.40.49; author rillig; state Exp; branches; next 1.3; 1.3 date 2004.06.02.12.48.18; author recht; state Exp; branches; next 1.2; 1.2 date 2002.08.25.21.52.31; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.08.03.13.00.30; author hubertf; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.08.03.13.00.30; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.08.25.21.22.48; author jlam; state Exp; branches; next ; desc @@ 1.10 log @x11/aterm: Make these patch comments current. @ text @$NetBSD: patch-ae,v 1.9 2018/11/30 17:25:05 nia Exp $ - Use pseudo-terminal multiplexor on NetBSD. - Use ctype.h functions correctly. --- src/command.c.orig 2006-06-26 18:01:20.000000000 +0000 +++ src/command.c @@@@ -556,7 +556,7 @@@@ get_pty(void) ptydev = ttydev = _getpty(&fd, O_RDWR | O_NDELAY, 0622, 0); if (ptydev == NULL) goto Failed; -#elif defined (__svr4__) || defined(__CYGWIN32__) || defined(__lnx21__) +#elif defined (__svr4__) || defined(__CYGWIN32__) || defined(__lnx21__) || defined(__NetBSD__) { extern char *ptsname(); @@@@ -1251,9 +1251,9 @@@@ init_command(char *argv[]) meta_char = (Options & Opt_meta8 ? 0x80 : 033); if (rs_modifier && strlen(rs_modifier) == 4 - && toupper(*rs_modifier) == 'M' - && toupper(rs_modifier[1]) == 'O' - && toupper(rs_modifier[2]) == 'D') + && toupper((unsigned char)*rs_modifier) == 'M' + && toupper((unsigned char)rs_modifier[1]) == 'O' + && toupper((unsigned char)rs_modifier[2]) == 'D') switch (rs_modifier[3]) { case '2': ModXMask = Mod2Mask; @@@@ -1329,13 +1329,13 @@@@ init_xlocale(void) for (s = tmp; *s; s++) { char *end, *next_s; - for (; *s && isspace(*s); s++) + for (; *s && isspace((unsigned char)*s); s++) /* */ ; if (!*s) break; for (end = s; (*end && (*end != ',')); end++) /* */ ; - for (next_s = end--; ((end >= s) && isspace(*end)); end--) + for (next_s = end--; ((end >= s) && isspace((unsigned char)*end)); end--) /* */ ; *++end = '\0'; if (*s) { @@@@ -1367,13 +1367,13 @@@@ init_xlocale(void) unsigned short i; char *end, *next_s; - for (; *s && isspace(*s); s++) + for (; *s && isspace((unsigned char)*s); s++) /* */ ; if (!*s) break; for (end = s; (*end && (*end != ',')); end++) /* */ ; - for (next_s = end--; ((end >= s) && isspace(*end));) + for (next_s = end--; ((end >= s) && isspace((unsigned char)*end));) *end-- = 0; if (!strcmp(s, "OverTheSpot")) @ 1.9 log @x11/aterm: Update to 1.0.1. Bit over 11 years late, but at least we got there in the end! ChangeLog: 2007-08-01 vae * adding CL generation to makefiles * fixing configure bug * preparing configure for 1.0.1 * changed MWM HINTS, re gentoo bug #139554. 2006-06-26 sasha * fixed compile errors when no XLocale is available 2006-03-29 sasha * converted main.c back to unix mode * converted screen.c back to unix mode 2006-02-17 sasha * fixed bug preventing from pasting more then 16Kb into aterm 2006-02-13 sasha * minor cleanups * fix for the high-ascii pasting in screen.c - need to use XA_STRING ??? 2006-01-08 sasha * added patch for background refresh on desktop changes in ion3 when pixmap has not changed 2005-12-21 sasha * added uninstall target to the top Makefile 2005-12-06 sasha * Added patch for XIM support gratiously provided by calkin@@ieee.org 2005-09-19 sasha * updated mappings for F1-F4 to modern \033OP, etc. * possibly fixed pasting on 64bit systems 2005-09-06 sasha * updated contacts info in man page * applyed term size patch from daniel@@roe.ch 2005-07-11 sasha * fixed geometry printing into stderr @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.8 2016/05/01 19:56:40 dholland Exp $ a3 3 - Correctly set the terminal size on FreeBSD and NetBSD. (these parts apparently from upstream) @ 1.8 log @Patch up some problems found by compiling with gcc. PKGREVISION -> 12. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.7 2012/09/29 17:59:34 asau Exp $ d9 1 a9 1 --- src/command.c.orig 2005-06-21 20:08:16.000000000 +0000 d11 1 a11 1 @@@@ -542,7 +542,7 @@@@ get_pty(void) d20 1 a20 10 @@@@ -1085,6 +1085,8 @@@@ run_command(char *argv[]) #endif /* SRIOCSREDIR */ } + tt_winsize(0); /* set window size */ + /* reset signals and spin off the command interpreter */ signal(SIGINT, SIG_DFL); signal(SIGQUIT, SIG_DFL); @@@@ -1225,9 +1227,9 @@@@ init_command(char *argv[]) d33 1 a33 1 @@@@ -1302,13 +1304,13 @@@@ init_xlocale(void) d49 1 a49 1 @@@@ -1340,13 +1342,13 @@@@ init_xlocale(void) @ 1.7 log @Use pseudo-terminal multiplexor on NetBSD (available since 3.0). This makes the package functional on NetBSD after removal of traditional pseudo-terminals. Bump package revision. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.6 2007/01/19 08:02:33 rillig Exp $ d3 3 a5 1 Tags: from-upstream d7 1 a7 2 Use pseudo-terminal multiplexor on NetBSD. Correctly set the terminal size on FreeBSD and NetBSD. d29 45 @ 1.6 log @Added a patch from upstream that sets the terminal size correctly on FreeBSD and NetBSD. PKGREVISION++ @ text @d1 1 a1 1 $NetBSD$ d5 1 d8 11 a18 2 --- src/command.c.orig 2005-06-21 22:08:16.000000000 +0200 +++ src/command.c 2007-01-19 08:56:52.000000000 +0100 @ 1.5 log @Update to 1.0.0. Too many changes to list, please see the Changelog file. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.4 2005/02/14 15:40:49 rillig Exp $ d3 9 a11 29 --- src/command.c.orig Thu Sep 6 18:38:07 2001 +++ src/command.c Mon Feb 14 16:26:50 2005 @@@@ -534,7 +534,11 @@@@ ttydev = tty_name; # define PTYCHAR1 "pqrstuvwxyz" +#ifdef __NetBSD__ +# define PTYCHAR2 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" +#else # define PTYCHAR2 "0123456789abcdef" +#endif for (c1 = PTYCHAR1; *c1; c1++) { ptydev[len - 2] = ttydev[len - 2] = *c1; for (c2 = PTYCHAR2; *c2; c2++) { @@@@ -1146,6 +1150,11 @@@@ init_command(char *argv[]) num_fds = getdtablesize(); #endif +#if defined(__NetBSD__) + if (num_fds > FD_SETSIZE) + num_fds = FD_SETSIZE; +#endif + #ifdef META8_OPTION meta_char = (Options & Opt_meta8 ? 0x80 : 033); if (rs_modifier @@@@ -1763,16 +1772,21 @@@@ } break; d13 1 a13 8 + case XK_F1: /* "\033OP" */ + case XK_F2: /* "\033OQ" */ + case XK_F3: /* "\033OR" */ + case XK_F4: /* "\033OS" */ + len = 3; + STRCPY(kbuf, "\033OP"); + kbuf[2] += (keysym - XK_F1); + break; d15 3 a17 23 #define FKEY(n, fkey) \ len = 5; \ sprintf((char *) kbuf,"\033[%02d~", (int)((n) + (keysym - fkey))) - case XK_F1: /* "\033[11~" */ - case XK_F2: /* "\033[12~" */ - case XK_F3: /* "\033[13~" */ - case XK_F4: /* "\033[14~" */ case XK_F5: /* "\033[15~" */ - FKEY(11, XK_F1); + FKEY(15, XK_F5); break; case XK_F6: /* "\033[17~" */ @@@@ -2024,7 +2038,7 @@@@ #endif /* See if we can read from the application */ - if (FD_ISSET(cmd_fd, &readfds)) { + if (retval > 0 && FD_ISSET(cmd_fd, &readfds)) { unsigned int count = BUFSIZ; cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; @ 1.4 log @Allow more virtual terminal devices to be found on NetBSD. Approved by jlam. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2004/06/02 12:48:18 recht Exp $ @ 1.3 log @Fix a problem that pasting a selection from an aterm running on a 64bit platform into an application running on a 32bit platform doesn't always work. Patch by Joachim Kuebart in PR 25750 . Bump PKGREVISION to 5. @ text @d1 1 a1 1 $NetBSD$ d3 15 a17 3 --- src/command.c.orig 2004-05-20 12:10:08.000000000 +0200 +++ src/command.c 2004-05-20 12:09:37.000000000 +0200 @@@@ -1146,6 +1146,11 @@@@ d29 1 a29 1 @@@@ -1763,16 +1768,21 @@@@ d56 1 a56 1 @@@@ -2024,7 +2034,7 @@@@ @ 1.2 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1.2.1 2002/08/25 21:22:48 jlam Exp $ d3 2 a4 2 --- src/command.c.orig Thu Sep 6 18:38:07 2001 +++ src/command.c d17 28 a44 1 @@@@ -2024,7 +2029,7 @@@@ @ 1.1 log @Update aterm to aterm-0.4.2nb2: work around problem with lockup in select() Patch submitted by Christian Biere in PR 17745 @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ae was added on branch buildlink2 on 2002-08-25 21:22:48 +0000 @ text @d1 25 @ 1.1.2.2 log @Merge changes in the main trunk into the buildlink2 branch for those packages that have been converted to USE_BUILDLINK2. @ text @a0 25 $NetBSD: patch-ae,v 1.1.2.1 2002/08/25 21:22:48 jlam Exp $ --- src/command.c.orig Thu Sep 6 18:38:07 2001 +++ src/command.c @@@@ -1146,6 +1146,11 @@@@ num_fds = getdtablesize(); #endif +#if defined(__NetBSD__) + if (num_fds > FD_SETSIZE) + num_fds = FD_SETSIZE; +#endif + #ifdef META8_OPTION meta_char = (Options & Opt_meta8 ? 0x80 : 033); if (rs_modifier @@@@ -2024,7 +2029,7 @@@@ #endif /* See if we can read from the application */ - if (FD_ISSET(cmd_fd, &readfds)) { + if (retval > 0 && FD_ISSET(cmd_fd, &readfds)) { unsigned int count = BUFSIZ; cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; @