ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

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