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.117 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.148 by root, Wed Jan 18 19:43:51 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 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.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
213 }; 216 };
214 217
215bool 218bool
216rxvt_term::init_vars () 219rxvt_term::init_vars ()
217{ 220{
218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
220
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 224#endif
225 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
226 226
227 if (pix_colors == NULL) 227 if (pix_colors == NULL)
228 return false; 228 return false;
229 229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None; 231 pixmap = None;
232#endif 232#endif
233 233
234 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 237 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0; 239 focus = 0;
240 TermWin.ncol = 80; 240 ncol = 80;
241 TermWin.nrow = 24; 241 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
247 247
248 refresh_limit = 1; 248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
255 bgPixmap.x = bgPixmap.y = 50; 255 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
257#endif 257#endif
258 258
259 last_bot = last_state = -1; 259 last_bot = last_state = -1;
260
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267 260
268 return true; 261 return true;
269} 262}
270 263
271void 264void
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 333
341 /* 334 /*
342 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
343 */ 336 */
337
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
346 340
347 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
348 342
349 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 345
352 extract_resources (); 346 extract_resources ();
347
353 free (r_argv); 348 free (r_argv);
354 349
355 /* 350 /*
356 * set any defaults not already set 351 * set any defaults not already set
357 */ 352 */
… …
369 if (!rs[Rs_iconName]) 364 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 365 rs[Rs_iconName] = rs[Rs_name];
371 } 366 }
372 367
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 369 saveLines = min (i, MAX_SAVELINES);
375 370
376#if ENABLE_FRILLS 371#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 372 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 373 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
374
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 375 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 376 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
377
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 378 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 379 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 380#endif
384 381
385#ifdef POINTER_BLANK 382#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 383 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 384 pointerBlankDelay = i;
388 else 385 else
389 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
390#endif 387#endif
391 388
392 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 390 if (!saveLines)
394 options &= ~Opt_scrollBar; 391 set_option (Opt_scrollBar, 0);
395 392
396#ifdef PRINTPIPE 393#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 396#endif
… …
442 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443#endif 440#endif
444 441
445#ifdef XTERM_REVERSE_VIDEO 442#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 443 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 444 if (OPTION (Opt_reverseVideo))
448 { 445 {
449 if (!rs[Rs_color + Color_fg]) 446 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 447 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 448 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 449 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 454 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 455 rs[Rs_color + i] = def_colorName[i];
459 456
460#ifndef XTERM_REVERSE_VIDEO 457#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 458 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 459 if (OPTION (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 461#endif
465 462
466 /* convenient aliases for setting fg/bg to colors */ 463 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 464 color_aliases (Color_fg);
468 color_aliases (Color_bg); 465 color_aliases (Color_bg);
… …
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 516
520 sprintf (env_display, "DISPLAY=%s", val); 517 sprintf (env_display, "DISPLAY=%s", val);
521 518
522 /* avoiding the math library: 519 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 522 ;
526 MAX_IT (i, 1); 523 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 525
529 sprintf (env_windowid, "WINDOWID=%u", 526 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]); 527 (unsigned int)parent[0]);
531 528
532 /* add entries to the environment: 529 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 530 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 531 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 532 * @ COLORTERM: terminal sub-name and also indicates its color
… …
574 * This should support all European type languages. 571 * This should support all European type languages.
575 */ 572 */
576void 573void
577rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
578{ 575{
576 set_environ (envv);
577
579#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
580 free (this->locale); 579 free (this->locale);
581 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
582 581
583 if (!this->locale) 582 if (!this->locale)
584 { 583 {
585 if (*locale) 584 if (*locale)
586 { 585 {
587 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
588 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
589 } 588 }
590 else 589 else
591 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
592 591
593 this->locale = ""; 592 this->locale = "C";
594 } 593 }
595 594
596 595
597 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
598 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
613} 612}
614 613
615void 614void
616rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
617{ 616{
617 set_environ (envv);
618
618#ifdef USE_XIM 619#ifdef USE_XIM
619 if (!locale) 620 if (!locale)
620 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
621 else 622 else
622 { 623 {
… …
644 * Initialize the command connection. 645 * Initialize the command connection.
645 * This should be called after the X server connection is established. 646 * This should be called after the X server connection is established.
646 */ 647 */
647 648
648#ifdef META8_OPTION 649#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 651#endif
651 652
652 get_ourmods (); 653 get_ourmods ();
653 654
654 if (!(options & Opt_scrollTtyOutput)) 655 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 656 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 657 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 658 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 659 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 660 priv_modes |= PrivMode_smoothScroll;
660 661
661#ifndef NO_BACKSPACE_KEY 662#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
664#endif 665#endif
665 666
666 /* add value for scrollBar */ 667 /* add value for scrollBar */
667 if (scrollbar_visible ()) 668 if (scrollBar.state)
668 { 669 {
669 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
670 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
671 } 672 }
672
673 if (menubar_visible ())
674 {
675 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar;
677 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 673
684 run_command (argv); 674 run_command (argv);
685} 675}
686 676
687/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
… …
702 continue; 692 continue;
703 693
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 695 {
706#ifndef XTERM_REVERSE_VIDEO 696#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 697 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 698 rs[Rs_color + i] = def_colorName[!i];
709 else 699 else
710#endif 700#endif
711 rs[Rs_color + i] = def_colorName[i]; 701 rs[Rs_color + i] = def_colorName[i];
712 702
… …
737 } 727 }
738 } 728 }
739 } 729 }
740 730
741 pix_colors[i] = xcol; 731 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i);
733 }
734
742#ifdef OFF_FOCUS_FADING 735#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 739#endif
746 SET_PIXCOLOR (i);
747 }
748 740
749 if (display->depth <= 2) 741 if (display->depth <= 2)
750 { 742 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
752 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
753 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
754 } 746 }
755 747
756 /* 748 /*
757 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
758 * 750 *
759 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
760 * from the fvwm window manager. 752 * from the fvwm window manager.
761 */ 753 */
762#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
763 755
764 if (display->depth <= 2) 756 if (display->depth <= 2)
757 {
765 { /* Monochrome */ 758 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 759 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 760 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 762 }
770 else 763 else
… …
806 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
807 800
808 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
809 { /* bright colors */ 802 { /* bright colors */
810 i -= 8; 803 i -= 8;
811#ifndef NO_BRIGHTCOLOR
812 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
813 return; 805 return;
814#endif
815 } 806 }
816 807
817 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
819 } 810 }
… …
918#if ENABLE_FRILLS 909#if ENABLE_FRILLS
919 Atom prop = None; 910 Atom prop = None;
920 MWMHints mwmhints; 911 MWMHints mwmhints;
921#endif 912#endif
922 XGCValues gcvalue; 913 XGCValues gcvalue;
923 long vt_emask;
924 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
925 XWindowAttributes gattr; 915 XWindowAttributes gattr;
926 Window top, parent; 916 Window top, parent;
927 dDisp; 917 dDisp;
928 918
… …
932#endif 922#endif
933 923
934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
936 926
937 if (options & Opt_transparent) 927 if (OPTION (Opt_transparent))
938 { 928 {
939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
940 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
941 } 931 }
942 932
933 /* grab colors before netscape does */
934 Get_Colours ();
935
936 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938
939 parent = DefaultRootWindow (disp);
940
941 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942
943#if ENABLE_FRILLS 943#if ENABLE_FRILLS
944 if (options & Opt_borderLess) 944 if (OPTION (Opt_borderLess))
945 { 945 {
946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
947 947
948 if (prop == None) 948 if (prop == None)
949 { 949 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
951#ifdef PREFER_24BIT
952 attributes.override_redirect = TRUE; 951 attributes.override_redirect = TRUE;
953#endif
954 mwmhints.flags = 0; 952 mwmhints.flags = 0;
955 } 953 }
956 else 954 else
957 { 955 {
958 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
961 } 959 }
962 else 960 else
963 mwmhints.flags = 0; 961 mwmhints.flags = 0;
964#endif 962#endif
965 963
966 /* grab colors before netscape does */
967 Get_Colours ();
968
969 if (!set_fonts ())
970 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
971
972 parent = DefaultRootWindow (disp);
973
974#if ENABLE_XEMBED 964#if ENABLE_XEMBED
975 if (rs[Rs_embed]) 965 if (rs[Rs_embed])
976 { 966 {
977 XWindowAttributes wattr; 967 XWindowAttributes wattr;
978 968
… …
981 if (!XGetWindowAttributes (disp, parent, &wattr)) 971 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983 973
984 window_calc (wattr.width, wattr.height); 974 window_calc (wattr.width, wattr.height);
985 } 975 }
986
987#endif 976#endif
977
988 window_calc (0, 0); 978 window_calc (0, 0);
989 979
990 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
991#ifdef PREFER_24BIT
992 attributes.background_pixel = pix_colors_focused[Color_border]; 981 attributes.background_pixel = pix_colors_focused[Color_border];
993 attributes.border_pixel = pix_colors_focused[Color_border]; 982 attributes.border_pixel = pix_colors_focused[Color_border];
994 attributes.colormap = display->cmap; 983 attributes.colormap = display->cmap;
995 top = XCreateWindow (disp, parent, 984 top = XCreateWindow (disp, parent,
996 szHint.x, szHint.y, 985 szHint.x, szHint.y,
997 szHint.width, szHint.height, 986 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 987 ext_bwidth,
999 display->depth, InputOutput, 988 display->depth, InputOutput,
1000 display->visual, 989 display->visual,
1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1002#else 991 &attributes);
1003 top = XCreateSimpleWindow (disp, parent,
1004 szHint.x, szHint.y,
1005 szHint.width, szHint.height,
1006 TermWin.ext_bwidth,
1007 pix_colors_focused[Color_border],
1008 pix_colors_focused[Color_border]);
1009#endif
1010 992
1011 TermWin.parent[0] = top; 993 this->parent[0] = top;
1012 994
1013 old_width = szHint.width; 995 old_width = szHint.width;
1014 old_height = szHint.height; 996 old_height = szHint.height;
1015 997
1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1019 classHint.res_name = (char *)rs[Rs_name]; 1001 classHint.res_name = (char *)rs[Rs_name];
1020 classHint.res_class = (char *)RESCLASS; 1002 classHint.res_class = (char *)RESCLASS;
1021 1003
1022 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1004 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1023 wmHint.input = True; 1005 wmHint.input = True;
1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1025 wmHint.window_group = top; 1007 wmHint.window_group = top;
1026 1008
1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1028 &szHint, &wmHint, &classHint); 1010 &szHint, &wmHint, &classHint);
1029 1011
… …
1034#endif 1016#endif
1035 }; 1017 };
1036 1018
1037 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1038 1020
1021#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif
1025
1039#if ENABLE_EWMH 1026#if ENABLE_EWMH
1040 long pid = getpid (); 1027 long pid = getpid ();
1041 1028
1042 XChangeProperty (disp, top, 1029 XChangeProperty (disp, top,
1043 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1063#endif 1050#endif
1064 1051
1065 /* vt cursor: Black-on-White is standard, but this is more popular */ 1052 /* vt cursor: Black-on-White is standard, but this is more popular */
1066 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1067 1054
1068#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1055#ifdef HAVE_SCROLLBARS
1069 /* cursor (menuBar/scrollBar): Black-on-White */ 1056 /* cursor scrollBar: Black-on-White */
1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1071#endif 1058#endif
1072 1059
1073 /* the vt window */ 1060 /* the vt window */
1074 TermWin.vt = XCreateSimpleWindow (disp, top, 1061 vt = XCreateSimpleWindow (disp, top,
1075 window_vt_x, 1062 window_vt_x,
1076 window_vt_y, 1063 window_vt_y,
1077 TermWin_TotalWidth (), 1064 width,
1078 TermWin_TotalHeight (), 1065 height,
1079 0, 1066 0,
1080 pix_colors_focused[Color_fg], 1067 pix_colors_focused[Color_fg],
1081 pix_colors_focused[Color_bg]); 1068 pix_colors_focused[Color_bg]);
1082#ifdef DEBUG_X 1069#ifdef DEBUG_X
1083 XStoreName (disp, TermWin.vt, "vt window"); 1070 XStoreName (disp, vt, "vt window");
1084#endif 1071#endif
1085 1072
1086 attributes.bit_gravity = NorthWestGravity; 1073 attributes.bit_gravity = NorthWestGravity;
1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1088 1075
1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1090 1077
1091#ifdef POINTER_BLANK 1078 if (OPTION (Opt_pointerBlank))
1092 if (options & Opt_pointerBlank)
1093 vt_emask |= PointerMotionMask; 1079 vt_emask |= PointerMotionMask;
1094 else 1080 else
1095#endif
1096 vt_emask |= Button1MotionMask | Button3MotionMask; 1081 vt_emask |= Button1MotionMask | Button3MotionMask;
1097 1082
1098 XSelectInput (disp, TermWin.vt, vt_emask); 1083 vt_select_input ();
1084
1099 vt_ev.start (display, TermWin.vt); 1085 vt_ev.start (display, vt);
1100
1101#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1102 if (menuBar_height ())
1103 {
1104 menuBar.win = XCreateSimpleWindow (disp, top,
1105 window_vt_x, 0,
1106 TermWin_TotalWidth (),
1107 menuBar_TotalHeight (),
1108 0,
1109 pix_colors_focused[Color_fg],
1110 pix_colors_focused[Color_scroll]);
1111
1112#ifdef DEBUG_X
1113 XStoreName (disp, menuBar.win, "menubar");
1114#endif
1115
1116 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1117
1118 XDefineCursor (disp, menuBar.win,
1119 XCreateFontCursor (disp, XC_left_ptr));
1120
1121 XSelectInput (disp, menuBar.win,
1122 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1123 menubar_ev.start (display, menuBar.win);
1124 }
1125#endif
1126 1086
1127#ifdef XPM_BACKGROUND 1087#ifdef XPM_BACKGROUND
1128 if (rs[Rs_backgroundPixmap] != NULL 1088 if (rs[Rs_backgroundPixmap] != NULL
1129 && ! (options & Opt_transparent)) 1089 && ! OPTION (Opt_transparent))
1130 { 1090 {
1131 const char *p = rs[Rs_backgroundPixmap]; 1091 const char *p = rs[Rs_backgroundPixmap];
1132 1092
1133 if ((p = strchr (p, ';')) != NULL) 1093 if ((p = strchr (p, ';')) != NULL)
1134 { 1094 {
… …
1143 1103
1144 /* graphics context for the vt window */ 1104 /* graphics context for the vt window */
1145 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1146 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1147 gcvalue.graphics_exposures = 1; 1107 gcvalue.graphics_exposures = 1;
1148 TermWin.gc = XCreateGC (disp, TermWin.vt, 1108 gc = XCreateGC (disp, vt,
1149 GCForeground | GCBackground | GCGraphicsExposures, 1109 GCForeground | GCBackground | GCGraphicsExposures,
1150 &gcvalue); 1110 &gcvalue);
1151 1111
1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1112 drawable = new rxvt_drawable (display, vt);
1153 1113
1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1114#ifdef RXVT_SCROLLBAR
1155 gcvalue.foreground = pix_colors[Color_topShadow]; 1115 gcvalue.foreground = pix_colors[Color_topShadow];
1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1117 gcvalue.foreground = pix_colors[Color_bottomShadow];
1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161#endif 1121#endif
1162 1122
1163#ifdef OFF_FOCUS_FADING 1123#ifdef OFF_FOCUS_FADING
1164 // initially we are in unfocused state 1124 // initially we are in unfocused state
1165 if (rs[Rs_fade]) 1125 if (rs[Rs_fade])
… …
1190 /* 1150 /*
1191 * standard System V termios interface 1151 * standard System V termios interface
1192 */ 1152 */
1193 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1194 { 1154 {
1195 /* return error - use system defaults */ 1155 // return error - use system defaults,
1156 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t));
1158
1196 tio->c_cc[VINTR] = CINTR; 1159 tio->c_cc[VINTR] = CINTR;
1197 tio->c_cc[VQUIT] = CQUIT; 1160 tio->c_cc[VQUIT] = CQUIT;
1198 tio->c_cc[VERASE] = CERASE; 1161 tio->c_cc[VERASE] = CERASE;
1162#ifdef VERASE2
1163 tio->c_cc[VERASE2] = CERASE2;
1164#endif
1199 tio->c_cc[VKILL] = CKILL; 1165 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1166 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1167 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1168 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1169# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1170 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1171# endif
1207# ifdef VREPRINT 1172# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1173 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1174# endif
1211# ifdef VDISCRD 1175# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1176 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1177# endif
1215# ifdef VWERSE 1178# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1179 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1180# endif
1219# ifdef VLNEXT 1181# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1182 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1183# endif
1223
1224 } 1184 }
1185
1225 tio->c_cc[VEOF] = CEOF; 1186 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1187 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1188# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1189 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1190# endif
1231# ifdef VSWTC 1191# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1192 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1193# endif
1235# ifdef VSWTCH 1194# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1195 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1196# endif
1239# if VMIN != VEOF 1197# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1198 tio->c_cc[VMIN] = 1;
1242# endif 1199# endif
1243# if VTIME != VEOL 1200# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1201 tio->c_cc[VTIME] = 0;
1246# endif 1202# endif
1247 1203
1248 if (erase != -1) 1204 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1205 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1233 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1234 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1235 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1236 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1237 }
1238
1282 if (erase != -1) 1239 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1240 tio->sg.sg_erase = (char)erase;
1284 1241
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1243
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1249 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1250 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1251 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1252 tio->tc.t_brkc = -1;
1296 } 1253 }
1254
1297 /* get local special chars */ 1255 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1256 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1257 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1258 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1259 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1263 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1264 }
1307 /* get line discipline */ 1265 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1266 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1267# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1268 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1269# endif /* NTTYDISC */
1313 1270
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1272#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1295 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1296 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1297 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1298 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1299# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1300 FOO (IUCLC, "IUCLC");
1345# endif 1301# endif
1346# ifdef IXANY 1302# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1303 FOO (IXANY, "IXANY");
1349# endif 1304# endif
1350# ifdef IMAXBEL 1305# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1306 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1307# endif
1354 1308
1355 fprintf (stderr, "\n"); 1309 fprintf (stderr, "\n");
1356 1310
… …
1363 FOO (VERASE, "VERASE"); 1317 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1318 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1319 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1320 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1321# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1322 FOO (VEOL2, "VEOL2");
1370# endif 1323# endif
1371# ifdef VSWTC 1324# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1325 FOO (VSWTC, "VSWTC");
1374# endif 1326# endif
1375# ifdef VSWTCH 1327# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1328 FOO (VSWTCH, "VSWTCH");
1378# endif 1329# endif
1379
1380 FOO (VSTART, "VSTART"); 1330 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1331 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1332 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1333# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1334 FOO (VDSUSP, "VDSUSP");
1386# endif 1335# endif
1387# ifdef VREPRINT 1336# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1337 FOO (VREPRINT, "VREPRINT");
1390# endif 1338# endif
1391# ifdef VDISCRD 1339# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1340 FOO (VDISCRD, "VDISCRD");
1394# endif 1341# endif
1395# ifdef VWERSE 1342# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1343 FOO (VWERSE, "VWERSE");
1398# endif 1344# endif
1399# ifdef VLNEXT 1345# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1346 FOO (VLNEXT, "VLNEXT");
1402# endif 1347# endif
1403 1348
1404 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1405# undef FOO 1350# undef FOO
… …
1417rxvt_term::run_command (const char *const *argv) 1362rxvt_term::run_command (const char *const *argv)
1418{ 1363{
1419#if ENABLE_FRILLS 1364#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1365 if (rs[Rs_pty_fd])
1421 { 1366 {
1422 pty.pty = atoi (rs[Rs_pty_fd]); 1367 pty->pty = atoi (rs[Rs_pty_fd]);
1423 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1368
1369 if (pty->pty >= 0)
1370 {
1371 if (getfd_hook)
1372 pty->pty = (*getfd_hook) (pty->pty);
1373
1374 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1375 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1376 }
1424 } 1377 }
1425 else 1378 else
1426#endif 1379#endif
1427 if (!pty.get ()) 1380 if (!pty->get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1429 1382
1430 pty.set_utf8_mode (enc_utf8); 1383 pty->set_utf8_mode (enc_utf8);
1431 1384
1432 /* set initial window size */ 1385 /* set initial window size */
1433 tt_winch (); 1386 tt_winch ();
1434 1387
1435 int er; 1388 int er;
… …
1448#if ENABLE_FRILLS 1401#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1402 if (rs[Rs_pty_fd])
1450 return; 1403 return;
1451#endif 1404#endif
1452 1405
1453 sw_chld.start (SIGCHLD);
1454
1455#ifndef __QNX__
1456 /* spin off the command interpreter */ 1406 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1407 switch (cmd_pid = fork ())
1458 { 1408 {
1459 case -1: 1409 case -1:
1460 { 1410 {
… …
1462 rxvt_fatal ("can't fork, aborting.\n"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1463 } 1413 }
1464 case 0: 1414 case 0:
1465 init_env (); 1415 init_env ();
1466 1416
1467 if (!pty.make_controlling_tty ()) 1417 if (!pty->make_controlling_tty ())
1468 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1418 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1469 else 1419 else
1470 { 1420 {
1471 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1472 dup2 (pty.tty, STDIN_FILENO); 1422 dup2 (pty->tty, STDIN_FILENO);
1473 dup2 (pty.tty, STDOUT_FILENO); 1423 dup2 (pty->tty, STDOUT_FILENO);
1474 dup2 (pty.tty, STDERR_FILENO); 1424 dup2 (pty->tty, STDERR_FILENO);
1475 1425
1476 // close all our file handles that we do no longer need 1426 // close all our file handles that we do no longer need
1477 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1427 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1478 { 1428 {
1479 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1429 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1480 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1430 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1481 } 1431 }
1482 1432
1483 run_child (argv); 1433 run_child (argv);
1484 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1434 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1485 } 1435 }
1486 1436
1487 _exit (EXIT_FAILURE); 1437 _exit (EXIT_FAILURE);
1488 1438
1489 default: 1439 default:
1490 {
1491#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1492 int fdstdin;
1493
1494 fdstdin = dup (STDIN_FILENO);
1495 dup2 (pty.tty, STDIN_FILENO);
1496#endif
1497
1498#ifdef UTMP_SUPPORT 1440#if UTMP_SUPPORT
1499 privileged_utmp (SAVE); 1441 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1500#endif 1443#endif
1501 1444
1502#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1445 pty->close_tty ();
1503
1504 dup2 (fdstdin, STDIN_FILENO);
1505 close (fdstdin);
1506#endif
1507 }
1508
1509 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1510 break; 1446 break;
1511 } 1447 }
1512#else /* __QNX__ uses qnxspawn () */
1513 fchmod (pty.tty, 0622);
1514 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1515 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1516
1517 if (run_child (argv) == -1)
1518 exit (EXIT_FAILURE);
1519#endif
1520} 1448}
1521 1449
1522/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *
1523 * CHILD PROCESS OPERATIONS * 1451 * CHILD PROCESS OPERATIONS *
1524 * ------------------------------------------------------------------------- */ 1452 * ------------------------------------------------------------------------- */
… …
1531{ 1459{
1532 char *login; 1460 char *login;
1533 1461
1534 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1462 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1535 1463
1536 if (options & Opt_console) 1464 if (OPTION (Opt_console))
1537 { /* be virtual console, fail silently */ 1465 { /* be virtual console, fail silently */
1538#ifdef TIOCCONS 1466#ifdef TIOCCONS
1539 unsigned int on = 1; 1467 unsigned int on = 1;
1540 1468
1541 ioctl (STDIN_FILENO, TIOCCONS, &on); 1469 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1568 // unblock signals (signals are blocked by iom.C 1496 // unblock signals (signals are blocked by iom.C
1569 sigset_t ss; 1497 sigset_t ss;
1570 sigemptyset (&ss); 1498 sigemptyset (&ss);
1571 sigprocmask (SIG_SETMASK, &ss, 0); 1499 sigprocmask (SIG_SETMASK, &ss, 0);
1572 1500
1573#ifndef __QNX__
1574 /* command interpreter path */ 1501 /* command interpreter path */
1575 if (argv != NULL) 1502 if (argv != NULL)
1576 { 1503 {
1577# ifdef DEBUG_CMD 1504# ifdef DEBUG_CMD
1578 int i; 1505 int i;
… …
1584 execvp (argv[0], (char *const *)argv); 1511 execvp (argv[0], (char *const *)argv);
1585 /* no error message: STDERR is closed! */ 1512 /* no error message: STDERR is closed! */
1586 } 1513 }
1587 else 1514 else
1588 { 1515 {
1589 const char *argv0, *shell; 1516 const char *argv0, *shell;
1590 1517
1591 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1592 shell = "/bin/sh"; 1519 shell = "/bin/sh";
1593 1520
1594 argv0 = (const char *)rxvt_r_basename (shell); 1521 argv0 = (const char *)rxvt_r_basename (shell);
1595 1522
1596 if (options & Opt_loginShell) 1523 if (OPTION (Opt_loginShell))
1597 { 1524 {
1598 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1525 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1599 1526
1600 login[0] = '-'; 1527 login[0] = '-';
1601 strcpy (&login[1], argv0); 1528 strcpy (&login[1], argv0);
1602 argv0 = login; 1529 argv0 = login;
1603 } 1530 }
1531
1604 execlp (shell, argv0, NULL); 1532 execlp (shell, argv0, NULL);
1605 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1606 } 1534 }
1607 1535
1608#else /* __QNX__ uses qnxspawn () */
1609
1610 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1611 char *command = NULL, fullcommand[_MAX_PATH];
1612 char **arg_v, *arg_a[2] = { NULL, NULL };
1613
1614 if (argv != NULL)
1615 {
1616 if (access (argv[0], X_OK) == -1)
1617 {
1618 if (strchr (argv[0], '/') == NULL)
1619 {
1620 searchenv (argv[0], "PATH", fullcommand);
1621
1622 if (fullcommand[0] != '\0')
1623 command = fullcommand;
1624 }
1625
1626 if (access (command, X_OK) == -1)
1627 return -1;
1628 }
1629 else
1630 command = argv[0];
1631
1632 arg_v = argv;
1633 }
1634 else
1635 {
1636 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1637 command = "/bin/sh";
1638
1639 arg_a[0] = my_basename (command);
1640
1641 if (options & Opt_loginShell)
1642 {
1643 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1644
1645 login[0] = '-';
1646 strcpy (&login[1], arg_a[0]);
1647 arg_a[0] = login;
1648 }
1649
1650 arg_v = arg_a;
1651 }
1652
1653 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1654 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1655 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1656 command, arg_v, environ, iov_a, 0);
1657 if (login)
1658 free (login);
1659
1660 pty.close_tty ();
1661 return pty.pty;
1662#endif
1663
1664 return -1; 1536 return -1;
1665} 1537}
1666 1538
1667/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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