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.151 by root, Fri Jan 20 12:16:28 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
763 764
764 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
765 { /* Monochrome */ 767 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 771 }
770 else 772 else
… …
806 int i = atoi (rs[Rs_color + idx]); 808 int i = atoi (rs[Rs_color + idx]);
807 809
808 if (i >= 8 && i <= 15) 810 if (i >= 8 && i <= 15)
809 { /* bright colors */ 811 { /* bright colors */
810 i -= 8; 812 i -= 8;
811#ifndef NO_BRIGHTCOLOR
812 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 813 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
813 return; 814 return;
814#endif
815 } 815 }
816 816
817 if (i >= 0 && i <= 7) /* normal colors */ 817 if (i >= 0 && i <= 7) /* normal colors */
818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
819 } 819 }
… …
918#if ENABLE_FRILLS 918#if ENABLE_FRILLS
919 Atom prop = None; 919 Atom prop = None;
920 MWMHints mwmhints; 920 MWMHints mwmhints;
921#endif 921#endif
922 XGCValues gcvalue; 922 XGCValues gcvalue;
923 long vt_emask;
924 XSetWindowAttributes attributes; 923 XSetWindowAttributes attributes;
925 XWindowAttributes gattr; 924 XWindowAttributes gattr;
926 Window top, parent; 925 Window top, parent;
927 dDisp; 926 dDisp;
928 927
… …
932#endif 931#endif
933 932
934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
936 935
937 if (options & Opt_transparent) 936 if (OPTION (Opt_transparent))
938 { 937 {
939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
940 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
941 } 940 }
942 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
943#if ENABLE_FRILLS 952#if ENABLE_FRILLS
944 if (options & Opt_borderLess) 953 if (OPTION (Opt_borderLess))
945 { 954 {
946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
947 956
948 if (prop == None) 957 if (prop == None)
949 { 958 {
950 /* 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");*/
951#ifdef PREFER_24BIT
952 attributes.override_redirect = TRUE; 960 attributes.override_redirect = TRUE;
953#endif
954 mwmhints.flags = 0; 961 mwmhints.flags = 0;
955 } 962 }
956 else 963 else
957 { 964 {
958 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
961 } 968 }
962 else 969 else
963 mwmhints.flags = 0; 970 mwmhints.flags = 0;
964#endif 971#endif
965 972
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 973#if ENABLE_XEMBED
975 if (rs[Rs_embed]) 974 if (rs[Rs_embed])
976 { 975 {
977 XWindowAttributes wattr; 976 XWindowAttributes wattr;
978 977
… …
981 if (!XGetWindowAttributes (disp, parent, &wattr)) 980 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983 982
984 window_calc (wattr.width, wattr.height); 983 window_calc (wattr.width, wattr.height);
985 } 984 }
986
987#endif 985#endif
986
988 window_calc (0, 0); 987 window_calc (0, 0);
989 988
990 /* sub-window placement & size in rxvt_resize_subwindows () */ 989 /* sub-window placement & size in rxvt_resize_subwindows () */
991#ifdef PREFER_24BIT
992 attributes.background_pixel = pix_colors_focused[Color_border]; 990 attributes.background_pixel = pix_colors_focused[Color_border];
993 attributes.border_pixel = pix_colors_focused[Color_border]; 991 attributes.border_pixel = pix_colors_focused[Color_border];
994 attributes.colormap = display->cmap; 992 attributes.colormap = display->cmap;
995 top = XCreateWindow (disp, parent, 993 top = XCreateWindow (disp, parent,
996 szHint.x, szHint.y, 994 szHint.x, szHint.y,
997 szHint.width, szHint.height, 995 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 996 ext_bwidth,
999 display->depth, InputOutput, 997 display->depth, InputOutput,
1000 display->visual, 998 display->visual,
1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1002#else 1000 &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 1001
1011 TermWin.parent[0] = top; 1002 this->parent[0] = top;
1012 1003
1013 old_width = szHint.width; 1004 old_width = szHint.width;
1014 old_height = szHint.height; 1005 old_height = szHint.height;
1015 1006
1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1019 classHint.res_name = (char *)rs[Rs_name]; 1010 classHint.res_name = (char *)rs[Rs_name];
1020 classHint.res_class = (char *)RESCLASS; 1011 classHint.res_class = (char *)RESCLASS;
1021 1012
1022 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1013 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1023 wmHint.input = True; 1014 wmHint.input = True;
1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1025 wmHint.window_group = top; 1016 wmHint.window_group = top;
1026 1017
1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1028 &szHint, &wmHint, &classHint); 1019 &szHint, &wmHint, &classHint);
1029 1020
… …
1034#endif 1025#endif
1035 }; 1026 };
1036 1027
1037 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1038 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
1039#if ENABLE_EWMH 1035#if ENABLE_EWMH
1040 long pid = getpid (); 1036 long pid = getpid ();
1041 1037
1042 XChangeProperty (disp, top, 1038 XChangeProperty (disp, top,
1043 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1063#endif 1059#endif
1064 1060
1065 /* 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 */
1066 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1067 1063
1068#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1064#ifdef HAVE_SCROLLBARS
1069 /* cursor (menuBar/scrollBar): Black-on-White */ 1065 /* cursor scrollBar: Black-on-White */
1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1071#endif 1067#endif
1072 1068
1073 /* the vt window */ 1069 /* the vt window */
1074 TermWin.vt = XCreateSimpleWindow (disp, top, 1070 vt = XCreateSimpleWindow (disp, top,
1075 window_vt_x, 1071 window_vt_x,
1076 window_vt_y, 1072 window_vt_y,
1077 TermWin_TotalWidth (), 1073 width,
1078 TermWin_TotalHeight (), 1074 height,
1079 0, 1075 0,
1080 pix_colors_focused[Color_fg], 1076 pix_colors_focused[Color_fg],
1081 pix_colors_focused[Color_bg]); 1077 pix_colors_focused[Color_bg]);
1082#ifdef DEBUG_X 1078#ifdef DEBUG_X
1083 XStoreName (disp, TermWin.vt, "vt window"); 1079 XStoreName (disp, vt, "vt window");
1084#endif 1080#endif
1085 1081
1086 attributes.bit_gravity = NorthWestGravity; 1082 attributes.bit_gravity = NorthWestGravity;
1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1088 1084
1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1090 1086
1091#ifdef POINTER_BLANK 1087 if (OPTION (Opt_pointerBlank))
1092 if (options & Opt_pointerBlank)
1093 vt_emask |= PointerMotionMask; 1088 vt_emask |= PointerMotionMask;
1094 else 1089 else
1095#endif
1096 vt_emask |= Button1MotionMask | Button3MotionMask; 1090 vt_emask |= Button1MotionMask | Button3MotionMask;
1097 1091
1098 XSelectInput (disp, TermWin.vt, vt_emask); 1092 vt_select_input ();
1093
1099 vt_ev.start (display, TermWin.vt); 1094 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 1095
1127#ifdef XPM_BACKGROUND 1096#ifdef XPM_BACKGROUND
1128 if (rs[Rs_backgroundPixmap] != NULL 1097 if (rs[Rs_backgroundPixmap] != NULL
1129 && ! (options & Opt_transparent)) 1098 && ! OPTION (Opt_transparent))
1130 { 1099 {
1131 const char *p = rs[Rs_backgroundPixmap]; 1100 const char *p = rs[Rs_backgroundPixmap];
1132 1101
1133 if ((p = strchr (p, ';')) != NULL) 1102 if ((p = strchr (p, ';')) != NULL)
1134 { 1103 {
… …
1143 1112
1144 /* graphics context for the vt window */ 1113 /* graphics context for the vt window */
1145 gcvalue.foreground = pix_colors[Color_fg]; 1114 gcvalue.foreground = pix_colors[Color_fg];
1146 gcvalue.background = pix_colors[Color_bg]; 1115 gcvalue.background = pix_colors[Color_bg];
1147 gcvalue.graphics_exposures = 1; 1116 gcvalue.graphics_exposures = 1;
1148 TermWin.gc = XCreateGC (disp, TermWin.vt, 1117 gc = XCreateGC (disp, vt,
1149 GCForeground | GCBackground | GCGraphicsExposures, 1118 GCForeground | GCBackground | GCGraphicsExposures,
1150 &gcvalue); 1119 &gcvalue);
1151 1120
1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1121 drawable = new rxvt_drawable (display, vt);
1153 1122
1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1123#ifdef RXVT_SCROLLBAR
1155 gcvalue.foreground = pix_colors[Color_topShadow]; 1124 gcvalue.foreground = pix_colors[Color_topShadow];
1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161#endif 1130#endif
1162 1131
1163#ifdef OFF_FOCUS_FADING 1132#ifdef OFF_FOCUS_FADING
1164 // initially we are in unfocused state 1133 // initially we are in unfocused state
1165 if (rs[Rs_fade]) 1134 if (rs[Rs_fade])
… …
1190 /* 1159 /*
1191 * standard System V termios interface 1160 * standard System V termios interface
1192 */ 1161 */
1193 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1194 { 1163 {
1195 /* 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
1196 tio->c_cc[VINTR] = CINTR; 1168 tio->c_cc[VINTR] = CINTR;
1197 tio->c_cc[VQUIT] = CQUIT; 1169 tio->c_cc[VQUIT] = CQUIT;
1198 tio->c_cc[VERASE] = CERASE; 1170 tio->c_cc[VERASE] = CERASE;
1171#ifdef VERASE2
1172 tio->c_cc[VERASE2] = CERASE2;
1173#endif
1199 tio->c_cc[VKILL] = CKILL; 1174 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1175 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1176 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1177 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1178# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1179 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1180# endif
1207# ifdef VREPRINT 1181# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1182 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1183# endif
1211# ifdef VDISCRD 1184# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1185 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1186# endif
1215# ifdef VWERSE 1187# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1188 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1189# endif
1219# ifdef VLNEXT 1190# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1191 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1192# endif
1223
1224 } 1193 }
1194
1225 tio->c_cc[VEOF] = CEOF; 1195 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1196 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1197# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1198 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1199# endif
1231# ifdef VSWTC 1200# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1201 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1202# endif
1235# ifdef VSWTCH 1203# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1204 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1205# endif
1239# if VMIN != VEOF 1206# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1207 tio->c_cc[VMIN] = 1;
1242# endif 1208# endif
1243# if VTIME != VEOL 1209# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1210 tio->c_cc[VTIME] = 0;
1246# endif 1211# endif
1247 1212
1248 if (erase != -1) 1213 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1214 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1243 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1244 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1245 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1246 }
1247
1282 if (erase != -1) 1248 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1249 tio->sg.sg_erase = (char)erase;
1284 1250
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1252
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1258 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1259 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1260 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1261 tio->tc.t_brkc = -1;
1296 } 1262 }
1263
1297 /* get local special chars */ 1264 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1266 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1273 }
1307 /* get line discipline */ 1274 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1276# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1277 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1278# endif /* NTTYDISC */
1313 1279
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1281#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1304 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1305 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1306 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1307 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1308# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1309 FOO (IUCLC, "IUCLC");
1345# endif 1310# endif
1346# ifdef IXANY 1311# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1312 FOO (IXANY, "IXANY");
1349# endif 1313# endif
1350# ifdef IMAXBEL 1314# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1315 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1316# endif
1354 1317
1355 fprintf (stderr, "\n"); 1318 fprintf (stderr, "\n");
1356 1319
… …
1363 FOO (VERASE, "VERASE"); 1326 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1327 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1328 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1329 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1330# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1331 FOO (VEOL2, "VEOL2");
1370# endif 1332# endif
1371# ifdef VSWTC 1333# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1334 FOO (VSWTC, "VSWTC");
1374# endif 1335# endif
1375# ifdef VSWTCH 1336# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1337 FOO (VSWTCH, "VSWTCH");
1378# endif 1338# endif
1379
1380 FOO (VSTART, "VSTART"); 1339 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1340 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1341 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1342# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1343 FOO (VDSUSP, "VDSUSP");
1386# endif 1344# endif
1387# ifdef VREPRINT 1345# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1346 FOO (VREPRINT, "VREPRINT");
1390# endif 1347# endif
1391# ifdef VDISCRD 1348# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1349 FOO (VDISCRD, "VDISCRD");
1394# endif 1350# endif
1395# ifdef VWERSE 1351# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1352 FOO (VWERSE, "VWERSE");
1398# endif 1353# endif
1399# ifdef VLNEXT 1354# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1355 FOO (VLNEXT, "VLNEXT");
1402# endif 1356# endif
1403 1357
1404 fprintf (stderr, "\n"); 1358 fprintf (stderr, "\n");
1405# undef FOO 1359# undef FOO
… …
1417rxvt_term::run_command (const char *const *argv) 1371rxvt_term::run_command (const char *const *argv)
1418{ 1372{
1419#if ENABLE_FRILLS 1373#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1374 if (rs[Rs_pty_fd])
1421 { 1375 {
1422 pty.pty = atoi (rs[Rs_pty_fd]); 1376 pty->pty = atoi (rs[Rs_pty_fd]);
1423 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 }
1424 } 1386 }
1425 else 1387 else
1426#endif 1388#endif
1427 if (!pty.get ()) 1389 if (!pty->get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1429 1391
1430 pty.set_utf8_mode (enc_utf8); 1392 pty->set_utf8_mode (enc_utf8);
1431 1393
1432 /* set initial window size */ 1394 /* set initial window size */
1433 tt_winch (); 1395 tt_winch ();
1434 1396
1435 int er; 1397 int er;
… …
1448#if ENABLE_FRILLS 1410#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1411 if (rs[Rs_pty_fd])
1450 return; 1412 return;
1451#endif 1413#endif
1452 1414
1453 sw_chld.start (SIGCHLD);
1454
1455#ifndef __QNX__
1456 /* spin off the command interpreter */ 1415 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1416 switch (cmd_pid = fork ())
1458 { 1417 {
1459 case -1: 1418 case -1:
1460 { 1419 {
… …
1462 rxvt_fatal ("can't fork, aborting.\n"); 1421 rxvt_fatal ("can't fork, aborting.\n");
1463 } 1422 }
1464 case 0: 1423 case 0:
1465 init_env (); 1424 init_env ();
1466 1425
1467 if (!pty.make_controlling_tty ()) 1426 if (!pty->make_controlling_tty ())
1468 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1427 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1469 else 1428 else
1470 { 1429 {
1471 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1430 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1472 dup2 (pty.tty, STDIN_FILENO); 1431 dup2 (pty->tty, STDIN_FILENO);
1473 dup2 (pty.tty, STDOUT_FILENO); 1432 dup2 (pty->tty, STDOUT_FILENO);
1474 dup2 (pty.tty, STDERR_FILENO); 1433 dup2 (pty->tty, STDERR_FILENO);
1475 1434
1476 // close all our file handles that we do no longer need 1435 // close all our file handles that we do no longer need
1477 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1436 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1478 { 1437 {
1479 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1438 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1480 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1439 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1481 } 1440 }
1482 1441
1483 run_child (argv); 1442 run_child (argv);
1484 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1443 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1485 } 1444 }
1486 1445
1487 _exit (EXIT_FAILURE); 1446 _exit (EXIT_FAILURE);
1488 1447
1489 default: 1448 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 1449#if UTMP_SUPPORT
1499 privileged_utmp (SAVE); 1450 if (!OPTION (Opt_utmpInhibit))
1451 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1500#endif 1452#endif
1501 1453
1502#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1454 pty->close_tty ();
1503 1455
1504 dup2 (fdstdin, STDIN_FILENO); 1456 child_ev.start (cmd_pid);
1505 close (fdstdin);
1506#endif
1507 }
1508 1457
1509 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1458 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1510 break; 1459 break;
1511 } 1460 }
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} 1461}
1521 1462
1522/* ------------------------------------------------------------------------- * 1463/* ------------------------------------------------------------------------- *
1523 * CHILD PROCESS OPERATIONS * 1464 * CHILD PROCESS OPERATIONS *
1524 * ------------------------------------------------------------------------- */ 1465 * ------------------------------------------------------------------------- */
… …
1531{ 1472{
1532 char *login; 1473 char *login;
1533 1474
1534 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1475 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1535 1476
1536 if (options & Opt_console) 1477 if (OPTION (Opt_console))
1537 { /* be virtual console, fail silently */ 1478 { /* be virtual console, fail silently */
1538#ifdef TIOCCONS 1479#ifdef TIOCCONS
1539 unsigned int on = 1; 1480 unsigned int on = 1;
1540 1481
1541 ioctl (STDIN_FILENO, TIOCCONS, &on); 1482 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1568 // unblock signals (signals are blocked by iom.C 1509 // unblock signals (signals are blocked by iom.C
1569 sigset_t ss; 1510 sigset_t ss;
1570 sigemptyset (&ss); 1511 sigemptyset (&ss);
1571 sigprocmask (SIG_SETMASK, &ss, 0); 1512 sigprocmask (SIG_SETMASK, &ss, 0);
1572 1513
1573#ifndef __QNX__
1574 /* command interpreter path */ 1514 /* command interpreter path */
1575 if (argv != NULL) 1515 if (argv != NULL)
1576 { 1516 {
1577# ifdef DEBUG_CMD 1517# ifdef DEBUG_CMD
1578 int i; 1518 int i;
… …
1584 execvp (argv[0], (char *const *)argv); 1524 execvp (argv[0], (char *const *)argv);
1585 /* no error message: STDERR is closed! */ 1525 /* no error message: STDERR is closed! */
1586 } 1526 }
1587 else 1527 else
1588 { 1528 {
1589 const char *argv0, *shell; 1529 const char *argv0, *shell;
1590 1530
1591 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1531 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1592 shell = "/bin/sh"; 1532 shell = "/bin/sh";
1593 1533
1594 argv0 = (const char *)rxvt_r_basename (shell); 1534 argv0 = (const char *)rxvt_r_basename (shell);
1595 1535
1596 if (options & Opt_loginShell) 1536 if (OPTION (Opt_loginShell))
1597 { 1537 {
1598 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1538 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1599 1539
1600 login[0] = '-'; 1540 login[0] = '-';
1601 strcpy (&login[1], argv0); 1541 strcpy (&login[1], argv0);
1602 argv0 = login; 1542 argv0 = login;
1603 } 1543 }
1544
1604 execlp (shell, argv0, NULL); 1545 execlp (shell, argv0, NULL);
1605 /* no error message: STDERR is closed! */ 1546 /* no error message: STDERR is closed! */
1606 } 1547 }
1607 1548
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; 1549 return -1;
1665} 1550}
1666 1551
1667/*----------------------- end-of-file (C source) -----------------------*/ 1552/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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