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.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.38 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

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