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.138 by root, Wed Jan 11 02:24:12 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
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;
… …
333 rs[Rs_name] = rxvt_r_basename (argv[0]); 339 rs[Rs_name] = rxvt_r_basename (argv[0]);
334 340
335 /* 341 /*
336 * Open display, get options/resources and create the window 342 * Open display, get options/resources and create the window
337 */ 343 */
344 {
345 TEMP_ENV;
346
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
340 349
341 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
351
352 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 }
355
356 extract_resources ();
342 free (r_argv); 357 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 358
361 /* 359 /*
362 * set any defaults not already set 360 * set any defaults not already set
363 */ 361 */
364 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
… …
375 if (!rs[Rs_iconName]) 373 if (!rs[Rs_iconName])
376 rs[Rs_iconName] = rs[Rs_name]; 374 rs[Rs_iconName] = rs[Rs_name];
377 } 375 }
378 376
379 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
380 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 378 saveLines = min (i, MAX_SAVELINES);
381 379
382#if ENABLE_FRILLS 380#if ENABLE_FRILLS
383 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 382 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
383
385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 384 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 385 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
386
387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
389#endif 389#endif
390 390
391#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
393 pointerBlankDelay = i; 393 pointerBlankDelay = i;
394 else 394 else
395 pointerBlankDelay = 2; 395 pointerBlankDelay = 2;
396#endif 396#endif
397 397
398 /* no point having a scrollbar without having any scrollback! */ 398 /* no point having a scrollbar without having any scrollback! */
399 if (!TermWin.saveLines) 399 if (!saveLines)
400 options &= ~Opt_scrollBar; 400 set_option (Opt_scrollBar, 0);
401 401
402#ifdef PRINTPIPE 402#ifdef PRINTPIPE
403 if (!rs[Rs_print_pipe]) 403 if (!rs[Rs_print_pipe])
404 rs[Rs_print_pipe] = PRINTPIPE; 404 rs[Rs_print_pipe] = PRINTPIPE;
405#endif 405#endif
… …
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 449#endif
450 450
451#ifdef XTERM_REVERSE_VIDEO 451#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 452 /* this is how xterm implements reverseVideo */
453 if (options & Opt_reverseVideo) 453 if (OPTION (Opt_reverseVideo))
454 { 454 {
455 if (!rs[Rs_color + Color_fg]) 455 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 456 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
457 if (!rs[Rs_color + Color_bg]) 457 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 458 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
463 if (!rs[Rs_color + i]) 463 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 464 rs[Rs_color + i] = def_colorName[i];
465 465
466#ifndef XTERM_REVERSE_VIDEO 466#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 467 /* this is how we implement reverseVideo */
468 if (options & Opt_reverseVideo) 468 if (OPTION (Opt_reverseVideo))
469 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 470#endif
471 471
472 /* convenient aliases for setting fg/bg to colors */ 472 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 473 color_aliases (Color_fg);
474 color_aliases (Color_bg); 474 color_aliases (Color_bg);
… …
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 525
526 sprintf (env_display, "DISPLAY=%s", val); 526 sprintf (env_display, "DISPLAY=%s", val);
527 527
528 /* avoiding the math library: 528 /* avoiding the math library:
529 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ; 531 ;
532 MAX_IT (i, 1); 532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534 534
535 sprintf (env_windowid, "WINDOWID=%u", 535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)TermWin.parent[0]); 536 (unsigned int)parent[0]);
537 537
538 /* add entries to the environment: 538 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 539 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 540 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 541 * @ COLORTERM: terminal sub-name and also indicates its color
… …
580 * This should support all European type languages. 580 * This should support all European type languages.
581 */ 581 */
582void 582void
583rxvt_term::set_locale (const char *locale) 583rxvt_term::set_locale (const char *locale)
584{ 584{
585 TEMP_ENV;
586
585#if HAVE_XSETLOCALE || HAVE_SETLOCALE 587#if HAVE_XSETLOCALE || HAVE_SETLOCALE
586 free (this->locale); 588 free (this->locale);
587 this->locale = setlocale (LC_CTYPE, locale); 589 this->locale = setlocale (LC_CTYPE, locale);
588 590
589 if (!this->locale) 591 if (!this->locale)
590 { 592 {
591 if (*locale) 593 if (*locale)
592 { 594 {
593 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 595 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
594 setlocale (LC_CTYPE, ""); 596 setlocale (LC_CTYPE, "C");
595 } 597 }
596 else 598 else
597 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 599 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
598 600
599 this->locale = ""; 601 this->locale = "C";
600 } 602 }
601 603
602 604
603 this->locale = rxvt_strdup (this->locale); 605 this->locale = rxvt_strdup (this->locale);
604 SET_LOCALE (this->locale); 606 SET_LOCALE (this->locale);
… …
619} 621}
620 622
621void 623void
622rxvt_term::init_xlocale () 624rxvt_term::init_xlocale ()
623{ 625{
626 TEMP_ENV;
627
624#ifdef USE_XIM 628#ifdef USE_XIM
625 if (!locale) 629 if (!locale)
626 rxvt_warn ("setting locale failed, working without locale support.\n"); 630 rxvt_warn ("setting locale failed, working without locale support.\n");
627 else 631 else
628 { 632 {
… …
650 * Initialize the command connection. 654 * Initialize the command connection.
651 * This should be called after the X server connection is established. 655 * This should be called after the X server connection is established.
652 */ 656 */
653 657
654#ifdef META8_OPTION 658#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 660#endif
657 661
658 get_ourmods (); 662 get_ourmods ();
659 663
660 if (!(options & Opt_scrollTtyOutput)) 664 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 665 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 666 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 667 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 668 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 669 priv_modes |= PrivMode_smoothScroll;
666 670
667#ifndef NO_BACKSPACE_KEY 671#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 672 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 673 priv_modes |= PrivMode_HaveBackSpace;
… …
673 if (scrollbar_visible ()) 677 if (scrollbar_visible ())
674 { 678 {
675 priv_modes |= PrivMode_scrollBar; 679 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 680 SavedModes |= PrivMode_scrollBar;
677 } 681 }
682
678 if (menubar_visible ()) 683 if (menubar_visible ())
679 { 684 {
680 priv_modes |= PrivMode_menuBar; 685 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 686 SavedModes |= PrivMode_menuBar;
682 } 687 }
683
684#ifdef CURSOR_BLINK
685 if (options & Opt_cursorBlink)
686 (void)gettimeofday (&lastcursorchange, NULL);
687#endif
688 688
689 run_command (argv); 689 run_command (argv);
690} 690}
691 691
692/*----------------------------------------------------------------------*/ 692/*----------------------------------------------------------------------*/
… …
707 continue; 707 continue;
708 708
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 710 {
711#ifndef XTERM_REVERSE_VIDEO 711#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 712 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 713 rs[Rs_color + i] = def_colorName[!i];
714 else 714 else
715#endif 715#endif
716 rs[Rs_color + i] = def_colorName[i]; 716 rs[Rs_color + i] = def_colorName[i];
717 717
… …
742 } 742 }
743 } 743 }
744 } 744 }
745 745
746 pix_colors[i] = xcol; 746 pix_colors[i] = xcol;
747 SET_PIXCOLOR (i);
748 }
749
747#ifdef OFF_FOCUS_FADING 750#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 751 if (rs[Rs_fade])
752 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 753 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
750#endif 754#endif
751 SET_PIXCOLOR (i);
752 }
753 755
754 if (display->depth <= 2) 756 if (display->depth <= 2)
755 { 757 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 758 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]; 759 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
765 * from the fvwm window manager. 767 * from the fvwm window manager.
766 */ 768 */
767#ifdef KEEP_SCROLLCOLOR 769#ifdef KEEP_SCROLLCOLOR
768 770
769 if (display->depth <= 2) 771 if (display->depth <= 2)
772 {
770 { /* Monochrome */ 773 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 774 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 775 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 777 }
775 else 778 else
… …
811 int i = atoi (rs[Rs_color + idx]); 814 int i = atoi (rs[Rs_color + idx]);
812 815
813 if (i >= 8 && i <= 15) 816 if (i >= 8 && i <= 15)
814 { /* bright colors */ 817 { /* bright colors */
815 i -= 8; 818 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 820 return;
819#endif
820 } 821 }
821 822
822 if (i >= 0 && i <= 7) /* normal colors */ 823 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 825 }
… …
830 * Use resource ``modifier'' to override the Meta modifier 831 * Use resource ``modifier'' to override the Meta modifier
831 */ 832 */
832void 833void
833rxvt_term::get_ourmods () 834rxvt_term::get_ourmods ()
834{ 835{
835 int i, j, k; 836 int i, j, k;
836 int requestedmeta, realmeta, realalt; 837 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 838 const char *cm, *rsmod;
838 XModifierKeymap *map; 839 XModifierKeymap *map;
839 KeyCode *kc; 840 KeyCode *kc;
840 const unsigned int modmasks[] = 841 const unsigned int modmasks[] =
841 { 842 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 843 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 844 };
844 845
… …
926#endif 927#endif
927 XGCValues gcvalue; 928 XGCValues gcvalue;
928 long vt_emask; 929 long vt_emask;
929 XSetWindowAttributes attributes; 930 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 931 XWindowAttributes gattr;
932 Window top, parent;
933 dDisp;
931 934
932#ifdef USING_W11LIB 935#ifdef USING_W11LIB
933 /* enable W11 callbacks */ 936 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif 938#endif
936 939
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 942
940 if (options & Opt_transparent) 943 if (OPTION (Opt_transparent))
941 { 944 {
942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 946 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 947 }
945 948
946#if ENABLE_FRILLS 949#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 950 if (OPTION (Opt_borderLess))
948 { 951 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 953
951 if (prop == None) 954 if (prop == None)
952 { 955 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT 957#ifdef PREFER_24BIT
… …
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
963 } 966 }
964 } 967 }
965 else 968 else
966 {
967 mwmhints.flags = 0; 969 mwmhints.flags = 0;
968 }
969#endif 970#endif
970 971
971 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
972 Get_Colours (); 973 Get_Colours ();
973 974
974 if (!set_fonts ()) 975 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 977
978 parent = DefaultRootWindow (disp);
979
980#if ENABLE_XEMBED
981 if (rs[Rs_embed])
982 {
983 XWindowAttributes wattr;
984
985 parent = strtol (rs[Rs_embed], 0, 0);
986
987 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989
990 window_calc (wattr.width, wattr.height);
991 }
992#endif
993
977 window_calc (0, 0); 994 window_calc (0, 0);
978 old_width = szHint.width;
979 old_height = szHint.height;
980 995
981 /* sub-window placement & size in rxvt_resize_subwindows () */ 996 /* sub-window placement & size in rxvt_resize_subwindows () */
982
983#ifdef PREFER_24BIT 997#ifdef PREFER_24BIT
984 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused[Color_border];
985 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused[Color_border];
986 attributes.colormap = display->cmap; 1000 attributes.colormap = display->cmap;
987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1001 top = XCreateWindow (disp, parent,
988 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
989 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
990 TermWin.ext_bwidth, 1004 ext_bwidth,
991 display->depth, InputOutput, 1005 display->depth, InputOutput,
992 display->visual, 1006 display->visual,
993 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
994#else 1008#else
995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1009 top = XCreateSimpleWindow (disp, parent,
996 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1012 ext_bwidth,
999 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
1000 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
1001#endif 1015#endif
1016
1017 this->parent[0] = top;
1018
1019 old_width = szHint.width;
1020 old_height = szHint.height;
1002 1021
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1024
1006 classHint.res_name = (char *)rs[Rs_name]; 1025 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1026 classHint.res_class = (char *)RESCLASS;
1008 1027
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1029 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1031 wmHint.window_group = top;
1013 1032
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1016 1035
1017 /* Enable delete window protocol */ 1036 Atom protocols[] = {
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1037 xa[XA_WM_DELETE_WINDOW],
1019 &xa[XA_WMDELETEWINDOW], 1); 1038#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING],
1040#endif
1041 };
1042
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 1044
1021#if ENABLE_FRILLS 1045#if ENABLE_FRILLS
1046 if (rs[Rs_transient_for])
1047 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1048#endif
1049
1050#if ENABLE_EWMH
1022 long pid = getpid (); 1051 long pid = getpid ();
1023 1052
1024 XChangeProperty (display->display, TermWin.parent[0], 1053 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1054 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1055 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif
1028 1056
1029 XSelectInput (display->display, TermWin.parent[0], 1057 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif
1059
1060 XSelectInput (disp, top,
1030 KeyPressMask 1061 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1063 | KeyReleaseMask
1033#endif 1064#endif
1034 | FocusChangeMask | VisibilityChangeMask 1065 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask
1036 | StructureNotifyMask); 1066 | ExposureMask | StructureNotifyMask);
1067
1037 termwin_ev.start (display, TermWin.parent[0]); 1068 termwin_ev.start (display, top);
1038 1069
1039#if ENABLE_FRILLS 1070#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1071 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1074#endif
1044 1075
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1076 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1078
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1080 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1082#endif
1052 1083
1053 /* the vt window */ 1084 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1085 vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1086 window_vt_x,
1056 window_vt_y, 1087 window_vt_y,
1057 TermWin_TotalWidth (), 1088 width,
1058 TermWin_TotalHeight (), 1089 height,
1059 0, 1090 0,
1060 pix_colors_focused[Color_fg], 1091 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1092 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1093#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1094 XStoreName (disp, vt, "vt window");
1064#endif 1095#endif
1065 1096
1066 attributes.bit_gravity = NorthWestGravity; 1097 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1098 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1068 1099
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070 1101
1071 pointer_unblank (); 1102 if (OPTION (Opt_pointerBlank)
1072 1103#ifdef ENABLE_PERL
1073#ifdef POINTER_BLANK 1104 || perl.self
1074 if (options & Opt_pointerBlank) 1105#endif
1106 )
1075 vt_emask |= PointerMotionMask; 1107 vt_emask |= PointerMotionMask;
1076 else 1108 else
1077#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1109 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1110
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1111 XSelectInput (disp, vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1112 vt_ev.start (display, vt);
1082 1113
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1115 if (menuBar_height ())
1085 { 1116 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1117 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1118 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1119 width,
1089 menuBar_TotalHeight (), 1120 menuBar_TotalHeight (),
1090 0, 1121 0,
1091 pix_colors_focused[Color_fg], 1122 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1123 pix_colors_focused[Color_scroll]);
1093 1124
1094#ifdef DEBUG_X 1125#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1126 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1127#endif
1097 1128
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1130
1100 XDefineCursor (display->display, menuBar.win, 1131 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1132 XCreateFontCursor (disp, XC_left_ptr));
1102 1133
1103 XSelectInput (display->display, menuBar.win, 1134 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1136 menubar_ev.start (display, menuBar.win);
1107 } 1137 }
1108#endif 1138#endif
1109 1139
1110#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1111 if (rs[Rs_backgroundPixmap] != NULL 1141 if (rs[Rs_backgroundPixmap] != NULL
1112 && ! (options & Opt_transparent)) 1142 && ! OPTION (Opt_transparent))
1113 { 1143 {
1114 const char *p = rs[Rs_backgroundPixmap]; 1144 const char *p = rs[Rs_backgroundPixmap];
1115 1145
1116 if ((p = strchr (p, ';')) != NULL) 1146 if ((p = strchr (p, ';')) != NULL)
1117 { 1147 {
… …
1126 1156
1127 /* graphics context for the vt window */ 1157 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1158 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1159 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1160 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1161 gc = XCreateGC (disp, vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1162 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1163 &gcvalue);
1134 1164
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1165 drawable = new rxvt_drawable (display, vt);
1136 1166
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1168 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1169 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1170 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1171 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1173 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1144#endif 1174#endif
1145 1175
1146#ifdef OFF_FOCUS_FADING 1176#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1177 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1178 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1179 pix_colors = pix_colors_unfocused;
1150#endif 1180#endif
1151 1181
1182 pointer_unblank ();
1152 scr_recolour (); 1183 scr_recolour ();
1184
1185#if ENABLE_XEMBED
1186 if (rs[Rs_embed])
1187 {
1188 long info[2] = { 0, XEMBED_MAPPED };
1189
1190 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1191 32, PropModeReplace, (unsigned char *)&info, 2);
1192 }
1193#endif
1153} 1194}
1154 1195
1155/* ------------------------------------------------------------------------- * 1196/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1197 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1198 * ------------------------------------------------------------------------- */
… …
1162 /* 1203 /*
1163 * standard System V termios interface 1204 * standard System V termios interface
1164 */ 1205 */
1165 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1206 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1166 { 1207 {
1167 /* return error - use system defaults */ 1208 // return error - use system defaults,
1209 // where possible, and zero elsewhere
1210 memset (tio, 0, sizeof (ttymode_t));
1211
1168 tio->c_cc[VINTR] = CINTR; 1212 tio->c_cc[VINTR] = CINTR;
1169 tio->c_cc[VQUIT] = CQUIT; 1213 tio->c_cc[VQUIT] = CQUIT;
1170 tio->c_cc[VERASE] = CERASE; 1214 tio->c_cc[VERASE] = CERASE;
1215#ifdef VERASE2
1216 tio->c_cc[VERASE2] = CERASE2;
1217#endif
1171 tio->c_cc[VKILL] = CKILL; 1218 tio->c_cc[VKILL] = CKILL;
1172 tio->c_cc[VSTART] = CSTART; 1219 tio->c_cc[VSTART] = CSTART;
1173 tio->c_cc[VSTOP] = CSTOP; 1220 tio->c_cc[VSTOP] = CSTOP;
1174 tio->c_cc[VSUSP] = CSUSP; 1221 tio->c_cc[VSUSP] = CSUSP;
1175# ifdef VDSUSP 1222# ifdef VDSUSP
1176
1177 tio->c_cc[VDSUSP] = CDSUSP; 1223 tio->c_cc[VDSUSP] = CDSUSP;
1178# endif 1224# endif
1179# ifdef VREPRINT 1225# ifdef VREPRINT
1180
1181 tio->c_cc[VREPRINT] = CRPRNT; 1226 tio->c_cc[VREPRINT] = CRPRNT;
1182# endif 1227# endif
1183# ifdef VDISCRD 1228# ifdef VDISCRD
1184
1185 tio->c_cc[VDISCRD] = CFLUSH; 1229 tio->c_cc[VDISCRD] = CFLUSH;
1186# endif 1230# endif
1187# ifdef VWERSE 1231# ifdef VWERSE
1188
1189 tio->c_cc[VWERSE] = CWERASE; 1232 tio->c_cc[VWERSE] = CWERASE;
1190# endif 1233# endif
1191# ifdef VLNEXT 1234# ifdef VLNEXT
1192
1193 tio->c_cc[VLNEXT] = CLNEXT; 1235 tio->c_cc[VLNEXT] = CLNEXT;
1194# endif 1236# endif
1195
1196 } 1237 }
1238
1197 tio->c_cc[VEOF] = CEOF; 1239 tio->c_cc[VEOF] = CEOF;
1198 tio->c_cc[VEOL] = VDISABLE; 1240 tio->c_cc[VEOL] = VDISABLE;
1199# ifdef VEOL2 1241# ifdef VEOL2
1200
1201 tio->c_cc[VEOL2] = VDISABLE; 1242 tio->c_cc[VEOL2] = VDISABLE;
1202# endif 1243# endif
1203# ifdef VSWTC 1244# ifdef VSWTC
1204
1205 tio->c_cc[VSWTC] = VDISABLE; 1245 tio->c_cc[VSWTC] = VDISABLE;
1206# endif 1246# endif
1207# ifdef VSWTCH 1247# ifdef VSWTCH
1208
1209 tio->c_cc[VSWTCH] = VDISABLE; 1248 tio->c_cc[VSWTCH] = VDISABLE;
1210# endif 1249# endif
1211# if VMIN != VEOF 1250# if VMIN != VEOF
1212
1213 tio->c_cc[VMIN] = 1; 1251 tio->c_cc[VMIN] = 1;
1214# endif 1252# endif
1215# if VTIME != VEOL 1253# if VTIME != VEOL
1216
1217 tio->c_cc[VTIME] = 0; 1254 tio->c_cc[VTIME] = 0;
1218# endif 1255# endif
1219 1256
1220 if (erase != -1) 1257 if (erase != -1)
1221 tio->c_cc[VERASE] = (char)erase; 1258 tio->c_cc[VERASE] = (char)erase;
… …
1249 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1286 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1250 { 1287 {
1251 tio->sg.sg_erase = CERASE; /* ^H */ 1288 tio->sg.sg_erase = CERASE; /* ^H */
1252 tio->sg.sg_kill = CKILL; /* ^U */ 1289 tio->sg.sg_kill = CKILL; /* ^U */
1253 } 1290 }
1291
1254 if (erase != -1) 1292 if (erase != -1)
1255 tio->sg.sg_erase = (char)erase; 1293 tio->sg.sg_erase = (char)erase;
1256 1294
1257 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1295 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1258 1296
… …
1264 tio->tc.t_startc = CSTART; /* ^Q */ 1302 tio->tc.t_startc = CSTART; /* ^Q */
1265 tio->tc.t_stopc = CSTOP; /* ^S */ 1303 tio->tc.t_stopc = CSTOP; /* ^S */
1266 tio->tc.t_eofc = CEOF; /* ^D */ 1304 tio->tc.t_eofc = CEOF; /* ^D */
1267 tio->tc.t_brkc = -1; 1305 tio->tc.t_brkc = -1;
1268 } 1306 }
1307
1269 /* get local special chars */ 1308 /* get local special chars */
1270 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1309 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1271 { 1310 {
1272 tio->lc.t_suspc = CSUSP; /* ^Z */ 1311 tio->lc.t_suspc = CSUSP; /* ^Z */
1273 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1312 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1277 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1316 tio->lc.t_lnextc = CLNEXT; /* ^V */
1278 } 1317 }
1279 /* get line discipline */ 1318 /* get line discipline */
1280 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1319 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1281# ifdef NTTYDISC 1320# ifdef NTTYDISC
1282
1283 tio->line = NTTYDISC; 1321 tio->line = NTTYDISC;
1284# endif /* NTTYDISC */ 1322# endif /* NTTYDISC */
1285 1323
1286 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1324 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1287#endif /* HAVE_TERMIOS_H */ 1325#endif /* HAVE_TERMIOS_H */
… …
1310 FOO (IGNCR, "IGNCR"); 1348 FOO (IGNCR, "IGNCR");
1311 FOO (ICRNL, "ICRNL"); 1349 FOO (ICRNL, "ICRNL");
1312 FOO (IXON, "IXON"); 1350 FOO (IXON, "IXON");
1313 FOO (IXOFF, "IXOFF"); 1351 FOO (IXOFF, "IXOFF");
1314# ifdef IUCLC 1352# ifdef IUCLC
1315
1316 FOO (IUCLC, "IUCLC"); 1353 FOO (IUCLC, "IUCLC");
1317# endif 1354# endif
1318# ifdef IXANY 1355# ifdef IXANY
1319
1320 FOO (IXANY, "IXANY"); 1356 FOO (IXANY, "IXANY");
1321# endif 1357# endif
1322# ifdef IMAXBEL 1358# ifdef IMAXBEL
1323
1324 FOO (IMAXBEL, "IMAXBEL"); 1359 FOO (IMAXBEL, "IMAXBEL");
1325# endif 1360# endif
1326 1361
1327 fprintf (stderr, "\n"); 1362 fprintf (stderr, "\n");
1328 1363
… …
1335 FOO (VERASE, "VERASE"); 1370 FOO (VERASE, "VERASE");
1336 FOO (VKILL, "VKILL"); 1371 FOO (VKILL, "VKILL");
1337 FOO (VEOF, "VEOF"); 1372 FOO (VEOF, "VEOF");
1338 FOO (VEOL, "VEOL"); 1373 FOO (VEOL, "VEOL");
1339# ifdef VEOL2 1374# ifdef VEOL2
1340
1341 FOO (VEOL2, "VEOL2"); 1375 FOO (VEOL2, "VEOL2");
1342# endif 1376# endif
1343# ifdef VSWTC 1377# ifdef VSWTC
1344
1345 FOO (VSWTC, "VSWTC"); 1378 FOO (VSWTC, "VSWTC");
1346# endif 1379# endif
1347# ifdef VSWTCH 1380# ifdef VSWTCH
1348
1349 FOO (VSWTCH, "VSWTCH"); 1381 FOO (VSWTCH, "VSWTCH");
1350# endif 1382# endif
1351
1352 FOO (VSTART, "VSTART"); 1383 FOO (VSTART, "VSTART");
1353 FOO (VSTOP, "VSTOP"); 1384 FOO (VSTOP, "VSTOP");
1354 FOO (VSUSP, "VSUSP"); 1385 FOO (VSUSP, "VSUSP");
1355# ifdef VDSUSP 1386# ifdef VDSUSP
1356
1357 FOO (VDSUSP, "VDSUSP"); 1387 FOO (VDSUSP, "VDSUSP");
1358# endif 1388# endif
1359# ifdef VREPRINT 1389# ifdef VREPRINT
1360
1361 FOO (VREPRINT, "VREPRINT"); 1390 FOO (VREPRINT, "VREPRINT");
1362# endif 1391# endif
1363# ifdef VDISCRD 1392# ifdef VDISCRD
1364
1365 FOO (VDISCRD, "VDISCRD"); 1393 FOO (VDISCRD, "VDISCRD");
1366# endif 1394# endif
1367# ifdef VWERSE 1395# ifdef VWERSE
1368
1369 FOO (VWERSE, "VWERSE"); 1396 FOO (VWERSE, "VWERSE");
1370# endif 1397# endif
1371# ifdef VLNEXT 1398# ifdef VLNEXT
1372
1373 FOO (VLNEXT, "VLNEXT"); 1399 FOO (VLNEXT, "VLNEXT");
1374# endif 1400# endif
1375 1401
1376 fprintf (stderr, "\n"); 1402 fprintf (stderr, "\n");
1377# undef FOO 1403# undef FOO
… …
1386 * the slave. 1412 * the slave.
1387 */ 1413 */
1388void 1414void
1389rxvt_term::run_command (const char *const *argv) 1415rxvt_term::run_command (const char *const *argv)
1390{ 1416{
1417 TEMP_ENV; // not very temporary...
1418
1419#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd])
1421 {
1422 pty.pty = atoi (rs[Rs_pty_fd]);
1423
1424 if (pty.pty >= 0)
1425 {
1426 if (getfd_hook)
1427 pty.pty = (*getfd_hook) (pty.pty);
1428
1429 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1430 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1431 }
1432 }
1433 else
1434#endif
1391 if (!pty.get ()) 1435 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1437
1394 pty.set_utf8_mode (enc_utf8); 1438 pty.set_utf8_mode (enc_utf8);
1395 1439
1396 /* set initial window size */ 1440 /* set initial window size */
1397 tt_winch (); 1441 tt_winch ();
… …
1407#endif 1451#endif
1408 er = -1; 1452 er = -1;
1409 1453
1410 rxvt_get_ttymode (&tio, er); 1454 rxvt_get_ttymode (&tio, er);
1411 1455
1412 sw_chld.start (SIGCHLD); 1456#if ENABLE_FRILLS
1457 if (rs[Rs_pty_fd])
1458 return;
1459#endif
1413 1460
1414#ifndef __QNX__ 1461#ifndef __QNX__
1415 /* spin off the command interpreter */ 1462 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1463 switch (cmd_pid = fork ())
1417 { 1464 {
1418 case -1: 1465 case -1:
1466 {
1467 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1468 rxvt_fatal ("can't fork, aborting.\n");
1469 }
1420 case 0: 1470 case 0:
1421 init_env (); 1471 init_env ();
1422 1472
1423 if (!pty.make_controlling_tty ()) 1473 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1474 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1487{ 1537{
1488 char *login; 1538 char *login;
1489 1539
1490 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1491 1541
1492 if (options & Opt_console) 1542 if (OPTION (Opt_console))
1493 { /* be virtual console, fail silently */ 1543 { /* be virtual console, fail silently */
1494#ifdef TIOCCONS 1544#ifdef TIOCCONS
1495 unsigned int on = 1; 1545 unsigned int on = 1;
1496 1546
1497 ioctl (STDIN_FILENO, TIOCCONS, &on); 1547 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1540 execvp (argv[0], (char *const *)argv); 1590 execvp (argv[0], (char *const *)argv);
1541 /* no error message: STDERR is closed! */ 1591 /* no error message: STDERR is closed! */
1542 } 1592 }
1543 else 1593 else
1544 { 1594 {
1545 const char *argv0, *shell; 1595 const char *argv0, *shell;
1546 1596
1547 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1548 shell = "/bin/sh"; 1598 shell = "/bin/sh";
1549 1599
1550 argv0 = (const char *)rxvt_r_basename (shell); 1600 argv0 = (const char *)rxvt_r_basename (shell);
1551 1601
1552 if (options & Opt_loginShell) 1602 if (OPTION (Opt_loginShell))
1553 { 1603 {
1554 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1555 1605
1556 login[0] = '-'; 1606 login[0] = '-';
1557 strcpy (&login[1], argv0); 1607 strcpy (&login[1], argv0);
1558 argv0 = login; 1608 argv0 = login;
1559 } 1609 }
1610
1560 execlp (shell, argv0, NULL); 1611 execlp (shell, argv0, NULL);
1561 /* no error message: STDERR is closed! */ 1612 /* no error message: STDERR is closed! */
1562 } 1613 }
1563 1614
1564#else /* __QNX__ uses qnxspawn () */ 1615#else /* __QNX__ uses qnxspawn () */
… …
1592 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1643 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1593 command = "/bin/sh"; 1644 command = "/bin/sh";
1594 1645
1595 arg_a[0] = my_basename (command); 1646 arg_a[0] = my_basename (command);
1596 1647
1597 if (options & Opt_loginShell) 1648 if (OPTION (Opt_loginShell))
1598 { 1649 {
1599 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1650 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1600 1651
1601 login[0] = '-'; 1652 login[0] = '-';
1602 strcpy (&login[1], arg_a[0]); 1653 strcpy (&login[1], arg_a[0]);

Diff Legend

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