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

Diff Legend

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