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.113 by root, Sat Feb 19 04:16:49 2005 UTC vs.
Revision 1.139 by root, Wed Jan 11 03:13:26 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",
… …
185 "INCR", 188 "INCR",
186 "WM_PROTOCOLS", 189 "WM_PROTOCOLS",
187 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
188 "CLIPBOARD", 191 "CLIPBOARD",
189#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
190 "_NET_WM_PID", 196 "_NET_WM_PID",
191 "_MOTIF_WM_HINTS",
192 "_NET_WM_NAME", 197 "_NET_WM_NAME",
193 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
194#endif 200#endif
195#if USE_XIM 201#if USE_XIM
196 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
197#endif 203#endif
198#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
203 "DndProtocol", 209 "DndProtocol",
204 "DndSelection", 210 "DndSelection",
205#endif 211#endif
206#if ENABLE_XEMBED 212#if ENABLE_XEMBED
207 "_XEMBED", 213 "_XEMBED",
214 "_XEMBED_INFO",
208#endif 215#endif
209 }; 216 };
210 217
211bool 218bool
212rxvt_term::init_vars () 219rxvt_term::init_vars ()
213{ 220{
214 sw_term.start (SIGTERM);
215 sw_int.start (SIGINT);
216
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 224#endif
221 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
222 226
223 if (pix_colors == NULL) 227 if (pix_colors == NULL)
224 return false; 228 return false;
225 229
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 TermWin.pixmap = None; 231 pixmap = None;
228#endif 232#endif
229 233
230 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 237 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
235 TermWin.focus = 0; 239 focus = 0;
236 TermWin.ncol = 80; 240 ncol = 80;
237 TermWin.nrow = 24; 241 nrow = 24;
238 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
239 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
240 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
241 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
243 247
244 refresh_limit = 1; 248 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
335 rs[Rs_name] = rxvt_r_basename (argv[0]); 339 rs[Rs_name] = rxvt_r_basename (argv[0]);
336 340
337 /* 341 /*
338 * Open display, get options/resources and create the window 342 * Open display, get options/resources and create the window
339 */ 343 */
344 {
345 TEMP_ENV;
346
340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
341 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
342 349
343 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
344 351
345#ifdef LOCAL_X_IS_UNIX
346 if (rs[Rs_display_name][0] == ':')
347 {
348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
349 strcpy (val, "unix");
350 strcat (val, rs[Rs_display_name]);
351 display = displays.get (val);
352 free (val);
353 }
354#endif
355
356 if (!display
357 && ! (display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
358 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
359 354
360 extract_resources (); 355 extract_resources ();
356 }
357
361 free (r_argv); 358 free (r_argv);
362 359
363 /* 360 /*
364 * set any defaults not already set 361 * set any defaults not already set
365 */ 362 */
… …
377 if (!rs[Rs_iconName]) 374 if (!rs[Rs_iconName])
378 rs[Rs_iconName] = rs[Rs_name]; 375 rs[Rs_iconName] = rs[Rs_name];
379 } 376 }
380 377
381 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
382 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 379 saveLines = min (i, MAX_SAVELINES);
383 380
384#if ENABLE_FRILLS 381#if ENABLE_FRILLS
385 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 382 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
386 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 383 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
387 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
388 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 386 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
387
389 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 388 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
390 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 389 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
391#endif 390#endif
392 391
393#ifdef POINTER_BLANK 392#ifdef POINTER_BLANK
394 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 393 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
395 pointerBlankDelay = i; 394 pointerBlankDelay = i;
396 else 395 else
397 pointerBlankDelay = 2; 396 pointerBlankDelay = 2;
398#endif 397#endif
399 398
400 /* no point having a scrollbar without having any scrollback! */ 399 /* no point having a scrollbar without having any scrollback! */
401 if (!TermWin.saveLines) 400 if (!saveLines)
402 options &= ~Opt_scrollBar; 401 set_option (Opt_scrollBar, 0);
403 402
404#ifdef PRINTPIPE 403#ifdef PRINTPIPE
405 if (!rs[Rs_print_pipe]) 404 if (!rs[Rs_print_pipe])
406 rs[Rs_print_pipe] = PRINTPIPE; 405 rs[Rs_print_pipe] = PRINTPIPE;
407#endif 406#endif
… …
450 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
451#endif 450#endif
452 451
453#ifdef XTERM_REVERSE_VIDEO 452#ifdef XTERM_REVERSE_VIDEO
454 /* this is how xterm implements reverseVideo */ 453 /* this is how xterm implements reverseVideo */
455 if (options & Opt_reverseVideo) 454 if (OPTION (Opt_reverseVideo))
456 { 455 {
457 if (!rs[Rs_color + Color_fg]) 456 if (!rs[Rs_color + Color_fg])
458 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 457 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
459 if (!rs[Rs_color + Color_bg]) 458 if (!rs[Rs_color + Color_bg])
460 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 459 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
465 if (!rs[Rs_color + i]) 464 if (!rs[Rs_color + i])
466 rs[Rs_color + i] = def_colorName[i]; 465 rs[Rs_color + i] = def_colorName[i];
467 466
468#ifndef XTERM_REVERSE_VIDEO 467#ifndef XTERM_REVERSE_VIDEO
469 /* this is how we implement reverseVideo */ 468 /* this is how we implement reverseVideo */
470 if (options & Opt_reverseVideo) 469 if (OPTION (Opt_reverseVideo))
471 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 470 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
472#endif 471#endif
473 472
474 /* convenient aliases for setting fg/bg to colors */ 473 /* convenient aliases for setting fg/bg to colors */
475 color_aliases (Color_fg); 474 color_aliases (Color_fg);
476 color_aliases (Color_bg); 475 color_aliases (Color_bg);
… …
526 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
527 526
528 sprintf (env_display, "DISPLAY=%s", val); 527 sprintf (env_display, "DISPLAY=%s", val);
529 528
530 /* avoiding the math library: 529 /* avoiding the math library:
531 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 530 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
532 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 531 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
533 ; 532 ;
534 MAX_IT (i, 1); 533 max_it (i, 1);
535 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
536 535
537 sprintf (env_windowid, "WINDOWID=%u", 536 sprintf (env_windowid, "WINDOWID=%u",
538 (unsigned int)TermWin.parent[0]); 537 (unsigned int)parent[0]);
539 538
540 /* add entries to the environment: 539 /* add entries to the environment:
541 * @ DISPLAY: in case we started with -display 540 * @ DISPLAY: in case we started with -display
542 * @ WINDOWID: X window id number of the window 541 * @ WINDOWID: X window id number of the window
543 * @ COLORTERM: terminal sub-name and also indicates its color 542 * @ COLORTERM: terminal sub-name and also indicates its color
… …
582 * This should support all European type languages. 581 * This should support all European type languages.
583 */ 582 */
584void 583void
585rxvt_term::set_locale (const char *locale) 584rxvt_term::set_locale (const char *locale)
586{ 585{
586 TEMP_ENV;
587
587#if HAVE_XSETLOCALE || HAVE_SETLOCALE 588#if HAVE_XSETLOCALE || HAVE_SETLOCALE
588 free (this->locale); 589 free (this->locale);
589 this->locale = setlocale (LC_CTYPE, locale); 590 this->locale = setlocale (LC_CTYPE, locale);
590 591
591 if (!this->locale) 592 if (!this->locale)
592 { 593 {
593 if (*locale) 594 if (*locale)
594 { 595 {
595 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 596 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
596 setlocale (LC_CTYPE, ""); 597 setlocale (LC_CTYPE, "C");
597 } 598 }
598 else 599 else
599 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 600 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
600 601
601 this->locale = ""; 602 this->locale = "C";
602 } 603 }
603 604
604 605
605 this->locale = rxvt_strdup (this->locale); 606 this->locale = rxvt_strdup (this->locale);
606 SET_LOCALE (this->locale); 607 SET_LOCALE (this->locale);
… …
621} 622}
622 623
623void 624void
624rxvt_term::init_xlocale () 625rxvt_term::init_xlocale ()
625{ 626{
627 TEMP_ENV;
628
626#ifdef USE_XIM 629#ifdef USE_XIM
627 if (!locale) 630 if (!locale)
628 rxvt_warn ("setting locale failed, working without locale support.\n"); 631 rxvt_warn ("setting locale failed, working without locale support.\n");
629 else 632 else
630 { 633 {
… …
652 * Initialize the command connection. 655 * Initialize the command connection.
653 * This should be called after the X server connection is established. 656 * This should be called after the X server connection is established.
654 */ 657 */
655 658
656#ifdef META8_OPTION 659#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 660 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
658#endif 661#endif
659 662
660 get_ourmods (); 663 get_ourmods ();
661 664
662 if (!(options & Opt_scrollTtyOutput)) 665 if (!OPTION (Opt_scrollTtyOutput))
663 priv_modes |= PrivMode_TtyOutputInh; 666 priv_modes |= PrivMode_TtyOutputInh;
664 if (options & Opt_scrollTtyKeypress) 667 if (OPTION (Opt_scrollTtyKeypress))
665 priv_modes |= PrivMode_Keypress; 668 priv_modes |= PrivMode_Keypress;
666 if (!(options & Opt_jumpScroll)) 669 if (!OPTION (Opt_jumpScroll))
667 priv_modes |= PrivMode_smoothScroll; 670 priv_modes |= PrivMode_smoothScroll;
668 671
669#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
670 if (strcmp (key_backspace, "DEC") == 0) 673 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 674 priv_modes |= PrivMode_HaveBackSpace;
… …
681 if (menubar_visible ()) 684 if (menubar_visible ())
682 { 685 {
683 priv_modes |= PrivMode_menuBar; 686 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar; 687 SavedModes |= PrivMode_menuBar;
685 } 688 }
686
687#ifdef CURSOR_BLINK
688 if (options & Opt_cursorBlink)
689 (void)gettimeofday (&lastcursorchange, NULL);
690#endif
691 689
692 run_command (argv); 690 run_command (argv);
693} 691}
694 692
695/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
… …
710 continue; 708 continue;
711 709
712 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
713 { 711 {
714#ifndef XTERM_REVERSE_VIDEO 712#ifndef XTERM_REVERSE_VIDEO
715 if (i < 2 && (options & Opt_reverseVideo)) 713 if (i < 2 && OPTION (Opt_reverseVideo))
716 rs[Rs_color + i] = def_colorName[!i]; 714 rs[Rs_color + i] = def_colorName[!i];
717 else 715 else
718#endif 716#endif
719 rs[Rs_color + i] = def_colorName[i]; 717 rs[Rs_color + i] = def_colorName[i];
720 718
… …
745 } 743 }
746 } 744 }
747 } 745 }
748 746
749 pix_colors[i] = xcol; 747 pix_colors[i] = xcol;
748 SET_PIXCOLOR (i);
749 }
750
750#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
751 if (rs[Rs_fade]) 752 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
752 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
753#endif 755#endif
754 SET_PIXCOLOR (i);
755 }
756 756
757 if (display->depth <= 2) 757 if (display->depth <= 2)
758 { 758 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
768 * from the fvwm window manager. 768 * from the fvwm window manager.
769 */ 769 */
770#ifdef KEEP_SCROLLCOLOR 770#ifdef KEEP_SCROLLCOLOR
771 771
772 if (display->depth <= 2) 772 if (display->depth <= 2)
773 {
773 { /* Monochrome */ 774 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 775 pix_colors[Color_scroll] = pix_colors[Color_fg];
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 776 pix_colors[Color_topShadow] = pix_colors[Color_bg];
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
777 } 778 }
778 else 779 else
… …
814 int i = atoi (rs[Rs_color + idx]); 815 int i = atoi (rs[Rs_color + idx]);
815 816
816 if (i >= 8 && i <= 15) 817 if (i >= 8 && i <= 15)
817 { /* bright colors */ 818 { /* bright colors */
818 i -= 8; 819 i -= 8;
819#ifndef NO_BRIGHTCOLOR
820 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 820 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
821 return; 821 return;
822#endif
823 } 822 }
824 823
825 if (i >= 0 && i <= 7) /* normal colors */ 824 if (i >= 0 && i <= 7) /* normal colors */
826 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
827 } 826 }
… …
929#endif 928#endif
930 XGCValues gcvalue; 929 XGCValues gcvalue;
931 long vt_emask; 930 long vt_emask;
932 XSetWindowAttributes attributes; 931 XSetWindowAttributes attributes;
933 XWindowAttributes gattr; 932 XWindowAttributes gattr;
934 Window top; 933 Window top, parent;
935 dDisp; 934 dDisp;
936 935
937#ifdef USING_W11LIB 936#ifdef USING_W11LIB
938 /* enable W11 callbacks */ 937 /* enable W11 callbacks */
939 W11AddEventHandler (disp, rxvt_W11_process_x_event); 938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
940#endif 939#endif
941 940
942 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
943 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
944 943
945 if (options & Opt_transparent) 944 if (OPTION (Opt_transparent))
946 { 945 {
947 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
948 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
949 } 948 }
950 949
951#if ENABLE_FRILLS 950#if ENABLE_FRILLS
952 if (options & Opt_borderLess) 951 if (OPTION (Opt_borderLess))
953 { 952 {
954 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
955 954
956 if (prop == None) 955 if (prop == None)
957 { 956 {
… …
966 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
967 mwmhints.decorations = 0; 966 mwmhints.decorations = 0;
968 } 967 }
969 } 968 }
970 else 969 else
971 {
972 mwmhints.flags = 0; 970 mwmhints.flags = 0;
973 }
974#endif 971#endif
975 972
976 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
977 Get_Colours (); 974 Get_Colours ();
978 975
979 if (!set_fonts ()) 976 if (!set_fonts ())
980 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
981 978
979 parent = DefaultRootWindow (disp);
980
982#if ENABLE_XEMBED 981#if ENABLE_XEMBED
983 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
984 { 983 {
985 XWindowAttributes wattr; 984 XWindowAttributes wattr;
986 985
987 top = strtol (rs[Rs_embed], 0, 0); 986 parent = strtol (rs[Rs_embed], 0, 0);
988 987
989 if (!XGetWindowAttributes (disp, top, &wattr)) 988 if (!XGetWindowAttributes (disp, parent, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991 990
992 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
992 }
993#endif
993 994
994#if 0 995 window_calc (0, 0);
995 if (wattr.map_state == IsViewable) 996
996 { 997 /* sub-window placement & size in rxvt_resize_subwindows () */
997 TermWin.mapped = 1; 998#ifdef PREFER_24BIT
998 refresh_type = FAST_REFRESH; 999 attributes.background_pixel = pix_colors_focused[Color_border];
999 XClearWindow (disp, top); 1000 attributes.border_pixel = pix_colors_focused[Color_border];
1000 // TODO: make XMapNotify-event-code a function and call it 1001 attributes.colormap = display->cmap;
1001 // TODO: how can I detect visibility without unmap/map? 1002 top = XCreateWindow (disp, parent,
1002 // TODO: focusin etc. 1003 szHint.x, szHint.y,
1003 } 1004 szHint.width, szHint.height,
1005 ext_bwidth,
1006 display->depth, InputOutput,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1004#else 1009#else
1005 // it's easiest just to unmap/map to get all state correctly set-up 1010 top = XCreateSimpleWindow (disp, parent,
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 {
1012 window_calc (0, 0);
1013
1014 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border];
1018 attributes.colormap = display->cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp),
1020 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
1021 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
1022 TermWin.ext_bwidth, 1013 ext_bwidth,
1023 display->depth, InputOutput,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1026#else
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1033#endif 1016#endif
1034 }
1035 1017
1036 TermWin.parent[0] = top; 1018 this->parent[0] = top;
1037 1019
1038 old_width = szHint.width; 1020 old_width = szHint.width;
1039 old_height = szHint.height; 1021 old_height = szHint.height;
1040 1022
1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1044 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1045 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1046 1028
1047 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1048 wmHint.input = True; 1030 wmHint.input = True;
1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1050 wmHint.window_group = top; 1032 wmHint.window_group = top;
1051 1033
1052 XSetWMProperties (disp, top, NULL, NULL, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1053 (char **)argv, argc, &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1054 1036
1055 /* Enable delete window protocol */ 1037 Atom protocols[] = {
1056 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1); 1038 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING],
1041#endif
1042 };
1043
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1057 1045
1058#if ENABLE_FRILLS 1046#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif
1050
1051#if ENABLE_EWMH
1059 long pid = getpid (); 1052 long pid = getpid ();
1060 1053
1061 XChangeProperty (disp, top, 1054 XChangeProperty (disp, top,
1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1063 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
1057
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1064#endif 1059#endif
1065 1060
1066 XSelectInput (disp, top, 1061 XSelectInput (disp, top,
1067 KeyPressMask 1062 KeyPressMask
1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
… …
1086 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1087 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1088#endif 1083#endif
1089 1084
1090 /* the vt window */ 1085 /* the vt window */
1091 TermWin.vt = XCreateSimpleWindow (disp, top, 1086 vt = XCreateSimpleWindow (disp, top,
1092 window_vt_x, 1087 window_vt_x,
1093 window_vt_y, 1088 window_vt_y,
1094 TermWin_TotalWidth (), 1089 width,
1095 TermWin_TotalHeight (), 1090 height,
1096 0, 1091 0,
1097 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1098 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1099#ifdef DEBUG_X 1094#ifdef DEBUG_X
1100 XStoreName (disp, TermWin.vt, "vt window"); 1095 XStoreName (disp, vt, "vt window");
1101#endif 1096#endif
1102 1097
1103 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1104 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1105 1100
1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1107 1102
1108#ifdef POINTER_BLANK 1103 if (OPTION (Opt_pointerBlank)
1109 if (options & Opt_pointerBlank) 1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1110 vt_emask |= PointerMotionMask; 1108 vt_emask |= PointerMotionMask;
1111 else 1109 else
1112#endif
1113 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1114 1111
1115 XSelectInput (disp, TermWin.vt, vt_emask); 1112 XSelectInput (disp, vt, vt_emask);
1116 vt_ev.start (display, TermWin.vt); 1113 vt_ev.start (display, vt);
1117 1114
1118#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1119 if (menuBar_height ()) 1116 if (menuBar_height ())
1120 { 1117 {
1121 menuBar.win = XCreateSimpleWindow (disp, top, 1118 menuBar.win = XCreateSimpleWindow (disp, top,
1122 window_vt_x, 0, 1119 window_vt_x, 0,
1123 TermWin_TotalWidth (), 1120 width,
1124 menuBar_TotalHeight (), 1121 menuBar_TotalHeight (),
1125 0, 1122 0,
1126 pix_colors_focused[Color_fg], 1123 pix_colors_focused[Color_fg],
1127 pix_colors_focused[Color_scroll]); 1124 pix_colors_focused[Color_scroll]);
1128 1125
… …
1141 } 1138 }
1142#endif 1139#endif
1143 1140
1144#ifdef XPM_BACKGROUND 1141#ifdef XPM_BACKGROUND
1145 if (rs[Rs_backgroundPixmap] != NULL 1142 if (rs[Rs_backgroundPixmap] != NULL
1146 && ! (options & Opt_transparent)) 1143 && ! OPTION (Opt_transparent))
1147 { 1144 {
1148 const char *p = rs[Rs_backgroundPixmap]; 1145 const char *p = rs[Rs_backgroundPixmap];
1149 1146
1150 if ((p = strchr (p, ';')) != NULL) 1147 if ((p = strchr (p, ';')) != NULL)
1151 { 1148 {
… …
1160 1157
1161 /* graphics context for the vt window */ 1158 /* graphics context for the vt window */
1162 gcvalue.foreground = pix_colors[Color_fg]; 1159 gcvalue.foreground = pix_colors[Color_fg];
1163 gcvalue.background = pix_colors[Color_bg]; 1160 gcvalue.background = pix_colors[Color_bg];
1164 gcvalue.graphics_exposures = 1; 1161 gcvalue.graphics_exposures = 1;
1165 TermWin.gc = XCreateGC (disp, TermWin.vt, 1162 gc = XCreateGC (disp, vt,
1166 GCForeground | GCBackground | GCGraphicsExposures, 1163 GCForeground | GCBackground | GCGraphicsExposures,
1167 &gcvalue); 1164 &gcvalue);
1168 1165
1169 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1166 drawable = new rxvt_drawable (display, vt);
1170 1167
1171#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1172 gcvalue.foreground = pix_colors[Color_topShadow]; 1169 gcvalue.foreground = pix_colors[Color_topShadow];
1173 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1171 gcvalue.foreground = pix_colors[Color_bottomShadow];
1175 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1176 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1177 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1178#endif 1175#endif
1179 1176
1180#ifdef OFF_FOCUS_FADING 1177#ifdef OFF_FOCUS_FADING
1181 // initially we are in unfocused state 1178 // initially we are in unfocused state
1182 if (rs[Rs_fade]) 1179 if (rs[Rs_fade])
… …
1185 1182
1186 pointer_unblank (); 1183 pointer_unblank ();
1187 scr_recolour (); 1184 scr_recolour ();
1188 1185
1189#if ENABLE_XEMBED 1186#if ENABLE_XEMBED
1190 // why this is necessary, I don't know, race condition?? 1187 if (rs[Rs_embed])
1191 XMoveWindow (disp, TermWin.vt, window_vt_x, window_vt_y); 1188 {
1189 long info[2] = { 0, XEMBED_MAPPED };
1190
1191 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1192 32, PropModeReplace, (unsigned char *)&info, 2);
1193 }
1192#endif 1194#endif
1193} 1195}
1194 1196
1195/* ------------------------------------------------------------------------- * 1197/* ------------------------------------------------------------------------- *
1196 * GET TTY CURRENT STATE * 1198 * GET TTY CURRENT STATE *
… …
1202 /* 1204 /*
1203 * standard System V termios interface 1205 * standard System V termios interface
1204 */ 1206 */
1205 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1207 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1206 { 1208 {
1207 /* return error - use system defaults */ 1209 // return error - use system defaults,
1210 // where possible, and zero elsewhere
1211 memset (tio, 0, sizeof (ttymode_t));
1212
1208 tio->c_cc[VINTR] = CINTR; 1213 tio->c_cc[VINTR] = CINTR;
1209 tio->c_cc[VQUIT] = CQUIT; 1214 tio->c_cc[VQUIT] = CQUIT;
1210 tio->c_cc[VERASE] = CERASE; 1215 tio->c_cc[VERASE] = CERASE;
1216#ifdef VERASE2
1217 tio->c_cc[VERASE2] = CERASE2;
1218#endif
1211 tio->c_cc[VKILL] = CKILL; 1219 tio->c_cc[VKILL] = CKILL;
1212 tio->c_cc[VSTART] = CSTART; 1220 tio->c_cc[VSTART] = CSTART;
1213 tio->c_cc[VSTOP] = CSTOP; 1221 tio->c_cc[VSTOP] = CSTOP;
1214 tio->c_cc[VSUSP] = CSUSP; 1222 tio->c_cc[VSUSP] = CSUSP;
1215# ifdef VDSUSP 1223# ifdef VDSUSP
1216
1217 tio->c_cc[VDSUSP] = CDSUSP; 1224 tio->c_cc[VDSUSP] = CDSUSP;
1218# endif 1225# endif
1219# ifdef VREPRINT 1226# ifdef VREPRINT
1220
1221 tio->c_cc[VREPRINT] = CRPRNT; 1227 tio->c_cc[VREPRINT] = CRPRNT;
1222# endif 1228# endif
1223# ifdef VDISCRD 1229# ifdef VDISCRD
1224
1225 tio->c_cc[VDISCRD] = CFLUSH; 1230 tio->c_cc[VDISCRD] = CFLUSH;
1226# endif 1231# endif
1227# ifdef VWERSE 1232# ifdef VWERSE
1228
1229 tio->c_cc[VWERSE] = CWERASE; 1233 tio->c_cc[VWERSE] = CWERASE;
1230# endif 1234# endif
1231# ifdef VLNEXT 1235# ifdef VLNEXT
1232
1233 tio->c_cc[VLNEXT] = CLNEXT; 1236 tio->c_cc[VLNEXT] = CLNEXT;
1234# endif 1237# endif
1235
1236 } 1238 }
1239
1237 tio->c_cc[VEOF] = CEOF; 1240 tio->c_cc[VEOF] = CEOF;
1238 tio->c_cc[VEOL] = VDISABLE; 1241 tio->c_cc[VEOL] = VDISABLE;
1239# ifdef VEOL2 1242# ifdef VEOL2
1240
1241 tio->c_cc[VEOL2] = VDISABLE; 1243 tio->c_cc[VEOL2] = VDISABLE;
1242# endif 1244# endif
1243# ifdef VSWTC 1245# ifdef VSWTC
1244
1245 tio->c_cc[VSWTC] = VDISABLE; 1246 tio->c_cc[VSWTC] = VDISABLE;
1246# endif 1247# endif
1247# ifdef VSWTCH 1248# ifdef VSWTCH
1248
1249 tio->c_cc[VSWTCH] = VDISABLE; 1249 tio->c_cc[VSWTCH] = VDISABLE;
1250# endif 1250# endif
1251# if VMIN != VEOF 1251# if VMIN != VEOF
1252
1253 tio->c_cc[VMIN] = 1; 1252 tio->c_cc[VMIN] = 1;
1254# endif 1253# endif
1255# if VTIME != VEOL 1254# if VTIME != VEOL
1256
1257 tio->c_cc[VTIME] = 0; 1255 tio->c_cc[VTIME] = 0;
1258# endif 1256# endif
1259 1257
1260 if (erase != -1) 1258 if (erase != -1)
1261 tio->c_cc[VERASE] = (char)erase; 1259 tio->c_cc[VERASE] = (char)erase;
… …
1289 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1287 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290 { 1288 {
1291 tio->sg.sg_erase = CERASE; /* ^H */ 1289 tio->sg.sg_erase = CERASE; /* ^H */
1292 tio->sg.sg_kill = CKILL; /* ^U */ 1290 tio->sg.sg_kill = CKILL; /* ^U */
1293 } 1291 }
1292
1294 if (erase != -1) 1293 if (erase != -1)
1295 tio->sg.sg_erase = (char)erase; 1294 tio->sg.sg_erase = (char)erase;
1296 1295
1297 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1296 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298 1297
… …
1304 tio->tc.t_startc = CSTART; /* ^Q */ 1303 tio->tc.t_startc = CSTART; /* ^Q */
1305 tio->tc.t_stopc = CSTOP; /* ^S */ 1304 tio->tc.t_stopc = CSTOP; /* ^S */
1306 tio->tc.t_eofc = CEOF; /* ^D */ 1305 tio->tc.t_eofc = CEOF; /* ^D */
1307 tio->tc.t_brkc = -1; 1306 tio->tc.t_brkc = -1;
1308 } 1307 }
1308
1309 /* get local special chars */ 1309 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 { 1311 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */ 1312 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1317 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 } 1318 }
1319 /* get line discipline */ 1319 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC 1321# ifdef NTTYDISC
1322
1323 tio->line = NTTYDISC; 1322 tio->line = NTTYDISC;
1324# endif /* NTTYDISC */ 1323# endif /* NTTYDISC */
1325 1324
1326 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1325 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327#endif /* HAVE_TERMIOS_H */ 1326#endif /* HAVE_TERMIOS_H */
… …
1350 FOO (IGNCR, "IGNCR"); 1349 FOO (IGNCR, "IGNCR");
1351 FOO (ICRNL, "ICRNL"); 1350 FOO (ICRNL, "ICRNL");
1352 FOO (IXON, "IXON"); 1351 FOO (IXON, "IXON");
1353 FOO (IXOFF, "IXOFF"); 1352 FOO (IXOFF, "IXOFF");
1354# ifdef IUCLC 1353# ifdef IUCLC
1355
1356 FOO (IUCLC, "IUCLC"); 1354 FOO (IUCLC, "IUCLC");
1357# endif 1355# endif
1358# ifdef IXANY 1356# ifdef IXANY
1359
1360 FOO (IXANY, "IXANY"); 1357 FOO (IXANY, "IXANY");
1361# endif 1358# endif
1362# ifdef IMAXBEL 1359# ifdef IMAXBEL
1363
1364 FOO (IMAXBEL, "IMAXBEL"); 1360 FOO (IMAXBEL, "IMAXBEL");
1365# endif 1361# endif
1366 1362
1367 fprintf (stderr, "\n"); 1363 fprintf (stderr, "\n");
1368 1364
… …
1375 FOO (VERASE, "VERASE"); 1371 FOO (VERASE, "VERASE");
1376 FOO (VKILL, "VKILL"); 1372 FOO (VKILL, "VKILL");
1377 FOO (VEOF, "VEOF"); 1373 FOO (VEOF, "VEOF");
1378 FOO (VEOL, "VEOL"); 1374 FOO (VEOL, "VEOL");
1379# ifdef VEOL2 1375# ifdef VEOL2
1380
1381 FOO (VEOL2, "VEOL2"); 1376 FOO (VEOL2, "VEOL2");
1382# endif 1377# endif
1383# ifdef VSWTC 1378# ifdef VSWTC
1384
1385 FOO (VSWTC, "VSWTC"); 1379 FOO (VSWTC, "VSWTC");
1386# endif 1380# endif
1387# ifdef VSWTCH 1381# ifdef VSWTCH
1388
1389 FOO (VSWTCH, "VSWTCH"); 1382 FOO (VSWTCH, "VSWTCH");
1390# endif 1383# endif
1391
1392 FOO (VSTART, "VSTART"); 1384 FOO (VSTART, "VSTART");
1393 FOO (VSTOP, "VSTOP"); 1385 FOO (VSTOP, "VSTOP");
1394 FOO (VSUSP, "VSUSP"); 1386 FOO (VSUSP, "VSUSP");
1395# ifdef VDSUSP 1387# ifdef VDSUSP
1396
1397 FOO (VDSUSP, "VDSUSP"); 1388 FOO (VDSUSP, "VDSUSP");
1398# endif 1389# endif
1399# ifdef VREPRINT 1390# ifdef VREPRINT
1400
1401 FOO (VREPRINT, "VREPRINT"); 1391 FOO (VREPRINT, "VREPRINT");
1402# endif 1392# endif
1403# ifdef VDISCRD 1393# ifdef VDISCRD
1404
1405 FOO (VDISCRD, "VDISCRD"); 1394 FOO (VDISCRD, "VDISCRD");
1406# endif 1395# endif
1407# ifdef VWERSE 1396# ifdef VWERSE
1408
1409 FOO (VWERSE, "VWERSE"); 1397 FOO (VWERSE, "VWERSE");
1410# endif 1398# endif
1411# ifdef VLNEXT 1399# ifdef VLNEXT
1412
1413 FOO (VLNEXT, "VLNEXT"); 1400 FOO (VLNEXT, "VLNEXT");
1414# endif 1401# endif
1415 1402
1416 fprintf (stderr, "\n"); 1403 fprintf (stderr, "\n");
1417# undef FOO 1404# undef FOO
… …
1426 * the slave. 1413 * the slave.
1427 */ 1414 */
1428void 1415void
1429rxvt_term::run_command (const char *const *argv) 1416rxvt_term::run_command (const char *const *argv)
1430{ 1417{
1418 TEMP_ENV; // not very temporary...
1419
1431#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1432 if (rs[Rs_pty_fd]) 1421 if (rs[Rs_pty_fd])
1433 { 1422 {
1434 pty.pty = atoi (rs[Rs_pty_fd]); 1423 pty.pty = atoi (rs[Rs_pty_fd]);
1424
1425 if (pty.pty >= 0)
1426 {
1427 if (getfd_hook)
1428 pty.pty = (*getfd_hook) (pty.pty);
1429
1435 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 }
1436 } 1433 }
1437 else 1434 else
1438#endif 1435#endif
1439 if (!pty.get ()) 1436 if (!pty.get ())
1440 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1459 1456
1460#if ENABLE_FRILLS 1457#if ENABLE_FRILLS
1461 if (rs[Rs_pty_fd]) 1458 if (rs[Rs_pty_fd])
1462 return; 1459 return;
1463#endif 1460#endif
1464
1465 sw_chld.start (SIGCHLD);
1466 1461
1467#ifndef __QNX__ 1462#ifndef __QNX__
1468 /* spin off the command interpreter */ 1463 /* spin off the command interpreter */
1469 switch (cmd_pid = fork ()) 1464 switch (cmd_pid = fork ())
1470 { 1465 {
… …
1543{ 1538{
1544 char *login; 1539 char *login;
1545 1540
1546 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1541 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1547 1542
1548 if (options & Opt_console) 1543 if (OPTION (Opt_console))
1549 { /* be virtual console, fail silently */ 1544 { /* be virtual console, fail silently */
1550#ifdef TIOCCONS 1545#ifdef TIOCCONS
1551 unsigned int on = 1; 1546 unsigned int on = 1;
1552 1547
1553 ioctl (STDIN_FILENO, TIOCCONS, &on); 1548 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1596 execvp (argv[0], (char *const *)argv); 1591 execvp (argv[0], (char *const *)argv);
1597 /* no error message: STDERR is closed! */ 1592 /* no error message: STDERR is closed! */
1598 } 1593 }
1599 else 1594 else
1600 { 1595 {
1601 const char *argv0, *shell; 1596 const char *argv0, *shell;
1602 1597
1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604 shell = "/bin/sh"; 1599 shell = "/bin/sh";
1605 1600
1606 argv0 = (const char *)rxvt_r_basename (shell); 1601 argv0 = (const char *)rxvt_r_basename (shell);
1607 1602
1608 if (options & Opt_loginShell) 1603 if (OPTION (Opt_loginShell))
1609 { 1604 {
1610 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1605 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1611 1606
1612 login[0] = '-'; 1607 login[0] = '-';
1613 strcpy (&login[1], argv0); 1608 strcpy (&login[1], argv0);
1614 argv0 = login; 1609 argv0 = login;
1615 } 1610 }
1611
1616 execlp (shell, argv0, NULL); 1612 execlp (shell, argv0, NULL);
1617 /* no error message: STDERR is closed! */ 1613 /* no error message: STDERR is closed! */
1618 } 1614 }
1619 1615
1620#else /* __QNX__ uses qnxspawn () */ 1616#else /* __QNX__ uses qnxspawn () */
… …
1648 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1649 command = "/bin/sh"; 1645 command = "/bin/sh";
1650 1646
1651 arg_a[0] = my_basename (command); 1647 arg_a[0] = my_basename (command);
1652 1648
1653 if (options & Opt_loginShell) 1649 if (OPTION (Opt_loginShell))
1654 { 1650 {
1655 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1656 1652
1657 login[0] = '-'; 1653 login[0] = '-';
1658 strcpy (&login[1], arg_a[0]); 1654 strcpy (&login[1], arg_a[0]);

Diff Legend

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