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.107 by root, Wed Feb 2 08:09:23 2005 UTC vs.
Revision 1.130 by root, Wed Jan 4 04:42:45 2006 UTC

… …
33 33
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
39#include <limits>
38 40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
… …
169 COLOR_SCROLLTROUGH, 171 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 172#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 173#if TINTING
172 NULL, 174 NULL,
173#endif 175#endif
176#if OFF_FOCUS_FADING
177 "black",
178#endif
174 }; 179 };
175 180
176const char *const xa_names[] = 181const char *const xa_names[] =
177 { 182 {
178 "TEXT", 183 "TEXT",
… …
181 "MULTIPLE", 186 "MULTIPLE",
182 "TARGETS", 187 "TARGETS",
183 "TIMESTAMP", 188 "TIMESTAMP",
184 "VT_SELECTION", 189 "VT_SELECTION",
185 "INCR", 190 "INCR",
191 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 192 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 193 "CLIPBOARD",
188#if ENABLE_FRILLS 194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
189 "_NET_WM_PID", 198 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 199 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
193#endif 202#endif
194#if USE_XIM 203#if USE_XIM
195 "WM_LOCALE_NAME", 204 "WM_LOCALE_NAME",
196#endif 205#endif
197#ifdef TRANSPARENT 206#ifdef TRANSPARENT
… …
200#endif 209#endif
201#ifdef OFFIX_DND 210#ifdef OFFIX_DND
202 "DndProtocol", 211 "DndProtocol",
203 "DndSelection", 212 "DndSelection",
204#endif 213#endif
214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif
205 }; 218 };
206 219
207bool 220bool
208rxvt_term::init_vars () 221rxvt_term::init_vars ()
209{ 222{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 224#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 226#endif
217 pix_colors = pix_colors_focused; 227 pix_colors = pix_colors_focused;
218 228
219 if (pix_colors == NULL) 229 if (pix_colors == NULL)
220 return false; 230 return false;
221 231
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 233 pixmap = None;
224#endif 234#endif
225 235
226 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 239 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 241 focus = 0;
234 TermWin.ncol = 80; 242 ncol = 80;
235 TermWin.nrow = 24; 243 nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
237 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
238 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
239 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
240 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
241 249
242 refresh_limit = 1; 250 refresh_limit = 1;
243 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
244 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
… …
337 */ 345 */
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 347 rs[Rs_display_name] = ":0";
340 348
341 get_options (r_argc, r_argv); 349 get_options (r_argc, r_argv);
350
351 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353
354 extract_resources ();
342 free (r_argv); 355 free (r_argv);
343
344#ifdef LOCAL_X_IS_UNIX
345 if (rs[Rs_display_name][0] == ':')
346 {
347 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
348 strcpy (val, "unix");
349 strcat (val, rs[Rs_display_name]);
350 display = displays.get (val);
351 free (val);
352 }
353#endif
354
355 if (!display
356 && ! (display = displays.get (rs[Rs_display_name])))
357 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
358
359 extract_resources (display->display, rs[Rs_name]);
360 356
361 /* 357 /*
362 * set any defaults not already set 358 * set any defaults not already set
363 */ 359 */
364 if (cmd_argv && cmd_argv[0]) 360 if (cmd_argv && cmd_argv[0])
… …
375 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
376 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
377 } 373 }
378 374
379 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
380 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
381 377
382#if ENABLE_FRILLS 378#if ENABLE_FRILLS
383 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
389#endif 387#endif
390 388
391#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
393 pointerBlankDelay = i; 391 pointerBlankDelay = i;
394 else 392 else
395 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
396#endif 394#endif
397 395
398 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
399 if (!TermWin.saveLines) 397 if (!saveLines)
400 options &= ~Opt_scrollBar; 398 CLR_OPTION (Opt_scrollBar);
401 399
402#ifdef PRINTPIPE 400#ifdef PRINTPIPE
403 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
404 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
405#endif 403#endif
… …
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 447#endif
450 448
451#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
453 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
454 { 452 {
455 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
457 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
463 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
465 463
466#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
468 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
469 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 468#endif
471 469
472 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 471 color_aliases (Color_fg);
474 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 523
526 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
527 525
528 /* avoiding the math library: 526 /* avoiding the math library:
529 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ; 529 ;
532 MAX_IT (i, 1); 530 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534 532
535 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
537 535
538 /* add entries to the environment: 536 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
650 * Initialize the command connection. 648 * Initialize the command connection.
651 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
652 */ 650 */
653 651
654#ifdef META8_OPTION 652#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 654#endif
657 655
658 get_ourmods (); 656 get_ourmods ();
659 657
660 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
666 664
667#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
673 if (scrollbar_visible ()) 671 if (scrollbar_visible ())
674 { 672 {
675 priv_modes |= PrivMode_scrollBar; 673 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 674 SavedModes |= PrivMode_scrollBar;
677 } 675 }
676
678 if (menubar_visible ()) 677 if (menubar_visible ())
679 { 678 {
680 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
682 } 681 }
683
684#ifdef CURSOR_BLINK
685 if (options & Opt_cursorBlink)
686 (void)gettimeofday (&lastcursorchange, NULL);
687#endif
688 682
689 run_command (argv); 683 run_command (argv);
690} 684}
691 685
692/*----------------------------------------------------------------------*/ 686/*----------------------------------------------------------------------*/
… …
707 continue; 701 continue;
708 702
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 704 {
711#ifndef XTERM_REVERSE_VIDEO 705#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 706 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 707 rs[Rs_color + i] = def_colorName[!i];
714 else 708 else
715#endif 709#endif
716 rs[Rs_color + i] = def_colorName[i]; 710 rs[Rs_color + i] = def_colorName[i];
717 711
… …
742 } 736 }
743 } 737 }
744 } 738 }
745 739
746 pix_colors[i] = xcol; 740 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i);
742 }
743
747#ifdef OFF_FOCUS_FADING 744#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 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]);
750#endif 748#endif
751 SET_PIXCOLOR (i);
752 }
753 749
754 if (display->depth <= 2) 750 if (display->depth <= 2)
755 { 751 {
756 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];
757 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];
… …
765 * from the fvwm window manager. 761 * from the fvwm window manager.
766 */ 762 */
767#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
768 764
769 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
770 { /* Monochrome */ 767 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 771 }
775 else 772 else
… …
830 * Use resource ``modifier'' to override the Meta modifier 827 * Use resource ``modifier'' to override the Meta modifier
831 */ 828 */
832void 829void
833rxvt_term::get_ourmods () 830rxvt_term::get_ourmods ()
834{ 831{
835 int i, j, k; 832 int i, j, k;
836 int requestedmeta, realmeta, realalt; 833 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 834 const char *cm, *rsmod;
838 XModifierKeymap *map; 835 XModifierKeymap *map;
839 KeyCode *kc; 836 KeyCode *kc;
840 const unsigned int modmasks[] = 837 const unsigned int modmasks[] =
841 { 838 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 839 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 840 };
844 841
… …
926#endif 923#endif
927 XGCValues gcvalue; 924 XGCValues gcvalue;
928 long vt_emask; 925 long vt_emask;
929 XSetWindowAttributes attributes; 926 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 927 XWindowAttributes gattr;
928 Window top, parent;
929 dDisp;
931 930
932#ifdef USING_W11LIB 931#ifdef USING_W11LIB
933 /* enable W11 callbacks */ 932 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 933 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif 934#endif
936 935
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 937 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 938
940 if (options & Opt_transparent) 939 if (OPTION (Opt_transparent))
941 { 940 {
942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 943 }
945 944
946#if ENABLE_FRILLS 945#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 946 if (OPTION (Opt_borderLess))
948 { 947 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 949
951 if (prop == None) 950 if (prop == None)
952 { 951 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT 953#ifdef PREFER_24BIT
… …
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 960 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0; 961 mwmhints.decorations = 0;
963 } 962 }
964 } 963 }
965 else 964 else
966 {
967 mwmhints.flags = 0; 965 mwmhints.flags = 0;
968 }
969#endif 966#endif
970 967
971 /* grab colors before netscape does */ 968 /* grab colors before netscape does */
972 Get_Colours (); 969 Get_Colours ();
973 970
974 if (!set_fonts ()) 971 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 972 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 973
974 parent = DefaultRootWindow (disp);
975
976#if ENABLE_XEMBED
977 if (rs[Rs_embed])
978 {
979 XWindowAttributes wattr;
980
981 parent = strtol (rs[Rs_embed], 0, 0);
982
983 if (!XGetWindowAttributes (disp, parent, &wattr))
984 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985
986 window_calc (wattr.width, wattr.height);
987 }
988#endif
989
977 window_calc (0, 0); 990 window_calc (0, 0);
978 old_width = szHint.width;
979 old_height = szHint.height;
980 991
981 /* sub-window placement & size in rxvt_resize_subwindows () */ 992 /* sub-window placement & size in rxvt_resize_subwindows () */
982
983#ifdef PREFER_24BIT 993#ifdef PREFER_24BIT
984 attributes.background_pixel = pix_colors_focused[Color_border]; 994 attributes.background_pixel = pix_colors_focused[Color_border];
985 attributes.border_pixel = pix_colors_focused[Color_border]; 995 attributes.border_pixel = pix_colors_focused[Color_border];
986 attributes.colormap = display->cmap; 996 attributes.colormap = display->cmap;
987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 997 top = XCreateWindow (disp, parent,
988 szHint.x, szHint.y, 998 szHint.x, szHint.y,
989 szHint.width, szHint.height, 999 szHint.width, szHint.height,
990 TermWin.ext_bwidth, 1000 ext_bwidth,
991 display->depth, InputOutput, 1001 display->depth, InputOutput,
992 display->visual, 1002 display->visual,
993 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
994#else 1004#else
995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1005 top = XCreateSimpleWindow (disp, parent,
996 szHint.x, szHint.y, 1006 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1007 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1008 ext_bwidth,
999 pix_colors_focused[Color_border], 1009 pix_colors_focused[Color_border],
1000 pix_colors_focused[Color_border]); 1010 pix_colors_focused[Color_border]);
1001#endif 1011#endif
1012
1013 this->parent[0] = top;
1014
1015 old_width = szHint.width;
1016 old_height = szHint.height;
1002 1017
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1018 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1019 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1020
1006 classHint.res_name = (char *)rs[Rs_name]; 1021 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1022 classHint.res_class = (char *)RESCLASS;
1008 1023
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1024 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1025 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1026 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1027 wmHint.window_group = top;
1013 1028
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1029 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1030 &szHint, &wmHint, &classHint);
1016 1031
1017 /* Enable delete window protocol */ 1032 Atom protocols[] = {
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1033 xa[XA_WM_DELETE_WINDOW],
1019 &xa[XA_WMDELETEWINDOW], 1); 1034#if ENABLE_EWMH
1035 xa[XA_NET_WM_PING],
1036#endif
1037 };
1020 1038
1021#if ENABLE_FRILLS 1039 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1040
1041#if ENABLE_EWMH
1022 long pid = getpid (); 1042 long pid = getpid ();
1023 1043
1024 XChangeProperty (display->display, TermWin.parent[0], 1044 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1045 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1046 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif
1028 1047
1029 XSelectInput (display->display, TermWin.parent[0], 1048 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1049#endif
1050
1051 XSelectInput (disp, top,
1030 KeyPressMask 1052 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1053#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1054 | KeyReleaseMask
1033#endif 1055#endif
1034 | FocusChangeMask | VisibilityChangeMask 1056 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask
1036 | StructureNotifyMask); 1057 | ExposureMask | StructureNotifyMask);
1058
1037 termwin_ev.start (display, TermWin.parent[0]); 1059 termwin_ev.start (display, top);
1038 1060
1039#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1062 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1063 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1064 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1065#endif
1044 1066
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1067 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1068 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1069
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1070#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1071 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1073#endif
1052 1074
1053 /* the vt window */ 1075 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1076 vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1077 window_vt_x,
1056 window_vt_y, 1078 window_vt_y,
1057 TermWin_TotalWidth (), 1079 width,
1058 TermWin_TotalHeight (), 1080 height,
1059 0, 1081 0,
1060 pix_colors_focused[Color_fg], 1082 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1083 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1084#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1085 XStoreName (disp, vt, "vt window");
1064#endif 1086#endif
1065 1087
1066 attributes.bit_gravity = NorthWestGravity; 1088 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1068 1090
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070 1092
1071 pointer_unblank ();
1072
1073#ifdef POINTER_BLANK 1093#ifdef POINTER_BLANK
1074 if (options & Opt_pointerBlank) 1094 if (OPTION (Opt_pointerBlank))
1075 vt_emask |= PointerMotionMask; 1095 vt_emask |= PointerMotionMask;
1076 else 1096 else
1077#endif 1097#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1099
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1100 XSelectInput (disp, vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1101 vt_ev.start (display, vt);
1082 1102
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1104 if (menuBar_height ())
1085 { 1105 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1106 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1107 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1108 width,
1089 menuBar_TotalHeight (), 1109 menuBar_TotalHeight (),
1090 0, 1110 0,
1091 pix_colors_focused[Color_fg], 1111 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1112 pix_colors_focused[Color_scroll]);
1093 1113
1094#ifdef DEBUG_X 1114#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1115 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1116#endif
1097 1117
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1118 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1119
1100 XDefineCursor (display->display, menuBar.win, 1120 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1121 XCreateFontCursor (disp, XC_left_ptr));
1102 1122
1103 XSelectInput (display->display, menuBar.win, 1123 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1124 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1125 menubar_ev.start (display, menuBar.win);
1107 } 1126 }
1108#endif 1127#endif
1109 1128
1110#ifdef XPM_BACKGROUND 1129#ifdef XPM_BACKGROUND
1111 if (rs[Rs_backgroundPixmap] != NULL 1130 if (rs[Rs_backgroundPixmap] != NULL
1112 && ! (options & Opt_transparent)) 1131 && ! OPTION (Opt_transparent))
1113 { 1132 {
1114 const char *p = rs[Rs_backgroundPixmap]; 1133 const char *p = rs[Rs_backgroundPixmap];
1115 1134
1116 if ((p = strchr (p, ';')) != NULL) 1135 if ((p = strchr (p, ';')) != NULL)
1117 { 1136 {
… …
1126 1145
1127 /* graphics context for the vt window */ 1146 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1147 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1148 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1149 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1150 gc = XCreateGC (disp, vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1151 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1152 &gcvalue);
1134 1153
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1154 drawable = new rxvt_drawable (display, vt);
1136 1155
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1157 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1159 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1162 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1144#endif 1163#endif
1145 1164
1146#ifdef OFF_FOCUS_FADING 1165#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1166 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1167 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1168 pix_colors = pix_colors_unfocused;
1150#endif 1169#endif
1151 1170
1171 pointer_unblank ();
1152 scr_recolour (); 1172 scr_recolour ();
1173
1174#if ENABLE_XEMBED
1175 if (rs[Rs_embed])
1176 {
1177 long info[2] = { 0, XEMBED_MAPPED };
1178
1179 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1180 32, PropModeReplace, (unsigned char *)&info, 2);
1181 }
1182#endif
1153} 1183}
1154 1184
1155/* ------------------------------------------------------------------------- * 1185/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1186 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1187 * ------------------------------------------------------------------------- */
… …
1162 /* 1192 /*
1163 * standard System V termios interface 1193 * standard System V termios interface
1164 */ 1194 */
1165 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1166 { 1196 {
1167 /* return error - use system defaults */ 1197 // return error - use system defaults,
1198 // where possible, and zero elsewhere
1199 memset (tio, 0, sizeof (ttymode_t));
1200
1168 tio->c_cc[VINTR] = CINTR; 1201 tio->c_cc[VINTR] = CINTR;
1169 tio->c_cc[VQUIT] = CQUIT; 1202 tio->c_cc[VQUIT] = CQUIT;
1170 tio->c_cc[VERASE] = CERASE; 1203 tio->c_cc[VERASE] = CERASE;
1204#ifdef VERASE2
1205 tio->c_cc[VERASE2] = CERASE2;
1206#endif
1171 tio->c_cc[VKILL] = CKILL; 1207 tio->c_cc[VKILL] = CKILL;
1172 tio->c_cc[VSTART] = CSTART; 1208 tio->c_cc[VSTART] = CSTART;
1173 tio->c_cc[VSTOP] = CSTOP; 1209 tio->c_cc[VSTOP] = CSTOP;
1174 tio->c_cc[VSUSP] = CSUSP; 1210 tio->c_cc[VSUSP] = CSUSP;
1175# ifdef VDSUSP 1211# ifdef VDSUSP
1176
1177 tio->c_cc[VDSUSP] = CDSUSP; 1212 tio->c_cc[VDSUSP] = CDSUSP;
1178# endif 1213# endif
1179# ifdef VREPRINT 1214# ifdef VREPRINT
1180
1181 tio->c_cc[VREPRINT] = CRPRNT; 1215 tio->c_cc[VREPRINT] = CRPRNT;
1182# endif 1216# endif
1183# ifdef VDISCRD 1217# ifdef VDISCRD
1184
1185 tio->c_cc[VDISCRD] = CFLUSH; 1218 tio->c_cc[VDISCRD] = CFLUSH;
1186# endif 1219# endif
1187# ifdef VWERSE 1220# ifdef VWERSE
1188
1189 tio->c_cc[VWERSE] = CWERASE; 1221 tio->c_cc[VWERSE] = CWERASE;
1190# endif 1222# endif
1191# ifdef VLNEXT 1223# ifdef VLNEXT
1192
1193 tio->c_cc[VLNEXT] = CLNEXT; 1224 tio->c_cc[VLNEXT] = CLNEXT;
1194# endif 1225# endif
1195
1196 } 1226 }
1227
1197 tio->c_cc[VEOF] = CEOF; 1228 tio->c_cc[VEOF] = CEOF;
1198 tio->c_cc[VEOL] = VDISABLE; 1229 tio->c_cc[VEOL] = VDISABLE;
1199# ifdef VEOL2 1230# ifdef VEOL2
1200
1201 tio->c_cc[VEOL2] = VDISABLE; 1231 tio->c_cc[VEOL2] = VDISABLE;
1202# endif 1232# endif
1203# ifdef VSWTC 1233# ifdef VSWTC
1204
1205 tio->c_cc[VSWTC] = VDISABLE; 1234 tio->c_cc[VSWTC] = VDISABLE;
1206# endif 1235# endif
1207# ifdef VSWTCH 1236# ifdef VSWTCH
1208
1209 tio->c_cc[VSWTCH] = VDISABLE; 1237 tio->c_cc[VSWTCH] = VDISABLE;
1210# endif 1238# endif
1211# if VMIN != VEOF 1239# if VMIN != VEOF
1212
1213 tio->c_cc[VMIN] = 1; 1240 tio->c_cc[VMIN] = 1;
1214# endif 1241# endif
1215# if VTIME != VEOL 1242# if VTIME != VEOL
1216
1217 tio->c_cc[VTIME] = 0; 1243 tio->c_cc[VTIME] = 0;
1218# endif 1244# endif
1219 1245
1220 if (erase != -1) 1246 if (erase != -1)
1221 tio->c_cc[VERASE] = (char)erase; 1247 tio->c_cc[VERASE] = (char)erase;
… …
1249 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1275 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1250 { 1276 {
1251 tio->sg.sg_erase = CERASE; /* ^H */ 1277 tio->sg.sg_erase = CERASE; /* ^H */
1252 tio->sg.sg_kill = CKILL; /* ^U */ 1278 tio->sg.sg_kill = CKILL; /* ^U */
1253 } 1279 }
1280
1254 if (erase != -1) 1281 if (erase != -1)
1255 tio->sg.sg_erase = (char)erase; 1282 tio->sg.sg_erase = (char)erase;
1256 1283
1257 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1284 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1258 1285
… …
1264 tio->tc.t_startc = CSTART; /* ^Q */ 1291 tio->tc.t_startc = CSTART; /* ^Q */
1265 tio->tc.t_stopc = CSTOP; /* ^S */ 1292 tio->tc.t_stopc = CSTOP; /* ^S */
1266 tio->tc.t_eofc = CEOF; /* ^D */ 1293 tio->tc.t_eofc = CEOF; /* ^D */
1267 tio->tc.t_brkc = -1; 1294 tio->tc.t_brkc = -1;
1268 } 1295 }
1296
1269 /* get local special chars */ 1297 /* get local special chars */
1270 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1271 { 1299 {
1272 tio->lc.t_suspc = CSUSP; /* ^Z */ 1300 tio->lc.t_suspc = CSUSP; /* ^Z */
1273 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1277 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1305 tio->lc.t_lnextc = CLNEXT; /* ^V */
1278 } 1306 }
1279 /* get line discipline */ 1307 /* get line discipline */
1280 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1281# ifdef NTTYDISC 1309# ifdef NTTYDISC
1282
1283 tio->line = NTTYDISC; 1310 tio->line = NTTYDISC;
1284# endif /* NTTYDISC */ 1311# endif /* NTTYDISC */
1285 1312
1286 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1313 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1287#endif /* HAVE_TERMIOS_H */ 1314#endif /* HAVE_TERMIOS_H */
… …
1310 FOO (IGNCR, "IGNCR"); 1337 FOO (IGNCR, "IGNCR");
1311 FOO (ICRNL, "ICRNL"); 1338 FOO (ICRNL, "ICRNL");
1312 FOO (IXON, "IXON"); 1339 FOO (IXON, "IXON");
1313 FOO (IXOFF, "IXOFF"); 1340 FOO (IXOFF, "IXOFF");
1314# ifdef IUCLC 1341# ifdef IUCLC
1315
1316 FOO (IUCLC, "IUCLC"); 1342 FOO (IUCLC, "IUCLC");
1317# endif 1343# endif
1318# ifdef IXANY 1344# ifdef IXANY
1319
1320 FOO (IXANY, "IXANY"); 1345 FOO (IXANY, "IXANY");
1321# endif 1346# endif
1322# ifdef IMAXBEL 1347# ifdef IMAXBEL
1323
1324 FOO (IMAXBEL, "IMAXBEL"); 1348 FOO (IMAXBEL, "IMAXBEL");
1325# endif 1349# endif
1326 1350
1327 fprintf (stderr, "\n"); 1351 fprintf (stderr, "\n");
1328 1352
… …
1335 FOO (VERASE, "VERASE"); 1359 FOO (VERASE, "VERASE");
1336 FOO (VKILL, "VKILL"); 1360 FOO (VKILL, "VKILL");
1337 FOO (VEOF, "VEOF"); 1361 FOO (VEOF, "VEOF");
1338 FOO (VEOL, "VEOL"); 1362 FOO (VEOL, "VEOL");
1339# ifdef VEOL2 1363# ifdef VEOL2
1340
1341 FOO (VEOL2, "VEOL2"); 1364 FOO (VEOL2, "VEOL2");
1342# endif 1365# endif
1343# ifdef VSWTC 1366# ifdef VSWTC
1344
1345 FOO (VSWTC, "VSWTC"); 1367 FOO (VSWTC, "VSWTC");
1346# endif 1368# endif
1347# ifdef VSWTCH 1369# ifdef VSWTCH
1348
1349 FOO (VSWTCH, "VSWTCH"); 1370 FOO (VSWTCH, "VSWTCH");
1350# endif 1371# endif
1351
1352 FOO (VSTART, "VSTART"); 1372 FOO (VSTART, "VSTART");
1353 FOO (VSTOP, "VSTOP"); 1373 FOO (VSTOP, "VSTOP");
1354 FOO (VSUSP, "VSUSP"); 1374 FOO (VSUSP, "VSUSP");
1355# ifdef VDSUSP 1375# ifdef VDSUSP
1356
1357 FOO (VDSUSP, "VDSUSP"); 1376 FOO (VDSUSP, "VDSUSP");
1358# endif 1377# endif
1359# ifdef VREPRINT 1378# ifdef VREPRINT
1360
1361 FOO (VREPRINT, "VREPRINT"); 1379 FOO (VREPRINT, "VREPRINT");
1362# endif 1380# endif
1363# ifdef VDISCRD 1381# ifdef VDISCRD
1364
1365 FOO (VDISCRD, "VDISCRD"); 1382 FOO (VDISCRD, "VDISCRD");
1366# endif 1383# endif
1367# ifdef VWERSE 1384# ifdef VWERSE
1368
1369 FOO (VWERSE, "VWERSE"); 1385 FOO (VWERSE, "VWERSE");
1370# endif 1386# endif
1371# ifdef VLNEXT 1387# ifdef VLNEXT
1372
1373 FOO (VLNEXT, "VLNEXT"); 1388 FOO (VLNEXT, "VLNEXT");
1374# endif 1389# endif
1375 1390
1376 fprintf (stderr, "\n"); 1391 fprintf (stderr, "\n");
1377# undef FOO 1392# undef FOO
… …
1386 * the slave. 1401 * the slave.
1387 */ 1402 */
1388void 1403void
1389rxvt_term::run_command (const char *const *argv) 1404rxvt_term::run_command (const char *const *argv)
1390{ 1405{
1406#if ENABLE_FRILLS
1407 if (rs[Rs_pty_fd])
1408 {
1409 pty.pty = atoi (rs[Rs_pty_fd]);
1410
1411 if (getfd_hook)
1412 pty.pty = (*getfd_hook) (pty.pty);
1413
1414 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1415 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1416 }
1417 else
1418#endif
1391 if (!pty.get ()) 1419 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1421
1394 pty.set_utf8_mode (enc_utf8); 1422 pty.set_utf8_mode (enc_utf8);
1395 1423
1396 /* set initial window size */ 1424 /* set initial window size */
1397 tt_winch (); 1425 tt_winch ();
… …
1407#endif 1435#endif
1408 er = -1; 1436 er = -1;
1409 1437
1410 rxvt_get_ttymode (&tio, er); 1438 rxvt_get_ttymode (&tio, er);
1411 1439
1412 sw_chld.start (SIGCHLD); 1440#if ENABLE_FRILLS
1441 if (rs[Rs_pty_fd])
1442 return;
1443#endif
1413 1444
1414#ifndef __QNX__ 1445#ifndef __QNX__
1415 /* spin off the command interpreter */ 1446 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1447 switch (cmd_pid = fork ())
1417 { 1448 {
1418 case -1: 1449 case -1:
1450 {
1451 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1452 rxvt_fatal ("can't fork, aborting.\n");
1453 }
1420 case 0: 1454 case 0:
1421 init_env (); 1455 init_env ();
1422 1456
1423 if (!pty.make_controlling_tty ()) 1457 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1458 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1487{ 1521{
1488 char *login; 1522 char *login;
1489 1523
1490 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1524 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1491 1525
1492 if (options & Opt_console) 1526 if (OPTION (Opt_console))
1493 { /* be virtual console, fail silently */ 1527 { /* be virtual console, fail silently */
1494#ifdef TIOCCONS 1528#ifdef TIOCCONS
1495 unsigned int on = 1; 1529 unsigned int on = 1;
1496 1530
1497 ioctl (STDIN_FILENO, TIOCCONS, &on); 1531 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1547 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1548 shell = "/bin/sh"; 1582 shell = "/bin/sh";
1549 1583
1550 argv0 = (const char *)rxvt_r_basename (shell); 1584 argv0 = (const char *)rxvt_r_basename (shell);
1551 1585
1552 if (options & Opt_loginShell) 1586 if (OPTION (Opt_loginShell))
1553 { 1587 {
1554 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1588 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1555 1589
1556 login[0] = '-'; 1590 login[0] = '-';
1557 strcpy (&login[1], argv0); 1591 strcpy (&login[1], argv0);
… …
1592 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1593 command = "/bin/sh"; 1627 command = "/bin/sh";
1594 1628
1595 arg_a[0] = my_basename (command); 1629 arg_a[0] = my_basename (command);
1596 1630
1597 if (options & Opt_loginShell) 1631 if (OPTION (Opt_loginShell))
1598 { 1632 {
1599 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1600 1634
1601 login[0] = '-'; 1635 login[0] = '-';
1602 strcpy (&login[1], arg_a[0]); 1636 strcpy (&login[1], arg_a[0]);

Diff Legend

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