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.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.124 by root, Wed Dec 21 14:19:19 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,
173#endif
174#if OFF_FOCUS_FADING
175 "black",
169#endif 176#endif
170 }; 177 };
171 178
172const char *const xa_names[] = 179const char *const xa_names[] =
173 { 180 {
… …
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",
183 "CLIPBOARD", 191 "CLIPBOARD",
184#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
185 "_NET_WM_PID", 196 "_NET_WM_PID",
186 "_MOTIF_WM_HINTS",
187 "_NET_WM_NAME", 197 "_NET_WM_NAME",
188 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
189#endif 200#endif
190#if USE_XIM 201#if USE_XIM
191 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
192#endif 203#endif
193#ifdef TRANSPARENT 204#ifdef TRANSPARENT
194 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
195 "_XSETROOT_ID", 206 "ESETROOT_PMAP_ID",
196#endif 207#endif
197#ifdef OFFIX_DND 208#ifdef OFFIX_DND
198 "DndProtocol", 209 "DndProtocol",
199 "DndSelection", 210 "DndSelection",
200#endif 211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
201 }; 216 };
202 217
203bool 218bool
204rxvt_term::init_vars () 219rxvt_term::init_vars ()
205{ 220{
206 sw_term.start (SIGTERM);
207
208 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
209#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
210 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
211#endif 224#endif
212 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
213 226
214 if (pix_colors == NULL) 227 if (pix_colors == NULL)
215 return false; 228 return false;
216 229
217#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
218 TermWin.pixmap = None; 231 pixmap = None;
219#endif 232#endif
220 233
221 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
222 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
223 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
224 want_refresh = 1; 237 want_refresh = 1;
225 cmd_pid = -1;
226 pty.pty = pty.tty = -1;
227 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
228 TermWin.focus = 0; 239 focus = 0;
229 TermWin.ncol = 80; 240 ncol = 80;
230 TermWin.nrow = 24; 241 nrow = 24;
231 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
232 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
233 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
234 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
235 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
236 247
237 refresh_limit = 1; 248 refresh_limit = 1;
238 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
239 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
248 last_bot = last_state = -1; 259 last_bot = last_state = -1;
249 260
250#ifdef MENUBAR 261#ifdef MENUBAR
251 menu_readonly = 1; 262 menu_readonly = 1;
252# if ! (MENUBAR_MAX > 1) 263# if ! (MENUBAR_MAX > 1)
253 CurrentBar = & (BarList); 264 CurrentBar = &BarList;
254# endif /* (MENUBAR_MAX > 1) */ 265# endif /* (MENUBAR_MAX > 1) */
255#endif 266#endif
256 267
257 return true; 268 return true;
258} 269}
… …
332 */ 343 */
333 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
334 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
335 346
336 get_options (r_argc, r_argv); 347 get_options (r_argc, r_argv);
348
349 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351
352 extract_resources ();
337 free (r_argv); 353 free (r_argv);
338
339#ifdef LOCAL_X_IS_UNIX
340 if (rs[Rs_display_name][0] == ':')
341 {
342 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
343 strcpy (val, "unix");
344 strcat (val, rs[Rs_display_name]);
345 display = displays.get (val);
346 free (val);
347 }
348#endif
349
350 if (!display
351 && ! (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 (display->display, rs[Rs_name]);
355 354
356 /* 355 /*
357 * set any defaults not already set 356 * set any defaults not already set
358 */ 357 */
359 if (cmd_argv && cmd_argv[0]) 358 if (cmd_argv && cmd_argv[0])
… …
370 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
371 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
372 } 371 }
373 372
374 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
375 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_POSITIVE_INT16);
376 375
377#if ENABLE_FRILLS 376#if ENABLE_FRILLS
378 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
379 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, MAX_POSITIVE_INT16);
379
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, MAX_POSITIVE_INT16);
382#endif
383 382
384#ifndef NO_LINESPACE
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, MAX_POSITIVE_INT16);
387#endif 385#endif
388 386
389#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391 pointerBlankDelay = i; 389 pointerBlankDelay = i;
392 else 390 else
393 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
394#endif 392#endif
395 393
396 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
397 if (!TermWin.saveLines) 395 if (!saveLines)
398 options &= ~Opt_scrollBar; 396 options &= ~Opt_scrollBar;
399 397
400#ifdef PRINTPIPE 398#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
… …
462 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
463 461
464#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 464 if (options & Opt_reverseVideo)
467 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 466#endif
469 467
470 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 469 color_aliases (Color_fg);
472 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 521
524 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
525 523
526 /* avoiding the math library: 524 /* avoiding the math library:
527 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ; 527 ;
530 MAX_IT (i, 1); 528 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532 530
533 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
535 533
536 /* add entries to the environment: 534 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
601 this->locale = rxvt_strdup (this->locale); 599 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 600 SET_LOCALE (this->locale);
603 mbstate.reset (); 601 mbstate.reset ();
604#endif 602#endif
605 603
606#if 0
607#if HAVE_NL_LANGINFO 604#if HAVE_NL_LANGINFO
608 char *codeset = strdup (nl_langinfo (CODESET)); 605 char *codeset = strdup (nl_langinfo (CODESET));
609 enc_utf8 = !strcasecmp (codeset, "UTF-8") 606 // /^UTF.?8/i
610 || !strcasecmp (codeset, "UTF8"); 607 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
608 && (codeset[1] == 'T' || codeset[1] == 't')
609 && (codeset[2] == 'F' || codeset[2] == 'f')
610 && (codeset[3] == '8' || codeset[4] == '8');
611 free (codeset); 611 free (codeset);
612#else 612#else
613 enc_utf8 = 0; 613 enc_utf8 = 0;
614#endif
615#endif 614#endif
616} 615}
617 616
618void 617void
619rxvt_term::init_xlocale () 618rxvt_term::init_xlocale ()
… …
670 if (scrollbar_visible ()) 669 if (scrollbar_visible ())
671 { 670 {
672 priv_modes |= PrivMode_scrollBar; 671 priv_modes |= PrivMode_scrollBar;
673 SavedModes |= PrivMode_scrollBar; 672 SavedModes |= PrivMode_scrollBar;
674 } 673 }
674
675 if (menubar_visible ()) 675 if (menubar_visible ())
676 { 676 {
677 priv_modes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
679 } 679 }
… …
739 } 739 }
740 } 740 }
741 } 741 }
742 742
743 pix_colors[i] = xcol; 743 pix_colors[i] = xcol;
744 SET_PIXCOLOR (i);
745 }
746
744#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade]) 748 if (rs[Rs_fade])
749 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
746 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 750 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
747#endif 751#endif
748 SET_PIXCOLOR (i);
749 }
750 752
751 if (display->depth <= 2) 753 if (display->depth <= 2)
752 { 754 {
753 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
754 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
762 * from the fvwm window manager. 764 * from the fvwm window manager.
763 */ 765 */
764#ifdef KEEP_SCROLLCOLOR 766#ifdef KEEP_SCROLLCOLOR
765 767
766 if (display->depth <= 2) 768 if (display->depth <= 2)
769 {
767 { /* Monochrome */ 770 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 771 pix_colors[Color_scroll] = pix_colors[Color_fg];
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 772 pix_colors[Color_topShadow] = pix_colors[Color_bg];
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
771 } 774 }
772 else 775 else
… …
827 * Use resource ``modifier'' to override the Meta modifier 830 * Use resource ``modifier'' to override the Meta modifier
828 */ 831 */
829void 832void
830rxvt_term::get_ourmods () 833rxvt_term::get_ourmods ()
831{ 834{
832 int i, j, k; 835 int i, j, k;
833 int requestedmeta, realmeta, realalt; 836 int requestedmeta, realmeta, realalt;
834 const char *cm, *rsmod; 837 const char *cm, *rsmod;
835 XModifierKeymap *map; 838 XModifierKeymap *map;
836 KeyCode *kc; 839 KeyCode *kc;
837 const unsigned int modmasks[] = 840 const unsigned int modmasks[] =
838 { 841 {
839 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
840 }; 843 };
841 844
842 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
843 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
847
844 if (rsmod 848 if (rsmod
845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846 requestedmeta = rsmod[3] - '0'; 850 requestedmeta = rsmod[3] - '0';
847 851
848 map = XGetModifierMapping (display->display); 852 map = XGetModifierMapping (display->display);
849 kc = map->modifiermap; 853 kc = map->modifiermap;
854
850 for (i = 1; i < 6; i++) 855 for (i = 1; i < 6; i++)
851 { 856 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
858
853 for (j = map->max_keypermod; j--; k++) 859 for (j = map->max_keypermod; j--; k++)
854 { 860 {
855 if (kc[k] == 0) 861 if (kc[k] == 0)
856 break; 862 break;
863
857 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 864 switch (XKeycodeToKeysym (display->display, kc[k], 0))
858 { 865 {
859 case XK_Num_Lock: 866 case XK_Num_Lock:
860 ModNumLockMask = modmasks[i - 1]; 867 ModNumLockMask = modmasks[i - 1];
861 /* FALLTHROUGH */ 868 continue;
862 default: 869
863 continue; /* for (;;) */ 870 case XK_ISO_Level3_Shift:
871 ModLevel3Mask = modmasks[i - 1];
872 continue;
873
864 case XK_Meta_L: 874 case XK_Meta_L:
865 case XK_Meta_R: 875 case XK_Meta_R:
866 cm = "meta"; 876 cm = "meta";
867 realmeta = i; 877 realmeta = i;
868 break; 878 break;
879
869 case XK_Alt_L: 880 case XK_Alt_L:
870 case XK_Alt_R: 881 case XK_Alt_R:
871 cm = "alt"; 882 cm = "alt";
872 realalt = i; 883 realalt = i;
873 break; 884 break;
885
874 case XK_Super_L: 886 case XK_Super_L:
875 case XK_Super_R: 887 case XK_Super_R:
876 cm = "super"; 888 cm = "super";
877 break; 889 break;
890
878 case XK_Hyper_L: 891 case XK_Hyper_L:
879 case XK_Hyper_R: 892 case XK_Hyper_R:
880 cm = "hyper"; 893 cm = "hyper";
881 break; 894 break;
895
896 default:
897 continue;
882 } 898 }
899
883 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 900 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
884 requestedmeta = i; 901 requestedmeta = i;
885 } 902 }
886 } 903 }
904
887 XFreeModifiermap (map); 905 XFreeModifiermap (map);
906
888 i = (requestedmeta ? requestedmeta 907 i = requestedmeta ? requestedmeta
889 : (realmeta ? realmeta 908 : realmeta ? realmeta
890 : (realalt ? realalt : 0))); 909 : realalt ? realalt
910 : 0;
911
891 if (i) 912 if (i)
892 ModMetaMask = modmasks[i - 1]; 913 ModMetaMask = modmasks[i - 1];
893} 914}
894 915
895/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
… …
905#endif 926#endif
906 XGCValues gcvalue; 927 XGCValues gcvalue;
907 long vt_emask; 928 long vt_emask;
908 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
909 XWindowAttributes gattr; 930 XWindowAttributes gattr;
931 Window top, parent;
932 dDisp;
910 933
911#ifdef USING_W11LIB 934#ifdef USING_W11LIB
912 /* enable W11 callbacks */ 935 /* enable W11 callbacks */
913 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
914#endif 937#endif
915 938
916 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
917 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
918 941
919 if (options & Opt_transparent) 942 if (options & Opt_transparent)
920 { 943 {
921 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
922 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 945 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
923 } 946 }
924 947
925#if ENABLE_FRILLS 948#if ENABLE_FRILLS
926 if (options & Opt_borderLess) 949 if (options & Opt_borderLess)
927 { 950 {
928 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
929 952
930 if (prop == None) 953 if (prop == None)
931 { 954 {
932 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
933#ifdef PREFER_24BIT 956#ifdef PREFER_24BIT
… …
940 mwmhints.flags = MWM_HINTS_DECORATIONS; 963 mwmhints.flags = MWM_HINTS_DECORATIONS;
941 mwmhints.decorations = 0; 964 mwmhints.decorations = 0;
942 } 965 }
943 } 966 }
944 else 967 else
945 {
946 mwmhints.flags = 0; 968 mwmhints.flags = 0;
947 }
948#endif 969#endif
949 970
950 /* grab colors before netscape does */ 971 /* grab colors before netscape does */
951 Get_Colours (); 972 Get_Colours ();
952 973
953 if (!set_fonts ()) 974 if (!set_fonts ())
954 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
955 976
977 parent = DefaultRootWindow (disp);
978
979#if ENABLE_XEMBED
980 if (rs[Rs_embed])
981 {
982 XWindowAttributes wattr;
983
984 parent = strtol (rs[Rs_embed], 0, 0);
985
986 if (!XGetWindowAttributes (disp, parent, &wattr))
987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
988
989 window_calc (wattr.width, wattr.height);
990 }
991#endif
992
956 window_calc (0, 0); 993 window_calc (0, 0);
957 old_width = szHint.width;
958 old_height = szHint.height;
959 994
960 /* sub-window placement & size in rxvt_resize_subwindows () */ 995 /* sub-window placement & size in rxvt_resize_subwindows () */
961
962#ifdef PREFER_24BIT 996#ifdef PREFER_24BIT
963 attributes.background_pixel = pix_colors_focused[Color_border]; 997 attributes.background_pixel = pix_colors_focused[Color_border];
964 attributes.border_pixel = pix_colors_focused[Color_border]; 998 attributes.border_pixel = pix_colors_focused[Color_border];
965 attributes.colormap = display->cmap; 999 attributes.colormap = display->cmap;
966 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1000 top = XCreateWindow (disp, parent,
967 szHint.x, szHint.y, 1001 szHint.x, szHint.y,
968 szHint.width, szHint.height, 1002 szHint.width, szHint.height,
969 TermWin.ext_bwidth, 1003 ext_bwidth,
970 display->depth, InputOutput, 1004 display->depth, InputOutput,
971 display->visual, 1005 display->visual,
972 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
973#else 1007#else
974 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1008 top = XCreateSimpleWindow (disp, parent,
975 szHint.x, szHint.y, 1009 szHint.x, szHint.y,
976 szHint.width, szHint.height, 1010 szHint.width, szHint.height,
977 TermWin.ext_bwidth, 1011 ext_bwidth,
978 pix_colors_focused[Color_border], 1012 pix_colors_focused[Color_border],
979 pix_colors_focused[Color_border]); 1013 pix_colors_focused[Color_border]);
980#endif 1014#endif
1015
1016 this->parent[0] = top;
1017
1018 old_width = szHint.width;
1019 old_height = szHint.height;
981 1020
982 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
983 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1022 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
984 1023
985 classHint.res_name = (char *)rs[Rs_name]; 1024 classHint.res_name = (char *)rs[Rs_name];
986 classHint.res_class = (char *)RESCLASS; 1025 classHint.res_class = (char *)RESCLASS;
987 1026
988 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1027 wmHint.flags = InputHint | StateHint | WindowGroupHint;
989 wmHint.input = True; 1028 wmHint.input = True;
990 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
991 wmHint.window_group = TermWin.parent[0]; 1030 wmHint.window_group = top;
992 1031
993 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
994 (char **)argv, argc, &szHint, &wmHint, &classHint); 1033 &szHint, &wmHint, &classHint);
995 1034
996 /* Enable delete window protocol */ 1035 Atom protocols[] = {
997 XSetWMProtocols (display->display, TermWin.parent[0], 1036 xa[XA_WM_DELETE_WINDOW],
998 &xa[XA_WMDELETEWINDOW], 1); 1037#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING],
1039#endif
1040 };
999 1041
1000#if ENABLE_FRILLS 1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043
1044#if ENABLE_EWMH
1001 long pid = getpid (); 1045 long pid = getpid ();
1002 1046
1003 XChangeProperty (display->display, TermWin.parent[0], 1047 XChangeProperty (disp, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 1049 PropModeReplace, (unsigned char *)&pid, 1);
1006#endif
1007 1050
1008 XSelectInput (display->display, TermWin.parent[0], 1051 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1052#endif
1053
1054 XSelectInput (disp, top,
1009 KeyPressMask 1055 KeyPressMask
1010#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1056#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1011 | KeyReleaseMask 1057 | KeyReleaseMask
1012#endif 1058#endif
1013 | FocusChangeMask | VisibilityChangeMask 1059 | FocusChangeMask | VisibilityChangeMask
1014 | ExposureMask
1015 | StructureNotifyMask); 1060 | ExposureMask | StructureNotifyMask);
1061
1016 termwin_ev.start (display, TermWin.parent[0]); 1062 termwin_ev.start (display, top);
1017 1063
1018#if ENABLE_FRILLS 1064#if ENABLE_FRILLS
1019 if (mwmhints.flags) 1065 if (mwmhints.flags)
1020 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1066 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1021 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1067 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1022#endif 1068#endif
1023 1069
1024 /* vt cursor: Black-on-White is standard, but this is more popular */ 1070 /* vt cursor: Black-on-White is standard, but this is more popular */
1025 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1071 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1026 1072
1027#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1073#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1028 /* cursor (menuBar/scrollBar): Black-on-White */ 1074 /* cursor (menuBar/scrollBar): Black-on-White */
1029 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1030#endif
1031
1032#ifdef POINTER_BLANK
1033 {
1034 XColor blackcolour;
1035 blackcolour.red = 0;
1036 blackcolour.green = 0;
1037 blackcolour.blue = 0;
1038 Font f = XLoadFont (display->display, "fixed");
1039 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1040 &blackcolour, &blackcolour);
1041 XUnloadFont (display->display, f);
1042 }
1043#endif 1076#endif
1044 1077
1045 /* the vt window */ 1078 /* the vt window */
1046 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1079 vt = XCreateSimpleWindow (disp, top,
1047 window_vt_x, 1080 window_vt_x,
1048 window_vt_y, 1081 window_vt_y,
1049 TermWin_TotalWidth (), 1082 TermWin_TotalWidth (),
1050 TermWin_TotalHeight (), 1083 TermWin_TotalHeight (),
1051 0, 1084 0,
1052 pix_colors_focused[Color_fg], 1085 pix_colors_focused[Color_fg],
1053 pix_colors_focused[Color_bg]); 1086 pix_colors_focused[Color_bg]);
1054#ifdef DEBUG_X 1087#ifdef DEBUG_X
1055 XStoreName (display->display, TermWin.vt, "vt window"); 1088 XStoreName (disp, vt, "vt window");
1056#endif 1089#endif
1057 1090
1058 attributes.bit_gravity = NorthWestGravity; 1091 attributes.bit_gravity = NorthWestGravity;
1059 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1060 1093
1061 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1062
1063 pointer_unblank ();
1064 1095
1065#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
1066 if (options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
1067 vt_emask |= PointerMotionMask; 1098 vt_emask |= PointerMotionMask;
1068 else 1099 else
1069#endif 1100#endif
1070 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1071 1102
1072 XSelectInput (display->display, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1073 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1074 1105
1075#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1076 if (menuBar_height ()) 1107 if (menuBar_height ())
1077 { 1108 {
1078 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1109 menuBar.win = XCreateSimpleWindow (disp, top,
1079 window_vt_x, 0, 1110 window_vt_x, 0,
1080 TermWin_TotalWidth (), 1111 TermWin_TotalWidth (),
1081 menuBar_TotalHeight (), 1112 menuBar_TotalHeight (),
1082 0, 1113 0,
1083 pix_colors_focused[Color_fg], 1114 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_scroll]); 1115 pix_colors_focused[Color_scroll]);
1085 1116
1086#ifdef DEBUG_X 1117#ifdef DEBUG_X
1087 XStoreName (display->display, menuBar.win, "menubar"); 1118 XStoreName (disp, menuBar.win, "menubar");
1088#endif 1119#endif
1089 1120
1090 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1091 1122
1092 XDefineCursor (display->display, menuBar.win, 1123 XDefineCursor (disp, menuBar.win,
1093 XCreateFontCursor (display->display, XC_left_ptr)); 1124 XCreateFontCursor (disp, XC_left_ptr));
1094 1125
1095 XSelectInput (display->display, menuBar.win, 1126 XSelectInput (disp, menuBar.win,
1096 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1097 | Button1MotionMask));
1098 menubar_ev.start (display, menuBar.win); 1128 menubar_ev.start (display, menuBar.win);
1099 } 1129 }
1100#endif 1130#endif
1101 1131
1102#ifdef XPM_BACKGROUND 1132#ifdef XPM_BACKGROUND
… …
1118 1148
1119 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1120 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1121 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1122 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1123 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1124 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1125 &gcvalue); 1155 &gcvalue);
1126 1156
1127 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1128 1158
1129#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1130 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1131 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1133 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1134 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1135 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1136#endif 1166#endif
1137 1167
1138#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1139 // initially we are in unfocused state 1169 // initially we are in unfocused state
1140 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
1141 pix_colors = pix_colors_unfocused; 1171 pix_colors = pix_colors_unfocused;
1142#endif 1172#endif
1143 1173
1174 pointer_unblank ();
1144 scr_recolour (); 1175 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1145} 1186}
1146 1187
1147/* ------------------------------------------------------------------------- * 1188/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE * 1189 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */ 1190 * ------------------------------------------------------------------------- */
… …
1163 tio->c_cc[VKILL] = CKILL; 1204 tio->c_cc[VKILL] = CKILL;
1164 tio->c_cc[VSTART] = CSTART; 1205 tio->c_cc[VSTART] = CSTART;
1165 tio->c_cc[VSTOP] = CSTOP; 1206 tio->c_cc[VSTOP] = CSTOP;
1166 tio->c_cc[VSUSP] = CSUSP; 1207 tio->c_cc[VSUSP] = CSUSP;
1167# ifdef VDSUSP 1208# ifdef VDSUSP
1168
1169 tio->c_cc[VDSUSP] = CDSUSP; 1209 tio->c_cc[VDSUSP] = CDSUSP;
1170# endif 1210# endif
1171# ifdef VREPRINT 1211# ifdef VREPRINT
1172
1173 tio->c_cc[VREPRINT] = CRPRNT; 1212 tio->c_cc[VREPRINT] = CRPRNT;
1174# endif 1213# endif
1175# ifdef VDISCRD 1214# ifdef VDISCRD
1176
1177 tio->c_cc[VDISCRD] = CFLUSH; 1215 tio->c_cc[VDISCRD] = CFLUSH;
1178# endif 1216# endif
1179# ifdef VWERSE 1217# ifdef VWERSE
1180
1181 tio->c_cc[VWERSE] = CWERASE; 1218 tio->c_cc[VWERSE] = CWERASE;
1182# endif 1219# endif
1183# ifdef VLNEXT 1220# ifdef VLNEXT
1184
1185 tio->c_cc[VLNEXT] = CLNEXT; 1221 tio->c_cc[VLNEXT] = CLNEXT;
1186# endif 1222# endif
1187
1188 } 1223 }
1224
1189 tio->c_cc[VEOF] = CEOF; 1225 tio->c_cc[VEOF] = CEOF;
1190 tio->c_cc[VEOL] = VDISABLE; 1226 tio->c_cc[VEOL] = VDISABLE;
1191# ifdef VEOL2 1227# ifdef VEOL2
1192
1193 tio->c_cc[VEOL2] = VDISABLE; 1228 tio->c_cc[VEOL2] = VDISABLE;
1194# endif 1229# endif
1195# ifdef VSWTC 1230# ifdef VSWTC
1196
1197 tio->c_cc[VSWTC] = VDISABLE; 1231 tio->c_cc[VSWTC] = VDISABLE;
1198# endif 1232# endif
1199# ifdef VSWTCH 1233# ifdef VSWTCH
1200
1201 tio->c_cc[VSWTCH] = VDISABLE; 1234 tio->c_cc[VSWTCH] = VDISABLE;
1202# endif 1235# endif
1203# if VMIN != VEOF 1236# if VMIN != VEOF
1204
1205 tio->c_cc[VMIN] = 1; 1237 tio->c_cc[VMIN] = 1;
1206# endif 1238# endif
1207# if VTIME != VEOL 1239# if VTIME != VEOL
1208
1209 tio->c_cc[VTIME] = 0; 1240 tio->c_cc[VTIME] = 0;
1210# endif 1241# endif
1211 1242
1212 if (erase != -1) 1243 if (erase != -1)
1213 tio->c_cc[VERASE] = (char)erase; 1244 tio->c_cc[VERASE] = (char)erase;
… …
1241 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1242 { 1273 {
1243 tio->sg.sg_erase = CERASE; /* ^H */ 1274 tio->sg.sg_erase = CERASE; /* ^H */
1244 tio->sg.sg_kill = CKILL; /* ^U */ 1275 tio->sg.sg_kill = CKILL; /* ^U */
1245 } 1276 }
1277
1246 if (erase != -1) 1278 if (erase != -1)
1247 tio->sg.sg_erase = (char)erase; 1279 tio->sg.sg_erase = (char)erase;
1248 1280
1249 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1250 1282
… …
1256 tio->tc.t_startc = CSTART; /* ^Q */ 1288 tio->tc.t_startc = CSTART; /* ^Q */
1257 tio->tc.t_stopc = CSTOP; /* ^S */ 1289 tio->tc.t_stopc = CSTOP; /* ^S */
1258 tio->tc.t_eofc = CEOF; /* ^D */ 1290 tio->tc.t_eofc = CEOF; /* ^D */
1259 tio->tc.t_brkc = -1; 1291 tio->tc.t_brkc = -1;
1260 } 1292 }
1293
1261 /* get local special chars */ 1294 /* get local special chars */
1262 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1263 { 1296 {
1264 tio->lc.t_suspc = CSUSP; /* ^Z */ 1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1265 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1269 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1270 } 1303 }
1271 /* get line discipline */ 1304 /* get line discipline */
1272 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1273# ifdef NTTYDISC 1306# ifdef NTTYDISC
1274
1275 tio->line = NTTYDISC; 1307 tio->line = NTTYDISC;
1276# endif /* NTTYDISC */ 1308# endif /* NTTYDISC */
1277 1309
1278 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1279#endif /* HAVE_TERMIOS_H */ 1311#endif /* HAVE_TERMIOS_H */
… …
1302 FOO (IGNCR, "IGNCR"); 1334 FOO (IGNCR, "IGNCR");
1303 FOO (ICRNL, "ICRNL"); 1335 FOO (ICRNL, "ICRNL");
1304 FOO (IXON, "IXON"); 1336 FOO (IXON, "IXON");
1305 FOO (IXOFF, "IXOFF"); 1337 FOO (IXOFF, "IXOFF");
1306# ifdef IUCLC 1338# ifdef IUCLC
1307
1308 FOO (IUCLC, "IUCLC"); 1339 FOO (IUCLC, "IUCLC");
1309# endif 1340# endif
1310# ifdef IXANY 1341# ifdef IXANY
1311
1312 FOO (IXANY, "IXANY"); 1342 FOO (IXANY, "IXANY");
1313# endif 1343# endif
1314# ifdef IMAXBEL 1344# ifdef IMAXBEL
1315
1316 FOO (IMAXBEL, "IMAXBEL"); 1345 FOO (IMAXBEL, "IMAXBEL");
1317# endif 1346# endif
1318 1347
1319 fprintf (stderr, "\n"); 1348 fprintf (stderr, "\n");
1320 1349
… …
1327 FOO (VERASE, "VERASE"); 1356 FOO (VERASE, "VERASE");
1328 FOO (VKILL, "VKILL"); 1357 FOO (VKILL, "VKILL");
1329 FOO (VEOF, "VEOF"); 1358 FOO (VEOF, "VEOF");
1330 FOO (VEOL, "VEOL"); 1359 FOO (VEOL, "VEOL");
1331# ifdef VEOL2 1360# ifdef VEOL2
1332
1333 FOO (VEOL2, "VEOL2"); 1361 FOO (VEOL2, "VEOL2");
1334# endif 1362# endif
1335# ifdef VSWTC 1363# ifdef VSWTC
1336
1337 FOO (VSWTC, "VSWTC"); 1364 FOO (VSWTC, "VSWTC");
1338# endif 1365# endif
1339# ifdef VSWTCH 1366# ifdef VSWTCH
1340
1341 FOO (VSWTCH, "VSWTCH"); 1367 FOO (VSWTCH, "VSWTCH");
1342# endif 1368# endif
1343
1344 FOO (VSTART, "VSTART"); 1369 FOO (VSTART, "VSTART");
1345 FOO (VSTOP, "VSTOP"); 1370 FOO (VSTOP, "VSTOP");
1346 FOO (VSUSP, "VSUSP"); 1371 FOO (VSUSP, "VSUSP");
1347# ifdef VDSUSP 1372# ifdef VDSUSP
1348
1349 FOO (VDSUSP, "VDSUSP"); 1373 FOO (VDSUSP, "VDSUSP");
1350# endif 1374# endif
1351# ifdef VREPRINT 1375# ifdef VREPRINT
1352
1353 FOO (VREPRINT, "VREPRINT"); 1376 FOO (VREPRINT, "VREPRINT");
1354# endif 1377# endif
1355# ifdef VDISCRD 1378# ifdef VDISCRD
1356
1357 FOO (VDISCRD, "VDISCRD"); 1379 FOO (VDISCRD, "VDISCRD");
1358# endif 1380# endif
1359# ifdef VWERSE 1381# ifdef VWERSE
1360
1361 FOO (VWERSE, "VWERSE"); 1382 FOO (VWERSE, "VWERSE");
1362# endif 1383# endif
1363# ifdef VLNEXT 1384# ifdef VLNEXT
1364
1365 FOO (VLNEXT, "VLNEXT"); 1385 FOO (VLNEXT, "VLNEXT");
1366# endif 1386# endif
1367 1387
1368 fprintf (stderr, "\n"); 1388 fprintf (stderr, "\n");
1369# undef FOO 1389# undef FOO
… …
1378 * the slave. 1398 * the slave.
1379 */ 1399 */
1380void 1400void
1381rxvt_term::run_command (const char *const *argv) 1401rxvt_term::run_command (const char *const *argv)
1382{ 1402{
1403#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd])
1405 {
1406 pty.pty = atoi (rs[Rs_pty_fd]);
1407 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1408 }
1409 else
1410#endif
1411 if (!pty.get ())
1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1413
1414 pty.set_utf8_mode (enc_utf8);
1415
1416 /* set initial window size */
1417 tt_winch ();
1418
1383 int er; 1419 int er;
1384
1385 if (!pty.get ())
1386 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1387 1420
1388#ifndef NO_BACKSPACE_KEY 1421#ifndef NO_BACKSPACE_KEY
1389 if (key_backspace[0] && !key_backspace[1]) 1422 if (key_backspace[0] && !key_backspace[1])
1390 er = key_backspace[0]; 1423 er = key_backspace[0];
1391 else if (strcmp (key_backspace, "DEC") == 0) 1424 else if (strcmp (key_backspace, "DEC") == 0)
… …
1394#endif 1427#endif
1395 er = -1; 1428 er = -1;
1396 1429
1397 rxvt_get_ttymode (&tio, er); 1430 rxvt_get_ttymode (&tio, er);
1398 1431
1399 /* set initial window size */ 1432#if ENABLE_FRILLS
1400 tt_winch (); 1433 if (rs[Rs_pty_fd])
1401 1434 return;
1402 sw_chld.start (SIGCHLD); 1435#endif
1403 1436
1404#ifndef __QNX__ 1437#ifndef __QNX__
1405 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1406 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1407 { 1440 {
1408 case -1: 1441 case -1:
1442 {
1443 cmd_pid = 0;
1409 rxvt_fatal ("can't fork, aborting.\n"); 1444 rxvt_fatal ("can't fork, aborting.\n");
1445 }
1410 case 0: 1446 case 0:
1411 init_env (); 1447 init_env ();
1412 1448
1413 if (!pty.make_controlling_tty ()) 1449 if (!pty.make_controlling_tty ())
1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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