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

Diff Legend

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