head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.8 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2010Q2:1.2.0.34 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.32 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.30 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.28 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.26 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.24 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.22 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.20 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.18 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.16 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.14 pkgsrc-2008Q1:1.2.0.12 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.10 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.8 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.6 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.4 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.2 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.1.0.14 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.12 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.10 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.8 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.6 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.4 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.2 pkgsrc-2005Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2010.09.22.09.33.41; author obache; state dead; branches; next 1.2; 1.2 date 2006.12.19.07.53.57; author wiz; state Exp; branches; next 1.1; 1.1 date 2005.03.06.17.50.49; author hira; state Exp; branches; next ; desc @@ 1.3 log @Update mlterm to 3.0.1. Based on PR#43822 by YAMASHIRO, Jun. Additional clean up by me. pkgsrc changes: * set LICENSE=modified-bsd (with uim option, gnu-lgpl-v2 additionally). * add m17nlib option. ver 3.0.1 * Improvements for performance of changing 256 colors by "\x1b]4;N;rgb:RR/GG/BB\x07" sequence. (Thanks to Konosuke Watanabe san) * Support "ESC[9Nm" and "ESC[10Nm" sequences. * Add --button3/button3_behavior option. (If "menu1" is specified, pressing button3 shows conf_menu_path_1 program (mlterm-menu) like gnome-terminal.) * Add "Copy" & "Paste" menus to mlterm-menu. * Improvements for compatibility with xterm about RGB of system colors. * Add 'col_size_of_width_a' to configuration protocol. (doc/en/PROTOCOL) * Merge SF patches: #2988801, #2987646 (Thanks to Ahmed El-Mahmoudy) * Other bug fixes: #2818015(partly),#2818018 (Thanks to Thomas Wolff) ver 3.0.0 * Support 256 colors. (Thanks to Shinichiro Hamaji san) * Character convertion tables are separated from libmkf library. * Support win32(Windows 2000-XP) native GUI. ('--with-gui=win32' in mingw, msys and cygwin) * Support font and color configuration protocol. (doc/en/PROTOCOL.font,PROTOCOL.color) * Change 'aafont' format as follows. (Elements in parentheses are optional.) [Family]-[Encoding](:[Percentage]) => [Family]( [Weight] [Slant] [Size]-[Encoding]:[Percentage]) * Add 'DEFAULT' key which specifies fonts used by default for font configuration files. * Add --maxptys option. * Add 'mlclient', 'mlclientx', 'static_backscroll_mode' and 'type_engine' to configuration protocol. (doc/en/PROTOCOL) * Add 'mlclientx' command. * Merge SF patches - #1574764 (Thanks to Christian Biere) # (Thanks to Frederic Heulin) #2879800 (Thanks to Kouichi Kusanagi san) * Other bug fixes: #1999220 (Thanks to Christian Biere) ver 2.9.4 * Arabic translation of mlconfig [Khaled Hosny] * Selected region can be expanded by right-clicking [minami] (Thanks to ssakane) * New config key string "title" to allow change pty title [minami] * Set DISPLAY correctly for ptys opened by -P option [nokada] (SF Bug #1534313) * Fixed compile errors with gcc 4.3 [mfabian] * Fixed a potentiol off-by-one bug [mfabian] (Thanks to Dominique Leuenberger) * Fixed compile errors on biarch systems [Kenshi Muto] (Debian Bug #396532) * Plugged file-desctiptor leaks [Christian Biere] (SF Patch #1576044) * Made "restore cursor" work properly with alternate screens [minami] (SF Bug#1472143) * Fixed broken handling of Atom [Kusanagi Kouichi] * Other bug fixes: - Debian BUG #329194 [David Kolovratnik] - SF Bug #1568596 [nokada] - SF Patch #1574241 [Christian Biere] @ text @$NetBSD: patch-ad,v 1.2 2006/12/19 07:53:57 wiz Exp $ --- kiklib/src/kik_pty_streams.c.orig 2005-11-21 15:24:03.000000000 +0100 +++ kiklib/src/kik_pty_streams.c 2006-12-16 00:04:11.000000000 +0100 @@@@ -9,6 +9,7 @@@@ /* When _XOPEN_SOURCE is defined, * u_int/u_long/... may not be defined without _BSD_SOURCE */ #define _BSD_SOURCE 1 +#define _NETBSD_SOURCE 1 /* for solaris */ #define __EXTENSIONS__ @@@@ -34,6 +35,9 @@@@ #ifdef HAVE_SYS_STROPTS_H #include #endif +#ifdef __NetBSD__ +#include +#endif #include "kik_str.h" /* strdup */ #include "kik_debug.h" @@@@ -75,6 +79,7 @@@@ kik_msg_printf( "Unable to open a master pseudo-terminal device.\n") ; return -1; } + kik_file_set_cloexec( *master) ; /* * The behaviour of the grantpt() function is unspecified * if the application has installed a signal handler to catch SIGCHLD signals. @@@@ -104,13 +109,30 @@@@ return -1; } - fcntl(*master, F_SETFL, O_NDELAY); - if( ( *slave = open( ttydev, O_RDWR | O_NOCTTY, 0)) < 0) { return -1; } + if ((*slave_name = strdup(ttydev)) == NULL) { + close(*master); + close(*slave); + return -1; + } + + pid = fork(); + if (pid == -1) { + free(*slave_name); + return -1; + } + else if(pid == 0) { + close(*master); + login_tty(*slave); + return 0; + } + + fcntl(*master, F_SETFL, O_NDELAY); + /* * cygwin doesn't have isastream. */ @@@@ -209,79 +231,16 @@@@ } } - if( ( *slave_name = strdup( ttydev)) == NULL) - { - close( *master) ; - close( *slave) ; - - return -1 ; - } - - pid = fork() ; - - if( pid == -1) - { - /* fork failed */ - - free( *slave_name) ; - - return -1 ; - } - else if( pid == 0) - { - /* child */ - - close(*master) ; -#ifdef HAVE_SETSID - setsid() ; -#else /*HAVE_SETSID*/ -#ifdef TIOCNOTTY - fd = open("/dev/tty", O_RDWR | O_NOCTTY); - if (fd >= 0) - { - ioctl(fd, TIOCNOTTY, NULL); - close(fd); - } -#endif /*TIOCNOTTY*/ -#endif /*HAVE_SETSID*/ - fd = open("/dev/tty", O_RDWR | O_NOCTTY); - if (fd >= 0) - { - close(fd); - } - fd = open(ttydev, O_RDWR); - if (fd >= 0) - { - close(fd); - } - fd = open("/dev/tty", O_WRONLY); - if (fd < 0) - { - return -1; - } - close(fd); - - dup2( *slave , 0) ; - dup2( *slave , 1) ; - dup2( *slave , 2) ; - - if( *slave > STDERR_FILENO) - { - close(*slave) ; - } - - cfsetispeed( &tio , B9600) ; - cfsetospeed( &tio , B9600) ; + cfsetispeed(&tio, B9600); + cfsetospeed(&tio, B9600); - if( tcsetattr(STDIN_FILENO, TCSANOW , &tio) < 0) - { - #ifdef DEBUG - kik_warn_printf( KIK_DEBUG_TAG " tcsetattr() failed.\n") ; - #endif - } - - return 0 ; + if(tcsetattr(STDIN_FILENO, TCSANOW , &tio) < 0) { + #ifdef DEBUG + kik_warn_printf( KIK_DEBUG_TAG " tcsetattr() failed.\n") ; + #endif } + + kik_file_set_cloexec( *slave) ; return pid ; } @ 1.2 log @Update to 2.9.3 with additional fixes from mlterm CVS, provided by Christian Biere in PR 34798 with minor fixes by me. Changes: * Improvements for compatibility with xterm: - Log file handling [kzys] - Function keys [seiichi] (Thanks to Konosuke Watanabe) - Sequence for setting scroll region [seiichi] (Thanks to SHIOTA Shoichi and Takashi SHIRAI) - Behavior of saving/restoring cursor [minami] (Thanks to Thomas Dickey for suggestions) - Termcap and Terminfo [minami, seiichi] - Turn off mouse position reporting by a "reset" sequence [minami] (Debian Bug #55637) * Improvement build prosess for cross-compiling [minami] * Workaround for missing rgb.txt [minami] * Updated documents [kzys, minami, seiichi] * Bug fix for broken selection requester [minami] * Added support for SCIM-1.4.x [seiichi] * Removed support for SCIM-1.0.x [seiichi] * Removed support for uim-0.x.x [seiichi] * Hebrew mapping table for "kbd" input method [seiich] * Revided a scroll caching mechanism [seiichi] (SF Bug #1161050) * Suppressed a check for libxpg4 of FreeBSD [seiichi] (Thanks to SHIOTA Shoichi and MANTANI Nobutaka) * Fixed a bug of alignment of full width chars when variable column width is enabled [minami] (Thanks to Oibane) * Vietnamese translation for mlconfig [Pham Thanh Long] * Other Bug fixes: - SF Bug #1206515 [Takeshi Hakamata] - SF Bug #1161055 [seiichi] - Debian Bug #302231 [Andreas Jochens] - Debian Bug #313970 [Jens Seidel] - Debian Bug #350590 [seiichi] - SUSE Bug #105320 [mfabian] @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @ Update mlterm to 2.9.2. Patch submitted by FUKAUMI Naoki (PR pkg/29061). - fix for new ptm(4) handling (submitted in PR) - even if pty doesn't exist, try to open next pty (submitted by minskim@@). - add myself to MAINTAINER Changes from 2.9.1 are: * [SECURITY] Fixed possible integer overflow. * Improvement for mouse tracking feature. [minami] * New "--iconpath" option and "icon_path" key for per-window icon setting. [minami] * New "--kill" option for mlclient. [minami] * Revived termcap file. [seiichi] * Xterm-like color scheme for cursor and selection. [minami] * SCIM input method plugin (Experimental) [seiichi] * Updated documentations. (#1110868) [mfabian, minami, seiichi] * IIIMF X aux object handling. [seiichi] * Implemented some xterm private esc sequences (1047/1048/1049). [minami] * Fixed a shortcut key bug [minami] (Thanks to Yusuke Sakai) * Bug fixes for input method plugins [Kenichi Handa, Etsushi Kato] * Other bug fixes including #1081111 and #1048321 [mfabian, minami, seiichi] Changes from 2.9.0 are: * Fixed a segfault caused by broken hash table. (#1061470) [seiichi] * Fixed a segfault when mlclient has bool option. (#1069725) [minami, seiichi] * Workaround for a segfault of uim-prime. [seiichi] * Some improvements for m17n-lib support. [seiichi] * Updated w3mmlconfig. [seiichi] * A couple of fixes in configure scripts. [minami, seiichi] * Minor improvement to allow signal handling to be old POSIX compliant. [minami] * Horizontal candidate window for input methods. [seiichi] * Non-interactive mode of mlcc. [minami] * man-page of mlcc. [minami] * A lot of cleanups for mlconfig to get rid of compiler warnings. [minami] * Fixes for missing locale files in mlterm.spec. (#1072304) [seiichi] Changes from 2.8.0p1 are: * Improvement of borderless mode using _MOTIF_WM_HINTS [minami] * Fixed a selection bug with KDE klipper. [minami] * GTK+2 migration in mlconfig/mlterm-menu [minami] * New option "--type" to select the rendering engine for drawing fonts [karaki] * Fixed a bug when moving cursor to out of the screen. [minami] * Fixed a bug in mod_meta_mode = 8bit. [minami] * Fixed a bug that crashed mlterm by changing font size [minami] * Fixed a bug in stream pty on 64bit arch. (Debian BTS #226654) [minami] * Fixed a bug of "mlclient -e" [MURANO Naoki ] * mlconfig lists scrollbars in user"s configuration directory and system directory. [kubota] * New external tool "mlterm-zoom" [kzys] * Update man [kubota, mfabian, minami, seiichi] * Fixed a bug that crashed mlterm when invalid value was specified with --fsrange option [mfabian] * Fixed a bug that crashed mlterm when resizing a window over and over. [seiichi] * Verbose message for devpts problem of Linux (Debian BTS #257765) [seiichi] * Fixed a bug with DEC special character in using xft. [minami] * Fixed a bug in selecting ISCII text. [karaki] * Support uim. (Experimental) [seiichi] * Support IIIMF. (Experimental) [seiichi] * Support input method of m17n-lib. (Experimental) [seiichi] * Support INCR type transfer of ICCM selection protocol. (Debian BTS #248087) [minami] * Fixed incorrect mapping for KOI8-U <-> UCS4. (Debian BTS #267631) [Eugeniy Meshcheryakov ] * A lot of improvements for terminfo [minami] * Fixes for strange behavior of VT emulation [minami, seiichi] * Fixed a bug that XIM could not be used with multiple displays. [seiichi] * Fixed a bug that the preedit area of XIM became invisible in the maximized window. [seiichi] * Cleanups and refactorings for ml_* APIs [karaki] @ text @d3 2 a4 2 --- kiklib/src/kik_pty_streams.c.orig 2004-10-23 06:59:39.000000000 +0900 +++ kiklib/src/kik_pty_streams.c 2005-03-05 23:07:02.000000000 +0900 d23 9 a31 1 @@@@ -99,13 +103,30 @@@@ d64 1 a64 1 @@@@ -204,78 +225,13 @@@@ d147 2 d151 1 @