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.26 by pcg, Fri Feb 13 12:16:21 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
782 */ 767 */
783 putenv(R->env_display); 768 putenv (env_display);
784 putenv(R->env_windowid); 769 putenv (env_windowid);
770
785#ifdef RXVT_TERMINFO 771#ifdef RXVT_TERMINFO
786
787 putenv("TERMINFO=" RXVT_TERMINFO); 772 putenv ("TERMINFO=" RXVT_TERMINFO);
788#endif 773#endif
789 774
790 if (XDEPTH <= 2) 775 if (display->depth <= 2)
791 putenv("COLORTERM=" COLORTERMENV "-mono"); 776 putenv ("COLORTERM=" COLORTERMENV "-mono");
792 else 777 else
793 putenv("COLORTERM=" COLORTERMENVFULL); 778 putenv ("COLORTERM=" COLORTERMENVFULL);
779
794 if (R->rs[Rs_term_name] != NULL) 780 if (rs[Rs_term_name] != NULL)
795 { 781 {
796 R->env_term = (char *)rxvt_malloc((STRLEN(R->rs[Rs_term_name]) + 6) * sizeof(char)); 782 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]); 783 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
798 putenv(R->env_term); 784 putenv (env_term);
799 } 785 }
800 else 786 else
801 putenv("TERM=" TERMENV); 787 putenv ("TERM=" TERMENV);
802 788
803#ifdef HAVE_UNSETENV 789#ifdef HAVE_UNSETENV
804 /* avoid passing old settings and confusing term size */ 790 /* avoid passing old settings and confusing term size */
805 unsetenv("LINES"); 791 unsetenv ("LINES");
806 unsetenv("COLUMNS"); 792 unsetenv ("COLUMNS");
807 unsetenv("TERMCAP"); /* terminfo should be okay */ 793 unsetenv ("TERMCAP"); /* terminfo should be okay */
808#endif /* HAVE_UNSETENV */ 794#endif /* HAVE_UNSETENV */
809} 795}
810 796
811/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
812/* 798/*
813 * This is more or less stolen straight from XFree86 xterm. 799 * This is more or less stolen straight from XFree86 xterm.
814 * This should support all European type languages. 800 * This should support all European type languages.
815 */ 801 */
816/* EXTPROTO */
817void 802void
803rxvt_term::set_locale (const char *locale)
804{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
808#endif
809#if HAVE_NL_LANGINFO
810 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
813 || !STRCASECMP (codeset, "UTF8");
814#else
815 enc_utf8 = 1;
816#endif
817}
818
819void
818rxvt_init_xlocale(pR) 820rxvt_term::init_xlocale ()
819{ 821{
820#ifdef USE_XIM 822#ifdef USE_XIM
821 if (R->locale == NULL) 823 if (!locale)
822 rxvt_print_error("Setting locale failed."); 824 rxvt_print_error ("Setting locale failed.");
823 else 825 else
824 { 826 {
825 Atom wmlocale; 827 Atom wmlocale;
826 828
827 wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); 829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
828 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, 830 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
829 XA_STRING, 8, PropModeReplace, 831 XA_STRING, 8, PropModeReplace,
830 (unsigned char *)R->locale, STRLEN(R->locale)); 832 (unsigned char *)locale, STRLEN (locale));
831 833
832 if (XSupportsLocale() != True) 834 if (!XSupportsLocale ())
833 { 835 {
834 rxvt_print_error("The locale is not supported by Xlib"); 836 rxvt_print_error ("The locale is not supported by Xlib");
835 return; 837 return;
836 } 838 }
837 839
838 rxvt_setTermFontSet(aR_ 0); 840 im_ev.start (display);
839 841
840 /* see if we can connect yet */ 842 /* see if we can connect already */
841 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); 843 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 } 844 }
848#endif 845#endif
849} 846}
850 847
851/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
852/* EXTPROTO */
853void 849void
854rxvt_init_command(pR_ const char *const *argv) 850rxvt_term::init_command (const char *const *argv)
855{ 851{
856 /* 852 /*
857 * Initialize the command connection. 853 * Initialize the command connection.
858 * This should be called after the X server connection is established. 854 * This should be called after the X server connection is established.
859 */ 855 */
860 int i; 856 int i;
861 857
862 for (i = 0; i < NUM_XA; i++) 858 for (i = 0; i < NUM_XA; i++)
863 R->xa[i] = XInternAtom(R->Xdisplay, xa_names[i], False); 859 xa[i] = XInternAtom (display->display, xa_names[i], False);
864 860
865 /* Enable delete window protocol */ 861 /* Enable delete window protocol */
866 XSetWMProtocols(R->Xdisplay, R->TermWin.parent[0], 862 XSetWMProtocols (display->display, TermWin.parent[0],
867 &(R->xa[XA_WMDELETEWINDOW]), 1); 863 & (xa[XA_WMDELETEWINDOW]), 1);
868 864
869#ifdef USING_W11LIB 865#ifdef USING_W11LIB
870 /* enable W11 callbacks */ 866 /* enable W11 callbacks */
871 W11AddEventHandler(R->Xdisplay, rxvt_W11_process_x_event); 867 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
872#endif 868#endif
873 869
874#ifdef META8_OPTION 870#ifdef META8_OPTION
875
876 R->meta_char = (R->Options & Opt_meta8 ? 0x80 : C0_ESC); 871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
877#endif 872#endif
878 873
879 rxvt_get_ourmods(aR); 874 get_ourmods ();
880 875
881 if (!(R->Options & Opt_scrollTtyOutput)) 876 if (! (Options & Opt_scrollTtyOutput))
882 R->PrivateModes |= PrivMode_TtyOutputInh; 877 PrivateModes |= PrivMode_TtyOutputInh;
883 if (R->Options & Opt_scrollTtyKeypress) 878 if (Options & Opt_scrollTtyKeypress)
884 R->PrivateModes |= PrivMode_Keypress; 879 PrivateModes |= PrivMode_Keypress;
885 if (!(R->Options & Opt_jumpScroll)) 880 if (! (Options & Opt_jumpScroll))
886 R->PrivateModes |= PrivMode_smoothScroll; 881 PrivateModes |= PrivMode_smoothScroll;
882
887#ifndef NO_BACKSPACE_KEY 883#ifndef NO_BACKSPACE_KEY
888
889 if (STRCMP(R->key_backspace, "DEC") == 0) 884 if (STRCMP (key_backspace, "DEC") == 0)
890 R->PrivateModes |= PrivMode_HaveBackSpace; 885 PrivateModes |= PrivMode_HaveBackSpace;
891#endif 886#endif
887
892 /* add value for scrollBar */ 888 /* add value for scrollBar */
893 if (scrollbar_visible(R)) 889 if (scrollbar_visible ())
894 { 890 {
895 R->PrivateModes |= PrivMode_scrollBar; 891 PrivateModes |= PrivMode_scrollBar;
896 R->SavedModes |= PrivMode_scrollBar; 892 SavedModes |= PrivMode_scrollBar;
897 } 893 }
898 if (menubar_visible(R)) 894 if (menubar_visible ())
899 { 895 {
900 R->PrivateModes |= PrivMode_menuBar; 896 PrivateModes |= PrivMode_menuBar;
901 R->SavedModes |= PrivMode_menuBar; 897 SavedModes |= PrivMode_menuBar;
902 } 898 }
899
903#ifdef GREEK_SUPPORT 900#ifdef GREEK_SUPPORT
904 greek_init(); 901 greek_init ();
905#endif 902#endif
906
907 R->Xfd = XConnectionNumber (R->Xdisplay);
908 903
909#ifdef CURSOR_BLINK 904#ifdef CURSOR_BLINK
910
911 if (R->Options & Opt_cursorBlink) 905 if (Options & Opt_cursorBlink)
912 (void)gettimeofday(&R->lastcursorchange, NULL); 906 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 907#endif
914 908
915 if ((R->cmd_fd = rxvt_run_command (aR_ argv)) < 0) 909 if ((cmd_fd = run_command (argv)) < 0)
916 { 910 {
917 rxvt_print_error ("aborting"); 911 rxvt_print_error ("aborting");
918 exit (EXIT_FAILURE); 912 exit (EXIT_FAILURE);
919 } 913 }
920} 914}
921 915
922/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
923/* INTPROTO */
924void 917void
925rxvt_Get_Colours(pR) 918rxvt_term::Get_Colours ()
926{ 919{
927 int i; 920 int i;
928 921
929 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 922 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
930 { 923 {
931 rxvt_color xcol; 924 rxvt_color xcol;
932 925
933 if (!R->rs[Rs_color + i]) 926 if (!rs[Rs_color + i])
934 continue; 927 continue;
935 928
936 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 929 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
937 { 930 {
938#ifndef XTERM_REVERSE_VIDEO 931#ifndef XTERM_REVERSE_VIDEO
939 if (i < 2 && (R->Options & Opt_reverseVideo)) 932 if (i < 2 && (Options & Opt_reverseVideo))
940 {
941 R->rs[Rs_color + i] = def_colorName[!i]; 933 rs[Rs_color + i] = def_colorName[!i];
942 }
943 else 934 else
944#endif 935#endif
945
946 R->rs[Rs_color + i] = def_colorName[i]; 936 rs[Rs_color + i] = def_colorName[i];
937
947 if (!R->rs[Rs_color + i]) 938 if (!rs[Rs_color + i])
948 continue; 939 continue;
940
949 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 941 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
950 { 942 {
951 switch (i) 943 switch (i)
952 { 944 {
953 case Color_fg: 945 case Color_fg:
954 case Color_bg: 946 case Color_bg:
955 /* fatal: need bg/fg color */ 947 /* fatal: need bg/fg color */
956 rxvt_print_error("aborting"); 948 rxvt_print_error ("aborting");
957 exit(EXIT_FAILURE); 949 exit (EXIT_FAILURE);
958 /* NOTREACHED */ 950 /* NOTREACHED */
959 break; 951 break;
960#ifndef NO_CURSORCOLOR 952#ifndef NO_CURSORCOLOR
961
962 case Color_cursor2: 953 case Color_cursor2:
963 xcol = R->PixColors[Color_fg]; 954 xcol = PixColors[Color_fg];
964 break; 955 break;
965#endif /* ! NO_CURSORCOLOR */ 956#endif /* ! NO_CURSORCOLOR */
966
967 case Color_pointer: 957 case Color_pointer:
968 xcol = R->PixColors[Color_fg]; 958 xcol = PixColors[Color_fg];
969 break; 959 break;
970 default: 960 default:
971 xcol = R->PixColors[Color_bg]; /* None */ 961 xcol = PixColors[Color_bg]; /* None */
972 break; 962 break;
973 } 963 }
974 } 964 }
975 } 965 }
966
976 R->PixColors[i] = xcol; 967 PixColors[i] = xcol;
977 SET_PIXCOLOR(R, i); 968 SET_PIXCOLOR (i);
978 } 969 }
979 970
980 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 971 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
981 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 972 PixColors[Color_pointer] = PixColors[Color_fg];
982 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 973 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
983 R->PixColors[Color_border] = R->PixColors[Color_fg]; 974 PixColors[Color_border] = PixColors[Color_fg];
984 975
985 /* 976 /*
986 * get scrollBar/menuBar shadow colors 977 * get scrollBar/menuBar shadow colors
987 * 978 *
988 * The calculations of topShadow/bottomShadow values are adapted 979 * The calculations of topShadow/bottomShadow values are adapted
… …
990 */ 981 */
991#ifdef KEEP_SCROLLCOLOR 982#ifdef KEEP_SCROLLCOLOR
992 983
993 if (XDEPTH <= 2) 984 if (XDEPTH <= 2)
994 { /* Monochrome */ 985 { /* Monochrome */
995 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 986 PixColors[Color_scroll] = PixColors[Color_fg];
996 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 987 PixColors[Color_topShadow] = PixColors[Color_bg];
997 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 988 PixColors[Color_bottomShadow] = PixColors[Color_bg];
998 } 989 }
999 else 990 else
1000 { 991 {
1001 rxvt_color xcol[3]; 992 rxvt_color xcol[3];
1002 /* xcol[0] == white 993 /* xcol[0] == white
1003 * xcol[1] == top shadow 994 * xcol[1] == top shadow
1004 * xcol[2] == bot shadow */ 995 * xcol[2] == bot shadow */
1005 996
1006 xcol[1] = R->PixColors[Color_scroll]; 997 xcol[1] = PixColors[Color_scroll];
1007# ifdef PREFER_24BIT 998# ifdef PREFER_24BIT
1008 999 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); */ 1000 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1011# else 1001# else
1012
1013 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1002 xcol[0].set (display, WhitePixel (display->display, display->screen));
1014# endif 1003# endif
1015 1004
1016 unsigned short R1, G1, B1, R0, G0, B0; 1005 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1017 1006
1018 xcol[0].get (r, R0, G0, B0); 1007 xcol[0].get (display, pr0, pg0, pb0);
1019 xcol[1].get (r, R1, G1, B1); 1008 xcol[1].get (display, pr1, pg1, pb1);
1020 1009
1021 /* bottomShadowColor */ 1010 /* bottomShadowColor */
1022 if (!xcol[2].set (aR_ R1 / 2, G1 / 2, B1 / 2)) 1011 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1023 xcol[2] = R->PixColors[Color_Black]; 1012 xcol[2] = PixColors[Color_Black];
1024 1013
1025 R->PixColors[Color_bottomShadow] = xcol[2]; 1014 PixColors[Color_bottomShadow] = xcol[2];
1026 1015
1027 /* topShadowColor */ 1016 /* topShadowColor */
1028 if (!xcol[1].set (aR_ 1017 if (!xcol[1].set (display,
1029 min (R0, max (R0 / 5, R1) * 7 / 5), 1018 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1030 min (G0, max (G0 / 5, G1) * 7 / 5), 1019 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1031 min (B0, max (B0 / 5, B1) * 7 / 5))) 1020 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1032 xcol[1] = R->PixColors[Color_White]; 1021 xcol[1] = PixColors[Color_White];
1033 1022
1034 R->PixColors[Color_topShadow] = xcol[1]; 1023 PixColors[Color_topShadow] = xcol[1];
1035 } 1024 }
1036#endif /* KEEP_SCROLLCOLOR */ 1025#endif /* KEEP_SCROLLCOLOR */
1037} 1026}
1038 1027
1039/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
1040/* color aliases, fg/bg bright-bold */ 1029/* color aliases, fg/bg bright-bold */
1041/* INTPROTO */
1042void 1030void
1043rxvt_color_aliases(pR_ int idx) 1031rxvt_term::color_aliases (int idx)
1044{ 1032{
1045 if (R->rs[Rs_color + idx] && isdigit(*(R->rs[Rs_color + idx]))) 1033 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1046 { 1034 {
1047 int i = atoi(R->rs[Rs_color + idx]); 1035 int i = atoi (rs[Rs_color + idx]);
1048 1036
1049 if (i >= 8 && i <= 15) 1037 if (i >= 8 && i <= 15)
1050 { /* bright colors */ 1038 { /* bright colors */
1051 i -= 8; 1039 i -= 8;
1052#ifndef NO_BRIGHTCOLOR 1040#ifndef NO_BRIGHTCOLOR
1053
1054 R->rs[Rs_color + idx] = R->rs[Rs_color + minBrightCOLOR + i]; 1041 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1055 return; 1042 return;
1056#endif 1043#endif
1057 1044
1058 } 1045 }
1046
1059 if (i >= 0 && i <= 7) /* normal colors */ 1047 if (i >= 0 && i <= 7) /* normal colors */
1060 R->rs[Rs_color + idx] = R->rs[Rs_color + minCOLOR + i]; 1048 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1061 } 1049 }
1062} 1050}
1063 1051
1064/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1065/* 1053/*
1066 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1054 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1067 * Use resource ``modifier'' to override the Meta modifier 1055 * Use resource ``modifier'' to override the Meta modifier
1068 */ 1056 */
1069/* INTPROTO */
1070void 1057void
1071rxvt_get_ourmods(pR) 1058rxvt_term::get_ourmods ()
1072{ 1059{
1073 int i, j, k; 1060 int i, j, k;
1074 int requestedmeta, realmeta, realalt; 1061 int requestedmeta, realmeta, realalt;
1075 const char *cm, *rsmod; 1062 const char *cm, *rsmod;
1076 XModifierKeymap *map; 1063 XModifierKeymap *map;
… …
1079 { 1066 {
1080 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1067 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1081 }; 1068 };
1082 1069
1083 requestedmeta = realmeta = realalt = 0; 1070 requestedmeta = realmeta = realalt = 0;
1084 rsmod = R->rs[Rs_modifier]; 1071 rsmod = rs[Rs_modifier];
1085 if (rsmod 1072 if (rsmod
1086 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1073 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1087 requestedmeta = rsmod[3] - '0'; 1074 requestedmeta = rsmod[3] - '0';
1088 1075
1089 map = XGetModifierMapping(R->Xdisplay); 1076 map = XGetModifierMapping (display->display);
1090 kc = map->modifiermap; 1077 kc = map->modifiermap;
1091 for (i = 1; i < 6; i++) 1078 for (i = 1; i < 6; i++)
1092 { 1079 {
1093 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1080 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1094 for (j = map->max_keypermod; j--; k++) 1081 for (j = map->max_keypermod; j--; k++)
1095 { 1082 {
1096 if (kc[k] == 0) 1083 if (kc[k] == 0)
1097 break; 1084 break;
1098 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1085 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1099 { 1086 {
1100 case XK_Num_Lock: 1087 case XK_Num_Lock:
1101 R->ModNumLockMask = modmasks[i - 1]; 1088 ModNumLockMask = modmasks[i - 1];
1102 /* FALLTHROUGH */ 1089 /* FALLTHROUGH */
1103 default: 1090 default:
1104 continue; /* for(;;) */ 1091 continue; /* for (;;) */
1105 case XK_Meta_L: 1092 case XK_Meta_L:
1106 case XK_Meta_R: 1093 case XK_Meta_R:
1107 cm = "meta"; 1094 cm = "meta";
1108 realmeta = i; 1095 realmeta = i;
1109 break; 1096 break;
1110 case XK_Alt_L: 1097 case XK_Alt_L:
1111 case XK_Alt_R: 1098 case XK_Alt_R:
1112 cm = "alt"; 1099 cm = "alt";
1113 realalt = i; 1100 realalt = i;
1114 break; 1101 break;
1115 case XK_Super_L: 1102 case XK_Super_L:
1116 case XK_Super_R: 1103 case XK_Super_R:
1117 cm = "super"; 1104 cm = "super";
1118 break; 1105 break;
1119 case XK_Hyper_L: 1106 case XK_Hyper_L:
1120 case XK_Hyper_R: 1107 case XK_Hyper_R:
1121 cm = "hyper"; 1108 cm = "hyper";
1122 break; 1109 break;
1123 } 1110 }
1124 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1111 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1125 requestedmeta = i; 1112 requestedmeta = i;
1126 } 1113 }
1127 } 1114 }
1128 XFreeModifiermap(map); 1115 XFreeModifiermap (map);
1129 i = (requestedmeta ? requestedmeta 1116 i = (requestedmeta ? requestedmeta
1130 : (realmeta ? realmeta 1117 : (realmeta ? realmeta
1131 : (realalt ? realalt : 0))); 1118 : (realalt ? realalt : 0)));
1132 if (i) 1119 if (i)
1133 R->ModMetaMask = modmasks[i - 1]; 1120 ModMetaMask = modmasks[i - 1];
1134} 1121}
1135 1122
1136/*----------------------------------------------------------------------*/ 1123/*----------------------------------------------------------------------*/
1137/* rxvt_Create_Windows() - Open and map the window */ 1124/* rxvt_Create_Windows () - Open and map the window */
1138/* EXTPROTO */
1139void 1125void
1140rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1126rxvt_term::create_windows (int argc, const char *const *argv)
1141{ 1127{
1142 XClassHint classHint; 1128 XClassHint classHint;
1143 XWMHints wmHint; 1129 XWMHints wmHint;
1144 XGCValues gcvalue; 1130 XGCValues gcvalue;
1145 long vt_emask; 1131 long vt_emask;
1146 1132
1133 XWindowAttributes gattr;
1134
1135 if (Options & Opt_transparent)
1136 {
1137 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1138 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1139 }
1140
1141 /* grab colors before netscape does */
1142 Get_Colours ();
1143
1144 change_font (1, NULL);
1145 window_calc (0, 0);
1146 old_width = szHint.width;
1147 old_height = szHint.height;
1148
1149 /* parent window - reverse video so we can see placement errors
1150 * sub-window placement & size in rxvt_resize_subwindows ()
1151 */
1152
1147#ifdef PREFER_24BIT 1153#ifdef PREFER_24BIT
1148
1149 XSetWindowAttributes attributes; 1154 XSetWindowAttributes attributes;
1150 XWindowAttributes gattr;
1151 1155
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]; 1156 attributes.background_pixel = PixColors[Color_fg];
1198 attributes.border_pixel = R->PixColors[Color_border]; 1157 attributes.border_pixel = PixColors[Color_border];
1199 attributes.colormap = XCMAP; 1158 attributes.colormap = display->cmap;
1200 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1159 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1201 R->szHint.x, R->szHint.y, 1160 szHint.x, szHint.y,
1202 R->szHint.width, R->szHint.height, 1161 szHint.width, szHint.height,
1203 R->TermWin.ext_bwidth, 1162 TermWin.ext_bwidth,
1204 XDEPTH, InputOutput, 1163 display->depth, InputOutput,
1205 XVISUAL, 1164 display->visual,
1206 CWBackPixel | CWBorderPixel
1207 | CWColormap, &attributes); 1165 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1208#else 1166#else
1209 1167 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, 1168 szHint.x, szHint.y,
1212 R->szHint.width, 1169 szHint.width,
1213 R->szHint.height, 1170 szHint.height,
1214 R->TermWin.ext_bwidth, 1171 TermWin.ext_bwidth,
1215 R->PixColors[Color_border], 1172 PixColors[Color_border],
1216 R->PixColors[Color_fg]); 1173 PixColors[Color_fg]);
1217#endif 1174#endif
1218 1175
1219 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1176 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1220 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1177 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1221 1178
1222 classHint.res_name = (char *)R->rs[Rs_name]; 1179 classHint.res_name = (char *)rs[Rs_name];
1223 classHint.res_class = (char *)APL_CLASS; 1180 classHint.res_class = (char *)APL_CLASS;
1224 1181
1225 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1182 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1226 wmHint.input = True; 1183 wmHint.input = True;
1227 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1184 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1228 : NormalState); 1185 : NormalState);
1229 wmHint.window_group = R->TermWin.parent[0]; 1186 wmHint.window_group = TermWin.parent[0];
1230 1187
1231 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1188 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1232 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1189 (char **)argv, argc, &szHint, &wmHint, &classHint);
1190
1233 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1191 XSelectInput (display->display, TermWin.parent[0],
1234 (KeyPressMask 1192 KeyPressMask
1235#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1193#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1236 | KeyReleaseMask 1194 | KeyReleaseMask
1237#endif 1195#endif
1238 | FocusChangeMask | VisibilityChangeMask 1196 | FocusChangeMask | VisibilityChangeMask
1239 | StructureNotifyMask)); 1197 | StructureNotifyMask);
1198 termwin_ev.start (display, TermWin.parent[0]);
1240 1199
1241 /* vt cursor: Black-on-White is standard, but this is more popular */ 1200 /* vt cursor: Black-on-White is standard, but this is more popular */
1242 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1201 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1243 1202
1244#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1203#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1245 /* cursor (menuBar/scrollBar): Black-on-White */ 1204 /* cursor (menuBar/scrollBar): Black-on-White */
1246 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1205 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1247#endif 1206#endif
1248 1207
1249#ifdef POINTER_BLANK 1208#ifdef POINTER_BLANK
1250
1251 { 1209 {
1252 XColor blackcolour; 1210 XColor blackcolour;
1253 blackcolour.red = 0; 1211 blackcolour.red = 0;
1254 blackcolour.green = 0; 1212 blackcolour.green = 0;
1255 blackcolour.blue = 0; 1213 blackcolour.blue = 0;
1256 Font f = XLoadFont (R->Xdisplay, "fixed"); 1214 Font f = XLoadFont (display->display, "fixed");
1257 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1215 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1258 &blackcolour, &blackcolour); 1216 &blackcolour, &blackcolour);
1259 XUnloadFont (R->Xdisplay, f); 1217 XUnloadFont (display->display, f);
1260 } 1218 }
1261#endif 1219#endif
1262 1220
1263 /* the vt window */ 1221 /* the vt window */
1264 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1222 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1265 R->window_vt_x, R->window_vt_y, 1223 window_vt_x, window_vt_y,
1266 TermWin_TotalWidth(), 1224 TermWin_TotalWidth (),
1267 TermWin_TotalHeight(), 1225 TermWin_TotalHeight (),
1268 0, 1226 0,
1269 R->PixColors[Color_fg], 1227 PixColors[Color_fg],
1270 R->PixColors[Color_bg]); 1228 PixColors[Color_bg]);
1229
1271#ifdef DEBUG_X 1230#ifdef DEBUG_X
1272
1273 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1231 XStoreName (display->display, TermWin.vt, "vt window");
1274#endif 1232#endif
1275
1276 R->pointer_unblank ();
1277 1233
1278 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1234 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1279 | PropertyChangeMask); 1235 | PropertyChangeMask);
1236
1280#ifdef POINTER_BLANK 1237#ifdef POINTER_BLANK
1238 pointer_unblank ();
1281 1239
1282 if ((R->Options & Opt_pointerBlank)) 1240 if ((Options & Opt_pointerBlank))
1283 vt_emask |= PointerMotionMask; 1241 vt_emask |= PointerMotionMask;
1284 else 1242 else
1285#endif 1243#endif
1286
1287 vt_emask |= (Button1MotionMask | Button3MotionMask); 1244 vt_emask |= (Button1MotionMask | Button3MotionMask);
1245
1288 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1246 XSelectInput (display->display, TermWin.vt, vt_emask);
1247 vt_ev.start (display, TermWin.vt);
1289 1248
1290#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1291
1292 if (menuBar_height()) 1250 if (menuBar_height ())
1293 { 1251 {
1294 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1252 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1295 R->window_vt_x, 0, 1253 window_vt_x, 0,
1296 TermWin_TotalWidth(), 1254 TermWin_TotalWidth (),
1297 menuBar_TotalHeight(), 1255 menuBar_TotalHeight (),
1298 0, 1256 0,
1299 R->PixColors[Color_fg], 1257 PixColors[Color_fg],
1300 R->PixColors[Color_scroll]); 1258 PixColors[Color_scroll]);
1301#ifdef DEBUG_X 1259#ifdef DEBUG_X
1302
1303 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1260 XStoreName (display->display, menuBar.win, "menubar");
1304#endif 1261#endif
1305 1262
1306 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1263 XDefineCursor (display->display, menuBar.win, pointer_leftptr);
1264
1307 XSelectInput(R->Xdisplay, R->menuBar.win, 1265 XSelectInput (display->display, menuBar.win,
1308 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1266 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1309 | Button1MotionMask)); 1267 | Button1MotionMask));
1268 menubar_ev.start (display, menuBar.win);
1310 } 1269 }
1311#endif 1270#endif
1271
1312#ifdef XPM_BACKGROUND 1272#ifdef XPM_BACKGROUND
1313 if (R->rs[Rs_backgroundPixmap] != NULL 1273 if (rs[Rs_backgroundPixmap] != NULL
1314 && !(R->Options & Opt_transparent)) 1274 && ! (Options & Opt_transparent))
1315 { 1275 {
1316 const char *p = R->rs[Rs_backgroundPixmap]; 1276 const char *p = rs[Rs_backgroundPixmap];
1317 1277
1318 if ((p = STRCHR(p, ';')) != NULL) 1278 if ((p = STRCHR (p, ';')) != NULL)
1319 { 1279 {
1320 p++; 1280 p++;
1321 rxvt_scale_pixmap(aR_ p); 1281 scale_pixmap (p);
1322 } 1282 }
1323 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1283 set_bgPixmap (rs[Rs_backgroundPixmap]);
1324 rxvt_scr_touch(aR_ True); 1284 scr_touch (True);
1325 } 1285 }
1326#endif 1286#endif
1327 1287
1328 /* graphics context for the vt window */ 1288 /* graphics context for the vt window */
1329 gcvalue.foreground = R->PixColors[Color_fg]; 1289 gcvalue.foreground = PixColors[Color_fg];
1330 gcvalue.background = R->PixColors[Color_bg]; 1290 gcvalue.background = PixColors[Color_bg];
1331 gcvalue.graphics_exposures = 1; 1291 gcvalue.graphics_exposures = 1;
1332 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1292 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1333 GCForeground | GCBackground 1293 GCForeground | GCBackground
1334 | GCGraphicsExposures, &gcvalue); 1294 | GCGraphicsExposures, &gcvalue);
1335 1295
1336#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1296#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1337
1338 gcvalue.foreground = R->PixColors[Color_topShadow]; 1297 gcvalue.foreground = PixColors[Color_topShadow];
1339 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1298 topShadowGC = XCreateGC (display->display, TermWin.vt,
1340 GCForeground, &gcvalue); 1299 GCForeground, &gcvalue);
1341 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1300 gcvalue.foreground = PixColors[Color_bottomShadow];
1342 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1301 botShadowGC = XCreateGC (display->display, TermWin.vt,
1343 GCForeground, &gcvalue); 1302 GCForeground, &gcvalue);
1344 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1303 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1345 : Color_scroll)]; 1304 : Color_scroll)];
1346 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1305 scrollbarGC = XCreateGC (display->display, TermWin.vt,
1347 GCForeground, &gcvalue); 1306 GCForeground, &gcvalue);
1348#endif 1307#endif
1349} 1308}
1350 1309
1351/*----------------------------------------------------------------------*/ 1310/*----------------------------------------------------------------------*/
1352/* 1311/*
1353 * Run the command in a subprocess and return a file descriptor for the 1312 * 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 1313 * master end of the pseudo-teletype pair with the command talking to
1355 * the slave. 1314 * the slave.
1356 */ 1315 */
1357/* INTPROTO */
1358int 1316int
1359rxvt_run_command(pR_ const char *const *argv) 1317rxvt_term::run_command (const char *const *argv)
1360{ 1318{
1361 int cfd, er; 1319 int cfd, er;
1362 1320
1363 /* get master (pty) */ 1321 /* get master (pty) */
1364 if ((cfd = rxvt_get_pty (&(R->tty_fd), &(R->ttydev))) < 0) 1322 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1365 { 1323 {
1366 rxvt_print_error("can't open pseudo-tty"); 1324 rxvt_print_error ("can't open pseudo-tty");
1367 return -1; 1325 return -1;
1368 } 1326 }
1369 1327
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); 1328 fcntl (cfd, F_SETFL, O_NONBLOCK);
1380 1329
1381 /* get slave (tty) */ 1330 /* get slave (tty) */
1382 if (R->tty_fd < 0) 1331 if (tty_fd < 0)
1383 { 1332 {
1384#ifndef NO_SETOWNER_TTYDEV 1333#ifndef NO_SETOWNER_TTYDEV
1385 rxvt_privileged_ttydev (aR_ SAVE); 1334 privileged_ttydev (SAVE);
1386#endif 1335#endif
1387 1336
1388 if ((R->tty_fd = rxvt_get_tty (R->ttydev)) < 0) 1337 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1389 { 1338 {
1390 close(cfd); 1339 close (cfd);
1391 rxvt_print_error("can't open slave tty %s", R->ttydev); 1340 rxvt_print_error ("can't open slave tty %s", ttydev);
1392 return -1; 1341 return -1;
1393 } 1342 }
1394 } 1343 }
1395#ifndef NO_BACKSPACE_KEY 1344#ifndef NO_BACKSPACE_KEY
1396 if (R->key_backspace[0] && !R->key_backspace[1]) 1345 if (key_backspace[0] && !key_backspace[1])
1397 er = R->key_backspace[0]; 1346 er = key_backspace[0];
1398 else if (STRCMP(R->key_backspace, "DEC") == 0) 1347 else if (STRCMP (key_backspace, "DEC") == 0)
1399 er = '\177'; /* the initial state anyway */ 1348 er = '\177'; /* the initial state anyway */
1400 else 1349 else
1401#endif 1350#endif
1402 1351
1403 er = -1; 1352 er = -1;
1404 1353
1405 rxvt_get_ttymode (&(R->tio), er); 1354 rxvt_get_ttymode (& (tio), er);
1406 1355
1407#ifndef __QNX__ 1356#ifndef __QNX__
1408 /* spin off the command interpreter */ 1357 /* spin off the command interpreter */
1409 switch (R->cmd_pid = fork ()) 1358 switch (cmd_pid = fork ())
1410 { 1359 {
1411 case -1: 1360 case -1:
1412 rxvt_print_error("can't fork"); 1361 rxvt_print_error ("can't fork");
1413 return -1; 1362 return -1;
1414 case 0: 1363 case 0:
1415 close (cfd); /* only keep R->tty_fd and STDERR open */ 1364 close (cfd); /* only keep tty_fd and STDERR open */
1416 close (R->Xfd); 1365
1417 if (rxvt_control_tty (R->tty_fd, R->ttydev) < 0) 1366 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1418 rxvt_print_error ("could not obtain control of tty"); 1367 rxvt_print_error ("could not obtain control of tty");
1419 else 1368 else
1369 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO);
1373 dup2 (tty_fd, STDERR_FILENO);
1374
1375 if (tty_fd > 2)
1376 close (tty_fd);
1377
1378 run_child (argv);
1379 }
1380 exit (EXIT_FAILURE);
1381 /* NOTREACHED */
1382 default:
1420 { 1383 {
1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin;
1386
1387 fdstdin = dup (STDIN_FILENO);
1422 dup2 (R->tty_fd, STDIN_FILENO); 1388 dup2 (tty_fd, STDIN_FILENO);
1389#endif
1390
1391#ifdef UTMP_SUPPORT
1392 privileged_utmp (SAVE);
1393#endif
1394
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396
1423 dup2 (R->tty_fd, STDOUT_FILENO); 1397 dup2 (fdstdin, STDIN_FILENO);
1424 dup2 (R->tty_fd, STDERR_FILENO);
1425
1426 if (R->tty_fd > 2)
1427 close (R->tty_fd); 1398 close (fdstdin);
1399#endif
1428 1400
1429 rxvt_run_child (aR_ argv);
1430 } 1401 }
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 */ 1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1451 break; 1403 break;
1452 } 1404 }
1453#else /* __QNX__ uses qnxspawn() */ 1405#else /* __QNX__ uses qnxspawn () */
1454 fchmod (R->tty_fd, 0622); 1406 fchmod (tty_fd, 0622);
1455 fcntl (R->tty_fd, F_SETFD, FD_CLOEXEC); 1407 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1456 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1408 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1457 1409
1458 if (rxvt_run_child (aR_ argv) == -1) 1410 if (run_child (argv) == -1)
1459 exit (EXIT_FAILURE); 1411 exit (EXIT_FAILURE);
1460#endif 1412#endif
1461 1413
1462 return cfd; 1414 return cfd;
1463} 1415}
… …
1467 * ------------------------------------------------------------------------- */ 1419 * ------------------------------------------------------------------------- */
1468/* 1420/*
1469 * The only open file descriptor is the slave tty - so no error messages. 1421 * The only open file descriptor is the slave tty - so no error messages.
1470 * returns are fatal 1422 * returns are fatal
1471 */ 1423 */
1472/* INTPROTO */
1473int 1424int
1474rxvt_run_child(pR_ const char *const *argv) 1425rxvt_term::run_child (const char *const *argv)
1475{ 1426{
1476 char *login; 1427 char *login;
1477 1428
1478 SET_TTYMODE (STDIN_FILENO, &(R->tio)); /* init terminal attributes */ 1429 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1479 1430
1480 if (R->Options & Opt_console) 1431 if (Options & Opt_console)
1481 { /* be virtual console, fail silently */ 1432 { /* be virtual console, fail silently */
1482#ifdef TIOCCONS 1433#ifdef TIOCCONS
1483 unsigned int on = 1; 1434 unsigned int on = 1;
1484 1435
1485 ioctl (STDIN_FILENO, TIOCCONS, &on); 1436 ioctl (STDIN_FILENO, TIOCCONS, &on);
1486#elif defined (SRIOCSREDIR) 1437#elif defined (SRIOCSREDIR)
1487
1488 int fd; 1438 int fd;
1489 1439
1490 fd = open (CONSOLE, O_WRONLY, 0); 1440 fd = open (CONSOLE, O_WRONLY, 0);
1491 if (fd >= 0) 1441 if (fd >= 0)
1492 { 1442 {
… …
1504 /* 1454 /*
1505 * mimick login's behavior by disabling the job control signals 1455 * mimick login's behavior by disabling the job control signals
1506 * a shell that wants them can turn them back on 1456 * a shell that wants them can turn them back on
1507 */ 1457 */
1508#ifdef SIGTSTP 1458#ifdef SIGTSTP
1509
1510 signal (SIGTSTP, SIG_IGN); 1459 signal (SIGTSTP, SIG_IGN);
1511 signal (SIGTTIN, SIG_IGN); 1460 signal (SIGTTIN, SIG_IGN);
1512 signal (SIGTTOU, SIG_IGN); 1461 signal (SIGTTOU, SIG_IGN);
1513#endif /* SIGTSTP */ 1462#endif /* SIGTSTP */
1514 1463
1515 /* set window size */ 1464 /* set window size */
1516 struct winsize ws; 1465 struct winsize ws;
1517 1466
1518 ws.ws_col = R->TermWin.ncol; 1467 ws.ws_col = TermWin.ncol;
1519 ws.ws_row = R->TermWin.nrow; 1468 ws.ws_row = TermWin.nrow;
1520 ws.ws_xpixel = ws.ws_ypixel = 0; 1469 ws.ws_xpixel = ws.ws_ypixel = 0;
1521 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); 1470 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1522 1471
1523 // unblock signals (signals are blocked by iom.C 1472 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss; 1473 sigset_t ss;
… …
1531 { 1480 {
1532# ifdef DEBUG_CMD 1481# ifdef DEBUG_CMD
1533 int i; 1482 int i;
1534 1483
1535 for (i = 0; argv[i]; i++) 1484 for (i = 0; argv[i]; i++)
1536 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1485 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1537# endif 1486# endif
1538 1487
1539 execvp(argv[0], (char *const *)argv); 1488 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */ 1489 /* no error message: STDERR is closed! */
1541 } 1490 }
1542 else 1491 else
1543 { 1492 {
1544 const char *argv0, *shell; 1493 const char *argv0, *shell;
1545 1494
1546 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1495 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1496 shell = "/bin/sh";
1548 1497
1549 argv0 = (const char *)rxvt_r_basename(shell); 1498 argv0 = (const char *)rxvt_r_basename (shell);
1550 if (R->Options & Opt_loginShell) 1499 if (Options & Opt_loginShell)
1551 { 1500 {
1552 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1501 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1553 1502
1554 login[0] = '-'; 1503 login[0] = '-';
1555 STRCPY(&login[1], argv0); 1504 STRCPY (&login[1], argv0);
1556 argv0 = login; 1505 argv0 = login;
1557 } 1506 }
1558 execlp(shell, argv0, NULL); 1507 execlp (shell, argv0, NULL);
1559 /* no error message: STDERR is closed! */ 1508 /* no error message: STDERR is closed! */
1560 } 1509 }
1510
1561#else /* __QNX__ uses qnxspawn() */ 1511#else /* __QNX__ uses qnxspawn () */
1562 { 1512
1563 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1513 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1564 char *command = NULL, fullcommand[_MAX_PATH]; 1514 char *command = NULL, fullcommand[_MAX_PATH];
1565 char **arg_v, *arg_a[2] = { NULL, NULL }; 1515 char **arg_v, *arg_a[2] = { NULL, NULL };
1566 1516
1567 if (argv != NULL) 1517 if (argv != NULL)
1568 { 1518 {
1569 if (access(argv[0], X_OK) == -1) 1519 if (access (argv[0], X_OK) == -1)
1570 { 1520 {
1571 if (STRCHR(argv[0], '/') == NULL) 1521 if (STRCHR (argv[0], '/') == NULL)
1572 { 1522 {
1573 searchenv(argv[0], "PATH", fullcommand); 1523 searchenv (argv[0], "PATH", fullcommand);
1574 if (fullcommand[0] != '\0') 1524 if (fullcommand[0] != '\0')
1575 command = fullcommand; 1525 command = fullcommand;
1576 } 1526 }
1577 if (access(command, X_OK) == -1) 1527 if (access (command, X_OK) == -1)
1578 return -1; 1528 return -1;
1579 } 1529 }
1580 else 1530 else
1581 command = argv[0]; 1531 command = argv[0];
1582 arg_v = argv; 1532 arg_v = argv;
1583 } 1533 }
1584 else 1534 else
1585 { 1535 {
1586 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1536 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1587 command = "/bin/sh"; 1537 command = "/bin/sh";
1588 1538
1589 arg_a[0] = my_basename(command); 1539 arg_a[0] = my_basename (command);
1590 if (R->Options & Opt_loginShell) 1540 if (Options & Opt_loginShell)
1591 { 1541 {
1592 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1542 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1593 1543
1594 login[0] = '-'; 1544 login[0] = '-';
1595 STRCPY(&login[1], arg_a[0]); 1545 STRCPY (&login[1], arg_a[0]);
1596 arg_a[0] = login; 1546 arg_a[0] = login;
1597 } 1547 }
1598 arg_v = arg_a; 1548 arg_v = arg_a;
1599 } 1549 }
1600 iov_a[0] = iov_a[1] = iov_a[2] = R->tty_fd; 1550 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1601 R->cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1551 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1602 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1552 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1603 command, arg_v, environ, iov_a, 0); 1553 command, arg_v, environ, iov_a, 0);
1604 if (login) 1554 if (login)
1605 free(login); 1555 free (login);
1556
1606 close(R->tty_fd); 1557 close (tty_fd);
1607 return R->cmd_fd; 1558 return cmd_fd;
1608 } 1559
1609#endif 1560#endif
1610 return -1; 1561 return -1;
1611} 1562}
1612 1563
1613/* ------------------------------------------------------------------------- * 1564/* ------------------------------------------------------------------------- *
1614 * GET TTY CURRENT STATE * 1565 * GET TTY CURRENT STATE *
1615 * ------------------------------------------------------------------------- */ 1566 * ------------------------------------------------------------------------- */
1616/* rxvt_get_ttymode() */ 1567/* rxvt_get_ttymode () */
1617/* INTPROTO */ 1568/* EXTPROTO */
1618void 1569void
1619rxvt_get_ttymode(ttymode_t *tio, int erase) 1570rxvt_get_ttymode (ttymode_t *tio, int erase)
1620{ 1571{
1621#ifdef HAVE_TERMIOS_H 1572#ifdef HAVE_TERMIOS_H
1622 /* 1573 /*
1623 * standard System V termios interface 1574 * standard System V termios interface
1624 */ 1575 */
1625 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1576 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1626 { 1577 {
1627 /* return error - use system defaults */ 1578 /* return error - use system defaults */
1628 tio->c_cc[VINTR] = CINTR; 1579 tio->c_cc[VINTR] = CINTR;
1629 tio->c_cc[VQUIT] = CQUIT; 1580 tio->c_cc[VQUIT] = CQUIT;
1630 tio->c_cc[VERASE] = CERASE; 1581 tio->c_cc[VERASE] = CERASE;
… …
1704 /* 1655 /*
1705 * sgtty interface 1656 * sgtty interface
1706 */ 1657 */
1707 1658
1708 /* get parameters -- gtty */ 1659 /* get parameters -- gtty */
1709 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1660 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1710 { 1661 {
1711 tio->sg.sg_erase = CERASE; /* ^H */ 1662 tio->sg.sg_erase = CERASE; /* ^H */
1712 tio->sg.sg_kill = CKILL; /* ^U */ 1663 tio->sg.sg_kill = CKILL; /* ^U */
1713 } 1664 }
1714 if (erase != -1) 1665 if (erase != -1)
1715 tio->sg.sg_erase = (char)erase; 1666 tio->sg.sg_erase = (char)erase;
1716 1667
1717 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1668 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1718 1669
1719 /* get special characters */ 1670 /* get special characters */
1720 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1671 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1721 { 1672 {
1722 tio->tc.t_intrc = CINTR; /* ^C */ 1673 tio->tc.t_intrc = CINTR; /* ^C */
1723 tio->tc.t_quitc = CQUIT; /* ^\ */ 1674 tio->tc.t_quitc = CQUIT; /* ^\ */
1724 tio->tc.t_startc = CSTART; /* ^Q */ 1675 tio->tc.t_startc = CSTART; /* ^Q */
1725 tio->tc.t_stopc = CSTOP; /* ^S */ 1676 tio->tc.t_stopc = CSTOP; /* ^S */
1726 tio->tc.t_eofc = CEOF; /* ^D */ 1677 tio->tc.t_eofc = CEOF; /* ^D */
1727 tio->tc.t_brkc = -1; 1678 tio->tc.t_brkc = -1;
1728 } 1679 }
1729 /* get local special chars */ 1680 /* get local special chars */
1730 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1681 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1731 { 1682 {
1732 tio->lc.t_suspc = CSUSP; /* ^Z */ 1683 tio->lc.t_suspc = CSUSP; /* ^Z */
1733 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1684 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1734 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1685 tio->lc.t_rprntc = CRPRNT; /* ^R */
1735 tio->lc.t_flushc = CFLUSH; /* ^O */ 1686 tio->lc.t_flushc = CFLUSH; /* ^O */
1736 tio->lc.t_werasc = CWERASE; /* ^W */ 1687 tio->lc.t_werasc = CWERASE; /* ^W */
1737 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1688 tio->lc.t_lnextc = CLNEXT; /* ^V */
1738 } 1689 }
1739 /* get line discipline */ 1690 /* get line discipline */
1740 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1691 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1741# ifdef NTTYDISC 1692# ifdef NTTYDISC
1742 1693
1743 tio->line = NTTYDISC; 1694 tio->line = NTTYDISC;
1744# endif /* NTTYDISC */ 1695# endif /* NTTYDISC */
1745 1696
… …
1750 * Debugging 1701 * Debugging
1751 */ 1702 */
1752#ifdef DEBUG_TTYMODE 1703#ifdef DEBUG_TTYMODE
1753#ifdef HAVE_TERMIOS_H 1704#ifdef HAVE_TERMIOS_H
1754 /* c_iflag bits */ 1705 /* c_iflag bits */
1755 fprintf(stderr, "Input flags\n"); 1706 fprintf (stderr, "Input flags\n");
1756 1707
1757 /* cpp token stringize doesn't work on all machines <sigh> */ 1708 /* cpp token stringize doesn't work on all machines <sigh> */
1758# define FOO(flag,name) \ 1709# define FOO(flag,name) \
1759 if ((tio->c_iflag) & flag) \ 1710 if ((tio->c_iflag) & flag) \
1760 fprintf (stderr, "%s ", name) 1711 fprintf (stderr, "%s ", name)
1761 1712
1762 /* c_iflag bits */ 1713 /* c_iflag bits */
1763 FOO(IGNBRK, "IGNBRK"); 1714 FOO (IGNBRK, "IGNBRK");
1764 FOO(BRKINT, "BRKINT"); 1715 FOO (BRKINT, "BRKINT");
1765 FOO(IGNPAR, "IGNPAR"); 1716 FOO (IGNPAR, "IGNPAR");
1766 FOO(PARMRK, "PARMRK"); 1717 FOO (PARMRK, "PARMRK");
1767 FOO(INPCK, "INPCK"); 1718 FOO (INPCK, "INPCK");
1768 FOO(ISTRIP, "ISTRIP"); 1719 FOO (ISTRIP, "ISTRIP");
1769 FOO(INLCR, "INLCR"); 1720 FOO (INLCR, "INLCR");
1770 FOO(IGNCR, "IGNCR"); 1721 FOO (IGNCR, "IGNCR");
1771 FOO(ICRNL, "ICRNL"); 1722 FOO (ICRNL, "ICRNL");
1772 FOO(IXON, "IXON"); 1723 FOO (IXON, "IXON");
1773 FOO(IXOFF, "IXOFF"); 1724 FOO (IXOFF, "IXOFF");
1774# ifdef IUCLC 1725# ifdef IUCLC
1775 1726
1776 FOO(IUCLC, "IUCLC"); 1727 FOO (IUCLC, "IUCLC");
1777# endif 1728# endif
1778# ifdef IXANY 1729# ifdef IXANY
1779 1730
1780 FOO(IXANY, "IXANY"); 1731 FOO (IXANY, "IXANY");
1781# endif 1732# endif
1782# ifdef IMAXBEL 1733# ifdef IMAXBEL
1783 1734
1784 FOO(IMAXBEL, "IMAXBEL"); 1735 FOO (IMAXBEL, "IMAXBEL");
1785# endif 1736# endif
1786 1737
1787 fprintf(stderr, "\n"); 1738 fprintf (stderr, "\n");
1788 1739
1789# undef FOO 1740# undef FOO
1790# define FOO(entry, name) \ 1741# define FOO(entry, name) \
1791 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1742 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1792 1743
1793 FOO(VINTR, "VINTR"); 1744 FOO (VINTR, "VINTR");
1794 FOO(VQUIT, "VQUIT"); 1745 FOO (VQUIT, "VQUIT");
1795 FOO(VERASE, "VERASE"); 1746 FOO (VERASE, "VERASE");
1796 FOO(VKILL, "VKILL"); 1747 FOO (VKILL, "VKILL");
1797 FOO(VEOF, "VEOF"); 1748 FOO (VEOF, "VEOF");
1798 FOO(VEOL, "VEOL"); 1749 FOO (VEOL, "VEOL");
1799# ifdef VEOL2 1750# ifdef VEOL2
1800 1751
1801 FOO(VEOL2, "VEOL2"); 1752 FOO (VEOL2, "VEOL2");
1802# endif 1753# endif
1803# ifdef VSWTC 1754# ifdef VSWTC
1804 1755
1805 FOO(VSWTC, "VSWTC"); 1756 FOO (VSWTC, "VSWTC");
1806# endif 1757# endif
1807# ifdef VSWTCH 1758# ifdef VSWTCH
1808 1759
1809 FOO(VSWTCH, "VSWTCH"); 1760 FOO (VSWTCH, "VSWTCH");
1810# endif 1761# endif
1811 1762
1812 FOO(VSTART, "VSTART"); 1763 FOO (VSTART, "VSTART");
1813 FOO(VSTOP, "VSTOP"); 1764 FOO (VSTOP, "VSTOP");
1814 FOO(VSUSP, "VSUSP"); 1765 FOO (VSUSP, "VSUSP");
1815# ifdef VDSUSP 1766# ifdef VDSUSP
1816 1767
1817 FOO(VDSUSP, "VDSUSP"); 1768 FOO (VDSUSP, "VDSUSP");
1818# endif 1769# endif
1819# ifdef VREPRINT 1770# ifdef VREPRINT
1820 1771
1821 FOO(VREPRINT, "VREPRINT"); 1772 FOO (VREPRINT, "VREPRINT");
1822# endif 1773# endif
1823# ifdef VDISCRD 1774# ifdef VDISCRD
1824 1775
1825 FOO(VDISCRD, "VDISCRD"); 1776 FOO (VDISCRD, "VDISCRD");
1826# endif 1777# endif
1827# ifdef VWERSE 1778# ifdef VWERSE
1828 1779
1829 FOO(VWERSE, "VWERSE"); 1780 FOO (VWERSE, "VWERSE");
1830# endif 1781# endif
1831# ifdef VLNEXT 1782# ifdef VLNEXT
1832 1783
1833 FOO(VLNEXT, "VLNEXT"); 1784 FOO (VLNEXT, "VLNEXT");
1834# endif 1785# endif
1835 1786
1836 fprintf(stderr, "\n"); 1787 fprintf (stderr, "\n");
1837# undef FOO 1788# undef FOO
1838# endif /* HAVE_TERMIOS_H */ 1789# endif /* HAVE_TERMIOS_H */
1839#endif /* DEBUG_TTYMODE */ 1790#endif /* DEBUG_TTYMODE */
1840} 1791}
1841 1792

Diff Legend

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