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.120 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 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) */
… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
223
224 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225#ifdef OFF_FOCUS_FADING 183#ifdef OFF_FOCUS_FADING
226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227#endif 185#endif
228 pix_colors = pix_colors_focused; 186 pix_colors = pix_colors_focused;
229 187
230 if (pix_colors == NULL) 188 if (pix_colors == NULL)
231 return false; 189 return false;
232 190
233#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
234 TermWin.pixmap = None; 192 pixmap = None;
235#endif 193#endif
236 194
237 MEvent.time = CurrentTime; 195 MEvent.time = CurrentTime;
238 MEvent.button = AnyButton; 196 MEvent.button = AnyButton;
239 options = DEFAULT_OPTIONS; 197 options = DEFAULT_OPTIONS;
240 want_refresh = 1; 198 want_refresh = 1;
241 priv_modes = SavedModes = PrivMode_Default; 199 priv_modes = SavedModes = PrivMode_Default;
242 TermWin.focus = 0; 200 focus = 0;
243 TermWin.ncol = 80; 201 ncol = 80;
244 TermWin.nrow = 24; 202 nrow = 24;
245 TermWin.int_bwidth = INTERNALBORDERWIDTH; 203 int_bwidth = INTERNALBORDERWIDTH;
246 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 204 ext_bwidth = EXTERNALBORDERWIDTH;
247 TermWin.lineSpace = LINESPACE; 205 lineSpace = LINESPACE;
248 TermWin.saveLines = SAVELINES; 206 saveLines = SAVELINES;
249 numpix_colors = TOTAL_COLORS; 207 numpix_colors = TOTAL_COLORS;
250 208
251 refresh_limit = 1; 209 refresh_limit = 1;
252 refresh_type = SLOW_REFRESH; 210 refresh_type = SLOW_REFRESH;
253 prev_nrow = prev_ncol = 0; 211 prev_nrow = prev_ncol = 0;
… …
258 bgPixmap.x = bgPixmap.y = 50; 216 bgPixmap.x = bgPixmap.y = 50;
259 bgPixmap.pixmap = None; 217 bgPixmap.pixmap = None;
260#endif 218#endif
261 219
262 last_bot = last_state = -1; 220 last_bot = last_state = -1;
263
264#ifdef MENUBAR
265 menu_readonly = 1;
266# if ! (MENUBAR_MAX > 1)
267 CurrentBar = &BarList;
268# endif /* (MENUBAR_MAX > 1) */
269#endif
270 221
271 return true; 222 return true;
272} 223}
273 224
274void 225void
… …
342 rs[Rs_name] = rxvt_r_basename (argv[0]); 293 rs[Rs_name] = rxvt_r_basename (argv[0]);
343 294
344 /* 295 /*
345 * Open display, get options/resources and create the window 296 * Open display, get options/resources and create the window
346 */ 297 */
298
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 299 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 300 rs[Rs_display_name] = ":0";
349 301
350 get_options (r_argc, r_argv); 302 get_options (r_argc, r_argv);
351 303
352 if (!(display = displays.get (rs[Rs_display_name]))) 304 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 306
355 extract_resources (); 307 extract_resources ();
308
356 free (r_argv); 309 free (r_argv);
310
311#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default";
314
315 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
316 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
317 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
318 {
319 rxvt_perl.init (this);
320 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
321 }
322#endif
357 323
358 /* 324 /*
359 * set any defaults not already set 325 * set any defaults not already set
360 */ 326 */
361 if (cmd_argv && cmd_argv[0]) 327 if (cmd_argv && cmd_argv[0])
… …
372 if (!rs[Rs_iconName]) 338 if (!rs[Rs_iconName])
373 rs[Rs_iconName] = rs[Rs_name]; 339 rs[Rs_iconName] = rs[Rs_name];
374 } 340 }
375 341
376 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 342 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 343 saveLines = min (i, MAX_SAVELINES);
378 344
379#if ENABLE_FRILLS 345#if ENABLE_FRILLS
380 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 346 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 347 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
348
382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 349 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 350 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
351
384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 352 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 353 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
386#endif 354#endif
387 355
388#ifdef POINTER_BLANK 356#ifdef POINTER_BLANK
389 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 357 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390 pointerBlankDelay = i; 358 pointerBlankDelay = i;
391 else 359 else
392 pointerBlankDelay = 2; 360 pointerBlankDelay = 2;
393#endif 361#endif
394 362
395 /* no point having a scrollbar without having any scrollback! */ 363 /* no point having a scrollbar without having any scrollback! */
396 if (!TermWin.saveLines) 364 if (!saveLines)
397 options &= ~Opt_scrollBar; 365 set_option (Opt_scrollBar, 0);
398 366
399#ifdef PRINTPIPE 367#ifdef PRINTPIPE
400 if (!rs[Rs_print_pipe]) 368 if (!rs[Rs_print_pipe])
401 rs[Rs_print_pipe] = PRINTPIPE; 369 rs[Rs_print_pipe] = PRINTPIPE;
402#endif 370#endif
… …
445 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 413 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
446#endif 414#endif
447 415
448#ifdef XTERM_REVERSE_VIDEO 416#ifdef XTERM_REVERSE_VIDEO
449 /* this is how xterm implements reverseVideo */ 417 /* this is how xterm implements reverseVideo */
450 if (options & Opt_reverseVideo) 418 if (OPTION (Opt_reverseVideo))
451 { 419 {
452 if (!rs[Rs_color + Color_fg]) 420 if (!rs[Rs_color + Color_fg])
453 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 421 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
454 if (!rs[Rs_color + Color_bg]) 422 if (!rs[Rs_color + Color_bg])
455 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 423 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
460 if (!rs[Rs_color + i]) 428 if (!rs[Rs_color + i])
461 rs[Rs_color + i] = def_colorName[i]; 429 rs[Rs_color + i] = def_colorName[i];
462 430
463#ifndef XTERM_REVERSE_VIDEO 431#ifndef XTERM_REVERSE_VIDEO
464 /* this is how we implement reverseVideo */ 432 /* this is how we implement reverseVideo */
465 if (options & Opt_reverseVideo) 433 if (OPTION (Opt_reverseVideo))
466 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
467#endif 435#endif
468 436
469 /* convenient aliases for setting fg/bg to colors */ 437 /* convenient aliases for setting fg/bg to colors */
470 color_aliases (Color_fg); 438 color_aliases (Color_fg);
471 color_aliases (Color_bg); 439 color_aliases (Color_bg);
… …
521 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
522 490
523 sprintf (env_display, "DISPLAY=%s", val); 491 sprintf (env_display, "DISPLAY=%s", val);
524 492
525 /* avoiding the math library: 493 /* avoiding the math library:
526 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
527 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
528 ; 496 ;
529 MAX_IT (i, 1); 497 max_it (i, 1);
530 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
531 499
532 sprintf (env_windowid, "WINDOWID=%u", 500 sprintf (env_windowid, "WINDOWID=%u",
533 (unsigned int)TermWin.parent[0]); 501 (unsigned int)parent[0]);
534 502
535 /* add entries to the environment: 503 /* add entries to the environment:
536 * @ DISPLAY: in case we started with -display 504 * @ DISPLAY: in case we started with -display
537 * @ WINDOWID: X window id number of the window 505 * @ WINDOWID: X window id number of the window
538 * @ COLORTERM: terminal sub-name and also indicates its color 506 * @ COLORTERM: terminal sub-name and also indicates its color
… …
577 * This should support all European type languages. 545 * This should support all European type languages.
578 */ 546 */
579void 547void
580rxvt_term::set_locale (const char *locale) 548rxvt_term::set_locale (const char *locale)
581{ 549{
550 set_environ (envv);
551
582#if HAVE_XSETLOCALE || HAVE_SETLOCALE 552#if HAVE_XSETLOCALE || HAVE_SETLOCALE
583 free (this->locale); 553 free (this->locale);
584 this->locale = setlocale (LC_CTYPE, locale); 554 this->locale = setlocale (LC_CTYPE, locale);
585 555
586 if (!this->locale) 556 if (!this->locale)
587 { 557 {
588 if (*locale) 558 if (*locale)
589 { 559 {
590 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 560 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
591 setlocale (LC_CTYPE, ""); 561 setlocale (LC_CTYPE, "C");
592 } 562 }
593 else 563 else
594 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 564 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
595 565
596 this->locale = ""; 566 this->locale = "C";
597 } 567 }
598 568
599 569
600 this->locale = rxvt_strdup (this->locale); 570 this->locale = rxvt_strdup (this->locale);
601 SET_LOCALE (this->locale); 571 SET_LOCALE (this->locale);
… …
616} 586}
617 587
618void 588void
619rxvt_term::init_xlocale () 589rxvt_term::init_xlocale ()
620{ 590{
591 set_environ (envv);
592
621#ifdef USE_XIM 593#ifdef USE_XIM
622 if (!locale) 594 if (!locale)
623 rxvt_warn ("setting locale failed, working without locale support.\n"); 595 rxvt_warn ("setting locale failed, working without locale support.\n");
624 else 596 else
625 { 597 {
… …
647 * Initialize the command connection. 619 * Initialize the command connection.
648 * This should be called after the X server connection is established. 620 * This should be called after the X server connection is established.
649 */ 621 */
650 622
651#ifdef META8_OPTION 623#ifdef META8_OPTION
652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653#endif 625#endif
654 626
655 get_ourmods (); 627 get_ourmods ();
656 628
657 if (!(options & Opt_scrollTtyOutput)) 629 if (!OPTION (Opt_scrollTtyOutput))
658 priv_modes |= PrivMode_TtyOutputInh; 630 priv_modes |= PrivMode_TtyOutputInh;
659 if (options & Opt_scrollTtyKeypress) 631 if (OPTION (Opt_scrollTtyKeypress))
660 priv_modes |= PrivMode_Keypress; 632 priv_modes |= PrivMode_Keypress;
661 if (!(options & Opt_jumpScroll)) 633 if (!OPTION (Opt_jumpScroll))
662 priv_modes |= PrivMode_smoothScroll; 634 priv_modes |= PrivMode_smoothScroll;
663 635
664#ifndef NO_BACKSPACE_KEY 636#ifndef NO_BACKSPACE_KEY
665 if (strcmp (key_backspace, "DEC") == 0) 637 if (strcmp (key_backspace, "DEC") == 0)
666 priv_modes |= PrivMode_HaveBackSpace; 638 priv_modes |= PrivMode_HaveBackSpace;
667#endif 639#endif
668 640
669 /* add value for scrollBar */ 641 /* add value for scrollBar */
670 if (scrollbar_visible ()) 642 if (scrollBar.state)
671 { 643 {
672 priv_modes |= PrivMode_scrollBar; 644 priv_modes |= PrivMode_scrollBar;
673 SavedModes |= PrivMode_scrollBar; 645 SavedModes |= PrivMode_scrollBar;
674 } 646 }
675
676 if (menubar_visible ())
677 {
678 priv_modes |= PrivMode_menuBar;
679 SavedModes |= PrivMode_menuBar;
680 }
681
682#ifdef CURSOR_BLINK
683 if (options & Opt_cursorBlink)
684 (void)gettimeofday (&lastcursorchange, NULL);
685#endif
686 647
687 run_command (argv); 648 run_command (argv);
688} 649}
689 650
690/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
… …
705 continue; 666 continue;
706 667
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 669 {
709#ifndef XTERM_REVERSE_VIDEO 670#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && (options & Opt_reverseVideo)) 671 if (i < 2 && OPTION (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 672 rs[Rs_color + i] = def_colorName[!i];
712 else 673 else
713#endif 674#endif
714 rs[Rs_color + i] = def_colorName[i]; 675 rs[Rs_color + i] = def_colorName[i];
715 676
… …
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 720 }
760 721
761 /* 722 /*
762 * get scrollBar/menuBar shadow colors 723 * get scrollBar shadow colors
763 * 724 *
764 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 726 * from the fvwm window manager.
766 */ 727 */
767#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
… …
812 int i = atoi (rs[Rs_color + idx]); 773 int i = atoi (rs[Rs_color + idx]);
813 774
814 if (i >= 8 && i <= 15) 775 if (i >= 8 && i <= 15)
815 { /* bright colors */ 776 { /* bright colors */
816 i -= 8; 777 i -= 8;
817#ifndef NO_BRIGHTCOLOR
818 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
819 return; 779 return;
820#endif
821 } 780 }
822 781
823 if (i >= 0 && i <= 7) /* normal colors */ 782 if (i >= 0 && i <= 7) /* normal colors */
824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825 } 784 }
… …
920rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
921{ 880{
922 XClassHint classHint; 881 XClassHint classHint;
923 XWMHints wmHint; 882 XWMHints wmHint;
924#if ENABLE_FRILLS 883#if ENABLE_FRILLS
925 Atom prop = None;
926 MWMHints mwmhints; 884 MWMHints mwmhints;
927#endif 885#endif
928 XGCValues gcvalue; 886 XGCValues gcvalue;
929 long vt_emask;
930 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
931 XWindowAttributes gattr;
932 Window top, parent; 888 Window top, parent;
933 dDisp; 889 dDisp;
934 890
935#ifdef USING_W11LIB 891 xa = display->xa;
936 /* enable W11 callbacks */
937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
938#endif
939 892
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 893 /* grab colors before netscape does */
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 894 Get_Colours ();
942 895
943 if (options & Opt_transparent) 896 if (!set_fonts ())
944 { 897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 898
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 899 parent = display->root;
947 } 900
901 attributes.override_redirect = !!OPTION (Opt_override_redirect);
948 902
949#if ENABLE_FRILLS 903#if ENABLE_FRILLS
950 if (options & Opt_borderLess) 904 if (OPTION (Opt_borderLess))
951 { 905 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
953
954 if (prop == None)
955 { 907 {
956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
957#ifdef PREFER_24BIT
958 attributes.override_redirect = TRUE; 909 attributes.override_redirect = TRUE;
959#endif
960 mwmhints.flags = 0; 910 mwmhints.flags = 0;
961 } 911 }
962 else 912 else
963 { 913 {
964 mwmhints.flags = MWM_HINTS_DECORATIONS; 914 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
967 } 917 }
968 else 918 else
969 mwmhints.flags = 0; 919 mwmhints.flags = 0;
970#endif 920#endif
971 921
972 /* grab colors before netscape does */
973 Get_Colours ();
974
975 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978 parent = DefaultRootWindow (disp);
979
980#if ENABLE_XEMBED 922#if ENABLE_XEMBED
981 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
982 { 924 {
983 XWindowAttributes wattr; 925 XWindowAttributes wattr;
984 926
… …
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 929 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 931
990 window_calc (wattr.width, wattr.height); 932 window_calc (wattr.width, wattr.height);
991 } 933 }
992
993#endif 934#endif
935
994 window_calc (0, 0); 936 window_calc (0, 0);
995 937
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused[Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused[Color_border];
1000 attributes.colormap = display->cmap; 941 attributes.colormap = display->cmap;
942
1001 top = XCreateWindow (disp, parent, 943 top = XCreateWindow (disp, parent,
1002 szHint.x, szHint.y, 944 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 945 szHint.width, szHint.height,
1004 TermWin.ext_bwidth, 946 ext_bwidth,
1005 display->depth, InputOutput, 947 display->depth, InputOutput,
1006 display->visual, 948 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1008#else 950 &attributes);
1009 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y,
1011 szHint.width, szHint.height,
1012 TermWin.ext_bwidth,
1013 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]);
1015#endif
1016 951
1017 TermWin.parent[0] = top; 952 this->parent[0] = top;
1018 953
1019 old_width = szHint.width; 954 old_width = szHint.width;
1020 old_height = szHint.height; 955 old_height = szHint.height;
1021 956
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1024 959
1025 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
1027 962
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 964 wmHint.input = True;
1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 966 wmHint.window_group = top;
1032 967
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
970
971#if ENABLE_FRILLS
972 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif
1035 976
1036 Atom protocols[] = { 977 Atom protocols[] = {
1037 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH 979#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
1040#endif 981#endif
1041 }; 982 };
1042 983
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044 985
986#if ENABLE_FRILLS
987 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif
990
1045#if ENABLE_EWMH 991#if ENABLE_EWMH
1046 long pid = getpid (); 992 long pid = getpid ();
1047 993
1048 XChangeProperty (disp, top, 994 XChangeProperty (disp, top,
1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 995 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1060 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1061 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1062 1008
1063 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1064 1010
1065#if ENABLE_FRILLS
1066 if (mwmhints.flags)
1067 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1068 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1069#endif
1070
1071 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1072 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1073 1013
1074#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1014#ifdef HAVE_SCROLLBARS
1075 /* cursor (menuBar/scrollBar): Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1077#endif 1017#endif
1078 1018
1079 /* the vt window */ 1019 /* the vt window */
1080 TermWin.vt = XCreateSimpleWindow (disp, top, 1020 vt = XCreateSimpleWindow (disp, top,
1081 window_vt_x,
1082 window_vt_y, 1021 window_vt_x, window_vt_y,
1083 TermWin_TotalWidth (), 1022 width, height,
1084 TermWin_TotalHeight (),
1085 0, 1023 0,
1086 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1088#ifdef DEBUG_X
1089 XStoreName (disp, TermWin.vt, "vt window");
1090#endif
1091 1026
1092 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1094 1029
1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1096 1031
1097#ifdef POINTER_BLANK 1032 if (OPTION (Opt_pointerBlank))
1098 if (options & Opt_pointerBlank)
1099 vt_emask |= PointerMotionMask; 1033 vt_emask |= PointerMotionMask;
1100 else 1034 else
1101#endif
1102 vt_emask |= Button1MotionMask | Button3MotionMask; 1035 vt_emask |= Button1MotionMask | Button3MotionMask;
1103 1036
1104 XSelectInput (disp, TermWin.vt, vt_emask); 1037 vt_select_input ();
1038
1105 vt_ev.start (display, TermWin.vt); 1039 vt_ev.start (display, vt);
1106
1107#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108 if (menuBar_height ())
1109 {
1110 menuBar.win = XCreateSimpleWindow (disp, top,
1111 window_vt_x, 0,
1112 TermWin_TotalWidth (),
1113 menuBar_TotalHeight (),
1114 0,
1115 pix_colors_focused[Color_fg],
1116 pix_colors_focused[Color_scroll]);
1117
1118#ifdef DEBUG_X
1119 XStoreName (disp, menuBar.win, "menubar");
1120#endif
1121
1122 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1123
1124 XDefineCursor (disp, menuBar.win,
1125 XCreateFontCursor (disp, XC_left_ptr));
1126
1127 XSelectInput (disp, menuBar.win,
1128 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1129 menubar_ev.start (display, menuBar.win);
1130 }
1131#endif
1132 1040
1133#ifdef XPM_BACKGROUND 1041#ifdef XPM_BACKGROUND
1134 if (rs[Rs_backgroundPixmap] != NULL 1042 if (rs[Rs_backgroundPixmap] != NULL
1135 && ! (options & Opt_transparent)) 1043 && ! OPTION (Opt_transparent))
1136 { 1044 {
1137 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1138 1046
1139 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1140 { 1048 {
… …
1146 scr_touch (true); 1054 scr_touch (true);
1147 } 1055 }
1148#endif 1056#endif
1149 1057
1150 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1151 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1152 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1153 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 1;
1062
1154 TermWin.gc = XCreateGC (disp, TermWin.vt, 1063 gc = XCreateGC (disp, vt,
1155 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1156 &gcvalue); 1065 &gcvalue);
1157 1066
1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1067 drawable = new rxvt_drawable (display, vt);
1159 1068
1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1069#ifdef RXVT_SCROLLBAR
1161 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1163 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167#endif 1076#endif
1168 1077
1169#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1170 // initially we are in unfocused state 1079 // initially we are in unfocused state
1171 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
1172 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1173#endif 1082#endif
1174 1083
1175 pointer_unblank (); 1084 pointer_unblank ();
1176 scr_recolour (); 1085 scr_recolour ();
1177
1178#if ENABLE_XEMBED
1179 if (rs[Rs_embed])
1180 {
1181 long info[2] = { 0, XEMBED_MAPPED };
1182
1183 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1184 32, PropModeReplace, (unsigned char *)&info, 2);
1185 }
1186#endif
1187} 1086}
1188 1087
1189/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1190 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1191 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
… …
1196 /* 1095 /*
1197 * standard System V termios interface 1096 * standard System V termios interface
1198 */ 1097 */
1199 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1200 { 1099 {
1201 /* return error - use system defaults */ 1100 // return error - use system defaults,
1101 // where possible, and zero elsewhere
1102 memset (tio, 0, sizeof (ttymode_t));
1103
1202 tio->c_cc[VINTR] = CINTR; 1104 tio->c_cc[VINTR] = CINTR;
1203 tio->c_cc[VQUIT] = CQUIT; 1105 tio->c_cc[VQUIT] = CQUIT;
1204 tio->c_cc[VERASE] = CERASE; 1106 tio->c_cc[VERASE] = CERASE;
1107#ifdef VERASE2
1108 tio->c_cc[VERASE2] = CERASE2;
1109#endif
1205 tio->c_cc[VKILL] = CKILL; 1110 tio->c_cc[VKILL] = CKILL;
1206 tio->c_cc[VSTART] = CSTART; 1111 tio->c_cc[VSTART] = CSTART;
1207 tio->c_cc[VSTOP] = CSTOP; 1112 tio->c_cc[VSTOP] = CSTOP;
1208 tio->c_cc[VSUSP] = CSUSP; 1113 tio->c_cc[VSUSP] = CSUSP;
1209# ifdef VDSUSP 1114# ifdef VDSUSP
… …
1402rxvt_term::run_command (const char *const *argv) 1307rxvt_term::run_command (const char *const *argv)
1403{ 1308{
1404#if ENABLE_FRILLS 1309#if ENABLE_FRILLS
1405 if (rs[Rs_pty_fd]) 1310 if (rs[Rs_pty_fd])
1406 { 1311 {
1407 pty.pty = atoi (rs[Rs_pty_fd]); 1312 pty->pty = atoi (rs[Rs_pty_fd]);
1408 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1313
1314 if (pty->pty >= 0)
1315 {
1316 if (getfd_hook)
1317 pty->pty = (*getfd_hook) (pty->pty);
1318
1319 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1320 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1321 }
1409 } 1322 }
1410 else 1323 else
1411#endif 1324#endif
1412 if (!pty.get ()) 1325 if (!pty->get ())
1413 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1414 1327
1415 pty.set_utf8_mode (enc_utf8); 1328 pty->set_utf8_mode (enc_utf8);
1416 1329
1417 /* set initial window size */ 1330 /* set initial window size */
1418 tt_winch (); 1331 tt_winch ();
1419 1332
1420 int er; 1333 int er;
… …
1433#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1434 if (rs[Rs_pty_fd]) 1347 if (rs[Rs_pty_fd])
1435 return; 1348 return;
1436#endif 1349#endif
1437 1350
1438 sw_chld.start (SIGCHLD);
1439
1440#ifndef __QNX__
1441 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1442 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1443 { 1353 {
1444 case -1: 1354 case -1:
1445 { 1355 {
… …
1447 rxvt_fatal ("can't fork, aborting.\n"); 1357 rxvt_fatal ("can't fork, aborting.\n");
1448 } 1358 }
1449 case 0: 1359 case 0:
1450 init_env (); 1360 init_env ();
1451 1361
1452 if (!pty.make_controlling_tty ()) 1362 if (!pty->make_controlling_tty ())
1453 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1363 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1454 else 1364 else
1455 { 1365 {
1456 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1457 dup2 (pty.tty, STDIN_FILENO); 1367 dup2 (pty->tty, STDIN_FILENO);
1458 dup2 (pty.tty, STDOUT_FILENO); 1368 dup2 (pty->tty, STDOUT_FILENO);
1459 dup2 (pty.tty, STDERR_FILENO); 1369 dup2 (pty->tty, STDERR_FILENO);
1460 1370
1461 // close all our file handles that we do no longer need 1371 // close all our file handles that we do no longer need
1462 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1372 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1463 { 1373 {
1464 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1374 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1465 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1375 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1466 } 1376 }
1467 1377
1468 run_child (argv); 1378 run_child (argv);
1469 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1379 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1470 } 1380 }
1471 1381
1472 _exit (EXIT_FAILURE); 1382 _exit (EXIT_FAILURE);
1473 1383
1474 default: 1384 default:
1475 { 1385 if (!OPTION (Opt_utmpInhibit))
1476#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1477 int fdstdin;
1478 1387
1479 fdstdin = dup (STDIN_FILENO); 1388 pty->close_tty ();
1480 dup2 (pty.tty, STDIN_FILENO);
1481#endif
1482 1389
1483#ifdef UTMP_SUPPORT 1390 child_ev.start (cmd_pid);
1484 privileged_utmp (SAVE);
1485#endif
1486 1391
1487#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1392 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1488
1489 dup2 (fdstdin, STDIN_FILENO);
1490 close (fdstdin);
1491#endif
1492 }
1493
1494 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1495 break; 1393 break;
1496 } 1394 }
1497#else /* __QNX__ uses qnxspawn () */
1498 fchmod (pty.tty, 0622);
1499 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1500 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1501
1502 if (run_child (argv) == -1)
1503 exit (EXIT_FAILURE);
1504#endif
1505} 1395}
1506 1396
1507/* ------------------------------------------------------------------------- * 1397/* ------------------------------------------------------------------------- *
1508 * CHILD PROCESS OPERATIONS * 1398 * CHILD PROCESS OPERATIONS *
1509 * ------------------------------------------------------------------------- */ 1399 * ------------------------------------------------------------------------- */
… …
1516{ 1406{
1517 char *login; 1407 char *login;
1518 1408
1519 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1520 1410
1521 if (options & Opt_console) 1411 if (OPTION (Opt_console))
1522 { /* be virtual console, fail silently */ 1412 { /* be virtual console, fail silently */
1523#ifdef TIOCCONS 1413#ifdef TIOCCONS
1524 unsigned int on = 1; 1414 unsigned int on = 1;
1525 1415
1526 ioctl (STDIN_FILENO, TIOCCONS, &on); 1416 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1553 // unblock signals (signals are blocked by iom.C 1443 // unblock signals (signals are blocked by iom.C
1554 sigset_t ss; 1444 sigset_t ss;
1555 sigemptyset (&ss); 1445 sigemptyset (&ss);
1556 sigprocmask (SIG_SETMASK, &ss, 0); 1446 sigprocmask (SIG_SETMASK, &ss, 0);
1557 1447
1558#ifndef __QNX__
1559 /* command interpreter path */ 1448 /* command interpreter path */
1560 if (argv != NULL) 1449 if (argv != NULL)
1561 { 1450 {
1562# ifdef DEBUG_CMD 1451# ifdef DEBUG_CMD
1563 int i; 1452 int i;
… …
1569 execvp (argv[0], (char *const *)argv); 1458 execvp (argv[0], (char *const *)argv);
1570 /* no error message: STDERR is closed! */ 1459 /* no error message: STDERR is closed! */
1571 } 1460 }
1572 else 1461 else
1573 { 1462 {
1574 const char *argv0, *shell; 1463 const char *argv0, *shell;
1575 1464
1576 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1577 shell = "/bin/sh"; 1466 shell = "/bin/sh";
1578 1467
1579 argv0 = (const char *)rxvt_r_basename (shell); 1468 argv0 = (const char *)rxvt_r_basename (shell);
1580 1469
1581 if (options & Opt_loginShell) 1470 if (OPTION (Opt_loginShell))
1582 { 1471 {
1583 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1584 1473
1585 login[0] = '-'; 1474 login[0] = '-';
1586 strcpy (&login[1], argv0); 1475 strcpy (&login[1], argv0);
1587 argv0 = login; 1476 argv0 = login;
1588 } 1477 }
1478
1589 execlp (shell, argv0, NULL); 1479 execlp (shell, argv0, NULL);
1590 /* no error message: STDERR is closed! */ 1480 /* no error message: STDERR is closed! */
1591 } 1481 }
1592 1482
1593#else /* __QNX__ uses qnxspawn () */
1594
1595 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1596 char *command = NULL, fullcommand[_MAX_PATH];
1597 char **arg_v, *arg_a[2] = { NULL, NULL };
1598
1599 if (argv != NULL)
1600 {
1601 if (access (argv[0], X_OK) == -1)
1602 {
1603 if (strchr (argv[0], '/') == NULL)
1604 {
1605 searchenv (argv[0], "PATH", fullcommand);
1606
1607 if (fullcommand[0] != '\0')
1608 command = fullcommand;
1609 }
1610
1611 if (access (command, X_OK) == -1)
1612 return -1;
1613 }
1614 else
1615 command = argv[0];
1616
1617 arg_v = argv;
1618 }
1619 else
1620 {
1621 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1622 command = "/bin/sh";
1623
1624 arg_a[0] = my_basename (command);
1625
1626 if (options & Opt_loginShell)
1627 {
1628 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1629
1630 login[0] = '-';
1631 strcpy (&login[1], arg_a[0]);
1632 arg_a[0] = login;
1633 }
1634
1635 arg_v = arg_a;
1636 }
1637
1638 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1639 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1640 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1641 command, arg_v, environ, iov_a, 0);
1642 if (login)
1643 free (login);
1644
1645 pty.close_tty ();
1646 return pty.pty;
1647#endif
1648
1649 return -1; 1483 return -1;
1650} 1484}
1651 1485
1652/*----------------------- end-of-file (C source) -----------------------*/ 1486/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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