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

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

Diff Legend

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