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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.162 by root, Tue Jan 31 16:19:16 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
47#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
48 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
49 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3)
50 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
51 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
52 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
53 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
54# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
55 "Grey90", /* 7: white (#E5E5E5) */ 57# else
56# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57 "AntiqueWhite", /* 7: white (#FAEBD7) */
58# endif 59# endif
59 /* high-intensity colors */ 60 /* high-intensity colors */
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
66 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
67 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
72 "White", /* 7/15: bright white (#FFFFFF) */
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174 }; 174#if OFF_FOCUS_FADING
175 175 "rgb:00/00/00",
176const char *const xa_names[] =
177 {
178 "TEXT",
179 "COMPOUND_TEXT",
180 "UTF8_STRING",
181 "MULTIPLE",
182 "TARGETS",
183 "TIMESTAMP",
184 "VT_SELECTION",
185 "INCR",
186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
197#ifdef TRANSPARENT
198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
200#endif
201#ifdef OFFIX_DND
202 "DndProtocol",
203 "DndSelection",
204#endif 176#endif
205 }; 177 };
206 178
207bool 179bool
208rxvt_term::init_vars () 180rxvt_term::init_vars ()
209{ 181{
210 sw_term.start (SIGTERM); 182 pix_colors = //
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 186#endif
217 pix_colors = pix_colors_focused;
218
219 if (pix_colors == NULL)
220 return false;
221 187
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 189 pixmap = None;
224#endif 190#endif
225 191
226 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 195 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0;
234 TermWin.ncol = 80; 197 ncol = 80;
235 TermWin.nrow = 24; 198 nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
237 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
238 TermWin.lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
239 TermWin.saveLines = SAVELINES; 202 saveLines = SAVELINES;
240 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
241 204
242 refresh_limit = 1; 205 refresh_limit = 1;
243 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
244 prev_nrow = prev_ncol = 0;
245 207
246 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
247#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
248 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
249 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
250 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
251#endif 213#endif
252 214
253 last_bot = last_state = -1; 215 last_bot = last_state = -1;
254
255#ifdef MENUBAR
256 menu_readonly = 1;
257# if ! (MENUBAR_MAX > 1)
258 CurrentBar = &BarList;
259# endif /* (MENUBAR_MAX > 1) */
260#endif
261 216
262 return true; 217 return true;
263} 218}
264 219
265void 220void
… …
333 rs[Rs_name] = rxvt_r_basename (argv[0]); 288 rs[Rs_name] = rxvt_r_basename (argv[0]);
334 289
335 /* 290 /*
336 * Open display, get options/resources and create the window 291 * Open display, get options/resources and create the window
337 */ 292 */
293
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 295 rs[Rs_display_name] = ":0";
340 296
341 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
342 298
343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':')
345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347 strcpy (val, "unix");
348 strcat (val, rs[Rs_display_name]);
349 display = displays.get (val);
350 free (val);
351 }
352#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357 301
302 xa = display->xa;
303
304#if XFT
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
310
358 extract_resources (); 311 extract_resources ();
312
359 free (r_argv); 313 free (r_argv);
314
315#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default";
318
319 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
320 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
321 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
322 {
323 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 }
326#endif
360 327
361 /* 328 /*
362 * set any defaults not already set 329 * set any defaults not already set
363 */ 330 */
364 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
375 if (!rs[Rs_iconName]) 342 if (!rs[Rs_iconName])
376 rs[Rs_iconName] = rs[Rs_name]; 343 rs[Rs_iconName] = rs[Rs_name];
377 } 344 }
378 345
379 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
380 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 347 saveLines = min (i, MAX_SAVELINES);
381 348
382#if ENABLE_FRILLS 349#if ENABLE_FRILLS
383 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 350 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 351 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
352
385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355
387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 357 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
389#endif 358#endif
390 359
391#ifdef POINTER_BLANK 360#ifdef POINTER_BLANK
392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
393 pointerBlankDelay = i; 362 pointerBlankDelay = i;
394 else 363 else
395 pointerBlankDelay = 2; 364 pointerBlankDelay = 2;
396#endif 365#endif
397 366
398 /* no point having a scrollbar without having any scrollback! */ 367 /* no point having a scrollbar without having any scrollback! */
399 if (!TermWin.saveLines) 368 if (!saveLines)
400 options &= ~Opt_scrollBar; 369 set_option (Opt_scrollBar, 0);
401 370
402#ifdef PRINTPIPE 371#ifdef PRINTPIPE
403 if (!rs[Rs_print_pipe]) 372 if (!rs[Rs_print_pipe])
404 rs[Rs_print_pipe] = PRINTPIPE; 373 rs[Rs_print_pipe] = PRINTPIPE;
405#endif 374#endif
… …
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 418#endif
450 419
451#ifdef XTERM_REVERSE_VIDEO 420#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 421 /* this is how xterm implements reverseVideo */
453 if (options & Opt_reverseVideo) 422 if (OPTION (Opt_reverseVideo))
454 { 423 {
455 if (!rs[Rs_color + Color_fg]) 424 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 425 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
457 if (!rs[Rs_color + Color_bg]) 426 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 427 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
463 if (!rs[Rs_color + i]) 432 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 433 rs[Rs_color + i] = def_colorName[i];
465 434
466#ifndef XTERM_REVERSE_VIDEO 435#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 436 /* this is how we implement reverseVideo */
468 if (options & Opt_reverseVideo) 437 if (OPTION (Opt_reverseVideo))
469 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 439#endif
471 440
472 /* convenient aliases for setting fg/bg to colors */ 441 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 442 color_aliases (Color_fg);
474 color_aliases (Color_bg); 443 color_aliases (Color_bg);
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
515 484
516 if (val == NULL) 485 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
519 488
520 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
522 491
523 i = strlen (val); 492 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 494
526 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
527 496
528 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
530 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
531 ;
532 MAX_IT (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)TermWin.parent[0]);
537 498
538 /* add entries to the environment: 499 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
545 */ 506 */
546 putenv (env_display); 507 putenv (env_display);
547 putenv (env_windowid); 508 putenv (env_windowid);
509
548 if (env_colorfgbg) 510 if (env_colorfgbg)
549 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
550 512
551#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 515#endif
554 516
555 if (display->depth <= 2) 517 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 519 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
559 521
560 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
580 * This should support all European type languages. 542 * This should support all European type languages.
581 */ 543 */
582void 544void
583rxvt_term::set_locale (const char *locale) 545rxvt_term::set_locale (const char *locale)
584{ 546{
547 set_environ (envv);
548
585#if HAVE_XSETLOCALE || HAVE_SETLOCALE 549#if HAVE_XSETLOCALE || HAVE_SETLOCALE
586 free (this->locale); 550 free (this->locale);
587 this->locale = setlocale (LC_CTYPE, locale); 551 this->locale = setlocale (LC_CTYPE, locale);
588 552
589 if (!this->locale) 553 if (!this->locale)
590 { 554 {
591 if (*locale) 555 if (*locale)
592 { 556 {
593 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 557 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
594 setlocale (LC_CTYPE, ""); 558 setlocale (LC_CTYPE, "C");
595 } 559 }
596 else 560 else
597 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 561 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
598 562
599 this->locale = ""; 563 this->locale = "C";
600 } 564 }
601 565
602 566
603 this->locale = rxvt_strdup (this->locale); 567 this->locale = rxvt_strdup (this->locale);
604 SET_LOCALE (this->locale); 568 SET_LOCALE (this->locale);
… …
619} 583}
620 584
621void 585void
622rxvt_term::init_xlocale () 586rxvt_term::init_xlocale ()
623{ 587{
588 set_environ (envv);
589
624#ifdef USE_XIM 590#ifdef USE_XIM
625 if (!locale) 591 if (!locale)
626 rxvt_warn ("setting locale failed, working without locale support.\n"); 592 rxvt_warn ("setting locale failed, working without locale support.\n");
627 else 593 else
628 { 594 {
… …
650 * Initialize the command connection. 616 * Initialize the command connection.
651 * This should be called after the X server connection is established. 617 * This should be called after the X server connection is established.
652 */ 618 */
653 619
654#ifdef META8_OPTION 620#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 622#endif
657 623
658 get_ourmods (); 624 get_ourmods ();
659 625
660 if (!(options & Opt_scrollTtyOutput)) 626 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 627 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 628 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 629 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 630 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 631 priv_modes |= PrivMode_smoothScroll;
666 632
667#ifndef NO_BACKSPACE_KEY 633#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 634 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 635 priv_modes |= PrivMode_HaveBackSpace;
670#endif 636#endif
671 637
672 /* add value for scrollBar */ 638 /* add value for scrollBar */
673 if (scrollbar_visible ()) 639 if (scrollBar.state)
674 { 640 {
675 priv_modes |= PrivMode_scrollBar; 641 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 642 SavedModes |= PrivMode_scrollBar;
677 } 643 }
678 if (menubar_visible ())
679 {
680 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar;
682 }
683
684#ifdef CURSOR_BLINK
685 if (options & Opt_cursorBlink)
686 (void)gettimeofday (&lastcursorchange, NULL);
687#endif
688 644
689 run_command (argv); 645 run_command (argv);
690} 646}
691 647
692/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
… …
697 653
698#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
700#endif 656#endif
701 657
702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
703 { 659 {
704 rxvt_color xcol; 660 rxvt_color xcol;
705 661
706 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
707 continue; 663 continue;
708 664
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, rs[Rs_color + i]))
710 { 666 {
711#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
714 else 670 else
715#endif 671#endif
716 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
717 673
718 if (!rs[Rs_color + i]) 674 if (!rs[Rs_color + i])
719 continue; 675 continue;
720 676
721 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, rs[Rs_color + i]))
722 { 678 {
723 switch (i) 679 switch (i)
724 { 680 {
725 case Color_fg: 681 case Color_fg:
726 case Color_bg: 682 case Color_bg:
727 /* fatal: need bg/fg color */ 683 /* fatal: need bg/fg color */
728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 684 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
729 /* NOTREACHED */
730 break; 685 break;
731#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
732 case Color_cursor2: 687 case Color_cursor2:
733 xcol = pix_colors[Color_fg]; 688 xcol = pix_colors[Color_fg];
734 break; 689 break;
… …
742 } 697 }
743 } 698 }
744 } 699 }
745 700
746 pix_colors[i] = xcol; 701 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i);
703 }
704
747#ifdef OFF_FOCUS_FADING 705#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 711 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
750#endif
751 SET_PIXCOLOR (i);
752 } 712 }
713#endif
753 714
754 if (display->depth <= 2) 715 if (depth <= 2)
755 { 716 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 720 }
760 721
761 /* 722 /*
762 * get scrollBar/menuBar shadow colors 723 * get scrollBar shadow colors
763 * 724 *
764 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 726 * from the fvwm window manager.
766 */ 727 */
767#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
768 729
769 if (display->depth <= 2) 730 if (depth <= 2)
731 {
770 { /* Monochrome */ 732 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 736 }
775 else 737 else
… …
778 /* xcol[0] == white 740 /* xcol[0] == white
779 * xcol[1] == top shadow 741 * xcol[1] == top shadow
780 * xcol[2] == bot shadow */ 742 * xcol[2] == bot shadow */
781 743
782 xcol[1] = pix_colors[Color_scroll]; 744 xcol[1] = pix_colors[Color_scroll];
783 xcol[0].set (display, 65535, 65535, 65535); 745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
784 746
785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 747 rxvt_rgba c0, c1;
786 748
787 xcol[0].get (display, pr0, pg0, pb0); 749 xcol[0].get (this, c0);
788 xcol[1].get (display, pr1, pg1, pb1); 750 xcol[1].get (this, c1);
789 751
790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 752 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
791 753
792 /* topShadowColor */ 754 /* topShadowColor */
793 if (!xcol[1].set (display, 755 if (!xcol[1].set (this,
756 rxvt_rgba (
794 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
795 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
796 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary
761 ));
797 xcol[1] = pix_colors[Color_White]; 762 xcol[1] = pix_colors[Color_White];
798 763
799 pix_colors[Color_topShadow] = xcol[1]; 764 pix_colors[Color_topShadow] = xcol[1];
800 } 765 }
801#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
… …
811 int i = atoi (rs[Rs_color + idx]); 776 int i = atoi (rs[Rs_color + idx]);
812 777
813 if (i >= 8 && i <= 15) 778 if (i >= 8 && i <= 15)
814 { /* bright colors */ 779 { /* bright colors */
815 i -= 8; 780 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 782 return;
819#endif
820 } 783 }
821 784
822 if (i >= 0 && i <= 7) /* normal colors */ 785 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 787 }
… …
847 810
848 if (rsmod 811 if (rsmod
849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
850 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
851 814
852 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (xdisp);
853 kc = map->modifiermap; 816 kc = map->modifiermap;
854 817
855 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
856 { 819 {
857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
859 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
860 { 823 {
861 if (kc[k] == 0) 824 if (kc[k] == 0)
862 break; 825 break;
863 826
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
865 { 828 {
866 case XK_Num_Lock: 829 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
868 continue; 831 continue;
869 832
… …
919rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
920{ 883{
921 XClassHint classHint; 884 XClassHint classHint;
922 XWMHints wmHint; 885 XWMHints wmHint;
923#if ENABLE_FRILLS 886#if ENABLE_FRILLS
924 Atom prop = None;
925 MWMHints mwmhints; 887 MWMHints mwmhints;
926#endif 888#endif
927 XGCValues gcvalue; 889 XGCValues gcvalue;
928 long vt_emask;
929 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
930 XWindowAttributes gattr;
931 Window top; 891 Window top, parent;
932 dDisp;
933 892
934#ifdef USING_W11LIB 893 dLocal (Display *, xdisp);
935 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif
938 894
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 895 /* grab colors before netscape does */
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 896 Get_Colours ();
941 897
942 if (options & Opt_transparent) 898 if (!set_fonts ())
943 { 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 900
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 901 parent = display->root;
946 } 902
903 attributes.override_redirect = !!OPTION (Opt_override_redirect);
947 904
948#if ENABLE_FRILLS 905#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 906 if (OPTION (Opt_borderLess))
950 { 907 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
952
953 if (prop == None)
954 { 909 {
955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
956#ifdef PREFER_24BIT
957 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
958#endif
959 mwmhints.flags = 0; 912 mwmhints.flags = 0;
960 } 913 }
961 else 914 else
962 { 915 {
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
964 mwmhints.decorations = 0; 917 mwmhints.decorations = 0;
965 } 918 }
966 } 919 }
967 else 920 else
968 {
969 mwmhints.flags = 0; 921 mwmhints.flags = 0;
970 }
971#endif 922#endif
972 923
973 /* grab colors before netscape does */ 924#if ENABLE_XEMBED
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979#if ENABLE_FRILLS
980 if (rs[Rs_embed]) 925 if (rs[Rs_embed])
981 { 926 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr; 927 XWindowAttributes wattr;
928
929 parent = strtol (rs[Rs_embed], 0, 0);
930
985 XGetWindowAttributes (disp, top, &wattr); 931 if (!XGetWindowAttributes (xdisp, parent, &wattr))
932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 933
987 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
988
989#if 0
990 if (wattr.map_state == IsViewable)
991 {
992 TermWin.mapped = 1;
993 refresh_type = FAST_REFRESH;
994 XClearWindow (disp, top);
995 // TODO: make XMapNotify-event-code a function and call it
996 // TODO: how can I detetc visibility without unmpa/map?
997 // TODO: focusin etc.
998 }
999#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up
1001 XUnmapWindow (disp, top);
1002#endif
1003 }
1004 else
1005#endif
1006 { 935 }
936#endif
937
1007 window_calc (0, 0); 938 window_calc (0, 0);
1008 939
1009 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
1010#ifdef PREFER_24BIT
1011 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
1012 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
1013 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
1014 top = XCreateWindow (disp, DefaultRootWindow (disp), 944
945 top = XCreateWindow (xdisp, parent,
1015 szHint.x, szHint.y, 946 szHint.x, szHint.y,
1016 szHint.width, szHint.height, 947 szHint.width, szHint.height,
1017 TermWin.ext_bwidth, 948 ext_bwidth,
1018 display->depth, InputOutput, 949 depth, InputOutput, visual,
1019 display->visual, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1020 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 951 &attributes);
1021#else
1022 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023 szHint.x, szHint.y,
1024 szHint.width, szHint.height,
1025 TermWin.ext_bwidth,
1026 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]);
1028#endif
1029 }
1030 952
1031 TermWin.parent[0] = top; 953 this->parent[0] = top;
1032 954
1033 old_width = szHint.width; 955 old_width = szHint.width;
1034 old_height = szHint.height; 956 old_height = szHint.height;
1035 957
1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1037 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1038 960
1039 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1040 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1041 963
1042 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1043 wmHint.input = True; 965 wmHint.input = True;
1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1045 wmHint.window_group = top; 967 wmHint.window_group = top;
1046 968
1047 XSetWMProperties (disp, top, NULL, NULL, 969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1048 (char **)argv, argc, &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
1049
1050 /* Enable delete window protocol */
1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1052 971
1053#if ENABLE_FRILLS 972#if ENABLE_FRILLS
973 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif
977
978 Atom protocols[] = {
979 xa[XA_WM_DELETE_WINDOW],
980#if ENABLE_EWMH
981 xa[XA_NET_WM_PING],
982#endif
983 };
984
985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
986
987#if ENABLE_FRILLS
988 if (rs[Rs_transient_for])
989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif
991
992#if ENABLE_EWMH
1054 long pid = getpid (); 993 long pid = getpid ();
1055 994
1056 XChangeProperty (disp, top, 995 XChangeProperty (xdisp, top,
1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1058 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1059#endif
1060 998
999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000#endif
1001
1061 XSelectInput (disp, top, 1002 XSelectInput (xdisp, top,
1062 KeyPressMask 1003 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1005 | KeyReleaseMask
1065#endif 1006#endif
1066 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask
1068 | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1009
1069 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1070 1011
1071#if ENABLE_FRILLS
1072 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1075#endif
1076
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1079 1014
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1015#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1083#endif 1018#endif
1084 1019
1085 /* the vt window */ 1020 /* the vt window */
1086 TermWin.vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (xdisp, top,
1087 window_vt_x,
1088 window_vt_y, 1022 window_vt_x, window_vt_y,
1089 TermWin_TotalWidth (), 1023 width, height,
1090 TermWin_TotalHeight (),
1091 0, 1024 0,
1092 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X
1095 XStoreName (disp, TermWin.vt, "vt window");
1096#endif
1097 1027
1098 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1100 1030
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1032
1103 pointer_unblank (); 1033 if (OPTION (Opt_pointerBlank))
1104
1105#ifdef POINTER_BLANK
1106 if (options & Opt_pointerBlank)
1107 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1108 else 1035 else
1109#endif
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1037
1112 XSelectInput (disp, TermWin.vt, vt_emask); 1038 vt_select_input ();
1039
1113 vt_ev.start (display, TermWin.vt); 1040 vt_ev.start (display, vt);
1114
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 TermWin_TotalWidth (),
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140 1041
1141#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! (options & Opt_transparent)) 1044 && !OPTION (Opt_transparent))
1144 { 1045 {
1145 const char *p = rs[Rs_backgroundPixmap]; 1046 const char *p = rs[Rs_backgroundPixmap];
1146 1047
1147 if ((p = strchr (p, ';')) != NULL) 1048 if ((p = strchr (p, ';')) != NULL)
1148 { 1049 {
… …
1154 scr_touch (true); 1055 scr_touch (true);
1155 } 1056 }
1156#endif 1057#endif
1157 1058
1158 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 1;
1063
1162 TermWin.gc = XCreateGC (disp, TermWin.vt, 1064 gc = XCreateGC (xdisp, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1066 &gcvalue);
1165 1067
1166 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1068 drawable = new rxvt_drawable (this, vt);
1167 1069
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1070#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1175#endif 1077#endif
1176 1078
1177#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1080 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1082 pix_colors = pix_colors_unfocused;
1181#endif 1083#endif
1182 1084
1085 pointer_unblank ();
1183 scr_recolour (); 1086 scr_recolour ();
1184} 1087}
1185 1088
1186/* ------------------------------------------------------------------------- * 1089/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1090 * GET TTY CURRENT STATE *
… …
1193 /* 1096 /*
1194 * standard System V termios interface 1097 * standard System V termios interface
1195 */ 1098 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1100 {
1198 /* return error - use system defaults */ 1101 // return error - use system defaults,
1102 // where possible, and zero elsewhere
1103 memset (tio, 0, sizeof (ttymode_t));
1104
1199 tio->c_cc[VINTR] = CINTR; 1105 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1106 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1107 tio->c_cc[VERASE] = CERASE;
1108#ifdef VERASE2
1109 tio->c_cc[VERASE2] = CERASE2;
1110#endif
1202 tio->c_cc[VKILL] = CKILL; 1111 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1112 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1113 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1114 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1115# ifdef VDSUSP
1207
1208 tio->c_cc[VDSUSP] = CDSUSP; 1116 tio->c_cc[VDSUSP] = CDSUSP;
1209# endif 1117# endif
1210# ifdef VREPRINT 1118# ifdef VREPRINT
1211
1212 tio->c_cc[VREPRINT] = CRPRNT; 1119 tio->c_cc[VREPRINT] = CRPRNT;
1213# endif 1120# endif
1214# ifdef VDISCRD 1121# ifdef VDISCRD
1215
1216 tio->c_cc[VDISCRD] = CFLUSH; 1122 tio->c_cc[VDISCRD] = CFLUSH;
1217# endif 1123# endif
1218# ifdef VWERSE 1124# ifdef VWERSE
1219
1220 tio->c_cc[VWERSE] = CWERASE; 1125 tio->c_cc[VWERSE] = CWERASE;
1221# endif 1126# endif
1222# ifdef VLNEXT 1127# ifdef VLNEXT
1223
1224 tio->c_cc[VLNEXT] = CLNEXT; 1128 tio->c_cc[VLNEXT] = CLNEXT;
1225# endif 1129# endif
1226
1227 } 1130 }
1131
1228 tio->c_cc[VEOF] = CEOF; 1132 tio->c_cc[VEOF] = CEOF;
1229 tio->c_cc[VEOL] = VDISABLE; 1133 tio->c_cc[VEOL] = VDISABLE;
1230# ifdef VEOL2 1134# ifdef VEOL2
1231
1232 tio->c_cc[VEOL2] = VDISABLE; 1135 tio->c_cc[VEOL2] = VDISABLE;
1233# endif 1136# endif
1234# ifdef VSWTC 1137# ifdef VSWTC
1235
1236 tio->c_cc[VSWTC] = VDISABLE; 1138 tio->c_cc[VSWTC] = VDISABLE;
1237# endif 1139# endif
1238# ifdef VSWTCH 1140# ifdef VSWTCH
1239
1240 tio->c_cc[VSWTCH] = VDISABLE; 1141 tio->c_cc[VSWTCH] = VDISABLE;
1241# endif 1142# endif
1242# if VMIN != VEOF 1143# if VMIN != VEOF
1243
1244 tio->c_cc[VMIN] = 1; 1144 tio->c_cc[VMIN] = 1;
1245# endif 1145# endif
1246# if VTIME != VEOL 1146# if VTIME != VEOL
1247
1248 tio->c_cc[VTIME] = 0; 1147 tio->c_cc[VTIME] = 0;
1249# endif 1148# endif
1250 1149
1251 if (erase != -1) 1150 if (erase != -1)
1252 tio->c_cc[VERASE] = (char)erase; 1151 tio->c_cc[VERASE] = (char)erase;
… …
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1179 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 { 1180 {
1282 tio->sg.sg_erase = CERASE; /* ^H */ 1181 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */ 1182 tio->sg.sg_kill = CKILL; /* ^U */
1284 } 1183 }
1184
1285 if (erase != -1) 1185 if (erase != -1)
1286 tio->sg.sg_erase = (char)erase; 1186 tio->sg.sg_erase = (char)erase;
1287 1187
1288 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1188 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1289 1189
… …
1295 tio->tc.t_startc = CSTART; /* ^Q */ 1195 tio->tc.t_startc = CSTART; /* ^Q */
1296 tio->tc.t_stopc = CSTOP; /* ^S */ 1196 tio->tc.t_stopc = CSTOP; /* ^S */
1297 tio->tc.t_eofc = CEOF; /* ^D */ 1197 tio->tc.t_eofc = CEOF; /* ^D */
1298 tio->tc.t_brkc = -1; 1198 tio->tc.t_brkc = -1;
1299 } 1199 }
1200
1300 /* get local special chars */ 1201 /* get local special chars */
1301 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1202 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1302 { 1203 {
1303 tio->lc.t_suspc = CSUSP; /* ^Z */ 1204 tio->lc.t_suspc = CSUSP; /* ^Z */
1304 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1205 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1308 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1209 tio->lc.t_lnextc = CLNEXT; /* ^V */
1309 } 1210 }
1310 /* get line discipline */ 1211 /* get line discipline */
1311 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1212 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1312# ifdef NTTYDISC 1213# ifdef NTTYDISC
1313
1314 tio->line = NTTYDISC; 1214 tio->line = NTTYDISC;
1315# endif /* NTTYDISC */ 1215# endif /* NTTYDISC */
1316 1216
1317 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1217 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1318#endif /* HAVE_TERMIOS_H */ 1218#endif /* HAVE_TERMIOS_H */
… …
1341 FOO (IGNCR, "IGNCR"); 1241 FOO (IGNCR, "IGNCR");
1342 FOO (ICRNL, "ICRNL"); 1242 FOO (ICRNL, "ICRNL");
1343 FOO (IXON, "IXON"); 1243 FOO (IXON, "IXON");
1344 FOO (IXOFF, "IXOFF"); 1244 FOO (IXOFF, "IXOFF");
1345# ifdef IUCLC 1245# ifdef IUCLC
1346
1347 FOO (IUCLC, "IUCLC"); 1246 FOO (IUCLC, "IUCLC");
1348# endif 1247# endif
1349# ifdef IXANY 1248# ifdef IXANY
1350
1351 FOO (IXANY, "IXANY"); 1249 FOO (IXANY, "IXANY");
1352# endif 1250# endif
1353# ifdef IMAXBEL 1251# ifdef IMAXBEL
1354
1355 FOO (IMAXBEL, "IMAXBEL"); 1252 FOO (IMAXBEL, "IMAXBEL");
1356# endif 1253# endif
1357 1254
1358 fprintf (stderr, "\n"); 1255 fprintf (stderr, "\n");
1359 1256
… …
1366 FOO (VERASE, "VERASE"); 1263 FOO (VERASE, "VERASE");
1367 FOO (VKILL, "VKILL"); 1264 FOO (VKILL, "VKILL");
1368 FOO (VEOF, "VEOF"); 1265 FOO (VEOF, "VEOF");
1369 FOO (VEOL, "VEOL"); 1266 FOO (VEOL, "VEOL");
1370# ifdef VEOL2 1267# ifdef VEOL2
1371
1372 FOO (VEOL2, "VEOL2"); 1268 FOO (VEOL2, "VEOL2");
1373# endif 1269# endif
1374# ifdef VSWTC 1270# ifdef VSWTC
1375
1376 FOO (VSWTC, "VSWTC"); 1271 FOO (VSWTC, "VSWTC");
1377# endif 1272# endif
1378# ifdef VSWTCH 1273# ifdef VSWTCH
1379
1380 FOO (VSWTCH, "VSWTCH"); 1274 FOO (VSWTCH, "VSWTCH");
1381# endif 1275# endif
1382
1383 FOO (VSTART, "VSTART"); 1276 FOO (VSTART, "VSTART");
1384 FOO (VSTOP, "VSTOP"); 1277 FOO (VSTOP, "VSTOP");
1385 FOO (VSUSP, "VSUSP"); 1278 FOO (VSUSP, "VSUSP");
1386# ifdef VDSUSP 1279# ifdef VDSUSP
1387
1388 FOO (VDSUSP, "VDSUSP"); 1280 FOO (VDSUSP, "VDSUSP");
1389# endif 1281# endif
1390# ifdef VREPRINT 1282# ifdef VREPRINT
1391
1392 FOO (VREPRINT, "VREPRINT"); 1283 FOO (VREPRINT, "VREPRINT");
1393# endif 1284# endif
1394# ifdef VDISCRD 1285# ifdef VDISCRD
1395
1396 FOO (VDISCRD, "VDISCRD"); 1286 FOO (VDISCRD, "VDISCRD");
1397# endif 1287# endif
1398# ifdef VWERSE 1288# ifdef VWERSE
1399
1400 FOO (VWERSE, "VWERSE"); 1289 FOO (VWERSE, "VWERSE");
1401# endif 1290# endif
1402# ifdef VLNEXT 1291# ifdef VLNEXT
1403
1404 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1405# endif 1293# endif
1406 1294
1407 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1408# undef FOO 1296# undef FOO
… …
1417 * the slave. 1305 * the slave.
1418 */ 1306 */
1419void 1307void
1420rxvt_term::run_command (const char *const *argv) 1308rxvt_term::run_command (const char *const *argv)
1421{ 1309{
1310#if ENABLE_FRILLS
1311 if (rs[Rs_pty_fd])
1312 {
1313 pty->pty = atoi (rs[Rs_pty_fd]);
1314
1315 if (pty->pty >= 0)
1316 {
1317 if (getfd_hook)
1318 pty->pty = (*getfd_hook) (pty->pty);
1319
1320 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1321 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1322 }
1323 }
1324 else
1325#endif
1422 if (!pty.get ()) 1326 if (!pty->get ())
1423 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1327 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424 1328
1425 pty.set_utf8_mode (enc_utf8); 1329 pty->set_utf8_mode (enc_utf8);
1426 1330
1427 /* set initial window size */ 1331 /* set initial window size */
1428 tt_winch (); 1332 tt_winch ();
1429 1333
1430 int er; 1334 int er;
… …
1438#endif 1342#endif
1439 er = -1; 1343 er = -1;
1440 1344
1441 rxvt_get_ttymode (&tio, er); 1345 rxvt_get_ttymode (&tio, er);
1442 1346
1443 sw_chld.start (SIGCHLD); 1347#if ENABLE_FRILLS
1348 if (rs[Rs_pty_fd])
1349 return;
1350#endif
1444 1351
1445#ifndef __QNX__
1446 /* spin off the command interpreter */ 1352 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1353 switch (cmd_pid = fork ())
1448 { 1354 {
1449 case -1: 1355 case -1:
1356 {
1357 cmd_pid = 0;
1450 rxvt_fatal ("can't fork, aborting.\n"); 1358 rxvt_fatal ("can't fork, aborting.\n");
1359 }
1451 case 0: 1360 case 0:
1452 init_env (); 1361 init_env ();
1453 1362
1454 if (!pty.make_controlling_tty ()) 1363 if (!pty->make_controlling_tty ())
1455 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1364 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1456 else 1365 else
1457 { 1366 {
1458 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1367 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1459 dup2 (pty.tty, STDIN_FILENO); 1368 dup2 (pty->tty, STDIN_FILENO);
1460 dup2 (pty.tty, STDOUT_FILENO); 1369 dup2 (pty->tty, STDOUT_FILENO);
1461 dup2 (pty.tty, STDERR_FILENO); 1370 dup2 (pty->tty, STDERR_FILENO);
1462 1371
1463 // close all our file handles that we do no longer need 1372 // close all our file handles that we do no longer need
1464 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1373 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1465 { 1374 {
1466 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1375 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1467 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1376 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1468 } 1377 }
1469 1378
1470 run_child (argv); 1379 run_child (argv);
1471 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1380 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1472 } 1381 }
1473 1382
1474 _exit (EXIT_FAILURE); 1383 _exit (EXIT_FAILURE);
1475 1384
1476 default: 1385 default:
1477 { 1386 if (!OPTION (Opt_utmpInhibit))
1478#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1479 int fdstdin;
1480 1388
1481 fdstdin = dup (STDIN_FILENO); 1389 pty->close_tty ();
1482 dup2 (pty.tty, STDIN_FILENO);
1483#endif
1484 1390
1485#ifdef UTMP_SUPPORT 1391 child_ev.start (cmd_pid);
1486 privileged_utmp (SAVE);
1487#endif
1488 1392
1489#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1393 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1490
1491 dup2 (fdstdin, STDIN_FILENO);
1492 close (fdstdin);
1493#endif
1494 }
1495
1496 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1497 break; 1394 break;
1498 } 1395 }
1499#else /* __QNX__ uses qnxspawn () */
1500 fchmod (pty.tty, 0622);
1501 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1502 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1503
1504 if (run_child (argv) == -1)
1505 exit (EXIT_FAILURE);
1506#endif
1507} 1396}
1508 1397
1509/* ------------------------------------------------------------------------- * 1398/* ------------------------------------------------------------------------- *
1510 * CHILD PROCESS OPERATIONS * 1399 * CHILD PROCESS OPERATIONS *
1511 * ------------------------------------------------------------------------- */ 1400 * ------------------------------------------------------------------------- */
… …
1518{ 1407{
1519 char *login; 1408 char *login;
1520 1409
1521 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1410 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1522 1411
1523 if (options & Opt_console) 1412 if (OPTION (Opt_console))
1524 { /* be virtual console, fail silently */ 1413 { /* be virtual console, fail silently */
1525#ifdef TIOCCONS 1414#ifdef TIOCCONS
1526 unsigned int on = 1; 1415 unsigned int on = 1;
1527 1416
1528 ioctl (STDIN_FILENO, TIOCCONS, &on); 1417 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1555 // unblock signals (signals are blocked by iom.C 1444 // unblock signals (signals are blocked by iom.C
1556 sigset_t ss; 1445 sigset_t ss;
1557 sigemptyset (&ss); 1446 sigemptyset (&ss);
1558 sigprocmask (SIG_SETMASK, &ss, 0); 1447 sigprocmask (SIG_SETMASK, &ss, 0);
1559 1448
1560#ifndef __QNX__
1561 /* command interpreter path */ 1449 /* command interpreter path */
1562 if (argv != NULL) 1450 if (argv != NULL)
1563 { 1451 {
1564# ifdef DEBUG_CMD 1452# ifdef DEBUG_CMD
1565 int i; 1453 int i;
… …
1571 execvp (argv[0], (char *const *)argv); 1459 execvp (argv[0], (char *const *)argv);
1572 /* no error message: STDERR is closed! */ 1460 /* no error message: STDERR is closed! */
1573 } 1461 }
1574 else 1462 else
1575 { 1463 {
1576 const char *argv0, *shell; 1464 const char *argv0, *shell;
1577 1465
1578 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1579 shell = "/bin/sh"; 1467 shell = "/bin/sh";
1580 1468
1581 argv0 = (const char *)rxvt_r_basename (shell); 1469 argv0 = (const char *)rxvt_r_basename (shell);
1582 1470
1583 if (options & Opt_loginShell) 1471 if (OPTION (Opt_loginShell))
1584 { 1472 {
1585 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1473 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1586 1474
1587 login[0] = '-'; 1475 login[0] = '-';
1588 strcpy (&login[1], argv0); 1476 strcpy (&login[1], argv0);
1589 argv0 = login; 1477 argv0 = login;
1590 } 1478 }
1479
1591 execlp (shell, argv0, NULL); 1480 execlp (shell, argv0, NULL);
1592 /* no error message: STDERR is closed! */ 1481 /* no error message: STDERR is closed! */
1593 } 1482 }
1594 1483
1595#else /* __QNX__ uses qnxspawn () */
1596
1597 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1598 char *command = NULL, fullcommand[_MAX_PATH];
1599 char **arg_v, *arg_a[2] = { NULL, NULL };
1600
1601 if (argv != NULL)
1602 {
1603 if (access (argv[0], X_OK) == -1)
1604 {
1605 if (strchr (argv[0], '/') == NULL)
1606 {
1607 searchenv (argv[0], "PATH", fullcommand);
1608
1609 if (fullcommand[0] != '\0')
1610 command = fullcommand;
1611 }
1612
1613 if (access (command, X_OK) == -1)
1614 return -1;
1615 }
1616 else
1617 command = argv[0];
1618
1619 arg_v = argv;
1620 }
1621 else
1622 {
1623 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1624 command = "/bin/sh";
1625
1626 arg_a[0] = my_basename (command);
1627
1628 if (options & Opt_loginShell)
1629 {
1630 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1631
1632 login[0] = '-';
1633 strcpy (&login[1], arg_a[0]);
1634 arg_a[0] = login;
1635 }
1636
1637 arg_v = arg_a;
1638 }
1639
1640 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1641 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1642 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1643 command, arg_v, environ, iov_a, 0);
1644 if (login)
1645 free (login);
1646
1647 pty.close_tty ();
1648 return pty.pty;
1649#endif
1650
1651 return -1; 1484 return -1;
1652} 1485}
1653 1486
1654/*----------------------- end-of-file (C source) -----------------------*/ 1487/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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