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.142 by root, Fri Jan 13 04:59:04 2006 UTC

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

Diff Legend

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