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

Diff Legend

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