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

Diff Legend

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