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

Diff Legend

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