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.13 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.40 by pcg, Sun Mar 14 23:14:39 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.13 2003/12/18 02:07:12 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
10 * - extensive modifications 9 * - extensive modifications
11 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
12 * - extensive modifications 11 * - extensive modifications
13 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
14 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 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.
… …
327#endif 327#endif
328#ifdef KEEP_SCROLLCOLOR 328#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 329 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 330 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 331#endif /* KEEP_SCROLLCOLOR */
332
332 }; 333 };
333 334
334const char *const xa_names[NUM_XA] = 335const char *const xa_names[NUM_XA] =
335 { 336 {
337 "TEXT",
336 "COMPOUND_TEXT", 338 "COMPOUND_TEXT",
339 "UTF8_STRING",
337 "MULTIPLE", 340 "MULTIPLE",
338 "TARGETS", 341 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 342 "TIMESTAMP",
341 "VT_SELECTION", 343 "VT_SELECTION",
342 "INCR", 344 "INCR",
343 "WM_DELETE_WINDOW", 345 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 346#ifdef TRANSPARENT
… …
350#endif 352#endif
351 "CLIPBOARD" 353 "CLIPBOARD"
352 }; 354 };
353 355
354bool 356bool
355rxvt_term::init_vars() 357rxvt_term::init_vars ()
356{ 358{
357 PixColors = new rxvt_color [TOTAL_COLORS]; 359 PixColors = new rxvt_color [TOTAL_COLORS];
358 if (PixColors == NULL) 360 if (PixColors == NULL)
359 return false; 361 return false;
360 362
… …
371 MEvent.time = CurrentTime; 373 MEvent.time = CurrentTime;
372 MEvent.button = AnyButton; 374 MEvent.button = AnyButton;
373 Options = DEFAULT_OPTIONS; 375 Options = DEFAULT_OPTIONS;
374 want_refresh = 1; 376 want_refresh = 1;
375 cmd_pid = -1; 377 cmd_pid = -1;
376 cmd_fd = tty_fd = Xfd = -1; 378 cmd_fd = tty_fd = -1;
377 PrivateModes = SavedModes = PrivMode_Default; 379 PrivateModes = SavedModes = PrivMode_Default;
378 TermWin.focus = 0; 380 TermWin.focus = 0;
379 TermWin.ncol = 80; 381 TermWin.ncol = 80;
380 TermWin.nrow = 24; 382 TermWin.nrow = 24;
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 383 TermWin.int_bwidth = INTERNALBORDERWIDTH;
382 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
383 TermWin.lineSpace = LINESPACE; 385 TermWin.lineSpace = LINESPACE;
384 TermWin.saveLines = SAVELINES; 386 TermWin.saveLines = SAVELINES;
385 numPixColors = TOTAL_COLORS; 387 numPixColors = TOTAL_COLORS;
386#ifndef NO_NEW_SELECTION
387 388
388 selection_style = NEW_SELECT;
389#else
390
391 selection_style = OLD_SELECT;
392#endif
393#ifndef NO_BRIGHTCOLOR 389#ifndef NO_BRIGHTCOLOR
394
395 colorfgbg = DEFAULT_RSTYLE; 390 colorfgbg = DEFAULT_RSTYLE;
396#endif
397#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
398
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402#ifdef GREEK_SUPPORT
403
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 391#endif
406 392
407 refresh_limit = 1; 393 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 394 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 395 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412
413 encoding_method = MULTICHAR_ENCODING;
414# endif
415
416 multichar_decode = rxvt_euc2jis;
417#endif
418 396
419 oldcursor.row = oldcursor.col = -1; 397 oldcursor.row = oldcursor.col = -1;
420#ifdef XPM_BACKGROUND 398#ifdef XPM_BACKGROUND
421 /* bgPixmap.w = bgPixmap.h = 0; */ 399 /* bgPixmap.w = bgPixmap.h = 0; */
422 bgPixmap.x = bgPixmap.y = 50; 400 bgPixmap.x = bgPixmap.y = 50;
423 bgPixmap.pixmap = None; 401 bgPixmap.pixmap = None;
424#endif 402#endif
425 403
426 last_bot = last_state = -1; 404 last_bot = last_state = -1;
405
427#ifdef MENUBAR 406#ifdef MENUBAR
428
429 menu_readonly = 1; 407 menu_readonly = 1;
430# if !(MENUBAR_MAX > 1) 408# if ! (MENUBAR_MAX > 1)
431
432 CurrentBar = &(BarList); 409 CurrentBar = & (BarList);
433# endif /* (MENUBAR_MAX > 1) */ 410# endif /* (MENUBAR_MAX > 1) */
434#endif 411#endif
435 412
436 return true; 413 return true;
437} 414}
438 415
439/* EXTPROTO */
440void 416void
441rxvt_init_secondary (pR) 417rxvt_term::init_secondary ()
442{ 418{
443 int i; 419 int i;
444#ifdef TTY_GID_SUPPORT 420#ifdef TTY_GID_SUPPORT
445 struct group *gr = getgrnam ("tty"); 421 struct group *gr = getgrnam ("tty");
446 422
447 if (gr) 423 if (gr)
448 { /* change group ownership of tty to "tty" */ 424 { /* change group ownership of tty to "tty" */
449 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 425 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
450 R->ttygid = gr->gr_gid; 426 ttygid = gr->gr_gid;
451 } 427 }
452 else 428 else
453#endif /* TTY_GID_SUPPORT */ 429#endif /* TTY_GID_SUPPORT */
430
454 { 431 {
455 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 432 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
456 R->ttygid = getgid (); 433 ttygid = getgid ();
457 } 434 }
458
459#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
460 R->locale = strdup (setlocale (LC_CTYPE, ""));
461#endif
462 435
463 /* 436 /*
464 * Close all unused file descriptors 437 * Close all unused file descriptors
465 * We don't want them, we don't need them. 438 * We don't want them, we don't need them.
466 */ 439 */
… …
474 dup2 (i, STDIN_FILENO); 447 dup2 (i, STDIN_FILENO);
475 close (i); 448 close (i);
476 } 449 }
477 450
478 dup2 (STDERR_FILENO, STDOUT_FILENO); 451 dup2 (STDERR_FILENO, STDOUT_FILENO);
452
479#if 0 // schmorp sayz closing filies is murder 453#if 0 // schmorp sayz closing filies is murder
480
481 for (i = STDERR_FILENO + 1; i < R->num_fds; i++) 454 for (i = STDERR_FILENO + 1; i < num_fds; i++)
482 { 455 {
483#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 456#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
484 if (i == 4 || i == 7) 457 if (i == 4 || i == 7)
485 continue; 458 continue;
486#endif 459#endif
487
488 close(i); 460 close (i);
489 } 461 }
490#endif 462#endif
491} 463}
492 464
493/*----------------------------------------------------------------------*/ 465/*----------------------------------------------------------------------*/
494/* EXTPROTO */
495const char ** 466const char **
496rxvt_init_resources (pR_ int argc, const char *const *argv) 467rxvt_term::init_resources (int argc, const char *const *argv)
497{ 468{
498 int i, r_argc; 469 int i, r_argc;
499 char *val; 470 char *val;
500 const char **cmd_argv, **r_argv; 471 const char **cmd_argv, **r_argv;
501 const char **rs;
502 472
503 /* 473 /*
504 * Look for -exec option. Find => split and make cmd_argv[] of command args 474 * Look for -exec option. Find => split and make cmd_argv[] of command args
505 */ 475 */
506 for (r_argc = 0; r_argc < argc; r_argc++) 476 for (r_argc = 0; r_argc < argc; r_argc++)
507 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 477 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
508 break; 478 break;
479
509 r_argv = (const char **)rxvt_malloc(sizeof(char *) * (r_argc + 1)); 480 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
510 481
511 for (i = 0; i < r_argc; i++) 482 for (i = 0; i < r_argc; i++)
512 r_argv[i] = (const char *)argv[i]; 483 r_argv[i] = (const char *)argv[i];
484
513 r_argv[i] = NULL; 485 r_argv[i] = NULL;
486
514 if (r_argc == argc) 487 if (r_argc == argc)
515 cmd_argv = NULL; 488 cmd_argv = NULL;
516 else 489 else
517 { 490 {
518 cmd_argv = (const char **)rxvt_malloc(sizeof(char *) * (argc - r_argc)); 491 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
519 492
520 for (i = 0; i < argc - r_argc - 1; i++) 493 for (i = 0; i < argc - r_argc - 1; i++)
521 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 494 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
495
522 cmd_argv[i] = NULL; 496 cmd_argv[i] = NULL;
523 } 497 }
524 498
525 /* clear all resources */ 499 /* clear all resources */
526 rs = R->rs;
527 for (i = 0; i < NUM_RESOURCES;) 500 for (i = 0; i < NUM_RESOURCES;)
528 rs[i++] = NULL; 501 rs[i++] = NULL;
529 502
530 rs[Rs_name] = rxvt_r_basename(argv[0]); 503 rs[Rs_name] = rxvt_r_basename (argv[0]);
504
531 /* 505 /*
532 * Open display, get options/resources and create the window 506 * Open display, get options/resources and create the window
533 */ 507 */
534 if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL) 508 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
535 rs[Rs_display_name] = ":0"; 509 rs[Rs_display_name] = ":0";
536 510
537 rxvt_get_options(aR_ r_argc, r_argv); 511 get_options (r_argc, r_argv);
538 free(r_argv); 512 free (r_argv);
539 513
540#ifdef LOCAL_X_IS_UNIX 514#ifdef LOCAL_X_IS_UNIX
541
542 if (rs[Rs_display_name][0] == ':') 515 if (rs[Rs_display_name][0] == ':')
543 { 516 {
544 val = rxvt_malloc(5 + STRLEN(rs[Rs_display_name])); 517 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
545 STRCPY(val, "unix"); 518 STRCPY (val, "unix");
546 STRCAT(val, rs[Rs_display_name]); 519 STRCAT (val, rs[Rs_display_name]);
547 R->Xdisplay = XOpenDisplay(val); 520 display = displays.get (val);
548 free(val); 521 free (val);
549 }
550#endif
551
552 if (R->Xdisplay == NULL
553 && (R->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL)
554 { 522 }
523#endif
524
525 if (!display
526 && ! (display = displays.get (rs[Rs_display_name])))
527 {
555 rxvt_print_error("can't open display %s", rs[Rs_display_name]); 528 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
556 exit(EXIT_FAILURE); 529 exit (EXIT_FAILURE);
557 } 530 }
558 531
559 rxvt_extract_resources(aR_ R->Xdisplay, rs[Rs_name]); 532 extract_resources (display->display, rs[Rs_name]);
560 533
561 /* 534 /*
562 * set any defaults not already set 535 * set any defaults not already set
563 */ 536 */
564 if (cmd_argv && cmd_argv[0]) 537 if (cmd_argv && cmd_argv[0])
565 { 538 {
566 if (!rs[Rs_title]) 539 if (!rs[Rs_title])
567 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 540 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
568 if (!rs[Rs_iconName]) 541 if (!rs[Rs_iconName])
569 rs[Rs_iconName] = rs[Rs_title]; 542 rs[Rs_iconName] = rs[Rs_title];
570 } 543 }
571 else 544 else
572 { 545 {
573 if (!rs[Rs_title]) 546 if (!rs[Rs_title])
574 rs[Rs_title] = rs[Rs_name]; 547 rs[Rs_title] = rs[Rs_name];
575 if (!rs[Rs_iconName]) 548 if (!rs[Rs_iconName])
576 rs[Rs_iconName] = rs[Rs_name]; 549 rs[Rs_iconName] = rs[Rs_name];
577 } 550 }
551
578 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 552 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
579 R->TermWin.saveLines = BOUND_POSITIVE_INT16(i); 553 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
554
580#ifndef NO_FRILLS 555#ifndef NO_FRILLS
581
582 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 556 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
583 R->TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 557 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
584 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 558 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
585 R->TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 559 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
586#endif 560#endif
561
587#ifndef NO_LINESPACE 562#ifndef NO_LINESPACE
588
589 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 563 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
590 R->TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 564 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
591#endif 565#endif
592 566
593#ifdef POINTER_BLANK 567#ifdef POINTER_BLANK
594
595 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 568 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
596 R->pointerBlankDelay = i; 569 pointerBlankDelay = i;
597 else 570 else
598 R->pointerBlankDelay = 2; 571 pointerBlankDelay = 2;
599#endif 572#endif
600 573
601 /* no point having a scrollbar without having any scrollback! */ 574 /* no point having a scrollbar without having any scrollback! */
602 if (!R->TermWin.saveLines) 575 if (!TermWin.saveLines)
603 R->Options &= ~Opt_scrollBar; 576 Options &= ~Opt_scrollBar;
604 577
605#ifdef PRINTPIPE 578#ifdef PRINTPIPE
606
607 if (!rs[Rs_print_pipe]) 579 if (!rs[Rs_print_pipe])
608 rs[Rs_print_pipe] = PRINTPIPE; 580 rs[Rs_print_pipe] = PRINTPIPE;
609#endif 581#endif
610 582
611 if (!rs[Rs_cutchars]) 583 if (!rs[Rs_cutchars])
612 rs[Rs_cutchars] = CUTCHARS; 584 rs[Rs_cutchars] = CUTCHARS;
613#ifdef ACS_ASCII
614 585
615 if (!rs[Rs_acs_chars])
616 rs[Rs_acs_chars] = ACS_CHARS;
617 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20)
618 {
619 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20);
620 for (; i < 0x20; )
621 val[i] = ' ';
622 rs[Rs_acs_chars] = val;
623 }
624#endif
625#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
626 if (!rs[Rs_backspace_key]) 587 if (!rs[Rs_backspace_key])
627# ifdef DEFAULT_BACKSPACE 588# ifdef DEFAULT_BACKSPACE
628
629 R->key_backspace = DEFAULT_BACKSPACE; 589 key_backspace = DEFAULT_BACKSPACE;
630# else 590# else
631
632 R->key_backspace = "DEC"; /* can toggle between \010 or \177 */ 591 key_backspace = "DEC"; /* can toggle between \010 or \177 */
633# endif 592# endif
634
635 else 593 else
636 { 594 {
637 val = STRDUP(rs[Rs_backspace_key]); 595 val = STRDUP (rs[Rs_backspace_key]);
638 rxvt_Str_trim(val); 596 rxvt_Str_trim (val);
639 rxvt_Str_escaped(val); 597 rxvt_Str_escaped (val);
640 R->key_backspace = val; 598 key_backspace = val;
641 } 599 }
642#endif 600#endif
601
643#ifndef NO_DELETE_KEY 602#ifndef NO_DELETE_KEY
644 if (!rs[Rs_delete_key]) 603 if (!rs[Rs_delete_key])
645# ifdef DEFAULT_DELETE 604# ifdef DEFAULT_DELETE
646
647 R->key_delete = DEFAULT_DELETE; 605 key_delete = DEFAULT_DELETE;
648# else 606# else
649
650 R->key_delete = "\033[3~"; 607 key_delete = "\033[3~";
651# endif 608# endif
652
653 else 609 else
654 { 610 {
655 val = STRDUP(rs[Rs_delete_key]); 611 val = STRDUP (rs[Rs_delete_key]);
656 rxvt_Str_trim(val); 612 rxvt_Str_trim (val);
657 rxvt_Str_escaped(val); 613 rxvt_Str_escaped (val);
658 R->key_delete = val; 614 key_delete = val;
659 } 615 }
660#endif 616#endif
661 if (rs[Rs_answerbackstring]) 617 if (rs[Rs_answerbackstring])
662 { 618 {
663 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 619 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
664 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
665 }
666
667 if (rs[Rs_selectstyle])
668 {
669 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0)
670 R->selection_style = OLD_WORD_SELECT;
671#ifndef NO_OLD_SELECTION
672
673 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
674 R->selection_style = OLD_SELECT;
675#endif
676
677 } 621 }
678 622
679#ifdef HAVE_SCROLLBARS 623#ifdef HAVE_SCROLLBARS
680 rxvt_setup_scrollbar(aR_ rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 624 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
681 rs[Rs_scrollBar_thickness]); 625 rs[Rs_scrollBar_thickness]);
682#endif 626#endif
683
684 R->TermWin.fontset = new rxvt_fontset (aR);
685 R->TermWin.fontset->populate (rs[Rs_font]);
686 R->TermWin.fwidth = R->TermWin.fontset->base_font ()->width;
687 R->TermWin.fheight = R->TermWin.fontset->base_font ()->height;
688 R->TermWin.fbase = R->TermWin.fontset->base_font ()->ascent;
689 627
690#ifdef XTERM_REVERSE_VIDEO 628#ifdef XTERM_REVERSE_VIDEO
691 /* this is how xterm implements reverseVideo */ 629 /* this is how xterm implements reverseVideo */
692 if (R->Options & Opt_reverseVideo) 630 if (Options & Opt_reverseVideo)
693 { 631 {
694 if (!rs[Rs_color + Color_fg]) 632 if (!rs[Rs_color + Color_fg])
695 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 633 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
696 if (!rs[Rs_color + Color_bg]) 634 if (!rs[Rs_color + Color_bg])
697 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 635 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
702 if (!rs[Rs_color + i]) 640 if (!rs[Rs_color + i])
703 rs[Rs_color + i] = def_colorName[i]; 641 rs[Rs_color + i] = def_colorName[i];
704 642
705#ifndef XTERM_REVERSE_VIDEO 643#ifndef XTERM_REVERSE_VIDEO
706 /* this is how we implement reverseVideo */ 644 /* this is how we implement reverseVideo */
707 if (R->Options & Opt_reverseVideo) 645 if (Options & Opt_reverseVideo)
708 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 646 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
709#endif 647#endif
710 648
711 /* convenient aliases for setting fg/bg to colors */ 649 /* convenient aliases for setting fg/bg to colors */
712 rxvt_color_aliases(aR_ Color_fg); 650 color_aliases (Color_fg);
713 rxvt_color_aliases(aR_ Color_bg); 651 color_aliases (Color_bg);
714#ifndef NO_CURSORCOLOR 652#ifndef NO_CURSORCOLOR
715
716 rxvt_color_aliases(aR_ Color_cursor); 653 color_aliases (Color_cursor);
717 rxvt_color_aliases(aR_ Color_cursor2); 654 color_aliases (Color_cursor2);
718#endif /* NO_CURSORCOLOR */ 655#endif /* NO_CURSORCOLOR */
719
720 rxvt_color_aliases(aR_ Color_pointer); 656 color_aliases (Color_pointer);
721 rxvt_color_aliases(aR_ Color_border); 657 color_aliases (Color_border);
722#ifndef NO_BOLD_UNDERLINE_REVERSE 658#ifndef NO_BOLD_UNDERLINE_REVERSE
723
724 rxvt_color_aliases(aR_ Color_BD); 659 color_aliases (Color_BD);
725 rxvt_color_aliases(aR_ Color_UL); 660 color_aliases (Color_UL);
726 rxvt_color_aliases(aR_ Color_RV); 661 color_aliases (Color_RV);
727#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 662#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
728 663
729 return cmd_argv; 664 return cmd_argv;
730} 665}
731 666
732/*----------------------------------------------------------------------*/ 667/*----------------------------------------------------------------------*/
733/* EXTPROTO */
734void 668void
735rxvt_init_env(pR) 669rxvt_term::init_env ()
736{ 670{
737 int i; 671 int i;
738 unsigned int u; 672 unsigned int u;
739 char *val; 673 char *val;
740 674
741#ifdef DISPLAY_IS_IP 675#ifdef DISPLAY_IS_IP
742 /* Fixup display_name for export over pty to any interested terminal 676 /* Fixup display_name for export over pty to any interested terminal
743 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 677 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
744 * (for the first non-loopback interface) that we get from 678 * (for the first non-loopback interface) that we get from
745 * rxvt_network_display(). This is more "name-resolution-portable", if you 679 * rxvt_network_display (). This is more "name-resolution-portable", if you
746 * will, and probably allows for faster x-client startup if your name 680 * will, and probably allows for faster x-client startup if your name
747 * server is beyond a slow link or overloaded at client startup. Of 681 * server is beyond a slow link or overloaded at client startup. Of
748 * course that only helps the shell's child processes, not us. 682 * course that only helps the shell's child processes, not us.
749 * 683 *
750 * Giving out the display_name also affords a potential security hole 684 * Giving out the display_name also affords a potential security hole
751 */ 685 */
752 val = rxvt_network_display(R->rs[Rs_display_name]); 686 val = rxvt_network_display (rs[Rs_display_name]);
753 R->rs[Rs_display_name] = (const char *)val; 687 rs[Rs_display_name] = (const char *)val;
688
754 if (val == NULL) 689 if (val == NULL)
755#endif /* DISPLAY_IS_IP */ 690#endif /* DISPLAY_IS_IP */
756
757 val = XDisplayString(R->Xdisplay); 691 val = XDisplayString (display->display);
692
758 if (R->rs[Rs_display_name] == NULL) 693 if (rs[Rs_display_name] == NULL)
759 R->rs[Rs_display_name] = val; /* use broken `:0' value */ 694 rs[Rs_display_name] = val; /* use broken `:0' value */
760 695
761 i = STRLEN(val); 696 i = STRLEN (val);
762 R->env_display = (char *)rxvt_malloc((i + 9) * sizeof(char)); 697 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
763 698
764 sprintf(R->env_display, "DISPLAY=%s", val); 699 sprintf (env_display, "DISPLAY=%s", val);
765 700
766 /* avoiding the math library: 701 /* avoiding the math library:
767 * i = (int)(ceil(log10((unsigned int)R->TermWin.parent[0]))) */ 702 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
768 for (i = 0, u = (unsigned int)R->TermWin.parent[0]; u; u /= 10, i++) 703 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
769 ; 704 ;
770 MAX_IT(i, 1); 705 MAX_IT (i, 1);
771 R->env_windowid = (char *)rxvt_malloc((i + 10) * sizeof(char)); 706 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
772 707
773 sprintf(R->env_windowid, "WINDOWID=%u", 708 sprintf (env_windowid, "WINDOWID=%u",
774 (unsigned int)R->TermWin.parent[0]); 709 (unsigned int)TermWin.parent[0]);
775 710
776 /* add entries to the environment: 711 /* add entries to the environment:
777 * @ DISPLAY: in case we started with -display 712 * @ DISPLAY: in case we started with -display
778 * @ WINDOWID: X window id number of the window 713 * @ WINDOWID: X window id number of the window
779 * @ COLORTERM: terminal sub-name and also indicates its color 714 * @ COLORTERM: terminal sub-name and also indicates its color
780 * @ TERM: terminal name 715 * @ TERM: terminal name
781 * @ TERMINFO: path to terminfo directory 716 * @ TERMINFO: path to terminfo directory
717 * @ COLORFGBG: fg;bg color codes
782 */ 718 */
783 putenv(R->env_display); 719 putenv (env_display);
784 putenv(R->env_windowid); 720 putenv (env_windowid);
721 if (env_colorfgbg)
722 putenv (env_colorfgbg);
723
785#ifdef RXVT_TERMINFO 724#ifdef RXVT_TERMINFO
786
787 putenv("TERMINFO=" RXVT_TERMINFO); 725 putenv ("TERMINFO=" RXVT_TERMINFO);
788#endif 726#endif
789 727
790 if (XDEPTH <= 2) 728 if (display->depth <= 2)
791 putenv("COLORTERM=" COLORTERMENV "-mono"); 729 putenv ("COLORTERM=" COLORTERMENV "-mono");
792 else 730 else
793 putenv("COLORTERM=" COLORTERMENVFULL); 731 putenv ("COLORTERM=" COLORTERMENVFULL);
732
794 if (R->rs[Rs_term_name] != NULL) 733 if (rs[Rs_term_name] != NULL)
795 { 734 {
796 R->env_term = (char *)rxvt_malloc((STRLEN(R->rs[Rs_term_name]) + 6) * sizeof(char)); 735 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char));
797 sprintf(R->env_term, "TERM=%s", R->rs[Rs_term_name]); 736 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
798 putenv(R->env_term); 737 putenv (env_term);
799 } 738 }
800 else 739 else
801 putenv("TERM=" TERMENV); 740 putenv ("TERM=" TERMENV);
802 741
803#ifdef HAVE_UNSETENV 742#ifdef HAVE_UNSETENV
804 /* avoid passing old settings and confusing term size */ 743 /* avoid passing old settings and confusing term size */
805 unsetenv("LINES"); 744 unsetenv ("LINES");
806 unsetenv("COLUMNS"); 745 unsetenv ("COLUMNS");
807 unsetenv("TERMCAP"); /* terminfo should be okay */ 746 unsetenv ("TERMCAP"); /* terminfo should be okay */
808#endif /* HAVE_UNSETENV */ 747#endif /* HAVE_UNSETENV */
809} 748}
810 749
811/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
812/* 751/*
813 * This is more or less stolen straight from XFree86 xterm. 752 * This is more or less stolen straight from XFree86 xterm.
814 * This should support all European type languages. 753 * This should support all European type languages.
815 */ 754 */
816/* EXTPROTO */
817void 755void
756rxvt_term::set_locale (const char *locale)
757{
758#if HAVE_XSETLOCALE || HAVE_SETLOCALE
759 free (this->locale);
760 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
761 SET_LOCALE (this->locale);
762 mbstate.reset ();
763#endif
764#if HAVE_NL_LANGINFO
765 free (codeset);
766 codeset = strdup (nl_langinfo (CODESET));
767 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
768 || !STRCASECMP (codeset, "UTF8");
769#else
770 enc_utf8 = 1;
771#endif
772}
773
774void
818rxvt_init_xlocale(pR) 775rxvt_term::init_xlocale ()
819{ 776{
820#ifdef USE_XIM 777#ifdef USE_XIM
821 if (R->locale == NULL) 778 if (!locale)
822 rxvt_print_error("Setting locale failed."); 779 rxvt_print_error ("Setting locale failed.");
823 else 780 else
824 { 781 {
825 Atom wmlocale; 782 Atom wmlocale;
826 783
827 wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); 784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
828 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, 785 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
829 XA_STRING, 8, PropModeReplace, 786 XA_STRING, 8, PropModeReplace,
830 (unsigned char *)R->locale, STRLEN(R->locale)); 787 (unsigned char *)locale, STRLEN (locale));
831 788
832 if (XSupportsLocale() != True) 789 if (!XSupportsLocale ())
833 { 790 {
834 rxvt_print_error("The locale is not supported by Xlib"); 791 rxvt_print_error ("The locale is not supported by Xlib");
835 return; 792 return;
836 } 793 }
837 794
838 rxvt_setTermFontSet(aR_ 0); 795 im_ev.start (display);
839 796
840 /* see if we can connect yet */ 797 /* see if we can connect already */
841 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); 798 im_cb ();
842
843 /* To avoid Segmentation Fault in C locale: Solaris only? */
844 if (STRCMP(R->locale, "C"))
845 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
846 rxvt_IMInstantiateCallback, NULL);
847 } 799 }
848#endif 800#endif
849} 801}
850 802
851/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
852/* EXTPROTO */
853void 804void
854rxvt_init_command(pR_ const char *const *argv) 805rxvt_term::init_command (const char *const *argv)
855{ 806{
856 /* 807 /*
857 * Initialize the command connection. 808 * Initialize the command connection.
858 * This should be called after the X server connection is established. 809 * This should be called after the X server connection is established.
859 */ 810 */
860 int i; 811 int i;
861 812
862 for (i = 0; i < NUM_XA; i++) 813 for (i = 0; i < NUM_XA; i++)
863 R->xa[i] = XInternAtom(R->Xdisplay, xa_names[i], False); 814 xa[i] = XInternAtom (display->display, xa_names[i], False);
864 815
865 /* Enable delete window protocol */ 816 /* Enable delete window protocol */
866 XSetWMProtocols(R->Xdisplay, R->TermWin.parent[0], 817 XSetWMProtocols (display->display, TermWin.parent[0],
867 &(R->xa[XA_WMDELETEWINDOW]), 1); 818 & (xa[XA_WMDELETEWINDOW]), 1);
868 819
869#ifdef USING_W11LIB 820#ifdef USING_W11LIB
870 /* enable W11 callbacks */ 821 /* enable W11 callbacks */
871 W11AddEventHandler(R->Xdisplay, rxvt_W11_process_x_event); 822 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
872#endif 823#endif
873 824
874#ifdef META8_OPTION 825#ifdef META8_OPTION
875
876 R->meta_char = (R->Options & Opt_meta8 ? 0x80 : C0_ESC); 826 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
877#endif 827#endif
878 828
879 rxvt_get_ourmods(aR); 829 get_ourmods ();
880 830
881 if (!(R->Options & Opt_scrollTtyOutput)) 831 if (! (Options & Opt_scrollTtyOutput))
882 R->PrivateModes |= PrivMode_TtyOutputInh; 832 PrivateModes |= PrivMode_TtyOutputInh;
883 if (R->Options & Opt_scrollTtyKeypress) 833 if (Options & Opt_scrollTtyKeypress)
884 R->PrivateModes |= PrivMode_Keypress; 834 PrivateModes |= PrivMode_Keypress;
885 if (!(R->Options & Opt_jumpScroll)) 835 if (! (Options & Opt_jumpScroll))
886 R->PrivateModes |= PrivMode_smoothScroll; 836 PrivateModes |= PrivMode_smoothScroll;
837
887#ifndef NO_BACKSPACE_KEY 838#ifndef NO_BACKSPACE_KEY
888
889 if (STRCMP(R->key_backspace, "DEC") == 0) 839 if (STRCMP (key_backspace, "DEC") == 0)
890 R->PrivateModes |= PrivMode_HaveBackSpace; 840 PrivateModes |= PrivMode_HaveBackSpace;
891#endif 841#endif
842
892 /* add value for scrollBar */ 843 /* add value for scrollBar */
893 if (scrollbar_visible(R)) 844 if (scrollbar_visible ())
894 { 845 {
895 R->PrivateModes |= PrivMode_scrollBar; 846 PrivateModes |= PrivMode_scrollBar;
896 R->SavedModes |= PrivMode_scrollBar; 847 SavedModes |= PrivMode_scrollBar;
897 } 848 }
898 if (menubar_visible(R)) 849 if (menubar_visible ())
899 { 850 {
900 R->PrivateModes |= PrivMode_menuBar; 851 PrivateModes |= PrivMode_menuBar;
901 R->SavedModes |= PrivMode_menuBar; 852 SavedModes |= PrivMode_menuBar;
902 } 853 }
903#ifdef GREEK_SUPPORT
904 greek_init();
905#endif
906
907 R->Xfd = XConnectionNumber (R->Xdisplay);
908 854
909#ifdef CURSOR_BLINK 855#ifdef CURSOR_BLINK
910
911 if (R->Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
912 (void)gettimeofday(&R->lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 858#endif
914 859
915 if ((R->cmd_fd = rxvt_run_command (aR_ argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
916 { 861 {
917 rxvt_print_error ("aborting"); 862 rxvt_print_error ("aborting");
918 exit (EXIT_FAILURE); 863 exit (EXIT_FAILURE);
919 } 864 }
920} 865}
921 866
922/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
923/* INTPROTO */
924void 868void
925rxvt_Get_Colours(pR) 869rxvt_term::Get_Colours ()
926{ 870{
927 int i; 871 int i;
928 872
929 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 873 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
930 { 874 {
931 rxvt_color xcol; 875 rxvt_color xcol;
932 876
933 if (!R->rs[Rs_color + i]) 877 if (!rs[Rs_color + i])
934 continue; 878 continue;
935 879
936 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 880 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
937 { 881 {
938#ifndef XTERM_REVERSE_VIDEO 882#ifndef XTERM_REVERSE_VIDEO
939 if (i < 2 && (R->Options & Opt_reverseVideo)) 883 if (i < 2 && (Options & Opt_reverseVideo))
940 {
941 R->rs[Rs_color + i] = def_colorName[!i]; 884 rs[Rs_color + i] = def_colorName[!i];
942 }
943 else 885 else
944#endif 886#endif
945
946 R->rs[Rs_color + i] = def_colorName[i]; 887 rs[Rs_color + i] = def_colorName[i];
888
947 if (!R->rs[Rs_color + i]) 889 if (!rs[Rs_color + i])
948 continue; 890 continue;
891
949 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 892 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
950 { 893 {
951 switch (i) 894 switch (i)
952 { 895 {
953 case Color_fg: 896 case Color_fg:
954 case Color_bg: 897 case Color_bg:
955 /* fatal: need bg/fg color */ 898 /* fatal: need bg/fg color */
956 rxvt_print_error("aborting"); 899 rxvt_print_error ("aborting");
957 exit(EXIT_FAILURE); 900 exit (EXIT_FAILURE);
958 /* NOTREACHED */ 901 /* NOTREACHED */
959 break; 902 break;
960#ifndef NO_CURSORCOLOR 903#ifndef NO_CURSORCOLOR
961
962 case Color_cursor2: 904 case Color_cursor2:
963 xcol = R->PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
964 break; 906 break;
965#endif /* ! NO_CURSORCOLOR */ 907#endif /* ! NO_CURSORCOLOR */
966
967 case Color_pointer: 908 case Color_pointer:
968 xcol = R->PixColors[Color_fg]; 909 xcol = PixColors[Color_fg];
969 break; 910 break;
970 default: 911 default:
971 xcol = R->PixColors[Color_bg]; /* None */ 912 xcol = PixColors[Color_bg]; /* None */
972 break; 913 break;
973 } 914 }
974 } 915 }
975 } 916 }
917
976 R->PixColors[i] = xcol; 918 PixColors[i] = xcol;
977 SET_PIXCOLOR(R, i); 919 SET_PIXCOLOR (i);
978 } 920 }
979 921
980 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 922 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
981 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 923 PixColors[Color_pointer] = PixColors[Color_fg];
982 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 924 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
983 R->PixColors[Color_border] = R->PixColors[Color_fg]; 925 PixColors[Color_border] = PixColors[Color_fg];
984 926
985 /* 927 /*
986 * get scrollBar/menuBar shadow colors 928 * get scrollBar/menuBar shadow colors
987 * 929 *
988 * The calculations of topShadow/bottomShadow values are adapted 930 * The calculations of topShadow/bottomShadow values are adapted
… …
990 */ 932 */
991#ifdef KEEP_SCROLLCOLOR 933#ifdef KEEP_SCROLLCOLOR
992 934
993 if (XDEPTH <= 2) 935 if (XDEPTH <= 2)
994 { /* Monochrome */ 936 { /* Monochrome */
995 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 937 PixColors[Color_scroll] = PixColors[Color_fg];
996 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 938 PixColors[Color_topShadow] = PixColors[Color_bg];
997 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 939 PixColors[Color_bottomShadow] = PixColors[Color_bg];
998 } 940 }
999 else 941 else
1000 { 942 {
1001 rxvt_color xcol[3]; 943 rxvt_color xcol[3];
1002 /* xcol[0] == white 944 /* xcol[0] == white
1003 * xcol[1] == top shadow 945 * xcol[1] == top shadow
1004 * xcol[2] == bot shadow */ 946 * xcol[2] == bot shadow */
1005 947
1006 xcol[1] = R->PixColors[Color_scroll]; 948 xcol[1] = PixColors[Color_scroll];
1007# ifdef PREFER_24BIT 949# ifdef PREFER_24BIT
1008 xcol[0].set (R, 65535, 65535, 65535); 950 xcol[0].set (display, 65535, 65535, 65535);
1009 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 951 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1010# else 952# else
1011 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 953 xcol[0].set (display, WhitePixel (display->display, display->screen));
1012# endif 954# endif
1013 955
1014 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 956 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1015 957
1016 xcol[0].get (R, pr0, pg0, pb0); 958 xcol[0].get (display, pr0, pg0, pb0);
1017 xcol[1].get (R, pr1, pg1, pb1); 959 xcol[1].get (display, pr1, pg1, pb1);
1018 960
1019 /* bottomShadowColor */ 961 /* bottomShadowColor */
1020 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 962 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1021 xcol[2] = R->PixColors[Color_Black]; 963 xcol[2] = PixColors[Color_Black];
1022 964
1023 R->PixColors[Color_bottomShadow] = xcol[2]; 965 PixColors[Color_bottomShadow] = xcol[2];
1024 966
1025 /* topShadowColor */ 967 /* topShadowColor */
1026 if (!xcol[1].set (aR_ 968 if (!xcol[1].set (display,
1027 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 969 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1028 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 970 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1029 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 971 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1030 xcol[1] = R->PixColors[Color_White]; 972 xcol[1] = PixColors[Color_White];
1031 973
1032 R->PixColors[Color_topShadow] = xcol[1]; 974 PixColors[Color_topShadow] = xcol[1];
1033 } 975 }
1034#endif /* KEEP_SCROLLCOLOR */ 976#endif /* KEEP_SCROLLCOLOR */
1035} 977}
1036 978
1037/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
1038/* color aliases, fg/bg bright-bold */ 980/* color aliases, fg/bg bright-bold */
1039/* INTPROTO */
1040void 981void
1041rxvt_color_aliases(pR_ int idx) 982rxvt_term::color_aliases (int idx)
1042{ 983{
1043 if (R->rs[Rs_color + idx] && isdigit(*(R->rs[Rs_color + idx]))) 984 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1044 { 985 {
1045 int i = atoi(R->rs[Rs_color + idx]); 986 int i = atoi (rs[Rs_color + idx]);
1046 987
1047 if (i >= 8 && i <= 15) 988 if (i >= 8 && i <= 15)
1048 { /* bright colors */ 989 { /* bright colors */
1049 i -= 8; 990 i -= 8;
1050#ifndef NO_BRIGHTCOLOR 991#ifndef NO_BRIGHTCOLOR
1051
1052 R->rs[Rs_color + idx] = R->rs[Rs_color + minBrightCOLOR + i]; 992 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1053 return; 993 return;
1054#endif 994#endif
1055 995
1056 } 996 }
997
1057 if (i >= 0 && i <= 7) /* normal colors */ 998 if (i >= 0 && i <= 7) /* normal colors */
1058 R->rs[Rs_color + idx] = R->rs[Rs_color + minCOLOR + i]; 999 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1059 } 1000 }
1060} 1001}
1061 1002
1062/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
1063/* 1004/*
1064 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1005 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1065 * Use resource ``modifier'' to override the Meta modifier 1006 * Use resource ``modifier'' to override the Meta modifier
1066 */ 1007 */
1067/* INTPROTO */
1068void 1008void
1069rxvt_get_ourmods(pR) 1009rxvt_term::get_ourmods ()
1070{ 1010{
1071 int i, j, k; 1011 int i, j, k;
1072 int requestedmeta, realmeta, realalt; 1012 int requestedmeta, realmeta, realalt;
1073 const char *cm, *rsmod; 1013 const char *cm, *rsmod;
1074 XModifierKeymap *map; 1014 XModifierKeymap *map;
… …
1077 { 1017 {
1078 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1018 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1079 }; 1019 };
1080 1020
1081 requestedmeta = realmeta = realalt = 0; 1021 requestedmeta = realmeta = realalt = 0;
1082 rsmod = R->rs[Rs_modifier]; 1022 rsmod = rs[Rs_modifier];
1083 if (rsmod 1023 if (rsmod
1084 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1024 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1085 requestedmeta = rsmod[3] - '0'; 1025 requestedmeta = rsmod[3] - '0';
1086 1026
1087 map = XGetModifierMapping(R->Xdisplay); 1027 map = XGetModifierMapping (display->display);
1088 kc = map->modifiermap; 1028 kc = map->modifiermap;
1089 for (i = 1; i < 6; i++) 1029 for (i = 1; i < 6; i++)
1090 { 1030 {
1091 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1031 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1092 for (j = map->max_keypermod; j--; k++) 1032 for (j = map->max_keypermod; j--; k++)
1093 { 1033 {
1094 if (kc[k] == 0) 1034 if (kc[k] == 0)
1095 break; 1035 break;
1096 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1036 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1097 { 1037 {
1098 case XK_Num_Lock: 1038 case XK_Num_Lock:
1099 R->ModNumLockMask = modmasks[i - 1]; 1039 ModNumLockMask = modmasks[i - 1];
1100 /* FALLTHROUGH */ 1040 /* FALLTHROUGH */
1101 default: 1041 default:
1102 continue; /* for(;;) */ 1042 continue; /* for (;;) */
1103 case XK_Meta_L: 1043 case XK_Meta_L:
1104 case XK_Meta_R: 1044 case XK_Meta_R:
1105 cm = "meta"; 1045 cm = "meta";
1106 realmeta = i; 1046 realmeta = i;
1107 break; 1047 break;
1108 case XK_Alt_L: 1048 case XK_Alt_L:
1109 case XK_Alt_R: 1049 case XK_Alt_R:
1110 cm = "alt"; 1050 cm = "alt";
1111 realalt = i; 1051 realalt = i;
1112 break; 1052 break;
1113 case XK_Super_L: 1053 case XK_Super_L:
1114 case XK_Super_R: 1054 case XK_Super_R:
1115 cm = "super"; 1055 cm = "super";
1116 break; 1056 break;
1117 case XK_Hyper_L: 1057 case XK_Hyper_L:
1118 case XK_Hyper_R: 1058 case XK_Hyper_R:
1119 cm = "hyper"; 1059 cm = "hyper";
1120 break; 1060 break;
1121 } 1061 }
1122 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1062 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1123 requestedmeta = i; 1063 requestedmeta = i;
1124 } 1064 }
1125 } 1065 }
1126 XFreeModifiermap(map); 1066 XFreeModifiermap (map);
1127 i = (requestedmeta ? requestedmeta 1067 i = (requestedmeta ? requestedmeta
1128 : (realmeta ? realmeta 1068 : (realmeta ? realmeta
1129 : (realalt ? realalt : 0))); 1069 : (realalt ? realalt : 0)));
1130 if (i) 1070 if (i)
1131 R->ModMetaMask = modmasks[i - 1]; 1071 ModMetaMask = modmasks[i - 1];
1132} 1072}
1133 1073
1134/*----------------------------------------------------------------------*/ 1074/*----------------------------------------------------------------------*/
1135/* rxvt_Create_Windows() - Open and map the window */ 1075/* rxvt_Create_Windows () - Open and map the window */
1136/* EXTPROTO */
1137void 1076void
1138rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1077rxvt_term::create_windows (int argc, const char *const *argv)
1139{ 1078{
1140 XClassHint classHint; 1079 XClassHint classHint;
1141 XWMHints wmHint; 1080 XWMHints wmHint;
1142 XGCValues gcvalue; 1081 XGCValues gcvalue;
1143 long vt_emask; 1082 long vt_emask;
1144 1083
1084 XWindowAttributes gattr;
1085
1086 if (Options & Opt_transparent)
1087 {
1088 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1089 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1090 }
1091
1092 /* grab colors before netscape does */
1093 Get_Colours ();
1094
1095 if (!change_font (rs[Rs_font]))
1096 {
1097 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098 destroy ();
1099 return;
1100 }
1101
1102 window_calc (0, 0);
1103 old_width = szHint.width;
1104 old_height = szHint.height;
1105
1106 /* parent window - reverse video so we can see placement errors
1107 * sub-window placement & size in rxvt_resize_subwindows ()
1108 */
1109
1145#ifdef PREFER_24BIT 1110#ifdef PREFER_24BIT
1146
1147 XSetWindowAttributes attributes; 1111 XSetWindowAttributes attributes;
1148 XWindowAttributes gattr;
1149 1112
1150 XCMAP = DefaultColormap(R->Xdisplay, Xscreen);
1151 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen);
1152
1153 if (R->Options & Opt_transparent)
1154 {
1155 XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen),
1156 &gattr);
1157 XDEPTH = gattr.depth;
1158 }
1159 else
1160 {
1161 XDEPTH = DefaultDepth(R->Xdisplay, Xscreen);
1162 /*
1163 * If depth is not 24, look for a 24bit visual.
1164 */
1165 if (XDEPTH != 24)
1166 {
1167 XVisualInfo vinfo;
1168
1169 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1170 {
1171 XDEPTH = 24;
1172 XVISUAL = vinfo.visual;
1173 XCMAP = XCreateColormap(R->Xdisplay,
1174 RootWindow(R->Xdisplay, Xscreen),
1175 XVISUAL, AllocNone);
1176 }
1177 }
1178 }
1179#endif
1180
1181 /* grab colors before netscape does */
1182 rxvt_Get_Colours(aR);
1183
1184 rxvt_change_font(aR_ 1, NULL);
1185 rxvt_window_calc(aR_ 0, 0);
1186 R->old_width = R->szHint.width;
1187 R->old_height = R->szHint.height;
1188
1189 /* parent window - reverse video so we can see placement errors
1190 * sub-window placement & size in rxvt_resize_subwindows()
1191 */
1192
1193#ifdef PREFER_24BIT
1194
1195 attributes.background_pixel = R->PixColors[Color_fg]; 1113 attributes.background_pixel = PixColors[Color_fg];
1196 attributes.border_pixel = R->PixColors[Color_border]; 1114 attributes.border_pixel = PixColors[Color_border];
1197 attributes.colormap = XCMAP; 1115 attributes.colormap = display->cmap;
1198 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1116 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1199 R->szHint.x, R->szHint.y, 1117 szHint.x, szHint.y,
1200 R->szHint.width, R->szHint.height, 1118 szHint.width, szHint.height,
1201 R->TermWin.ext_bwidth, 1119 TermWin.ext_bwidth,
1202 XDEPTH, InputOutput, 1120 display->depth, InputOutput,
1203 XVISUAL, 1121 display->visual,
1204 CWBackPixel | CWBorderPixel
1205 | CWColormap, &attributes); 1122 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1206#else 1123#else
1207 1124 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1208 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot,
1209 R->szHint.x, R->szHint.y, 1125 szHint.x, szHint.y,
1210 R->szHint.width, 1126 szHint.width,
1211 R->szHint.height, 1127 szHint.height,
1212 R->TermWin.ext_bwidth, 1128 TermWin.ext_bwidth,
1213 R->PixColors[Color_border], 1129 PixColors[Color_border],
1214 R->PixColors[Color_fg]); 1130 PixColors[Color_fg]);
1215#endif 1131#endif
1216 1132
1217 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1133 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1218 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1134 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1219 1135
1220 classHint.res_name = (char *)R->rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
1221 classHint.res_class = (char *)APL_CLASS; 1137 classHint.res_class = (char *)RESCLASS;
1222 1138
1223 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1139 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1224 wmHint.input = True; 1140 wmHint.input = True;
1225 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1141 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1226 : NormalState); 1142 : NormalState);
1227 wmHint.window_group = R->TermWin.parent[0]; 1143 wmHint.window_group = TermWin.parent[0];
1228 1144
1229 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1145 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1230 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1146 (char **)argv, argc, &szHint, &wmHint, &classHint);
1147
1231 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1148 XSelectInput (display->display, TermWin.parent[0],
1232 (KeyPressMask 1149 KeyPressMask
1233#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1150#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1234 | KeyReleaseMask 1151 | KeyReleaseMask
1235#endif 1152#endif
1236 | FocusChangeMask | VisibilityChangeMask 1153 | FocusChangeMask | VisibilityChangeMask
1237 | StructureNotifyMask)); 1154 | StructureNotifyMask);
1155 termwin_ev.start (display, TermWin.parent[0]);
1238 1156
1239 /* vt cursor: Black-on-White is standard, but this is more popular */ 1157 /* vt cursor: Black-on-White is standard, but this is more popular */
1240 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1158 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1241 1159
1242#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1160#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1243 /* cursor (menuBar/scrollBar): Black-on-White */ 1161 /* cursor (menuBar/scrollBar): Black-on-White */
1244 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1162 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1245#endif 1163#endif
1246 1164
1247#ifdef POINTER_BLANK 1165#ifdef POINTER_BLANK
1248
1249 { 1166 {
1250 XColor blackcolour; 1167 XColor blackcolour;
1251 blackcolour.red = 0; 1168 blackcolour.red = 0;
1252 blackcolour.green = 0; 1169 blackcolour.green = 0;
1253 blackcolour.blue = 0; 1170 blackcolour.blue = 0;
1254 Font f = XLoadFont (R->Xdisplay, "fixed"); 1171 Font f = XLoadFont (display->display, "fixed");
1255 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1172 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1256 &blackcolour, &blackcolour); 1173 &blackcolour, &blackcolour);
1257 XUnloadFont (R->Xdisplay, f); 1174 XUnloadFont (display->display, f);
1258 } 1175 }
1259#endif 1176#endif
1260 1177
1261 /* the vt window */ 1178 /* the vt window */
1262 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1179 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1263 R->window_vt_x, R->window_vt_y, 1180 window_vt_x, window_vt_y,
1264 TermWin_TotalWidth(), 1181 TermWin_TotalWidth (),
1265 TermWin_TotalHeight(), 1182 TermWin_TotalHeight (),
1266 0, 1183 0,
1267 R->PixColors[Color_fg], 1184 PixColors[Color_fg],
1268 R->PixColors[Color_bg]); 1185 PixColors[Color_bg]);
1186
1269#ifdef DEBUG_X 1187#ifdef DEBUG_X
1270
1271 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1188 XStoreName (display->display, TermWin.vt, "vt window");
1272#endif 1189#endif
1273
1274 R->pointer_unblank ();
1275 1190
1276 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1191 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1277 | PropertyChangeMask); 1192 | PropertyChangeMask);
1193
1278#ifdef POINTER_BLANK 1194#ifdef POINTER_BLANK
1195 pointer_unblank ();
1279 1196
1280 if ((R->Options & Opt_pointerBlank)) 1197 if ((Options & Opt_pointerBlank))
1281 vt_emask |= PointerMotionMask; 1198 vt_emask |= PointerMotionMask;
1282 else 1199 else
1283#endif 1200#endif
1284
1285 vt_emask |= (Button1MotionMask | Button3MotionMask); 1201 vt_emask |= (Button1MotionMask | Button3MotionMask);
1202
1286 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1203 XSelectInput (display->display, TermWin.vt, vt_emask);
1204 vt_ev.start (display, TermWin.vt);
1287 1205
1288#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1206#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1289
1290 if (menuBar_height()) 1207 if (menuBar_height ())
1291 { 1208 {
1292 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1209 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1293 R->window_vt_x, 0, 1210 window_vt_x, 0,
1294 TermWin_TotalWidth(), 1211 TermWin_TotalWidth (),
1295 menuBar_TotalHeight(), 1212 menuBar_TotalHeight (),
1296 0, 1213 0,
1297 R->PixColors[Color_fg], 1214 PixColors[Color_fg],
1298 R->PixColors[Color_scroll]); 1215 PixColors[Color_scroll]);
1216
1299#ifdef DEBUG_X 1217#ifdef DEBUG_X
1300
1301 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1218 XStoreName (display->display, menuBar.win, "menubar");
1302#endif 1219#endif
1303 1220
1304 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1221 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1222
1223 XDefineCursor (display->display, menuBar.win,
1224 XCreateFontCursor (display->display, XC_left_ptr));
1225
1305 XSelectInput(R->Xdisplay, R->menuBar.win, 1226 XSelectInput (display->display, menuBar.win,
1306 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1227 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1307 | Button1MotionMask)); 1228 | Button1MotionMask));
1229 menubar_ev.start (display, menuBar.win);
1308 } 1230 }
1309#endif 1231#endif
1232
1310#ifdef XPM_BACKGROUND 1233#ifdef XPM_BACKGROUND
1311 if (R->rs[Rs_backgroundPixmap] != NULL 1234 if (rs[Rs_backgroundPixmap] != NULL
1312 && !(R->Options & Opt_transparent)) 1235 && ! (Options & Opt_transparent))
1313 { 1236 {
1314 const char *p = R->rs[Rs_backgroundPixmap]; 1237 const char *p = rs[Rs_backgroundPixmap];
1315 1238
1316 if ((p = STRCHR(p, ';')) != NULL) 1239 if ((p = STRCHR (p, ';')) != NULL)
1317 { 1240 {
1318 p++; 1241 p++;
1319 rxvt_scale_pixmap(aR_ p); 1242 scale_pixmap (p);
1320 } 1243 }
1321 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1244 set_bgPixmap (rs[Rs_backgroundPixmap]);
1322 rxvt_scr_touch(aR_ True); 1245 scr_touch (True);
1323 } 1246 }
1324#endif 1247#endif
1325 1248
1326 /* graphics context for the vt window */ 1249 /* graphics context for the vt window */
1327 gcvalue.foreground = R->PixColors[Color_fg]; 1250 gcvalue.foreground = PixColors[Color_fg];
1328 gcvalue.background = R->PixColors[Color_bg]; 1251 gcvalue.background = PixColors[Color_bg];
1329 gcvalue.graphics_exposures = 1; 1252 gcvalue.graphics_exposures = 1;
1330 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1253 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1331 GCForeground | GCBackground 1254 GCForeground | GCBackground
1332 | GCGraphicsExposures, &gcvalue); 1255 | GCGraphicsExposures, &gcvalue);
1256
1257 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1333 1258
1334#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1259#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1335
1336 gcvalue.foreground = R->PixColors[Color_topShadow]; 1260 gcvalue.foreground = PixColors[Color_topShadow];
1337 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1261 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1338 GCForeground, &gcvalue);
1339 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1262 gcvalue.foreground = PixColors[Color_bottomShadow];
1340 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1263 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1341 GCForeground, &gcvalue);
1342 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1264 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1343 : Color_scroll)]; 1265 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1344 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt,
1345 GCForeground, &gcvalue);
1346#endif 1266#endif
1347} 1267}
1348 1268
1349/*----------------------------------------------------------------------*/ 1269/*----------------------------------------------------------------------*/
1350/* 1270/*
1351 * Run the command in a subprocess and return a file descriptor for the 1271 * Run the command in a subprocess and return a file descriptor for the
1352 * master end of the pseudo-teletype pair with the command talking to 1272 * master end of the pseudo-teletype pair with the command talking to
1353 * the slave. 1273 * the slave.
1354 */ 1274 */
1355/* INTPROTO */
1356int 1275int
1357rxvt_run_command(pR_ const char *const *argv) 1276rxvt_term::run_command (const char *const *argv)
1358{ 1277{
1359 int cfd, er; 1278 int cfd, er;
1360 1279
1361 /* get master (pty) */ 1280 /* get master (pty) */
1362 if ((cfd = rxvt_get_pty (&(R->tty_fd), &(R->ttydev))) < 0) 1281 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1363 { 1282 {
1364 rxvt_print_error("can't open pseudo-tty"); 1283 rxvt_print_error ("can't open pseudo-tty");
1365 return -1; 1284 return -1;
1366 } 1285 }
1367 1286
1368#ifdef FD_SETSIZE
1369 if (R->Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1370 {
1371 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1372 rxvt_clean_exit();
1373 exit(EXIT_FAILURE);
1374 }
1375#endif
1376
1377 fcntl (cfd, F_SETFL, O_NONBLOCK); 1287 fcntl (cfd, F_SETFL, O_NONBLOCK);
1378 1288
1379 /* get slave (tty) */ 1289 /* get slave (tty) */
1380 if (R->tty_fd < 0) 1290 if (tty_fd < 0)
1381 { 1291 {
1382#ifndef NO_SETOWNER_TTYDEV 1292#ifndef NO_SETOWNER_TTYDEV
1383 rxvt_privileged_ttydev (aR_ SAVE); 1293 privileged_ttydev (SAVE);
1384#endif 1294#endif
1385 1295
1386 if ((R->tty_fd = rxvt_get_tty (R->ttydev)) < 0) 1296 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1387 { 1297 {
1388 close(cfd); 1298 close (cfd);
1389 rxvt_print_error("can't open slave tty %s", R->ttydev); 1299 rxvt_print_error ("can't open slave tty %s", ttydev);
1390 return -1; 1300 return -1;
1391 } 1301 }
1392 } 1302 }
1393#ifndef NO_BACKSPACE_KEY 1303#ifndef NO_BACKSPACE_KEY
1394 if (R->key_backspace[0] && !R->key_backspace[1]) 1304 if (key_backspace[0] && !key_backspace[1])
1395 er = R->key_backspace[0]; 1305 er = key_backspace[0];
1396 else if (STRCMP(R->key_backspace, "DEC") == 0) 1306 else if (STRCMP (key_backspace, "DEC") == 0)
1397 er = '\177'; /* the initial state anyway */ 1307 er = '\177'; /* the initial state anyway */
1398 else 1308 else
1399#endif 1309#endif
1400 1310
1401 er = -1; 1311 er = -1;
1402 1312
1403 rxvt_get_ttymode (&(R->tio), er); 1313 rxvt_get_ttymode (& (tio), er);
1404 1314
1405#ifndef __QNX__ 1315#ifndef __QNX__
1406 /* spin off the command interpreter */ 1316 /* spin off the command interpreter */
1407 switch (R->cmd_pid = fork ()) 1317 switch (cmd_pid = fork ())
1408 { 1318 {
1409 case -1: 1319 case -1:
1410 rxvt_print_error("can't fork"); 1320 rxvt_print_error ("can't fork");
1411 return -1; 1321 return -1;
1412 case 0: 1322 case 0:
1413 close (cfd); /* only keep R->tty_fd and STDERR open */ 1323 close (cfd); /* only keep tty_fd and STDERR open */
1414 close (R->Xfd); 1324
1325 init_env ();
1326
1415 if (rxvt_control_tty (R->tty_fd, R->ttydev) < 0) 1327 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1416 rxvt_print_error ("could not obtain control of tty"); 1328 rxvt_print_error ("could not obtain control of tty");
1417 else 1329 else
1330 {
1331 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1332 dup2 (tty_fd, STDIN_FILENO);
1333 dup2 (tty_fd, STDOUT_FILENO);
1334 dup2 (tty_fd, STDERR_FILENO);
1335
1336 if (tty_fd > 2)
1337 close (tty_fd);
1338
1339 run_child (argv);
1340 }
1341 exit (EXIT_FAILURE);
1342 /* NOTREACHED */
1343 default:
1418 { 1344 {
1419 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1345#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1346 int fdstdin;
1347
1348 fdstdin = dup (STDIN_FILENO);
1420 dup2 (R->tty_fd, STDIN_FILENO); 1349 dup2 (tty_fd, STDIN_FILENO);
1350#endif
1351
1352#ifdef UTMP_SUPPORT
1353 privileged_utmp (SAVE);
1354#endif
1355
1356#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1357
1421 dup2 (R->tty_fd, STDOUT_FILENO); 1358 dup2 (fdstdin, STDIN_FILENO);
1422 dup2 (R->tty_fd, STDERR_FILENO);
1423
1424 if (R->tty_fd > 2)
1425 close (R->tty_fd); 1359 close (fdstdin);
1360#endif
1426 1361
1427 rxvt_run_child (aR_ argv);
1428 } 1362 }
1429 exit (EXIT_FAILURE);
1430 /* NOTREACHED */
1431 default:
1432 {
1433#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1434 int fdstdin;
1435
1436 fdstdin = dup (STDIN_FILENO);
1437 dup2 (R->tty_fd, STDIN_FILENO);
1438#endif
1439
1440 rxvt_privileged_utmp (aR_ SAVE);
1441#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1442
1443 dup2 (fdstdin, STDIN_FILENO);
1444 close (fdstdin);
1445#endif
1446
1447 }
1448 close (R->tty_fd); /* keep STDERR_FILENO, R->cmd_fd, R->Xfd open */ 1363 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1449 break; 1364 break;
1450 } 1365 }
1451#else /* __QNX__ uses qnxspawn() */ 1366#else /* __QNX__ uses qnxspawn () */
1452 fchmod (R->tty_fd, 0622); 1367 fchmod (tty_fd, 0622);
1453 fcntl (R->tty_fd, F_SETFD, FD_CLOEXEC); 1368 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1454 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1369 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1455 1370
1456 if (rxvt_run_child (aR_ argv) == -1) 1371 if (run_child (argv) == -1)
1457 exit (EXIT_FAILURE); 1372 exit (EXIT_FAILURE);
1458#endif 1373#endif
1459 1374
1460 return cfd; 1375 return cfd;
1461} 1376}
… …
1465 * ------------------------------------------------------------------------- */ 1380 * ------------------------------------------------------------------------- */
1466/* 1381/*
1467 * The only open file descriptor is the slave tty - so no error messages. 1382 * The only open file descriptor is the slave tty - so no error messages.
1468 * returns are fatal 1383 * returns are fatal
1469 */ 1384 */
1470/* INTPROTO */
1471int 1385int
1472rxvt_run_child(pR_ const char *const *argv) 1386rxvt_term::run_child (const char *const *argv)
1473{ 1387{
1474 char *login; 1388 char *login;
1475 1389
1476 SET_TTYMODE (STDIN_FILENO, &(R->tio)); /* init terminal attributes */ 1390 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1477 1391
1478 if (R->Options & Opt_console) 1392 if (Options & Opt_console)
1479 { /* be virtual console, fail silently */ 1393 { /* be virtual console, fail silently */
1480#ifdef TIOCCONS 1394#ifdef TIOCCONS
1481 unsigned int on = 1; 1395 unsigned int on = 1;
1482 1396
1483 ioctl (STDIN_FILENO, TIOCCONS, &on); 1397 ioctl (STDIN_FILENO, TIOCCONS, &on);
1484#elif defined (SRIOCSREDIR) 1398#elif defined (SRIOCSREDIR)
1485
1486 int fd; 1399 int fd;
1487 1400
1488 fd = open (CONSOLE, O_WRONLY, 0); 1401 fd = open (CONSOLE, O_WRONLY, 0);
1489 if (fd >= 0) 1402 if (fd >= 0)
1490 { 1403 {
… …
1502 /* 1415 /*
1503 * mimick login's behavior by disabling the job control signals 1416 * mimick login's behavior by disabling the job control signals
1504 * a shell that wants them can turn them back on 1417 * a shell that wants them can turn them back on
1505 */ 1418 */
1506#ifdef SIGTSTP 1419#ifdef SIGTSTP
1507
1508 signal (SIGTSTP, SIG_IGN); 1420 signal (SIGTSTP, SIG_IGN);
1509 signal (SIGTTIN, SIG_IGN); 1421 signal (SIGTTIN, SIG_IGN);
1510 signal (SIGTTOU, SIG_IGN); 1422 signal (SIGTTOU, SIG_IGN);
1511#endif /* SIGTSTP */ 1423#endif /* SIGTSTP */
1512 1424
1513 /* set window size */ 1425 /* set window size */
1514 struct winsize ws; 1426 struct winsize ws;
1515 1427
1516 ws.ws_col = R->TermWin.ncol; 1428 ws.ws_col = TermWin.ncol;
1517 ws.ws_row = R->TermWin.nrow; 1429 ws.ws_row = TermWin.nrow;
1518 ws.ws_xpixel = ws.ws_ypixel = 0; 1430 ws.ws_xpixel = ws.ws_ypixel = 0;
1519 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); 1431 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1520 1432
1521 // unblock signals (signals are blocked by iom.C 1433 // unblock signals (signals are blocked by iom.C
1522 sigset_t ss; 1434 sigset_t ss;
… …
1529 { 1441 {
1530# ifdef DEBUG_CMD 1442# ifdef DEBUG_CMD
1531 int i; 1443 int i;
1532 1444
1533 for (i = 0; argv[i]; i++) 1445 for (i = 0; argv[i]; i++)
1534 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1446 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1535# endif 1447# endif
1536 1448
1537 execvp(argv[0], (char *const *)argv); 1449 execvp (argv[0], (char *const *)argv);
1538 /* no error message: STDERR is closed! */ 1450 /* no error message: STDERR is closed! */
1539 } 1451 }
1540 else 1452 else
1541 { 1453 {
1542 const char *argv0, *shell; 1454 const char *argv0, *shell;
1543 1455
1544 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1545 shell = "/bin/sh"; 1457 shell = "/bin/sh";
1546 1458
1547 argv0 = (const char *)rxvt_r_basename(shell); 1459 argv0 = (const char *)rxvt_r_basename (shell);
1548 if (R->Options & Opt_loginShell) 1460 if (Options & Opt_loginShell)
1549 { 1461 {
1550 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1462 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1551 1463
1552 login[0] = '-'; 1464 login[0] = '-';
1553 STRCPY(&login[1], argv0); 1465 STRCPY (&login[1], argv0);
1554 argv0 = login; 1466 argv0 = login;
1555 } 1467 }
1556 execlp(shell, argv0, NULL); 1468 execlp (shell, argv0, NULL);
1557 /* no error message: STDERR is closed! */ 1469 /* no error message: STDERR is closed! */
1558 } 1470 }
1471
1559#else /* __QNX__ uses qnxspawn() */ 1472#else /* __QNX__ uses qnxspawn () */
1560 { 1473
1561 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1474 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1562 char *command = NULL, fullcommand[_MAX_PATH]; 1475 char *command = NULL, fullcommand[_MAX_PATH];
1563 char **arg_v, *arg_a[2] = { NULL, NULL }; 1476 char **arg_v, *arg_a[2] = { NULL, NULL };
1564 1477
1565 if (argv != NULL) 1478 if (argv != NULL)
1566 { 1479 {
1567 if (access(argv[0], X_OK) == -1) 1480 if (access (argv[0], X_OK) == -1)
1568 { 1481 {
1569 if (STRCHR(argv[0], '/') == NULL) 1482 if (STRCHR (argv[0], '/') == NULL)
1570 { 1483 {
1571 searchenv(argv[0], "PATH", fullcommand); 1484 searchenv (argv[0], "PATH", fullcommand);
1572 if (fullcommand[0] != '\0') 1485 if (fullcommand[0] != '\0')
1573 command = fullcommand; 1486 command = fullcommand;
1574 } 1487 }
1575 if (access(command, X_OK) == -1) 1488 if (access (command, X_OK) == -1)
1576 return -1; 1489 return -1;
1577 } 1490 }
1578 else 1491 else
1579 command = argv[0]; 1492 command = argv[0];
1580 arg_v = argv; 1493 arg_v = argv;
1581 } 1494 }
1582 else 1495 else
1583 { 1496 {
1584 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1497 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1585 command = "/bin/sh"; 1498 command = "/bin/sh";
1586 1499
1587 arg_a[0] = my_basename(command); 1500 arg_a[0] = my_basename (command);
1588 if (R->Options & Opt_loginShell) 1501 if (Options & Opt_loginShell)
1589 { 1502 {
1590 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1503 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1591 1504
1592 login[0] = '-'; 1505 login[0] = '-';
1593 STRCPY(&login[1], arg_a[0]); 1506 STRCPY (&login[1], arg_a[0]);
1594 arg_a[0] = login; 1507 arg_a[0] = login;
1595 } 1508 }
1596 arg_v = arg_a; 1509 arg_v = arg_a;
1597 } 1510 }
1598 iov_a[0] = iov_a[1] = iov_a[2] = R->tty_fd; 1511 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1599 R->cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1512 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1600 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1513 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1601 command, arg_v, environ, iov_a, 0); 1514 command, arg_v, environ, iov_a, 0);
1602 if (login) 1515 if (login)
1603 free(login); 1516 free (login);
1517
1604 close(R->tty_fd); 1518 close (tty_fd);
1605 return R->cmd_fd; 1519 return cmd_fd;
1606 } 1520
1607#endif 1521#endif
1608 return -1; 1522 return -1;
1609} 1523}
1610 1524
1611/* ------------------------------------------------------------------------- * 1525/* ------------------------------------------------------------------------- *
1612 * GET TTY CURRENT STATE * 1526 * GET TTY CURRENT STATE *
1613 * ------------------------------------------------------------------------- */ 1527 * ------------------------------------------------------------------------- */
1614/* rxvt_get_ttymode() */ 1528/* rxvt_get_ttymode () */
1615/* INTPROTO */ 1529/* EXTPROTO */
1616void 1530void
1617rxvt_get_ttymode(ttymode_t *tio, int erase) 1531rxvt_get_ttymode (ttymode_t *tio, int erase)
1618{ 1532{
1619#ifdef HAVE_TERMIOS_H 1533#ifdef HAVE_TERMIOS_H
1620 /* 1534 /*
1621 * standard System V termios interface 1535 * standard System V termios interface
1622 */ 1536 */
1623 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1537 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1624 { 1538 {
1625 /* return error - use system defaults */ 1539 /* return error - use system defaults */
1626 tio->c_cc[VINTR] = CINTR; 1540 tio->c_cc[VINTR] = CINTR;
1627 tio->c_cc[VQUIT] = CQUIT; 1541 tio->c_cc[VQUIT] = CQUIT;
1628 tio->c_cc[VERASE] = CERASE; 1542 tio->c_cc[VERASE] = CERASE;
… …
1702 /* 1616 /*
1703 * sgtty interface 1617 * sgtty interface
1704 */ 1618 */
1705 1619
1706 /* get parameters -- gtty */ 1620 /* get parameters -- gtty */
1707 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1621 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1708 { 1622 {
1709 tio->sg.sg_erase = CERASE; /* ^H */ 1623 tio->sg.sg_erase = CERASE; /* ^H */
1710 tio->sg.sg_kill = CKILL; /* ^U */ 1624 tio->sg.sg_kill = CKILL; /* ^U */
1711 } 1625 }
1712 if (erase != -1) 1626 if (erase != -1)
1713 tio->sg.sg_erase = (char)erase; 1627 tio->sg.sg_erase = (char)erase;
1714 1628
1715 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1629 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1716 1630
1717 /* get special characters */ 1631 /* get special characters */
1718 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1632 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1719 { 1633 {
1720 tio->tc.t_intrc = CINTR; /* ^C */ 1634 tio->tc.t_intrc = CINTR; /* ^C */
1721 tio->tc.t_quitc = CQUIT; /* ^\ */ 1635 tio->tc.t_quitc = CQUIT; /* ^\ */
1722 tio->tc.t_startc = CSTART; /* ^Q */ 1636 tio->tc.t_startc = CSTART; /* ^Q */
1723 tio->tc.t_stopc = CSTOP; /* ^S */ 1637 tio->tc.t_stopc = CSTOP; /* ^S */
1724 tio->tc.t_eofc = CEOF; /* ^D */ 1638 tio->tc.t_eofc = CEOF; /* ^D */
1725 tio->tc.t_brkc = -1; 1639 tio->tc.t_brkc = -1;
1726 } 1640 }
1727 /* get local special chars */ 1641 /* get local special chars */
1728 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1642 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1729 { 1643 {
1730 tio->lc.t_suspc = CSUSP; /* ^Z */ 1644 tio->lc.t_suspc = CSUSP; /* ^Z */
1731 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1645 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1732 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1646 tio->lc.t_rprntc = CRPRNT; /* ^R */
1733 tio->lc.t_flushc = CFLUSH; /* ^O */ 1647 tio->lc.t_flushc = CFLUSH; /* ^O */
1734 tio->lc.t_werasc = CWERASE; /* ^W */ 1648 tio->lc.t_werasc = CWERASE; /* ^W */
1735 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1649 tio->lc.t_lnextc = CLNEXT; /* ^V */
1736 } 1650 }
1737 /* get line discipline */ 1651 /* get line discipline */
1738 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1652 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1739# ifdef NTTYDISC 1653# ifdef NTTYDISC
1740 1654
1741 tio->line = NTTYDISC; 1655 tio->line = NTTYDISC;
1742# endif /* NTTYDISC */ 1656# endif /* NTTYDISC */
1743 1657
… …
1748 * Debugging 1662 * Debugging
1749 */ 1663 */
1750#ifdef DEBUG_TTYMODE 1664#ifdef DEBUG_TTYMODE
1751#ifdef HAVE_TERMIOS_H 1665#ifdef HAVE_TERMIOS_H
1752 /* c_iflag bits */ 1666 /* c_iflag bits */
1753 fprintf(stderr, "Input flags\n"); 1667 fprintf (stderr, "Input flags\n");
1754 1668
1755 /* cpp token stringize doesn't work on all machines <sigh> */ 1669 /* cpp token stringize doesn't work on all machines <sigh> */
1756# define FOO(flag,name) \ 1670# define FOO(flag,name) \
1757 if ((tio->c_iflag) & flag) \ 1671 if ((tio->c_iflag) & flag) \
1758 fprintf (stderr, "%s ", name) 1672 fprintf (stderr, "%s ", name)
1759 1673
1760 /* c_iflag bits */ 1674 /* c_iflag bits */
1761 FOO(IGNBRK, "IGNBRK"); 1675 FOO (IGNBRK, "IGNBRK");
1762 FOO(BRKINT, "BRKINT"); 1676 FOO (BRKINT, "BRKINT");
1763 FOO(IGNPAR, "IGNPAR"); 1677 FOO (IGNPAR, "IGNPAR");
1764 FOO(PARMRK, "PARMRK"); 1678 FOO (PARMRK, "PARMRK");
1765 FOO(INPCK, "INPCK"); 1679 FOO (INPCK, "INPCK");
1766 FOO(ISTRIP, "ISTRIP"); 1680 FOO (ISTRIP, "ISTRIP");
1767 FOO(INLCR, "INLCR"); 1681 FOO (INLCR, "INLCR");
1768 FOO(IGNCR, "IGNCR"); 1682 FOO (IGNCR, "IGNCR");
1769 FOO(ICRNL, "ICRNL"); 1683 FOO (ICRNL, "ICRNL");
1770 FOO(IXON, "IXON"); 1684 FOO (IXON, "IXON");
1771 FOO(IXOFF, "IXOFF"); 1685 FOO (IXOFF, "IXOFF");
1772# ifdef IUCLC 1686# ifdef IUCLC
1773 1687
1774 FOO(IUCLC, "IUCLC"); 1688 FOO (IUCLC, "IUCLC");
1775# endif 1689# endif
1776# ifdef IXANY 1690# ifdef IXANY
1777 1691
1778 FOO(IXANY, "IXANY"); 1692 FOO (IXANY, "IXANY");
1779# endif 1693# endif
1780# ifdef IMAXBEL 1694# ifdef IMAXBEL
1781 1695
1782 FOO(IMAXBEL, "IMAXBEL"); 1696 FOO (IMAXBEL, "IMAXBEL");
1783# endif 1697# endif
1784 1698
1785 fprintf(stderr, "\n"); 1699 fprintf (stderr, "\n");
1786 1700
1787# undef FOO 1701# undef FOO
1788# define FOO(entry, name) \ 1702# define FOO(entry, name) \
1789 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1703 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1790 1704
1791 FOO(VINTR, "VINTR"); 1705 FOO (VINTR, "VINTR");
1792 FOO(VQUIT, "VQUIT"); 1706 FOO (VQUIT, "VQUIT");
1793 FOO(VERASE, "VERASE"); 1707 FOO (VERASE, "VERASE");
1794 FOO(VKILL, "VKILL"); 1708 FOO (VKILL, "VKILL");
1795 FOO(VEOF, "VEOF"); 1709 FOO (VEOF, "VEOF");
1796 FOO(VEOL, "VEOL"); 1710 FOO (VEOL, "VEOL");
1797# ifdef VEOL2 1711# ifdef VEOL2
1798 1712
1799 FOO(VEOL2, "VEOL2"); 1713 FOO (VEOL2, "VEOL2");
1800# endif 1714# endif
1801# ifdef VSWTC 1715# ifdef VSWTC
1802 1716
1803 FOO(VSWTC, "VSWTC"); 1717 FOO (VSWTC, "VSWTC");
1804# endif 1718# endif
1805# ifdef VSWTCH 1719# ifdef VSWTCH
1806 1720
1807 FOO(VSWTCH, "VSWTCH"); 1721 FOO (VSWTCH, "VSWTCH");
1808# endif 1722# endif
1809 1723
1810 FOO(VSTART, "VSTART"); 1724 FOO (VSTART, "VSTART");
1811 FOO(VSTOP, "VSTOP"); 1725 FOO (VSTOP, "VSTOP");
1812 FOO(VSUSP, "VSUSP"); 1726 FOO (VSUSP, "VSUSP");
1813# ifdef VDSUSP 1727# ifdef VDSUSP
1814 1728
1815 FOO(VDSUSP, "VDSUSP"); 1729 FOO (VDSUSP, "VDSUSP");
1816# endif 1730# endif
1817# ifdef VREPRINT 1731# ifdef VREPRINT
1818 1732
1819 FOO(VREPRINT, "VREPRINT"); 1733 FOO (VREPRINT, "VREPRINT");
1820# endif 1734# endif
1821# ifdef VDISCRD 1735# ifdef VDISCRD
1822 1736
1823 FOO(VDISCRD, "VDISCRD"); 1737 FOO (VDISCRD, "VDISCRD");
1824# endif 1738# endif
1825# ifdef VWERSE 1739# ifdef VWERSE
1826 1740
1827 FOO(VWERSE, "VWERSE"); 1741 FOO (VWERSE, "VWERSE");
1828# endif 1742# endif
1829# ifdef VLNEXT 1743# ifdef VLNEXT
1830 1744
1831 FOO(VLNEXT, "VLNEXT"); 1745 FOO (VLNEXT, "VLNEXT");
1832# endif 1746# endif
1833 1747
1834 fprintf(stderr, "\n"); 1748 fprintf (stderr, "\n");
1835# undef FOO 1749# undef FOO
1836# endif /* HAVE_TERMIOS_H */ 1750# endif /* HAVE_TERMIOS_H */
1837#endif /* DEBUG_TTYMODE */ 1751#endif /* DEBUG_TTYMODE */
1838} 1752}
1839 1753

Diff Legend

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