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

Diff Legend

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