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

Diff Legend

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