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.107 by root, Wed Feb 2 08:09:23 2005 UTC vs.
Revision 1.132 by root, Fri Jan 6 02:11:15 2006 UTC

… …
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 "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
181 "MULTIPLE", 184 "MULTIPLE",
182 "TARGETS", 185 "TARGETS",
183 "TIMESTAMP", 186 "TIMESTAMP",
184 "VT_SELECTION", 187 "VT_SELECTION",
185 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 191 "CLIPBOARD",
188#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
189 "_NET_WM_PID", 196 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 197 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
193#endif 200#endif
194#if USE_XIM 201#if USE_XIM
195 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
196#endif 203#endif
197#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
200#endif 207#endif
201#ifdef OFFIX_DND 208#ifdef OFFIX_DND
202 "DndProtocol", 209 "DndProtocol",
203 "DndSelection", 210 "DndSelection",
204#endif 211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
205 }; 216 };
206 217
207bool 218bool
208rxvt_term::init_vars () 219rxvt_term::init_vars ()
209{ 220{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 224#endif
217 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
218 226
219 if (pix_colors == NULL) 227 if (pix_colors == NULL)
220 return false; 228 return false;
221 229
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 231 pixmap = None;
224#endif 232#endif
225 233
226 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 237 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 239 focus = 0;
234 TermWin.ncol = 80; 240 ncol = 80;
235 TermWin.nrow = 24; 241 nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
237 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
238 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
239 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
240 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
241 247
242 refresh_limit = 1; 248 refresh_limit = 1;
243 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
244 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
337 */ 343 */
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
340 346
341 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 ();
342 free (r_argv); 353 free (r_argv);
343
344#ifdef LOCAL_X_IS_UNIX
345 if (rs[Rs_display_name][0] == ':')
346 {
347 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
348 strcpy (val, "unix");
349 strcat (val, rs[Rs_display_name]);
350 display = displays.get (val);
351 free (val);
352 }
353#endif
354
355 if (!display
356 && ! (display = displays.get (rs[Rs_display_name])))
357 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
358
359 extract_resources (display->display, rs[Rs_name]);
360 354
361 /* 355 /*
362 * set any defaults not already set 356 * set any defaults not already set
363 */ 357 */
364 if (cmd_argv && cmd_argv[0]) 358 if (cmd_argv && cmd_argv[0])
… …
375 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
376 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
377 } 371 }
378 372
379 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
380 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_SAVELINES);
381 375
382#if ENABLE_FRILLS 376#if ENABLE_FRILLS
383 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)
384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379
385 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)
386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382
387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
389#endif 385#endif
390 386
391#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
393 pointerBlankDelay = i; 389 pointerBlankDelay = i;
394 else 390 else
395 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
396#endif 392#endif
397 393
398 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
399 if (!TermWin.saveLines) 395 if (!saveLines)
400 options &= ~Opt_scrollBar; 396 CLR_OPTION (Opt_scrollBar);
401 397
402#ifdef PRINTPIPE 398#ifdef PRINTPIPE
403 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
404 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
405#endif 401#endif
… …
448 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]);
449#endif 445#endif
450 446
451#ifdef XTERM_REVERSE_VIDEO 447#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 448 /* this is how xterm implements reverseVideo */
453 if (options & Opt_reverseVideo) 449 if (OPTION (Opt_reverseVideo))
454 { 450 {
455 if (!rs[Rs_color + Color_fg]) 451 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 452 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
457 if (!rs[Rs_color + Color_bg]) 453 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 454 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
463 if (!rs[Rs_color + i]) 459 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
465 461
466#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
468 if (options & Opt_reverseVideo) 464 if (OPTION (Opt_reverseVideo))
469 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]);
470#endif 466#endif
471 467
472 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 469 color_aliases (Color_fg);
474 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 521
526 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
527 523
528 /* avoiding the math library: 524 /* avoiding the math library:
529 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 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++)
531 ; 527 ;
532 MAX_IT (i, 1); 528 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534 530
535 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
537 533
538 /* add entries to the environment: 534 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
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
… …
926#endif 919#endif
927 XGCValues gcvalue; 920 XGCValues gcvalue;
928 long vt_emask; 921 long vt_emask;
929 XSetWindowAttributes attributes; 922 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 923 XWindowAttributes gattr;
924 Window top, parent;
925 dDisp;
931 926
932#ifdef USING_W11LIB 927#ifdef USING_W11LIB
933 /* enable W11 callbacks */ 928 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 929 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif 930#endif
936 931
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 934
940 if (options & Opt_transparent) 935 if (OPTION (Opt_transparent))
941 { 936 {
942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 938 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 939 }
945 940
946#if ENABLE_FRILLS 941#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 942 if (OPTION (Opt_borderLess))
948 { 943 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 945
951 if (prop == None) 946 if (prop == None)
952 { 947 {
953 /* 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");*/
954#ifdef PREFER_24BIT 949#ifdef PREFER_24BIT
… …
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0; 957 mwmhints.decorations = 0;
963 } 958 }
964 } 959 }
965 else 960 else
966 {
967 mwmhints.flags = 0; 961 mwmhints.flags = 0;
968 }
969#endif 962#endif
970 963
971 /* grab colors before netscape does */ 964 /* grab colors before netscape does */
972 Get_Colours (); 965 Get_Colours ();
973 966
974 if (!set_fonts ()) 967 if (!set_fonts ())
975 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");
976 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
977 window_calc (0, 0); 986 window_calc (0, 0);
978 old_width = szHint.width;
979 old_height = szHint.height;
980 987
981 /* sub-window placement & size in rxvt_resize_subwindows () */ 988 /* sub-window placement & size in rxvt_resize_subwindows () */
982
983#ifdef PREFER_24BIT 989#ifdef PREFER_24BIT
984 attributes.background_pixel = pix_colors_focused[Color_border]; 990 attributes.background_pixel = pix_colors_focused[Color_border];
985 attributes.border_pixel = pix_colors_focused[Color_border]; 991 attributes.border_pixel = pix_colors_focused[Color_border];
986 attributes.colormap = display->cmap; 992 attributes.colormap = display->cmap;
987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 993 top = XCreateWindow (disp, parent,
988 szHint.x, szHint.y, 994 szHint.x, szHint.y,
989 szHint.width, szHint.height, 995 szHint.width, szHint.height,
990 TermWin.ext_bwidth, 996 ext_bwidth,
991 display->depth, InputOutput, 997 display->depth, InputOutput,
992 display->visual, 998 display->visual,
993 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 999 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
994#else 1000#else
995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1001 top = XCreateSimpleWindow (disp, parent,
996 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1004 ext_bwidth,
999 pix_colors_focused[Color_border], 1005 pix_colors_focused[Color_border],
1000 pix_colors_focused[Color_border]); 1006 pix_colors_focused[Color_border]);
1001#endif 1007#endif
1008
1009 this->parent[0] = top;
1010
1011 old_width = szHint.width;
1012 old_height = szHint.height;
1002 1013
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1014 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1015 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1016
1006 classHint.res_name = (char *)rs[Rs_name]; 1017 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1018 classHint.res_class = (char *)RESCLASS;
1008 1019
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1020 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1021 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1023 wmHint.window_group = top;
1013 1024
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1026 &szHint, &wmHint, &classHint);
1016 1027
1017 /* Enable delete window protocol */ 1028 Atom protocols[] = {
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1029 xa[XA_WM_DELETE_WINDOW],
1019 &xa[XA_WMDELETEWINDOW], 1); 1030#if ENABLE_EWMH
1031 xa[XA_NET_WM_PING],
1032#endif
1033 };
1020 1034
1021#if ENABLE_FRILLS 1035 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1036
1037#if ENABLE_EWMH
1022 long pid = getpid (); 1038 long pid = getpid ();
1023 1039
1024 XChangeProperty (display->display, TermWin.parent[0], 1040 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1041 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1042 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif
1028 1043
1029 XSelectInput (display->display, TermWin.parent[0], 1044 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1045#endif
1046
1047 XSelectInput (disp, top,
1030 KeyPressMask 1048 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1049#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1050 | KeyReleaseMask
1033#endif 1051#endif
1034 | FocusChangeMask | VisibilityChangeMask 1052 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask
1036 | StructureNotifyMask); 1053 | ExposureMask | StructureNotifyMask);
1054
1037 termwin_ev.start (display, TermWin.parent[0]); 1055 termwin_ev.start (display, top);
1038 1056
1039#if ENABLE_FRILLS 1057#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1058 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1059 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1060 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1061#endif
1044 1062
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1063 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1064 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1065
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1066#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1067 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1068 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1069#endif
1052 1070
1053 /* the vt window */ 1071 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1072 vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1073 window_vt_x,
1056 window_vt_y, 1074 window_vt_y,
1057 TermWin_TotalWidth (), 1075 width,
1058 TermWin_TotalHeight (), 1076 height,
1059 0, 1077 0,
1060 pix_colors_focused[Color_fg], 1078 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1079 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1080#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1081 XStoreName (disp, vt, "vt window");
1064#endif 1082#endif
1065 1083
1066 attributes.bit_gravity = NorthWestGravity; 1084 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1085 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1068 1086
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1087 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070 1088
1071 pointer_unblank ();
1072
1073#ifdef POINTER_BLANK 1089#ifdef POINTER_BLANK
1074 if (options & Opt_pointerBlank) 1090 if (OPTION (Opt_pointerBlank))
1075 vt_emask |= PointerMotionMask; 1091 vt_emask |= PointerMotionMask;
1076 else 1092 else
1077#endif 1093#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1094 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1095
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1096 XSelectInput (disp, vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1097 vt_ev.start (display, vt);
1082 1098
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1099#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1100 if (menuBar_height ())
1085 { 1101 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1102 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1103 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1104 width,
1089 menuBar_TotalHeight (), 1105 menuBar_TotalHeight (),
1090 0, 1106 0,
1091 pix_colors_focused[Color_fg], 1107 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1108 pix_colors_focused[Color_scroll]);
1093 1109
1094#ifdef DEBUG_X 1110#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1111 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1112#endif
1097 1113
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1114 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1115
1100 XDefineCursor (display->display, menuBar.win, 1116 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1117 XCreateFontCursor (disp, XC_left_ptr));
1102 1118
1103 XSelectInput (display->display, menuBar.win, 1119 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1120 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1121 menubar_ev.start (display, menuBar.win);
1107 } 1122 }
1108#endif 1123#endif
1109 1124
1110#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1111 if (rs[Rs_backgroundPixmap] != NULL 1126 if (rs[Rs_backgroundPixmap] != NULL
1112 && ! (options & Opt_transparent)) 1127 && ! OPTION (Opt_transparent))
1113 { 1128 {
1114 const char *p = rs[Rs_backgroundPixmap]; 1129 const char *p = rs[Rs_backgroundPixmap];
1115 1130
1116 if ((p = strchr (p, ';')) != NULL) 1131 if ((p = strchr (p, ';')) != NULL)
1117 { 1132 {
… …
1126 1141
1127 /* graphics context for the vt window */ 1142 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1143 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1144 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1145 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1146 gc = XCreateGC (disp, vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1147 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1148 &gcvalue);
1134 1149
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1150 drawable = new rxvt_drawable (display, vt);
1136 1151
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1152#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1153 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1154 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1155 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1156 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1157 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1158 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1144#endif 1159#endif
1145 1160
1146#ifdef OFF_FOCUS_FADING 1161#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1162 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1163 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1164 pix_colors = pix_colors_unfocused;
1150#endif 1165#endif
1151 1166
1167 pointer_unblank ();
1152 scr_recolour (); 1168 scr_recolour ();
1169
1170#if ENABLE_XEMBED
1171 if (rs[Rs_embed])
1172 {
1173 long info[2] = { 0, XEMBED_MAPPED };
1174
1175 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1176 32, PropModeReplace, (unsigned char *)&info, 2);
1177 }
1178#endif
1153} 1179}
1154 1180
1155/* ------------------------------------------------------------------------- * 1181/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1182 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1183 * ------------------------------------------------------------------------- */
… …
1162 /* 1188 /*
1163 * standard System V termios interface 1189 * standard System V termios interface
1164 */ 1190 */
1165 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1191 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1166 { 1192 {
1167 /* return error - use system defaults */ 1193 // return error - use system defaults,
1194 // where possible, and zero elsewhere
1195 memset (tio, 0, sizeof (ttymode_t));
1196
1168 tio->c_cc[VINTR] = CINTR; 1197 tio->c_cc[VINTR] = CINTR;
1169 tio->c_cc[VQUIT] = CQUIT; 1198 tio->c_cc[VQUIT] = CQUIT;
1170 tio->c_cc[VERASE] = CERASE; 1199 tio->c_cc[VERASE] = CERASE;
1200#ifdef VERASE2
1201 tio->c_cc[VERASE2] = CERASE2;
1202#endif
1171 tio->c_cc[VKILL] = CKILL; 1203 tio->c_cc[VKILL] = CKILL;
1172 tio->c_cc[VSTART] = CSTART; 1204 tio->c_cc[VSTART] = CSTART;
1173 tio->c_cc[VSTOP] = CSTOP; 1205 tio->c_cc[VSTOP] = CSTOP;
1174 tio->c_cc[VSUSP] = CSUSP; 1206 tio->c_cc[VSUSP] = CSUSP;
1175# ifdef VDSUSP 1207# ifdef VDSUSP
1176
1177 tio->c_cc[VDSUSP] = CDSUSP; 1208 tio->c_cc[VDSUSP] = CDSUSP;
1178# endif 1209# endif
1179# ifdef VREPRINT 1210# ifdef VREPRINT
1180
1181 tio->c_cc[VREPRINT] = CRPRNT; 1211 tio->c_cc[VREPRINT] = CRPRNT;
1182# endif 1212# endif
1183# ifdef VDISCRD 1213# ifdef VDISCRD
1184
1185 tio->c_cc[VDISCRD] = CFLUSH; 1214 tio->c_cc[VDISCRD] = CFLUSH;
1186# endif 1215# endif
1187# ifdef VWERSE 1216# ifdef VWERSE
1188
1189 tio->c_cc[VWERSE] = CWERASE; 1217 tio->c_cc[VWERSE] = CWERASE;
1190# endif 1218# endif
1191# ifdef VLNEXT 1219# ifdef VLNEXT
1192
1193 tio->c_cc[VLNEXT] = CLNEXT; 1220 tio->c_cc[VLNEXT] = CLNEXT;
1194# endif 1221# endif
1195
1196 } 1222 }
1223
1197 tio->c_cc[VEOF] = CEOF; 1224 tio->c_cc[VEOF] = CEOF;
1198 tio->c_cc[VEOL] = VDISABLE; 1225 tio->c_cc[VEOL] = VDISABLE;
1199# ifdef VEOL2 1226# ifdef VEOL2
1200
1201 tio->c_cc[VEOL2] = VDISABLE; 1227 tio->c_cc[VEOL2] = VDISABLE;
1202# endif 1228# endif
1203# ifdef VSWTC 1229# ifdef VSWTC
1204
1205 tio->c_cc[VSWTC] = VDISABLE; 1230 tio->c_cc[VSWTC] = VDISABLE;
1206# endif 1231# endif
1207# ifdef VSWTCH 1232# ifdef VSWTCH
1208
1209 tio->c_cc[VSWTCH] = VDISABLE; 1233 tio->c_cc[VSWTCH] = VDISABLE;
1210# endif 1234# endif
1211# if VMIN != VEOF 1235# if VMIN != VEOF
1212
1213 tio->c_cc[VMIN] = 1; 1236 tio->c_cc[VMIN] = 1;
1214# endif 1237# endif
1215# if VTIME != VEOL 1238# if VTIME != VEOL
1216
1217 tio->c_cc[VTIME] = 0; 1239 tio->c_cc[VTIME] = 0;
1218# endif 1240# endif
1219 1241
1220 if (erase != -1) 1242 if (erase != -1)
1221 tio->c_cc[VERASE] = (char)erase; 1243 tio->c_cc[VERASE] = (char)erase;
… …
1249 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1271 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1250 { 1272 {
1251 tio->sg.sg_erase = CERASE; /* ^H */ 1273 tio->sg.sg_erase = CERASE; /* ^H */
1252 tio->sg.sg_kill = CKILL; /* ^U */ 1274 tio->sg.sg_kill = CKILL; /* ^U */
1253 } 1275 }
1276
1254 if (erase != -1) 1277 if (erase != -1)
1255 tio->sg.sg_erase = (char)erase; 1278 tio->sg.sg_erase = (char)erase;
1256 1279
1257 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1280 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1258 1281
… …
1264 tio->tc.t_startc = CSTART; /* ^Q */ 1287 tio->tc.t_startc = CSTART; /* ^Q */
1265 tio->tc.t_stopc = CSTOP; /* ^S */ 1288 tio->tc.t_stopc = CSTOP; /* ^S */
1266 tio->tc.t_eofc = CEOF; /* ^D */ 1289 tio->tc.t_eofc = CEOF; /* ^D */
1267 tio->tc.t_brkc = -1; 1290 tio->tc.t_brkc = -1;
1268 } 1291 }
1292
1269 /* get local special chars */ 1293 /* get local special chars */
1270 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1294 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1271 { 1295 {
1272 tio->lc.t_suspc = CSUSP; /* ^Z */ 1296 tio->lc.t_suspc = CSUSP; /* ^Z */
1273 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1297 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1277 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1301 tio->lc.t_lnextc = CLNEXT; /* ^V */
1278 } 1302 }
1279 /* get line discipline */ 1303 /* get line discipline */
1280 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1304 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1281# ifdef NTTYDISC 1305# ifdef NTTYDISC
1282
1283 tio->line = NTTYDISC; 1306 tio->line = NTTYDISC;
1284# endif /* NTTYDISC */ 1307# endif /* NTTYDISC */
1285 1308
1286 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1309 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1287#endif /* HAVE_TERMIOS_H */ 1310#endif /* HAVE_TERMIOS_H */
… …
1310 FOO (IGNCR, "IGNCR"); 1333 FOO (IGNCR, "IGNCR");
1311 FOO (ICRNL, "ICRNL"); 1334 FOO (ICRNL, "ICRNL");
1312 FOO (IXON, "IXON"); 1335 FOO (IXON, "IXON");
1313 FOO (IXOFF, "IXOFF"); 1336 FOO (IXOFF, "IXOFF");
1314# ifdef IUCLC 1337# ifdef IUCLC
1315
1316 FOO (IUCLC, "IUCLC"); 1338 FOO (IUCLC, "IUCLC");
1317# endif 1339# endif
1318# ifdef IXANY 1340# ifdef IXANY
1319
1320 FOO (IXANY, "IXANY"); 1341 FOO (IXANY, "IXANY");
1321# endif 1342# endif
1322# ifdef IMAXBEL 1343# ifdef IMAXBEL
1323
1324 FOO (IMAXBEL, "IMAXBEL"); 1344 FOO (IMAXBEL, "IMAXBEL");
1325# endif 1345# endif
1326 1346
1327 fprintf (stderr, "\n"); 1347 fprintf (stderr, "\n");
1328 1348
… …
1335 FOO (VERASE, "VERASE"); 1355 FOO (VERASE, "VERASE");
1336 FOO (VKILL, "VKILL"); 1356 FOO (VKILL, "VKILL");
1337 FOO (VEOF, "VEOF"); 1357 FOO (VEOF, "VEOF");
1338 FOO (VEOL, "VEOL"); 1358 FOO (VEOL, "VEOL");
1339# ifdef VEOL2 1359# ifdef VEOL2
1340
1341 FOO (VEOL2, "VEOL2"); 1360 FOO (VEOL2, "VEOL2");
1342# endif 1361# endif
1343# ifdef VSWTC 1362# ifdef VSWTC
1344
1345 FOO (VSWTC, "VSWTC"); 1363 FOO (VSWTC, "VSWTC");
1346# endif 1364# endif
1347# ifdef VSWTCH 1365# ifdef VSWTCH
1348
1349 FOO (VSWTCH, "VSWTCH"); 1366 FOO (VSWTCH, "VSWTCH");
1350# endif 1367# endif
1351
1352 FOO (VSTART, "VSTART"); 1368 FOO (VSTART, "VSTART");
1353 FOO (VSTOP, "VSTOP"); 1369 FOO (VSTOP, "VSTOP");
1354 FOO (VSUSP, "VSUSP"); 1370 FOO (VSUSP, "VSUSP");
1355# ifdef VDSUSP 1371# ifdef VDSUSP
1356
1357 FOO (VDSUSP, "VDSUSP"); 1372 FOO (VDSUSP, "VDSUSP");
1358# endif 1373# endif
1359# ifdef VREPRINT 1374# ifdef VREPRINT
1360
1361 FOO (VREPRINT, "VREPRINT"); 1375 FOO (VREPRINT, "VREPRINT");
1362# endif 1376# endif
1363# ifdef VDISCRD 1377# ifdef VDISCRD
1364
1365 FOO (VDISCRD, "VDISCRD"); 1378 FOO (VDISCRD, "VDISCRD");
1366# endif 1379# endif
1367# ifdef VWERSE 1380# ifdef VWERSE
1368
1369 FOO (VWERSE, "VWERSE"); 1381 FOO (VWERSE, "VWERSE");
1370# endif 1382# endif
1371# ifdef VLNEXT 1383# ifdef VLNEXT
1372
1373 FOO (VLNEXT, "VLNEXT"); 1384 FOO (VLNEXT, "VLNEXT");
1374# endif 1385# endif
1375 1386
1376 fprintf (stderr, "\n"); 1387 fprintf (stderr, "\n");
1377# undef FOO 1388# undef FOO
… …
1386 * the slave. 1397 * the slave.
1387 */ 1398 */
1388void 1399void
1389rxvt_term::run_command (const char *const *argv) 1400rxvt_term::run_command (const char *const *argv)
1390{ 1401{
1402#if ENABLE_FRILLS
1403 if (rs[Rs_pty_fd])
1404 {
1405 pty.pty = atoi (rs[Rs_pty_fd]);
1406
1407 if (pty.pty >= 0)
1408 {
1409 if (getfd_hook)
1410 pty.pty = (*getfd_hook) (pty.pty);
1411
1412 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1413 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1414 }
1415 }
1416 else
1417#endif
1391 if (!pty.get ()) 1418 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1419 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1420
1394 pty.set_utf8_mode (enc_utf8); 1421 pty.set_utf8_mode (enc_utf8);
1395 1422
1396 /* set initial window size */ 1423 /* set initial window size */
1397 tt_winch (); 1424 tt_winch ();
… …
1407#endif 1434#endif
1408 er = -1; 1435 er = -1;
1409 1436
1410 rxvt_get_ttymode (&tio, er); 1437 rxvt_get_ttymode (&tio, er);
1411 1438
1412 sw_chld.start (SIGCHLD); 1439#if ENABLE_FRILLS
1440 if (rs[Rs_pty_fd])
1441 return;
1442#endif
1413 1443
1414#ifndef __QNX__ 1444#ifndef __QNX__
1415 /* spin off the command interpreter */ 1445 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1446 switch (cmd_pid = fork ())
1417 { 1447 {
1418 case -1: 1448 case -1:
1449 {
1450 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1451 rxvt_fatal ("can't fork, aborting.\n");
1452 }
1420 case 0: 1453 case 0:
1421 init_env (); 1454 init_env ();
1422 1455
1423 if (!pty.make_controlling_tty ()) 1456 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1457 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1487{ 1520{
1488 char *login; 1521 char *login;
1489 1522
1490 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1523 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1491 1524
1492 if (options & Opt_console) 1525 if (OPTION (Opt_console))
1493 { /* be virtual console, fail silently */ 1526 { /* be virtual console, fail silently */
1494#ifdef TIOCCONS 1527#ifdef TIOCCONS
1495 unsigned int on = 1; 1528 unsigned int on = 1;
1496 1529
1497 ioctl (STDIN_FILENO, TIOCCONS, &on); 1530 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1547 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1580 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1548 shell = "/bin/sh"; 1581 shell = "/bin/sh";
1549 1582
1550 argv0 = (const char *)rxvt_r_basename (shell); 1583 argv0 = (const char *)rxvt_r_basename (shell);
1551 1584
1552 if (options & Opt_loginShell) 1585 if (OPTION (Opt_loginShell))
1553 { 1586 {
1554 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1587 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1555 1588
1556 login[0] = '-'; 1589 login[0] = '-';
1557 strcpy (&login[1], argv0); 1590 strcpy (&login[1], argv0);
… …
1592 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1625 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1593 command = "/bin/sh"; 1626 command = "/bin/sh";
1594 1627
1595 arg_a[0] = my_basename (command); 1628 arg_a[0] = my_basename (command);
1596 1629
1597 if (options & Opt_loginShell) 1630 if (OPTION (Opt_loginShell))
1598 { 1631 {
1599 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1632 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1600 1633
1601 login[0] = '-'; 1634 login[0] = '-';
1602 strcpy (&login[1], arg_a[0]); 1635 strcpy (&login[1], arg_a[0]);

Diff Legend

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