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

Diff Legend

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