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

Diff Legend

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