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

Diff Legend

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