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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.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,
… …
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 CLR_OPTION (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;
393#endif 403#endif
… …
436 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]);
437#endif 447#endif
438 448
439#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
440 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
441 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
442 { 452 {
443 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
444 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
445 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
446 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
451 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
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 (OPTION (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
… …
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 605
596#if 0
597#if HAVE_NL_LANGINFO 606#if HAVE_NL_LANGINFO
598 char *codeset = strdup (nl_langinfo (CODESET)); 607 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 608 // /^UTF.?8/i
600 || !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');
601 free (codeset); 613 free (codeset);
602#else 614#else
603 enc_utf8 = 0; 615 enc_utf8 = 0;
604#endif
605#endif 616#endif
606} 617}
607 618
608void 619void
609rxvt_term::init_xlocale () 620rxvt_term::init_xlocale ()
… …
611#ifdef USE_XIM 622#ifdef USE_XIM
612 if (!locale) 623 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 624 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 625 else
615 { 626 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 627 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 628
618 if (!XSupportsLocale ()) 629 if (!XSupportsLocale ())
619 { 630 {
620 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");
621 return; 632 return;
… …
637 * Initialize the command connection. 648 * Initialize the command connection.
638 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
639 */ 650 */
640 651
641#ifdef META8_OPTION 652#ifdef META8_OPTION
642 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
643#endif 654#endif
644 655
645 get_ourmods (); 656 get_ourmods ();
646 657
647 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
648 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
649 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
650 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
651 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
652 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
653 664
654#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
655 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
656 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
660 if (scrollbar_visible ()) 671 if (scrollbar_visible ())
661 { 672 {
662 priv_modes |= PrivMode_scrollBar; 673 priv_modes |= PrivMode_scrollBar;
663 SavedModes |= PrivMode_scrollBar; 674 SavedModes |= PrivMode_scrollBar;
664 } 675 }
676
665 if (menubar_visible ()) 677 if (menubar_visible ())
666 { 678 {
667 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
668 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
669 } 681 }
670
671#ifdef CURSOR_BLINK
672 if (options & Opt_cursorBlink)
673 (void)gettimeofday (&lastcursorchange, NULL);
674#endif
675 682
676 run_command (argv); 683 run_command (argv);
677} 684}
678 685
679/*----------------------------------------------------------------------*/ 686/*----------------------------------------------------------------------*/
… …
694 continue; 701 continue;
695 702
696 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
697 { 704 {
698#ifndef XTERM_REVERSE_VIDEO 705#ifndef XTERM_REVERSE_VIDEO
699 if (i < 2 && (options & Opt_reverseVideo)) 706 if (i < 2 && OPTION (Opt_reverseVideo))
700 rs[Rs_color + i] = def_colorName[!i]; 707 rs[Rs_color + i] = def_colorName[!i];
701 else 708 else
702#endif 709#endif
703 rs[Rs_color + i] = def_colorName[i]; 710 rs[Rs_color + i] = def_colorName[i];
704 711
… …
729 } 736 }
730 } 737 }
731 } 738 }
732 739
733 pix_colors[i] = xcol; 740 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i);
742 }
743
734#ifdef OFF_FOCUS_FADING 744#ifdef OFF_FOCUS_FADING
735 if (rs[Rs_fade]) 745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
736 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]);
737#endif 748#endif
738 SET_PIXCOLOR (i);
739 }
740 749
741 if (display->depth <= 2) 750 if (display->depth <= 2)
742 { 751 {
743 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];
744 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];
… …
752 * from the fvwm window manager. 761 * from the fvwm window manager.
753 */ 762 */
754#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
755 764
756 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
757 { /* Monochrome */ 767 /* Monochrome */
758 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
759 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
760 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
761 } 771 }
762 else 772 else
… …
817 * Use resource ``modifier'' to override the Meta modifier 827 * Use resource ``modifier'' to override the Meta modifier
818 */ 828 */
819void 829void
820rxvt_term::get_ourmods () 830rxvt_term::get_ourmods ()
821{ 831{
822 int i, j, k; 832 int i, j, k;
823 int requestedmeta, realmeta, realalt; 833 int requestedmeta, realmeta, realalt;
824 const char *cm, *rsmod; 834 const char *cm, *rsmod;
825 XModifierKeymap *map; 835 XModifierKeymap *map;
826 KeyCode *kc; 836 KeyCode *kc;
827 const unsigned int modmasks[] = 837 const unsigned int modmasks[] =
828 { 838 {
829 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 839 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
830 }; 840 };
831 841
832 requestedmeta = realmeta = realalt = 0; 842 requestedmeta = realmeta = realalt = 0;
833 rsmod = rs[Rs_modifier]; 843 rsmod = rs[Rs_modifier];
844
834 if (rsmod 845 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 846 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 847 requestedmeta = rsmod[3] - '0';
837 848
838 map = XGetModifierMapping (display->display); 849 map = XGetModifierMapping (display->display);
839 kc = map->modifiermap; 850 kc = map->modifiermap;
851
840 for (i = 1; i < 6; i++) 852 for (i = 1; i < 6; i++)
841 { 853 {
842 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 854 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
855
843 for (j = map->max_keypermod; j--; k++) 856 for (j = map->max_keypermod; j--; k++)
844 { 857 {
845 if (kc[k] == 0) 858 if (kc[k] == 0)
846 break; 859 break;
860
847 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 861 switch (XKeycodeToKeysym (display->display, kc[k], 0))
848 { 862 {
849 case XK_Num_Lock: 863 case XK_Num_Lock:
850 ModNumLockMask = modmasks[i - 1]; 864 ModNumLockMask = modmasks[i - 1];
851 /* FALLTHROUGH */ 865 continue;
852 default: 866
853 continue; /* for (;;) */ 867 case XK_ISO_Level3_Shift:
868 ModLevel3Mask = modmasks[i - 1];
869 continue;
870
854 case XK_Meta_L: 871 case XK_Meta_L:
855 case XK_Meta_R: 872 case XK_Meta_R:
856 cm = "meta"; 873 cm = "meta";
857 realmeta = i; 874 realmeta = i;
858 break; 875 break;
876
859 case XK_Alt_L: 877 case XK_Alt_L:
860 case XK_Alt_R: 878 case XK_Alt_R:
861 cm = "alt"; 879 cm = "alt";
862 realalt = i; 880 realalt = i;
863 break; 881 break;
882
864 case XK_Super_L: 883 case XK_Super_L:
865 case XK_Super_R: 884 case XK_Super_R:
866 cm = "super"; 885 cm = "super";
867 break; 886 break;
887
868 case XK_Hyper_L: 888 case XK_Hyper_L:
869 case XK_Hyper_R: 889 case XK_Hyper_R:
870 cm = "hyper"; 890 cm = "hyper";
871 break; 891 break;
892
893 default:
894 continue;
872 } 895 }
896
873 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 897 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
874 requestedmeta = i; 898 requestedmeta = i;
875 } 899 }
876 } 900 }
901
877 XFreeModifiermap (map); 902 XFreeModifiermap (map);
903
878 i = (requestedmeta ? requestedmeta 904 i = requestedmeta ? requestedmeta
879 : (realmeta ? realmeta 905 : realmeta ? realmeta
880 : (realalt ? realalt : 0))); 906 : realalt ? realalt
907 : 0;
908
881 if (i) 909 if (i)
882 ModMetaMask = modmasks[i - 1]; 910 ModMetaMask = modmasks[i - 1];
883} 911}
884 912
885/*----------------------------------------------------------------------*/ 913/*----------------------------------------------------------------------*/
… …
895#endif 923#endif
896 XGCValues gcvalue; 924 XGCValues gcvalue;
897 long vt_emask; 925 long vt_emask;
898 XSetWindowAttributes attributes; 926 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 927 XWindowAttributes gattr;
900 928 Window top, parent;
901 for (int i = 0; i < NUM_XA; i++) 929 dDisp;
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903 930
904#ifdef USING_W11LIB 931#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 932 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 933 W11AddEventHandler (disp, rxvt_W11_process_x_event);
907#endif 934#endif
908 935
909 if (options & Opt_transparent) 936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
938
939 if (OPTION (Opt_transparent))
910 { 940 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
913 } 943 }
914 944
915#if ENABLE_FRILLS 945#if ENABLE_FRILLS
916 if (options & Opt_borderLess) 946 if (OPTION (Opt_borderLess))
917 { 947 {
918 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
919 949
920 if (prop == None) 950 if (prop == None)
921 { 951 {
922 /* 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");*/
923#ifdef PREFER_24BIT 953#ifdef PREFER_24BIT
… …
930 mwmhints.flags = MWM_HINTS_DECORATIONS; 960 mwmhints.flags = MWM_HINTS_DECORATIONS;
931 mwmhints.decorations = 0; 961 mwmhints.decorations = 0;
932 } 962 }
933 } 963 }
934 else 964 else
935 {
936 mwmhints.flags = 0; 965 mwmhints.flags = 0;
937 }
938#endif 966#endif
939 967
940 /* grab colors before netscape does */ 968 /* grab colors before netscape does */
941 Get_Colours (); 969 Get_Colours ();
942 970
943 if (!set_fonts ()) 971 if (!set_fonts ())
944 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");
945 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
946 window_calc (0, 0); 990 window_calc (0, 0);
947 old_width = szHint.width;
948 old_height = szHint.height;
949 991
950 /* sub-window placement & size in rxvt_resize_subwindows () */ 992 /* sub-window placement & size in rxvt_resize_subwindows () */
951
952#ifdef PREFER_24BIT 993#ifdef PREFER_24BIT
953 attributes.background_pixel = pix_colors_focused[Color_border]; 994 attributes.background_pixel = pix_colors_focused[Color_border];
954 attributes.border_pixel = pix_colors_focused[Color_border]; 995 attributes.border_pixel = pix_colors_focused[Color_border];
955 attributes.colormap = display->cmap; 996 attributes.colormap = display->cmap;
956 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 997 top = XCreateWindow (disp, parent,
957 szHint.x, szHint.y, 998 szHint.x, szHint.y,
958 szHint.width, szHint.height, 999 szHint.width, szHint.height,
959 TermWin.ext_bwidth, 1000 ext_bwidth,
960 display->depth, InputOutput, 1001 display->depth, InputOutput,
961 display->visual, 1002 display->visual,
962 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
963#else 1004#else
964 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1005 top = XCreateSimpleWindow (disp, parent,
965 szHint.x, szHint.y, 1006 szHint.x, szHint.y,
966 szHint.width, szHint.height, 1007 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 1008 ext_bwidth,
968 pix_colors_focused[Color_border], 1009 pix_colors_focused[Color_border],
969 pix_colors_focused[Color_border]); 1010 pix_colors_focused[Color_border]);
970#endif 1011#endif
1012
1013 this->parent[0] = top;
1014
1015 old_width = szHint.width;
1016 old_height = szHint.height;
971 1017
972 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1018 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
973 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1019 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
974 1020
975 classHint.res_name = (char *)rs[Rs_name]; 1021 classHint.res_name = (char *)rs[Rs_name];
976 classHint.res_class = (char *)RESCLASS; 1022 classHint.res_class = (char *)RESCLASS;
977 1023
978 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1024 wmHint.flags = InputHint | StateHint | WindowGroupHint;
979 wmHint.input = True; 1025 wmHint.input = True;
980 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1026 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
981 wmHint.window_group = TermWin.parent[0]; 1027 wmHint.window_group = top;
982 1028
983 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1029 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
984 (char **)argv, argc, &szHint, &wmHint, &classHint); 1030 &szHint, &wmHint, &classHint);
985 1031
986 /* Enable delete window protocol */ 1032 Atom protocols[] = {
987 XSetWMProtocols (display->display, TermWin.parent[0], 1033 xa[XA_WM_DELETE_WINDOW],
988 &xa[XA_WMDELETEWINDOW], 1); 1034#if ENABLE_EWMH
1035 xa[XA_NET_WM_PING],
1036#endif
1037 };
989 1038
990#if ENABLE_FRILLS 1039 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1040
1041#if ENABLE_EWMH
991 long pid = getpid (); 1042 long pid = getpid ();
992 1043
993 XChangeProperty (display->display, TermWin.parent[0], 1044 XChangeProperty (disp, top,
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1045 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1046 PropModeReplace, (unsigned char *)&pid, 1);
996#endif
997 1047
998 XSelectInput (display->display, TermWin.parent[0], 1048 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1049#endif
1050
1051 XSelectInput (disp, top,
999 KeyPressMask 1052 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1053#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1054 | KeyReleaseMask
1002#endif 1055#endif
1003 | FocusChangeMask | VisibilityChangeMask 1056 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask
1005 | StructureNotifyMask); 1057 | ExposureMask | StructureNotifyMask);
1058
1006 termwin_ev.start (display, TermWin.parent[0]); 1059 termwin_ev.start (display, top);
1007 1060
1008#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1062 if (mwmhints.flags)
1010 { 1063 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1011 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1012 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1013 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1064 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1065#endif
1016 1066
1017 /* 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 */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1068 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1069
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1070#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1071 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1023#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;
1024 1092
1025#ifdef POINTER_BLANK 1093#ifdef POINTER_BLANK
1026 { 1094 if (OPTION (Opt_pointerBlank))
1027 XColor blackcolour;
1028 blackcolour.red = 0;
1029 blackcolour.green = 0;
1030 blackcolour.blue = 0;
1031 Font f = XLoadFont (display->display, "fixed");
1032 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1033 &blackcolour, &blackcolour);
1034 XUnloadFont (display->display, f);
1035 }
1036#endif
1037
1038 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1040 window_vt_x,
1041 window_vt_y,
1042 TermWin_TotalWidth (),
1043 TermWin_TotalHeight (),
1044 0,
1045 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window");
1049#endif
1050
1051 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1053
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055
1056 pointer_unblank ();
1057
1058#ifdef POINTER_BLANK
1059 if (options & Opt_pointerBlank)
1060 vt_emask |= PointerMotionMask; 1095 vt_emask |= PointerMotionMask;
1061 else 1096 else
1062#endif 1097#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1099
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1100 XSelectInput (disp, vt, vt_emask);
1066 vt_ev.start (display, TermWin.vt); 1101 vt_ev.start (display, vt);
1067 1102
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ()) 1104 if (menuBar_height ())
1070 { 1105 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1106 menuBar.win = XCreateSimpleWindow (disp, top,
1072 window_vt_x, 0, 1107 window_vt_x, 0,
1073 TermWin_TotalWidth (), 1108 width,
1074 menuBar_TotalHeight (), 1109 menuBar_TotalHeight (),
1075 0, 1110 0,
1076 pix_colors_focused[Color_fg], 1111 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]); 1112 pix_colors_focused[Color_scroll]);
1078 1113
1079#ifdef DEBUG_X 1114#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar"); 1115 XStoreName (disp, menuBar.win, "menubar");
1081#endif 1116#endif
1082 1117
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1118 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084 1119
1085 XDefineCursor (display->display, menuBar.win, 1120 XDefineCursor (disp, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr)); 1121 XCreateFontCursor (disp, XC_left_ptr));
1087 1122
1088 XSelectInput (display->display, menuBar.win, 1123 XSelectInput (disp, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1124 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win); 1125 menubar_ev.start (display, menuBar.win);
1092 } 1126 }
1093#endif 1127#endif
1094 1128
1095#ifdef XPM_BACKGROUND 1129#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1130 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! (options & Opt_transparent)) 1131 && ! OPTION (Opt_transparent))
1098 { 1132 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1133 const char *p = rs[Rs_backgroundPixmap];
1100 1134
1101 if ((p = strchr (p, ';')) != NULL) 1135 if ((p = strchr (p, ';')) != NULL)
1102 { 1136 {
… …
1111 1145
1112 /* graphics context for the vt window */ 1146 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1147 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1148 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1149 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1150 gc = XCreateGC (disp, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1151 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1152 &gcvalue);
1119 1153
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1154 drawable = new rxvt_drawable (display, vt);
1121 1155
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1157 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1159 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1162 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129#endif 1163#endif
1130 1164
1131#ifdef OFF_FOCUS_FADING 1165#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1166 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1167 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1168 pix_colors = pix_colors_unfocused;
1135#endif 1169#endif
1136 1170
1171 pointer_unblank ();
1137 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
1138} 1183}
1139 1184
1140/* ------------------------------------------------------------------------- * 1185/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1186 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1187 * ------------------------------------------------------------------------- */
… …
1147 /* 1192 /*
1148 * standard System V termios interface 1193 * standard System V termios interface
1149 */ 1194 */
1150 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1151 { 1196 {
1152 /* 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
1153 tio->c_cc[VINTR] = CINTR; 1201 tio->c_cc[VINTR] = CINTR;
1154 tio->c_cc[VQUIT] = CQUIT; 1202 tio->c_cc[VQUIT] = CQUIT;
1155 tio->c_cc[VERASE] = CERASE; 1203 tio->c_cc[VERASE] = CERASE;
1204#ifdef VERASE2
1205 tio->c_cc[VERASE2] = CERASE2;
1206#endif
1156 tio->c_cc[VKILL] = CKILL; 1207 tio->c_cc[VKILL] = CKILL;
1157 tio->c_cc[VSTART] = CSTART; 1208 tio->c_cc[VSTART] = CSTART;
1158 tio->c_cc[VSTOP] = CSTOP; 1209 tio->c_cc[VSTOP] = CSTOP;
1159 tio->c_cc[VSUSP] = CSUSP; 1210 tio->c_cc[VSUSP] = CSUSP;
1160# ifdef VDSUSP 1211# ifdef VDSUSP
1161
1162 tio->c_cc[VDSUSP] = CDSUSP; 1212 tio->c_cc[VDSUSP] = CDSUSP;
1163# endif 1213# endif
1164# ifdef VREPRINT 1214# ifdef VREPRINT
1165
1166 tio->c_cc[VREPRINT] = CRPRNT; 1215 tio->c_cc[VREPRINT] = CRPRNT;
1167# endif 1216# endif
1168# ifdef VDISCRD 1217# ifdef VDISCRD
1169
1170 tio->c_cc[VDISCRD] = CFLUSH; 1218 tio->c_cc[VDISCRD] = CFLUSH;
1171# endif 1219# endif
1172# ifdef VWERSE 1220# ifdef VWERSE
1173
1174 tio->c_cc[VWERSE] = CWERASE; 1221 tio->c_cc[VWERSE] = CWERASE;
1175# endif 1222# endif
1176# ifdef VLNEXT 1223# ifdef VLNEXT
1177
1178 tio->c_cc[VLNEXT] = CLNEXT; 1224 tio->c_cc[VLNEXT] = CLNEXT;
1179# endif 1225# endif
1180
1181 } 1226 }
1227
1182 tio->c_cc[VEOF] = CEOF; 1228 tio->c_cc[VEOF] = CEOF;
1183 tio->c_cc[VEOL] = VDISABLE; 1229 tio->c_cc[VEOL] = VDISABLE;
1184# ifdef VEOL2 1230# ifdef VEOL2
1185
1186 tio->c_cc[VEOL2] = VDISABLE; 1231 tio->c_cc[VEOL2] = VDISABLE;
1187# endif 1232# endif
1188# ifdef VSWTC 1233# ifdef VSWTC
1189
1190 tio->c_cc[VSWTC] = VDISABLE; 1234 tio->c_cc[VSWTC] = VDISABLE;
1191# endif 1235# endif
1192# ifdef VSWTCH 1236# ifdef VSWTCH
1193
1194 tio->c_cc[VSWTCH] = VDISABLE; 1237 tio->c_cc[VSWTCH] = VDISABLE;
1195# endif 1238# endif
1196# if VMIN != VEOF 1239# if VMIN != VEOF
1197
1198 tio->c_cc[VMIN] = 1; 1240 tio->c_cc[VMIN] = 1;
1199# endif 1241# endif
1200# if VTIME != VEOL 1242# if VTIME != VEOL
1201
1202 tio->c_cc[VTIME] = 0; 1243 tio->c_cc[VTIME] = 0;
1203# endif 1244# endif
1204 1245
1205 if (erase != -1) 1246 if (erase != -1)
1206 tio->c_cc[VERASE] = (char)erase; 1247 tio->c_cc[VERASE] = (char)erase;
… …
1234 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1275 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1235 { 1276 {
1236 tio->sg.sg_erase = CERASE; /* ^H */ 1277 tio->sg.sg_erase = CERASE; /* ^H */
1237 tio->sg.sg_kill = CKILL; /* ^U */ 1278 tio->sg.sg_kill = CKILL; /* ^U */
1238 } 1279 }
1280
1239 if (erase != -1) 1281 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase; 1282 tio->sg.sg_erase = (char)erase;
1241 1283
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1284 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243 1285
… …
1249 tio->tc.t_startc = CSTART; /* ^Q */ 1291 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */ 1292 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */ 1293 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1; 1294 tio->tc.t_brkc = -1;
1253 } 1295 }
1296
1254 /* get local special chars */ 1297 /* get local special chars */
1255 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1256 { 1299 {
1257 tio->lc.t_suspc = CSUSP; /* ^Z */ 1300 tio->lc.t_suspc = CSUSP; /* ^Z */
1258 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1262 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1305 tio->lc.t_lnextc = CLNEXT; /* ^V */
1263 } 1306 }
1264 /* get line discipline */ 1307 /* get line discipline */
1265 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1266# ifdef NTTYDISC 1309# ifdef NTTYDISC
1267
1268 tio->line = NTTYDISC; 1310 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */ 1311# endif /* NTTYDISC */
1270 1312
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1313 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */ 1314#endif /* HAVE_TERMIOS_H */
… …
1295 FOO (IGNCR, "IGNCR"); 1337 FOO (IGNCR, "IGNCR");
1296 FOO (ICRNL, "ICRNL"); 1338 FOO (ICRNL, "ICRNL");
1297 FOO (IXON, "IXON"); 1339 FOO (IXON, "IXON");
1298 FOO (IXOFF, "IXOFF"); 1340 FOO (IXOFF, "IXOFF");
1299# ifdef IUCLC 1341# ifdef IUCLC
1300
1301 FOO (IUCLC, "IUCLC"); 1342 FOO (IUCLC, "IUCLC");
1302# endif 1343# endif
1303# ifdef IXANY 1344# ifdef IXANY
1304
1305 FOO (IXANY, "IXANY"); 1345 FOO (IXANY, "IXANY");
1306# endif 1346# endif
1307# ifdef IMAXBEL 1347# ifdef IMAXBEL
1308
1309 FOO (IMAXBEL, "IMAXBEL"); 1348 FOO (IMAXBEL, "IMAXBEL");
1310# endif 1349# endif
1311 1350
1312 fprintf (stderr, "\n"); 1351 fprintf (stderr, "\n");
1313 1352
… …
1320 FOO (VERASE, "VERASE"); 1359 FOO (VERASE, "VERASE");
1321 FOO (VKILL, "VKILL"); 1360 FOO (VKILL, "VKILL");
1322 FOO (VEOF, "VEOF"); 1361 FOO (VEOF, "VEOF");
1323 FOO (VEOL, "VEOL"); 1362 FOO (VEOL, "VEOL");
1324# ifdef VEOL2 1363# ifdef VEOL2
1325
1326 FOO (VEOL2, "VEOL2"); 1364 FOO (VEOL2, "VEOL2");
1327# endif 1365# endif
1328# ifdef VSWTC 1366# ifdef VSWTC
1329
1330 FOO (VSWTC, "VSWTC"); 1367 FOO (VSWTC, "VSWTC");
1331# endif 1368# endif
1332# ifdef VSWTCH 1369# ifdef VSWTCH
1333
1334 FOO (VSWTCH, "VSWTCH"); 1370 FOO (VSWTCH, "VSWTCH");
1335# endif 1371# endif
1336
1337 FOO (VSTART, "VSTART"); 1372 FOO (VSTART, "VSTART");
1338 FOO (VSTOP, "VSTOP"); 1373 FOO (VSTOP, "VSTOP");
1339 FOO (VSUSP, "VSUSP"); 1374 FOO (VSUSP, "VSUSP");
1340# ifdef VDSUSP 1375# ifdef VDSUSP
1341
1342 FOO (VDSUSP, "VDSUSP"); 1376 FOO (VDSUSP, "VDSUSP");
1343# endif 1377# endif
1344# ifdef VREPRINT 1378# ifdef VREPRINT
1345
1346 FOO (VREPRINT, "VREPRINT"); 1379 FOO (VREPRINT, "VREPRINT");
1347# endif 1380# endif
1348# ifdef VDISCRD 1381# ifdef VDISCRD
1349
1350 FOO (VDISCRD, "VDISCRD"); 1382 FOO (VDISCRD, "VDISCRD");
1351# endif 1383# endif
1352# ifdef VWERSE 1384# ifdef VWERSE
1353
1354 FOO (VWERSE, "VWERSE"); 1385 FOO (VWERSE, "VWERSE");
1355# endif 1386# endif
1356# ifdef VLNEXT 1387# ifdef VLNEXT
1357
1358 FOO (VLNEXT, "VLNEXT"); 1388 FOO (VLNEXT, "VLNEXT");
1359# endif 1389# endif
1360 1390
1361 fprintf (stderr, "\n"); 1391 fprintf (stderr, "\n");
1362# undef FOO 1392# undef FOO
… …
1371 * the slave. 1401 * the slave.
1372 */ 1402 */
1373void 1403void
1374rxvt_term::run_command (const char *const *argv) 1404rxvt_term::run_command (const char *const *argv)
1375{ 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
1376 int er; 1427 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1428
1381#ifndef NO_BACKSPACE_KEY 1429#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1430 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1431 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1432 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1435#endif
1388 er = -1; 1436 er = -1;
1389 1437
1390 rxvt_get_ttymode (&tio, er); 1438 rxvt_get_ttymode (&tio, er);
1391 1439
1392 /* set initial window size */ 1440#if ENABLE_FRILLS
1393 tt_winch (); 1441 if (rs[Rs_pty_fd])
1394 1442 return;
1395 sw_chld.start (SIGCHLD); 1443#endif
1396 1444
1397#ifndef __QNX__ 1445#ifndef __QNX__
1398 /* spin off the command interpreter */ 1446 /* spin off the command interpreter */
1399 switch (cmd_pid = fork ()) 1447 switch (cmd_pid = fork ())
1400 { 1448 {
1401 case -1: 1449 case -1:
1450 {
1451 cmd_pid = 0;
1402 rxvt_fatal ("can't fork, aborting.\n"); 1452 rxvt_fatal ("can't fork, aborting.\n");
1453 }
1403 case 0: 1454 case 0:
1404 init_env (); 1455 init_env ();
1405 1456
1406 if (!pty.make_controlling_tty ()) 1457 if (!pty.make_controlling_tty ())
1407 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1458 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1470{ 1521{
1471 char *login; 1522 char *login;
1472 1523
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1524 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474 1525
1475 if (options & Opt_console) 1526 if (OPTION (Opt_console))
1476 { /* be virtual console, fail silently */ 1527 { /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1528#ifdef TIOCCONS
1478 unsigned int on = 1; 1529 unsigned int on = 1;
1479 1530
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1531 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1530 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1531 shell = "/bin/sh"; 1582 shell = "/bin/sh";
1532 1583
1533 argv0 = (const char *)rxvt_r_basename (shell); 1584 argv0 = (const char *)rxvt_r_basename (shell);
1534 1585
1535 if (options & Opt_loginShell) 1586 if (OPTION (Opt_loginShell))
1536 { 1587 {
1537 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1588 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1538 1589
1539 login[0] = '-'; 1590 login[0] = '-';
1540 strcpy (&login[1], argv0); 1591 strcpy (&login[1], argv0);
… …
1575 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1576 command = "/bin/sh"; 1627 command = "/bin/sh";
1577 1628
1578 arg_a[0] = my_basename (command); 1629 arg_a[0] = my_basename (command);
1579 1630
1580 if (options & Opt_loginShell) 1631 if (OPTION (Opt_loginShell))
1581 { 1632 {
1582 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1583 1634
1584 login[0] = '-'; 1635 login[0] = '-';
1585 strcpy (&login[1], arg_a[0]); 1636 strcpy (&login[1], arg_a[0]);

Diff Legend

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