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

Diff Legend

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