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

Diff Legend

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