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.12 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.27 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

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