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

Diff Legend

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