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