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

Diff Legend

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