ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/ptytty.C
(Generate patch)

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.27 by root, Tue Jan 3 16:32:33 2006 UTC vs.
Revision 1.33 by root, Wed Jan 11 23:08:54 2006 UTC

… …
2 * File: ptytty.C 2 * File: ptytty.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
22 *---------------------------------------------------------------------*/ 22 *---------------------------------------------------------------------*/
23 23
24#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
25#include "rxvt.h" 25#include "rxvt.h"
26 26
27#ifdef HAVE_STDLIB_H
28# include <cstdlib> 27# include <cstdlib>
29#endif 28# include <cstring>
29
30#ifdef HAVE_SYS_TYPES_H 30#ifdef HAVE_SYS_TYPES_H
31# include <sys/types.h> 31# include <sys/types.h>
32#endif 32#endif
33#ifdef HAVE_UNISTD_H 33#ifdef HAVE_UNISTD_H
34# include <unistd.h> 34# include <unistd.h>
35#endif 35#endif
36#if defined(HAVE_STRING_H)
37# include <cstring>
38#endif
39#ifdef HAVE_FCNTL_H 36#ifdef HAVE_FCNTL_H
40# include <fcntl.h> 37# include <fcntl.h>
41#endif 38#endif
42#ifdef HAVE_SYS_IOCTL_H 39#ifdef HAVE_SYS_IOCTL_H
43# include <sys/ioctl.h> 40# include <sys/ioctl.h>
… …
46# include <sys/stropts.h> /* for I_PUSH */ 43# include <sys/stropts.h> /* for I_PUSH */
47#endif 44#endif
48#ifdef HAVE_ISASTREAM 45#ifdef HAVE_ISASTREAM
49# include <stropts.h> 46# include <stropts.h>
50#endif 47#endif
51#ifdef HAVE_PTY_H 48#if defined(HAVE_PTY_H)
52# include <pty.h> 49# include <pty.h>
53#endif 50#elif defined(HAVE_LIBUTIL_H)
54
55// better do this via configure, but....
56#if defined(__FreeBSD__)
57# include <libutil.h> 51# include <libutil.h>
58#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) 52#elif defined(HAVE_UTIL_H)
59# include <util.h> 53# include <util.h>
60#endif 54#endif
61 55
62#include <cstdio> 56#include <cstdio>
63#include <grp.h> 57#include <grp.h>
… …
93 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 87 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
94 if (*ttydev != NULL) 88 if (*ttydev != NULL)
95 return pfd; 89 return pfd;
96#endif 90#endif
97 91
98#ifdef PTYS_ARE_GETPTY
99 char *ptydev;
100
101 while ((ptydev = getpty ()) != NULL)
102 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
103 {
104 *ttydev = ptydev;
105 return pfd;
106 }
107#endif
108
109#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 92#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
110# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 93# if defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
111 94
112 { 95 {
113# ifdef PTYS_ARE_GETPT 96# ifdef PTYS_ARE_POSIX
114 pfd = getpt (); 97 pfd = posix_openpt (O_RDWR);
115# else 98# else
116 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 99 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
117# endif 100# endif
118 101
119 if (pfd >= 0) 102 if (pfd >= 0)
… …
396 379
397void 380void
398 381
399rxvt_ptytty::close_tty () 382rxvt_ptytty::close_tty ()
400{ 383{
401 if (tty >= 0) close (tty); 384 if (tty < 0)
385 return;
386
387 close (tty);
402 tty = -1; 388 tty = -1;
403} 389}
404 390
405void 391void
406rxvt_ptytty::put () 392rxvt_ptytty::put ()
407{ 393{
408#ifndef NO_SETOWNER_TTYDEV 394#ifndef NO_SETOWNER_TTYDEV
409 if (tty >= 0)
410 privileges (RESTORE); 395 privileges (RESTORE);
411#endif 396#endif
412 397
413 if (pty >= 0) close (pty); 398 if (pty >= 0) close (pty);
414 close_tty (); 399 close_tty ();
415 free (name); 400 free (name);
… …
452 437
453void 438void
454rxvt_ptytty::set_utf8_mode (bool on) 439rxvt_ptytty::set_utf8_mode (bool on)
455{ 440{
456#ifdef IUTF8 441#ifdef IUTF8
457 if (pty != -1) 442 if (pty < 0)
458 { 443 return;
444
459 struct termios tio; 445 struct termios tio;
460 446
461 if (tcgetattr (pty, &tio) != -1) 447 if (tcgetattr (pty, &tio) != -1)
448 {
449 tcflag_t new_cflag = tio.c_iflag;
450
451 if (on)
452 new_cflag |= IUTF8;
453 else
454 new_cflag &= ~IUTF8;
455
456 if (new_cflag != tio.c_iflag)
462 { 457 {
463 tcflag_t new_cflag = tio.c_iflag;
464
465 if (on)
466 new_cflag |= IUTF8;
467 else
468 new_cflag &= ~IUTF8;
469
470 if (new_cflag != tio.c_iflag)
471 {
472 tio.c_iflag = new_cflag; 458 tio.c_iflag = new_cflag;
473 tcsetattr (pty, TCSANOW, &tio); 459 tcsetattr (pty, TCSANOW, &tio);
474 }
475 } 460 }
476 } 461 }
477#endif 462#endif
478} 463}
479 464

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines