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.11 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.57 by root, Mon Jun 21 22:24:07 2004 UTC

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

Diff Legend

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