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.10 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.34 by pcg, Tue Feb 24 00:02:44 2004 UTC

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

Diff Legend

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