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

Diff Legend

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