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.92 by root, Wed Sep 8 17:23:02 2004 UTC vs.
Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC

… …
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
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 "init.h" 37#include "init.h"
37 38
38#include <signal.h> 39#include <csignal>
39 40
40const char *const def_colorName[] = 41const char *const def_colorName[] =
41 { 42 {
42 COLOR_FOREGROUND, 43 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 44 COLOR_BACKGROUND,
… …
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
165 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
166#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
170 }; 177 };
171 178
172const char *const xa_names[NUM_XA] = 179const char *const xa_names[] =
173 { 180 {
174 "TEXT", 181 "TEXT",
175 "COMPOUND_TEXT", 182 "COMPOUND_TEXT",
176 "UTF8_STRING", 183 "UTF8_STRING",
177 "MULTIPLE", 184 "MULTIPLE",
178 "TARGETS", 185 "TARGETS",
179 "TIMESTAMP", 186 "TIMESTAMP",
180 "VT_SELECTION", 187 "VT_SELECTION",
181 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
182 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
183#ifdef TRANSPARENT 204#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
185#endif 207#endif
186#ifdef OFFIX_DND 208#ifdef OFFIX_DND
187 "DndProtocol", 209 "DndProtocol",
188 "DndSelection", 210 "DndSelection",
189#endif 211#endif
190 "CLIPBOARD" 212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
191 }; 216 };
192 217
193bool 218bool
194rxvt_term::init_vars () 219rxvt_term::init_vars ()
195{ 220{
196 sw_term.start (SIGTERM); 221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
197 223
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 224 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING 225#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif 227#endif
… …
210 236
211 MEvent.time = CurrentTime; 237 MEvent.time = CurrentTime;
212 MEvent.button = AnyButton; 238 MEvent.button = AnyButton;
213 options = DEFAULT_OPTIONS; 239 options = DEFAULT_OPTIONS;
214 want_refresh = 1; 240 want_refresh = 1;
215 cmd_pid = -1;
216 pty.pty = pty.tty = -1;
217 priv_modes = SavedModes = PrivMode_Default; 241 priv_modes = SavedModes = PrivMode_Default;
218 TermWin.focus = 0; 242 TermWin.focus = 0;
219 TermWin.ncol = 80; 243 TermWin.ncol = 80;
220 TermWin.nrow = 24; 244 TermWin.nrow = 24;
221 TermWin.int_bwidth = INTERNALBORDERWIDTH; 245 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
238 last_bot = last_state = -1; 262 last_bot = last_state = -1;
239 263
240#ifdef MENUBAR 264#ifdef MENUBAR
241 menu_readonly = 1; 265 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1) 266# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList); 267 CurrentBar = &BarList;
244# endif /* (MENUBAR_MAX > 1) */ 268# endif /* (MENUBAR_MAX > 1) */
245#endif 269#endif
246 270
247 return true; 271 return true;
248} 272}
… …
322 */ 346 */
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
325 349
326 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
351
352 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354
355 extract_resources ();
327 free (r_argv); 356 free (r_argv);
328
329#ifdef LOCAL_X_IS_UNIX
330 if (rs[Rs_display_name][0] == ':')
331 {
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
333 strcpy (val, "unix");
334 strcat (val, rs[Rs_display_name]);
335 display = displays.get (val);
336 free (val);
337 }
338#endif
339
340 if (!display
341 && ! (display = displays.get (rs[Rs_display_name])))
342 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
343
344 extract_resources (display->display, rs[Rs_name]);
345 357
346 /* 358 /*
347 * set any defaults not already set 359 * set any defaults not already set
348 */ 360 */
349 if (cmd_argv && cmd_argv[0]) 361 if (cmd_argv && cmd_argv[0])
… …
367#if ENABLE_FRILLS 379#if ENABLE_FRILLS
368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 380 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370 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)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
372#endif
373
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377#endif 386#endif
378 387
379#ifdef POINTER_BLANK 388#ifdef POINTER_BLANK
… …
590 599
591 this->locale = rxvt_strdup (this->locale); 600 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 601 SET_LOCALE (this->locale);
593 mbstate.reset (); 602 mbstate.reset ();
594#endif 603#endif
595#if 0 604
596#if HAVE_NL_LANGINFO 605#if HAVE_NL_LANGINFO
606 char *codeset = strdup (nl_langinfo (CODESET));
607 // /^UTF.?8/i
608 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
609 && (codeset[1] == 'T' || codeset[1] == 't')
610 && (codeset[2] == 'F' || codeset[2] == 'f')
611 && (codeset[3] == '8' || codeset[4] == '8');
597 free (codeset); 612 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 613#else
602 enc_utf8 = 1; 614 enc_utf8 = 0;
603#endif
604#endif 615#endif
605} 616}
606 617
607void 618void
608rxvt_term::init_xlocale () 619rxvt_term::init_xlocale ()
… …
610#ifdef USE_XIM 621#ifdef USE_XIM
611 if (!locale) 622 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 623 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 624 else
614 { 625 {
615 Atom wmlocale; 626 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 627
622 if (!XSupportsLocale ()) 628 if (!XSupportsLocale ())
623 { 629 {
624 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 630 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
625 return; 631 return;
… …
639{ 645{
640 /* 646 /*
641 * Initialize the command connection. 647 * Initialize the command connection.
642 * This should be called after the X server connection is established. 648 * This should be called after the X server connection is established.
643 */ 649 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 650
658#ifdef META8_OPTION 651#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
660#endif 653#endif
661 654
… …
677 if (scrollbar_visible ()) 670 if (scrollbar_visible ())
678 { 671 {
679 priv_modes |= PrivMode_scrollBar; 672 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 673 SavedModes |= PrivMode_scrollBar;
681 } 674 }
675
682 if (menubar_visible ()) 676 if (menubar_visible ())
683 { 677 {
684 priv_modes |= PrivMode_menuBar; 678 priv_modes |= PrivMode_menuBar;
685 SavedModes |= PrivMode_menuBar; 679 SavedModes |= PrivMode_menuBar;
686 } 680 }
… …
746 } 740 }
747 } 741 }
748 } 742 }
749 743
750 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
751#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
754#endif 752#endif
755 SET_PIXCOLOR (i);
756 }
757 753
758 if (display->depth <= 2) 754 if (display->depth <= 2)
759 { 755 {
760 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
761 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
769 * from the fvwm window manager. 765 * from the fvwm window manager.
770 */ 766 */
771#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
772 768
773 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
774 { /* Monochrome */ 771 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
778 } 775 }
779 else 776 else
… …
834 * Use resource ``modifier'' to override the Meta modifier 831 * Use resource ``modifier'' to override the Meta modifier
835 */ 832 */
836void 833void
837rxvt_term::get_ourmods () 834rxvt_term::get_ourmods ()
838{ 835{
839 int i, j, k; 836 int i, j, k;
840 int requestedmeta, realmeta, realalt; 837 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 838 const char *cm, *rsmod;
842 XModifierKeymap *map; 839 XModifierKeymap *map;
843 KeyCode *kc; 840 KeyCode *kc;
844 const unsigned int modmasks[] = 841 const unsigned int modmasks[] =
845 { 842 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 843 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 844 };
848 845
849 requestedmeta = realmeta = realalt = 0; 846 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 847 rsmod = rs[Rs_modifier];
848
851 if (rsmod 849 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 851 requestedmeta = rsmod[3] - '0';
854 852
855 map = XGetModifierMapping (display->display); 853 map = XGetModifierMapping (display->display);
856 kc = map->modifiermap; 854 kc = map->modifiermap;
855
857 for (i = 1; i < 6; i++) 856 for (i = 1; i < 6; i++)
858 { 857 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 858 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
859
860 for (j = map->max_keypermod; j--; k++) 860 for (j = map->max_keypermod; j--; k++)
861 { 861 {
862 if (kc[k] == 0) 862 if (kc[k] == 0)
863 break; 863 break;
864
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 865 switch (XKeycodeToKeysym (display->display, kc[k], 0))
865 { 866 {
866 case XK_Num_Lock: 867 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 868 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 869 continue;
869 default: 870
870 continue; /* for (;;) */ 871 case XK_ISO_Level3_Shift:
872 ModLevel3Mask = modmasks[i - 1];
873 continue;
874
871 case XK_Meta_L: 875 case XK_Meta_L:
872 case XK_Meta_R: 876 case XK_Meta_R:
873 cm = "meta"; 877 cm = "meta";
874 realmeta = i; 878 realmeta = i;
875 break; 879 break;
880
876 case XK_Alt_L: 881 case XK_Alt_L:
877 case XK_Alt_R: 882 case XK_Alt_R:
878 cm = "alt"; 883 cm = "alt";
879 realalt = i; 884 realalt = i;
880 break; 885 break;
886
881 case XK_Super_L: 887 case XK_Super_L:
882 case XK_Super_R: 888 case XK_Super_R:
883 cm = "super"; 889 cm = "super";
884 break; 890 break;
891
885 case XK_Hyper_L: 892 case XK_Hyper_L:
886 case XK_Hyper_R: 893 case XK_Hyper_R:
887 cm = "hyper"; 894 cm = "hyper";
888 break; 895 break;
896
897 default:
898 continue;
889 } 899 }
900
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 901 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 902 requestedmeta = i;
892 } 903 }
893 } 904 }
905
894 XFreeModifiermap (map); 906 XFreeModifiermap (map);
907
895 i = (requestedmeta ? requestedmeta 908 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 909 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 910 : realalt ? realalt
911 : 0;
912
898 if (i) 913 if (i)
899 ModMetaMask = modmasks[i - 1]; 914 ModMetaMask = modmasks[i - 1];
900} 915}
901 916
902/*----------------------------------------------------------------------*/ 917/*----------------------------------------------------------------------*/
… …
912#endif 927#endif
913 XGCValues gcvalue; 928 XGCValues gcvalue;
914 long vt_emask; 929 long vt_emask;
915 XSetWindowAttributes attributes; 930 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 931 XWindowAttributes gattr;
932 Window top, parent;
933 dDisp;
934
935#ifdef USING_W11LIB
936 /* enable W11 callbacks */
937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
938#endif
939
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
917 942
918 if (options & Opt_transparent) 943 if (options & Opt_transparent)
919 { 944 {
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 946 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
922 } 947 }
923 948
924#if ENABLE_FRILLS 949#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 950 if (options & Opt_borderLess)
926 { 951 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
953
928 if (prop == None) 954 if (prop == None)
929 { 955 {
930 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
931#ifdef PREFER_24BIT 957#ifdef PREFER_24BIT
932 attributes.override_redirect = TRUE; 958 attributes.override_redirect = TRUE;
… …
938 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
939 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
940 } 966 }
941 } 967 }
942 else 968 else
943 {
944 mwmhints.flags = 0; 969 mwmhints.flags = 0;
945 }
946#endif 970#endif
947 971
948 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
949 Get_Colours (); 973 Get_Colours ();
950 974
951 if (!set_fonts ()) 975 if (!set_fonts ())
952 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
953 977
978 parent = DefaultRootWindow (disp);
979
980#if ENABLE_XEMBED
981 if (rs[Rs_embed])
982 {
983 XWindowAttributes wattr;
984
985 parent = strtol (rs[Rs_embed], 0, 0);
986
987 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989
990 window_calc (wattr.width, wattr.height);
991 }
992
993#endif
954 window_calc (0, 0); 994 window_calc (0, 0);
955 old_width = szHint.width;
956 old_height = szHint.height;
957 995
958 /* sub-window placement & size in rxvt_resize_subwindows () */ 996 /* sub-window placement & size in rxvt_resize_subwindows () */
959
960#ifdef PREFER_24BIT 997#ifdef PREFER_24BIT
961 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused[Color_border];
962 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused[Color_border];
963 attributes.colormap = display->cmap; 1000 attributes.colormap = display->cmap;
964 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1001 top = XCreateWindow (disp, parent,
965 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
966 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 1004 TermWin.ext_bwidth,
968 display->depth, InputOutput, 1005 display->depth, InputOutput,
969 display->visual, 1006 display->visual,
970 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
971#else 1008#else
972 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1009 top = XCreateSimpleWindow (disp, parent,
973 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
974 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
975 TermWin.ext_bwidth, 1012 TermWin.ext_bwidth,
976 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
977 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
978#endif 1015#endif
1016
1017 TermWin.parent[0] = top;
1018
1019 old_width = szHint.width;
1020 old_height = szHint.height;
979 1021
980 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
981 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
982 1024
983 classHint.res_name = (char *)rs[Rs_name]; 1025 classHint.res_name = (char *)rs[Rs_name];
984 classHint.res_class = (char *)RESCLASS; 1026 classHint.res_class = (char *)RESCLASS;
985 1027
986 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
987 wmHint.input = True; 1029 wmHint.input = True;
988 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
989 wmHint.window_group = TermWin.parent[0]; 1031 wmHint.window_group = top;
990 1032
991 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
992 (char **)argv, argc, &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
993 1035
994#if ENABLE_FRILLS 1036 Atom protocols[] = {
1037 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING],
1040#endif
1041 };
1042
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044
1045#if ENABLE_EWMH
995 long pid = getpid (); 1046 long pid = getpid ();
996 XChangeProperty (display->display, TermWin.parent[0], 1047
1048 XChangeProperty (disp, top,
997 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
998 PropModeReplace, (unsigned char *)&pid, 1); 1050 PropModeReplace, (unsigned char *)&pid, 1);
999#endif
1000 1051
1001 XSelectInput (display->display, TermWin.parent[0], 1052 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1053#endif
1054
1055 XSelectInput (disp, top,
1002 KeyPressMask 1056 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1057#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1058 | KeyReleaseMask
1005#endif 1059#endif
1006 | FocusChangeMask | VisibilityChangeMask 1060 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask
1008 | StructureNotifyMask); 1061 | ExposureMask | StructureNotifyMask);
1062
1009 termwin_ev.start (display, TermWin.parent[0]); 1063 termwin_ev.start (display, top);
1010 1064
1011#if ENABLE_FRILLS 1065#if ENABLE_FRILLS
1012 if (mwmhints.flags) 1066 if (mwmhints.flags)
1013 { 1067 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1014 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); 1068 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1015 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1016 }
1017#endif 1069#endif
1018 1070
1019 /* vt cursor: Black-on-White is standard, but this is more popular */ 1071 /* vt cursor: Black-on-White is standard, but this is more popular */
1020 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1072 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1021 1073
1022#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1074#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1023 /* cursor (menuBar/scrollBar): Black-on-White */ 1075 /* cursor (menuBar/scrollBar): Black-on-White */
1024 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1025#endif
1026
1027#ifdef POINTER_BLANK
1028 {
1029 XColor blackcolour;
1030 blackcolour.red = 0;
1031 blackcolour.green = 0;
1032 blackcolour.blue = 0;
1033 Font f = XLoadFont (display->display, "fixed");
1034 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1035 &blackcolour, &blackcolour);
1036 XUnloadFont (display->display, f);
1037 }
1038#endif 1077#endif
1039 1078
1040 /* the vt window */ 1079 /* the vt window */
1041 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1080 TermWin.vt = XCreateSimpleWindow (disp, top,
1042 window_vt_x, 1081 window_vt_x,
1043 window_vt_y, 1082 window_vt_y,
1044 TermWin_TotalWidth (), 1083 TermWin_TotalWidth (),
1045 TermWin_TotalHeight (), 1084 TermWin_TotalHeight (),
1046 0, 1085 0,
1047 pix_colors_focused[Color_fg], 1086 pix_colors_focused[Color_fg],
1048 pix_colors_focused[Color_bg]); 1087 pix_colors_focused[Color_bg]);
1049#ifdef DEBUG_X 1088#ifdef DEBUG_X
1050 XStoreName (display->display, TermWin.vt, "vt window"); 1089 XStoreName (disp, TermWin.vt, "vt window");
1051#endif 1090#endif
1052 1091
1053 attributes.bit_gravity = NorthWestGravity; 1092 attributes.bit_gravity = NorthWestGravity;
1054 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1055 1094
1056 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1057
1058 pointer_unblank ();
1059 1096
1060#ifdef POINTER_BLANK 1097#ifdef POINTER_BLANK
1061 if (options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
1062 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1063 else 1100 else
1064#endif 1101#endif
1065 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1066 1103
1067 XSelectInput (display->display, TermWin.vt, vt_emask); 1104 XSelectInput (disp, TermWin.vt, vt_emask);
1068 vt_ev.start (display, TermWin.vt); 1105 vt_ev.start (display, TermWin.vt);
1069 1106
1070#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1107#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1071 if (menuBar_height ()) 1108 if (menuBar_height ())
1072 { 1109 {
1073 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1110 menuBar.win = XCreateSimpleWindow (disp, top,
1074 window_vt_x, 0, 1111 window_vt_x, 0,
1075 TermWin_TotalWidth (), 1112 TermWin_TotalWidth (),
1076 menuBar_TotalHeight (), 1113 menuBar_TotalHeight (),
1077 0, 1114 0,
1078 pix_colors_focused[Color_fg], 1115 pix_colors_focused[Color_fg],
1079 pix_colors_focused[Color_scroll]); 1116 pix_colors_focused[Color_scroll]);
1080 1117
1081#ifdef DEBUG_X 1118#ifdef DEBUG_X
1082 XStoreName (display->display, menuBar.win, "menubar"); 1119 XStoreName (disp, menuBar.win, "menubar");
1083#endif 1120#endif
1084 1121
1085 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1122 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1086 1123
1087 XDefineCursor (display->display, menuBar.win, 1124 XDefineCursor (disp, menuBar.win,
1088 XCreateFontCursor (display->display, XC_left_ptr)); 1125 XCreateFontCursor (disp, XC_left_ptr));
1089 1126
1090 XSelectInput (display->display, menuBar.win, 1127 XSelectInput (disp, menuBar.win,
1091 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1128 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1092 | Button1MotionMask));
1093 menubar_ev.start (display, menuBar.win); 1129 menubar_ev.start (display, menuBar.win);
1094 } 1130 }
1095#endif 1131#endif
1096 1132
1097#ifdef XPM_BACKGROUND 1133#ifdef XPM_BACKGROUND
… …
1113 1149
1114 /* graphics context for the vt window */ 1150 /* graphics context for the vt window */
1115 gcvalue.foreground = pix_colors[Color_fg]; 1151 gcvalue.foreground = pix_colors[Color_fg];
1116 gcvalue.background = pix_colors[Color_bg]; 1152 gcvalue.background = pix_colors[Color_bg];
1117 gcvalue.graphics_exposures = 1; 1153 gcvalue.graphics_exposures = 1;
1118 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1154 TermWin.gc = XCreateGC (disp, TermWin.vt,
1119 GCForeground | GCBackground | GCGraphicsExposures, 1155 GCForeground | GCBackground | GCGraphicsExposures,
1120 &gcvalue); 1156 &gcvalue);
1121 1157
1122 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1123 1159
1124#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1125 gcvalue.foreground = pix_colors[Color_topShadow]; 1161 gcvalue.foreground = pix_colors[Color_topShadow];
1126 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1163 gcvalue.foreground = pix_colors[Color_bottomShadow];
1128 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1129 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1130 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1131#endif 1167#endif
1132 1168
1133#ifdef OFF_FOCUS_FADING 1169#ifdef OFF_FOCUS_FADING
1134 // initially we are in unfocused state 1170 // initially we are in unfocused state
1135 if (rs[Rs_fade]) 1171 if (rs[Rs_fade])
1136 pix_colors = pix_colors_unfocused; 1172 pix_colors = pix_colors_unfocused;
1137#endif 1173#endif
1138 1174
1175 pointer_unblank ();
1139 scr_recolour (); 1176 scr_recolour ();
1177
1178#if ENABLE_XEMBED
1179 if (rs[Rs_embed])
1180 {
1181 long info[2] = { 0, XEMBED_MAPPED };
1182
1183 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1184 32, PropModeReplace, (unsigned char *)&info, 2);
1185 }
1186#endif
1140} 1187}
1141 1188
1142/* ------------------------------------------------------------------------- * 1189/* ------------------------------------------------------------------------- *
1143 * GET TTY CURRENT STATE * 1190 * GET TTY CURRENT STATE *
1144 * ------------------------------------------------------------------------- */ 1191 * ------------------------------------------------------------------------- */
… …
1158 tio->c_cc[VKILL] = CKILL; 1205 tio->c_cc[VKILL] = CKILL;
1159 tio->c_cc[VSTART] = CSTART; 1206 tio->c_cc[VSTART] = CSTART;
1160 tio->c_cc[VSTOP] = CSTOP; 1207 tio->c_cc[VSTOP] = CSTOP;
1161 tio->c_cc[VSUSP] = CSUSP; 1208 tio->c_cc[VSUSP] = CSUSP;
1162# ifdef VDSUSP 1209# ifdef VDSUSP
1163
1164 tio->c_cc[VDSUSP] = CDSUSP; 1210 tio->c_cc[VDSUSP] = CDSUSP;
1165# endif 1211# endif
1166# ifdef VREPRINT 1212# ifdef VREPRINT
1167
1168 tio->c_cc[VREPRINT] = CRPRNT; 1213 tio->c_cc[VREPRINT] = CRPRNT;
1169# endif 1214# endif
1170# ifdef VDISCRD 1215# ifdef VDISCRD
1171
1172 tio->c_cc[VDISCRD] = CFLUSH; 1216 tio->c_cc[VDISCRD] = CFLUSH;
1173# endif 1217# endif
1174# ifdef VWERSE 1218# ifdef VWERSE
1175
1176 tio->c_cc[VWERSE] = CWERASE; 1219 tio->c_cc[VWERSE] = CWERASE;
1177# endif 1220# endif
1178# ifdef VLNEXT 1221# ifdef VLNEXT
1179
1180 tio->c_cc[VLNEXT] = CLNEXT; 1222 tio->c_cc[VLNEXT] = CLNEXT;
1181# endif 1223# endif
1182
1183 } 1224 }
1225
1184 tio->c_cc[VEOF] = CEOF; 1226 tio->c_cc[VEOF] = CEOF;
1185 tio->c_cc[VEOL] = VDISABLE; 1227 tio->c_cc[VEOL] = VDISABLE;
1186# ifdef VEOL2 1228# ifdef VEOL2
1187
1188 tio->c_cc[VEOL2] = VDISABLE; 1229 tio->c_cc[VEOL2] = VDISABLE;
1189# endif 1230# endif
1190# ifdef VSWTC 1231# ifdef VSWTC
1191
1192 tio->c_cc[VSWTC] = VDISABLE; 1232 tio->c_cc[VSWTC] = VDISABLE;
1193# endif 1233# endif
1194# ifdef VSWTCH 1234# ifdef VSWTCH
1195
1196 tio->c_cc[VSWTCH] = VDISABLE; 1235 tio->c_cc[VSWTCH] = VDISABLE;
1197# endif 1236# endif
1198# if VMIN != VEOF 1237# if VMIN != VEOF
1199
1200 tio->c_cc[VMIN] = 1; 1238 tio->c_cc[VMIN] = 1;
1201# endif 1239# endif
1202# if VTIME != VEOL 1240# if VTIME != VEOL
1203
1204 tio->c_cc[VTIME] = 0; 1241 tio->c_cc[VTIME] = 0;
1205# endif 1242# endif
1206 1243
1207 if (erase != -1) 1244 if (erase != -1)
1208 tio->c_cc[VERASE] = (char)erase; 1245 tio->c_cc[VERASE] = (char)erase;
… …
1236 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1273 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1237 { 1274 {
1238 tio->sg.sg_erase = CERASE; /* ^H */ 1275 tio->sg.sg_erase = CERASE; /* ^H */
1239 tio->sg.sg_kill = CKILL; /* ^U */ 1276 tio->sg.sg_kill = CKILL; /* ^U */
1240 } 1277 }
1278
1241 if (erase != -1) 1279 if (erase != -1)
1242 tio->sg.sg_erase = (char)erase; 1280 tio->sg.sg_erase = (char)erase;
1243 1281
1244 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1282 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1245 1283
… …
1251 tio->tc.t_startc = CSTART; /* ^Q */ 1289 tio->tc.t_startc = CSTART; /* ^Q */
1252 tio->tc.t_stopc = CSTOP; /* ^S */ 1290 tio->tc.t_stopc = CSTOP; /* ^S */
1253 tio->tc.t_eofc = CEOF; /* ^D */ 1291 tio->tc.t_eofc = CEOF; /* ^D */
1254 tio->tc.t_brkc = -1; 1292 tio->tc.t_brkc = -1;
1255 } 1293 }
1294
1256 /* get local special chars */ 1295 /* get local special chars */
1257 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1296 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1258 { 1297 {
1259 tio->lc.t_suspc = CSUSP; /* ^Z */ 1298 tio->lc.t_suspc = CSUSP; /* ^Z */
1260 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1299 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1264 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1303 tio->lc.t_lnextc = CLNEXT; /* ^V */
1265 } 1304 }
1266 /* get line discipline */ 1305 /* get line discipline */
1267 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1306 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1268# ifdef NTTYDISC 1307# ifdef NTTYDISC
1269
1270 tio->line = NTTYDISC; 1308 tio->line = NTTYDISC;
1271# endif /* NTTYDISC */ 1309# endif /* NTTYDISC */
1272 1310
1273 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1311 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1274#endif /* HAVE_TERMIOS_H */ 1312#endif /* HAVE_TERMIOS_H */
… …
1297 FOO (IGNCR, "IGNCR"); 1335 FOO (IGNCR, "IGNCR");
1298 FOO (ICRNL, "ICRNL"); 1336 FOO (ICRNL, "ICRNL");
1299 FOO (IXON, "IXON"); 1337 FOO (IXON, "IXON");
1300 FOO (IXOFF, "IXOFF"); 1338 FOO (IXOFF, "IXOFF");
1301# ifdef IUCLC 1339# ifdef IUCLC
1302
1303 FOO (IUCLC, "IUCLC"); 1340 FOO (IUCLC, "IUCLC");
1304# endif 1341# endif
1305# ifdef IXANY 1342# ifdef IXANY
1306
1307 FOO (IXANY, "IXANY"); 1343 FOO (IXANY, "IXANY");
1308# endif 1344# endif
1309# ifdef IMAXBEL 1345# ifdef IMAXBEL
1310
1311 FOO (IMAXBEL, "IMAXBEL"); 1346 FOO (IMAXBEL, "IMAXBEL");
1312# endif 1347# endif
1313 1348
1314 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1315 1350
… …
1322 FOO (VERASE, "VERASE"); 1357 FOO (VERASE, "VERASE");
1323 FOO (VKILL, "VKILL"); 1358 FOO (VKILL, "VKILL");
1324 FOO (VEOF, "VEOF"); 1359 FOO (VEOF, "VEOF");
1325 FOO (VEOL, "VEOL"); 1360 FOO (VEOL, "VEOL");
1326# ifdef VEOL2 1361# ifdef VEOL2
1327
1328 FOO (VEOL2, "VEOL2"); 1362 FOO (VEOL2, "VEOL2");
1329# endif 1363# endif
1330# ifdef VSWTC 1364# ifdef VSWTC
1331
1332 FOO (VSWTC, "VSWTC"); 1365 FOO (VSWTC, "VSWTC");
1333# endif 1366# endif
1334# ifdef VSWTCH 1367# ifdef VSWTCH
1335
1336 FOO (VSWTCH, "VSWTCH"); 1368 FOO (VSWTCH, "VSWTCH");
1337# endif 1369# endif
1338
1339 FOO (VSTART, "VSTART"); 1370 FOO (VSTART, "VSTART");
1340 FOO (VSTOP, "VSTOP"); 1371 FOO (VSTOP, "VSTOP");
1341 FOO (VSUSP, "VSUSP"); 1372 FOO (VSUSP, "VSUSP");
1342# ifdef VDSUSP 1373# ifdef VDSUSP
1343
1344 FOO (VDSUSP, "VDSUSP"); 1374 FOO (VDSUSP, "VDSUSP");
1345# endif 1375# endif
1346# ifdef VREPRINT 1376# ifdef VREPRINT
1347
1348 FOO (VREPRINT, "VREPRINT"); 1377 FOO (VREPRINT, "VREPRINT");
1349# endif 1378# endif
1350# ifdef VDISCRD 1379# ifdef VDISCRD
1351
1352 FOO (VDISCRD, "VDISCRD"); 1380 FOO (VDISCRD, "VDISCRD");
1353# endif 1381# endif
1354# ifdef VWERSE 1382# ifdef VWERSE
1355
1356 FOO (VWERSE, "VWERSE"); 1383 FOO (VWERSE, "VWERSE");
1357# endif 1384# endif
1358# ifdef VLNEXT 1385# ifdef VLNEXT
1359
1360 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1361# endif 1387# endif
1362 1388
1363 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1364# undef FOO 1390# undef FOO
… …
1373 * the slave. 1399 * the slave.
1374 */ 1400 */
1375void 1401void
1376rxvt_term::run_command (const char *const *argv) 1402rxvt_term::run_command (const char *const *argv)
1377{ 1403{
1404#if ENABLE_FRILLS
1405 if (rs[Rs_pty_fd])
1406 {
1407 pty.pty = atoi (rs[Rs_pty_fd]);
1408 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1409 }
1410 else
1411#endif
1412 if (!pty.get ())
1413 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1414
1415 pty.set_utf8_mode (enc_utf8);
1416
1417 /* set initial window size */
1418 tt_winch ();
1419
1378 int er; 1420 int er;
1379
1380 if (!pty.get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 1421
1383#ifndef NO_BACKSPACE_KEY 1422#ifndef NO_BACKSPACE_KEY
1384 if (key_backspace[0] && !key_backspace[1]) 1423 if (key_backspace[0] && !key_backspace[1])
1385 er = key_backspace[0]; 1424 er = key_backspace[0];
1386 else if (strcmp (key_backspace, "DEC") == 0) 1425 else if (strcmp (key_backspace, "DEC") == 0)
… …
1389#endif 1428#endif
1390 er = -1; 1429 er = -1;
1391 1430
1392 rxvt_get_ttymode (&tio, er); 1431 rxvt_get_ttymode (&tio, er);
1393 1432
1394 /* set initial window size */ 1433#if ENABLE_FRILLS
1395 tt_winch (); 1434 if (rs[Rs_pty_fd])
1435 return;
1436#endif
1396 1437
1397 sw_chld.start (SIGCHLD); 1438 sw_chld.start (SIGCHLD);
1398 1439
1399#ifndef __QNX__ 1440#ifndef __QNX__
1400 /* spin off the command interpreter */ 1441 /* spin off the command interpreter */
1401 switch (cmd_pid = fork ()) 1442 switch (cmd_pid = fork ())
1402 { 1443 {
1403 case -1: 1444 case -1:
1445 {
1446 cmd_pid = 0;
1404 rxvt_fatal ("can't fork, aborting.\n"); 1447 rxvt_fatal ("can't fork, aborting.\n");
1448 }
1405 case 0: 1449 case 0:
1406 init_env (); 1450 init_env ();
1407 1451
1408 if (!pty.make_controlling_tty ()) 1452 if (!pty.make_controlling_tty ())
1409 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1453 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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