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.120 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.138 by root, Wed Jan 11 02:24:12 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) */
… …
216 }; 216 };
217 217
218bool 218bool
219rxvt_term::init_vars () 219rxvt_term::init_vars ()
220{ 220{
221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
223
224 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227#endif 224#endif
228 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
229 226
230 if (pix_colors == NULL) 227 if (pix_colors == NULL)
231 return false; 228 return false;
232 229
233#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
234 TermWin.pixmap = None; 231 pixmap = None;
235#endif 232#endif
236 233
237 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
238 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
239 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
240 want_refresh = 1; 237 want_refresh = 1;
241 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
242 TermWin.focus = 0; 239 focus = 0;
243 TermWin.ncol = 80; 240 ncol = 80;
244 TermWin.nrow = 24; 241 nrow = 24;
245 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
246 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
247 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
248 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
249 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
250 247
251 refresh_limit = 1; 248 refresh_limit = 1;
252 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
253 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
342 rs[Rs_name] = rxvt_r_basename (argv[0]); 339 rs[Rs_name] = rxvt_r_basename (argv[0]);
343 340
344 /* 341 /*
345 * Open display, get options/resources and create the window 342 * Open display, get options/resources and create the window
346 */ 343 */
344 {
345 TEMP_ENV;
346
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
349 349
350 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
351 351
352 if (!(display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
353 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]);
354 }
354 355
355 extract_resources (); 356 extract_resources ();
356 free (r_argv); 357 free (r_argv);
357 358
358 /* 359 /*
… …
372 if (!rs[Rs_iconName]) 373 if (!rs[Rs_iconName])
373 rs[Rs_iconName] = rs[Rs_name]; 374 rs[Rs_iconName] = rs[Rs_name];
374 } 375 }
375 376
376 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 378 saveLines = min (i, MAX_SAVELINES);
378 379
379#if ENABLE_FRILLS 380#if ENABLE_FRILLS
380 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 382 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
383
382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 384 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 385 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
386
384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
386#endif 389#endif
387 390
388#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
389 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390 pointerBlankDelay = i; 393 pointerBlankDelay = i;
391 else 394 else
392 pointerBlankDelay = 2; 395 pointerBlankDelay = 2;
393#endif 396#endif
394 397
395 /* no point having a scrollbar without having any scrollback! */ 398 /* no point having a scrollbar without having any scrollback! */
396 if (!TermWin.saveLines) 399 if (!saveLines)
397 options &= ~Opt_scrollBar; 400 set_option (Opt_scrollBar, 0);
398 401
399#ifdef PRINTPIPE 402#ifdef PRINTPIPE
400 if (!rs[Rs_print_pipe]) 403 if (!rs[Rs_print_pipe])
401 rs[Rs_print_pipe] = PRINTPIPE; 404 rs[Rs_print_pipe] = PRINTPIPE;
402#endif 405#endif
… …
445 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
446#endif 449#endif
447 450
448#ifdef XTERM_REVERSE_VIDEO 451#ifdef XTERM_REVERSE_VIDEO
449 /* this is how xterm implements reverseVideo */ 452 /* this is how xterm implements reverseVideo */
450 if (options & Opt_reverseVideo) 453 if (OPTION (Opt_reverseVideo))
451 { 454 {
452 if (!rs[Rs_color + Color_fg]) 455 if (!rs[Rs_color + Color_fg])
453 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 456 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
454 if (!rs[Rs_color + Color_bg]) 457 if (!rs[Rs_color + Color_bg])
455 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 458 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
460 if (!rs[Rs_color + i]) 463 if (!rs[Rs_color + i])
461 rs[Rs_color + i] = def_colorName[i]; 464 rs[Rs_color + i] = def_colorName[i];
462 465
463#ifndef XTERM_REVERSE_VIDEO 466#ifndef XTERM_REVERSE_VIDEO
464 /* this is how we implement reverseVideo */ 467 /* this is how we implement reverseVideo */
465 if (options & Opt_reverseVideo) 468 if (OPTION (Opt_reverseVideo))
466 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
467#endif 470#endif
468 471
469 /* convenient aliases for setting fg/bg to colors */ 472 /* convenient aliases for setting fg/bg to colors */
470 color_aliases (Color_fg); 473 color_aliases (Color_fg);
471 color_aliases (Color_bg); 474 color_aliases (Color_bg);
… …
521 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
522 525
523 sprintf (env_display, "DISPLAY=%s", val); 526 sprintf (env_display, "DISPLAY=%s", val);
524 527
525 /* avoiding the math library: 528 /* avoiding the math library:
526 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
527 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
528 ; 531 ;
529 MAX_IT (i, 1); 532 max_it (i, 1);
530 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
531 534
532 sprintf (env_windowid, "WINDOWID=%u", 535 sprintf (env_windowid, "WINDOWID=%u",
533 (unsigned int)TermWin.parent[0]); 536 (unsigned int)parent[0]);
534 537
535 /* add entries to the environment: 538 /* add entries to the environment:
536 * @ DISPLAY: in case we started with -display 539 * @ DISPLAY: in case we started with -display
537 * @ WINDOWID: X window id number of the window 540 * @ WINDOWID: X window id number of the window
538 * @ COLORTERM: terminal sub-name and also indicates its color 541 * @ COLORTERM: terminal sub-name and also indicates its color
… …
577 * This should support all European type languages. 580 * This should support all European type languages.
578 */ 581 */
579void 582void
580rxvt_term::set_locale (const char *locale) 583rxvt_term::set_locale (const char *locale)
581{ 584{
585 TEMP_ENV;
586
582#if HAVE_XSETLOCALE || HAVE_SETLOCALE 587#if HAVE_XSETLOCALE || HAVE_SETLOCALE
583 free (this->locale); 588 free (this->locale);
584 this->locale = setlocale (LC_CTYPE, locale); 589 this->locale = setlocale (LC_CTYPE, locale);
585 590
586 if (!this->locale) 591 if (!this->locale)
587 { 592 {
588 if (*locale) 593 if (*locale)
589 { 594 {
590 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 595 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
591 setlocale (LC_CTYPE, ""); 596 setlocale (LC_CTYPE, "C");
592 } 597 }
593 else 598 else
594 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 599 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
595 600
596 this->locale = ""; 601 this->locale = "C";
597 } 602 }
598 603
599 604
600 this->locale = rxvt_strdup (this->locale); 605 this->locale = rxvt_strdup (this->locale);
601 SET_LOCALE (this->locale); 606 SET_LOCALE (this->locale);
… …
616} 621}
617 622
618void 623void
619rxvt_term::init_xlocale () 624rxvt_term::init_xlocale ()
620{ 625{
626 TEMP_ENV;
627
621#ifdef USE_XIM 628#ifdef USE_XIM
622 if (!locale) 629 if (!locale)
623 rxvt_warn ("setting locale failed, working without locale support.\n"); 630 rxvt_warn ("setting locale failed, working without locale support.\n");
624 else 631 else
625 { 632 {
… …
647 * Initialize the command connection. 654 * Initialize the command connection.
648 * This should be called after the X server connection is established. 655 * This should be called after the X server connection is established.
649 */ 656 */
650 657
651#ifdef META8_OPTION 658#ifdef META8_OPTION
652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653#endif 660#endif
654 661
655 get_ourmods (); 662 get_ourmods ();
656 663
657 if (!(options & Opt_scrollTtyOutput)) 664 if (!OPTION (Opt_scrollTtyOutput))
658 priv_modes |= PrivMode_TtyOutputInh; 665 priv_modes |= PrivMode_TtyOutputInh;
659 if (options & Opt_scrollTtyKeypress) 666 if (OPTION (Opt_scrollTtyKeypress))
660 priv_modes |= PrivMode_Keypress; 667 priv_modes |= PrivMode_Keypress;
661 if (!(options & Opt_jumpScroll)) 668 if (!OPTION (Opt_jumpScroll))
662 priv_modes |= PrivMode_smoothScroll; 669 priv_modes |= PrivMode_smoothScroll;
663 670
664#ifndef NO_BACKSPACE_KEY 671#ifndef NO_BACKSPACE_KEY
665 if (strcmp (key_backspace, "DEC") == 0) 672 if (strcmp (key_backspace, "DEC") == 0)
666 priv_modes |= PrivMode_HaveBackSpace; 673 priv_modes |= PrivMode_HaveBackSpace;
… …
676 if (menubar_visible ()) 683 if (menubar_visible ())
677 { 684 {
678 priv_modes |= PrivMode_menuBar; 685 priv_modes |= PrivMode_menuBar;
679 SavedModes |= PrivMode_menuBar; 686 SavedModes |= PrivMode_menuBar;
680 } 687 }
681
682#ifdef CURSOR_BLINK
683 if (options & Opt_cursorBlink)
684 (void)gettimeofday (&lastcursorchange, NULL);
685#endif
686 688
687 run_command (argv); 689 run_command (argv);
688} 690}
689 691
690/*----------------------------------------------------------------------*/ 692/*----------------------------------------------------------------------*/
… …
705 continue; 707 continue;
706 708
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 710 {
709#ifndef XTERM_REVERSE_VIDEO 711#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && (options & Opt_reverseVideo)) 712 if (i < 2 && OPTION (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 713 rs[Rs_color + i] = def_colorName[!i];
712 else 714 else
713#endif 715#endif
714 rs[Rs_color + i] = def_colorName[i]; 716 rs[Rs_color + i] = def_colorName[i];
715 717
… …
812 int i = atoi (rs[Rs_color + idx]); 814 int i = atoi (rs[Rs_color + idx]);
813 815
814 if (i >= 8 && i <= 15) 816 if (i >= 8 && i <= 15)
815 { /* bright colors */ 817 { /* bright colors */
816 i -= 8; 818 i -= 8;
817#ifndef NO_BRIGHTCOLOR
818 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
819 return; 820 return;
820#endif
821 } 821 }
822 822
823 if (i >= 0 && i <= 7) /* normal colors */ 823 if (i >= 0 && i <= 7) /* normal colors */
824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825 } 825 }
… …
938#endif 938#endif
939 939
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
942 942
943 if (options & Opt_transparent) 943 if (OPTION (Opt_transparent))
944 { 944 {
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 946 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
947 } 947 }
948 948
949#if ENABLE_FRILLS 949#if ENABLE_FRILLS
950 if (options & Opt_borderLess) 950 if (OPTION (Opt_borderLess))
951 { 951 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
953 953
954 if (prop == None) 954 if (prop == None)
955 { 955 {
… …
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 987 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 989
990 window_calc (wattr.width, wattr.height); 990 window_calc (wattr.width, wattr.height);
991 } 991 }
992
993#endif 992#endif
993
994 window_calc (0, 0); 994 window_calc (0, 0);
995 995
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 996 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT 997#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused[Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused[Color_border];
1000 attributes.colormap = display->cmap; 1000 attributes.colormap = display->cmap;
1001 top = XCreateWindow (disp, parent, 1001 top = XCreateWindow (disp, parent,
1002 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
1004 TermWin.ext_bwidth, 1004 ext_bwidth,
1005 display->depth, InputOutput, 1005 display->depth, InputOutput,
1006 display->visual, 1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1008#else 1008#else
1009 top = XCreateSimpleWindow (disp, parent, 1009 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
1011 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
1012 TermWin.ext_bwidth, 1012 ext_bwidth,
1013 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
1015#endif 1015#endif
1016 1016
1017 TermWin.parent[0] = top; 1017 this->parent[0] = top;
1018 1018
1019 old_width = szHint.width; 1019 old_width = szHint.width;
1020 old_height = szHint.height; 1020 old_height = szHint.height;
1021 1021
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1025 classHint.res_name = (char *)rs[Rs_name]; 1025 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 1026 classHint.res_class = (char *)RESCLASS;
1027 1027
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 1029 wmHint.input = True;
1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 1031 wmHint.window_group = top;
1032 1032
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1035 1035
… …
1040#endif 1040#endif
1041 }; 1041 };
1042 1042
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044 1044
1045#if ENABLE_FRILLS
1046 if (rs[Rs_transient_for])
1047 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1048#endif
1049
1045#if ENABLE_EWMH 1050#if ENABLE_EWMH
1046 long pid = getpid (); 1051 long pid = getpid ();
1047 1052
1048 XChangeProperty (disp, top, 1053 XChangeProperty (disp, top,
1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1054 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1075 /* cursor (menuBar/scrollBar): Black-on-White */ 1080 /* cursor (menuBar/scrollBar): Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1077#endif 1082#endif
1078 1083
1079 /* the vt window */ 1084 /* the vt window */
1080 TermWin.vt = XCreateSimpleWindow (disp, top, 1085 vt = XCreateSimpleWindow (disp, top,
1081 window_vt_x, 1086 window_vt_x,
1082 window_vt_y, 1087 window_vt_y,
1083 TermWin_TotalWidth (), 1088 width,
1084 TermWin_TotalHeight (), 1089 height,
1085 0, 1090 0,
1086 pix_colors_focused[Color_fg], 1091 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_bg]); 1092 pix_colors_focused[Color_bg]);
1088#ifdef DEBUG_X 1093#ifdef DEBUG_X
1089 XStoreName (disp, TermWin.vt, "vt window"); 1094 XStoreName (disp, vt, "vt window");
1090#endif 1095#endif
1091 1096
1092 attributes.bit_gravity = NorthWestGravity; 1097 attributes.bit_gravity = NorthWestGravity;
1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1098 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1094 1099
1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1096 1101
1097#ifdef POINTER_BLANK 1102 if (OPTION (Opt_pointerBlank)
1098 if (options & Opt_pointerBlank) 1103#ifdef ENABLE_PERL
1104 || perl.self
1105#endif
1106 )
1099 vt_emask |= PointerMotionMask; 1107 vt_emask |= PointerMotionMask;
1100 else 1108 else
1101#endif
1102 vt_emask |= Button1MotionMask | Button3MotionMask; 1109 vt_emask |= Button1MotionMask | Button3MotionMask;
1103 1110
1104 XSelectInput (disp, TermWin.vt, vt_emask); 1111 XSelectInput (disp, vt, vt_emask);
1105 vt_ev.start (display, TermWin.vt); 1112 vt_ev.start (display, vt);
1106 1113
1107#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108 if (menuBar_height ()) 1115 if (menuBar_height ())
1109 { 1116 {
1110 menuBar.win = XCreateSimpleWindow (disp, top, 1117 menuBar.win = XCreateSimpleWindow (disp, top,
1111 window_vt_x, 0, 1118 window_vt_x, 0,
1112 TermWin_TotalWidth (), 1119 width,
1113 menuBar_TotalHeight (), 1120 menuBar_TotalHeight (),
1114 0, 1121 0,
1115 pix_colors_focused[Color_fg], 1122 pix_colors_focused[Color_fg],
1116 pix_colors_focused[Color_scroll]); 1123 pix_colors_focused[Color_scroll]);
1117 1124
… …
1130 } 1137 }
1131#endif 1138#endif
1132 1139
1133#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1134 if (rs[Rs_backgroundPixmap] != NULL 1141 if (rs[Rs_backgroundPixmap] != NULL
1135 && ! (options & Opt_transparent)) 1142 && ! OPTION (Opt_transparent))
1136 { 1143 {
1137 const char *p = rs[Rs_backgroundPixmap]; 1144 const char *p = rs[Rs_backgroundPixmap];
1138 1145
1139 if ((p = strchr (p, ';')) != NULL) 1146 if ((p = strchr (p, ';')) != NULL)
1140 { 1147 {
… …
1149 1156
1150 /* graphics context for the vt window */ 1157 /* graphics context for the vt window */
1151 gcvalue.foreground = pix_colors[Color_fg]; 1158 gcvalue.foreground = pix_colors[Color_fg];
1152 gcvalue.background = pix_colors[Color_bg]; 1159 gcvalue.background = pix_colors[Color_bg];
1153 gcvalue.graphics_exposures = 1; 1160 gcvalue.graphics_exposures = 1;
1154 TermWin.gc = XCreateGC (disp, TermWin.vt, 1161 gc = XCreateGC (disp, vt,
1155 GCForeground | GCBackground | GCGraphicsExposures, 1162 GCForeground | GCBackground | GCGraphicsExposures,
1156 &gcvalue); 1163 &gcvalue);
1157 1164
1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1165 drawable = new rxvt_drawable (display, vt);
1159 1166
1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1161 gcvalue.foreground = pix_colors[Color_topShadow]; 1168 gcvalue.foreground = pix_colors[Color_topShadow];
1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1169 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1163 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1170 gcvalue.foreground = pix_colors[Color_bottomShadow];
1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1171 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1173 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167#endif 1174#endif
1168 1175
1169#ifdef OFF_FOCUS_FADING 1176#ifdef OFF_FOCUS_FADING
1170 // initially we are in unfocused state 1177 // initially we are in unfocused state
1171 if (rs[Rs_fade]) 1178 if (rs[Rs_fade])
… …
1196 /* 1203 /*
1197 * standard System V termios interface 1204 * standard System V termios interface
1198 */ 1205 */
1199 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1206 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1200 { 1207 {
1201 /* return error - use system defaults */ 1208 // return error - use system defaults,
1209 // where possible, and zero elsewhere
1210 memset (tio, 0, sizeof (ttymode_t));
1211
1202 tio->c_cc[VINTR] = CINTR; 1212 tio->c_cc[VINTR] = CINTR;
1203 tio->c_cc[VQUIT] = CQUIT; 1213 tio->c_cc[VQUIT] = CQUIT;
1204 tio->c_cc[VERASE] = CERASE; 1214 tio->c_cc[VERASE] = CERASE;
1215#ifdef VERASE2
1216 tio->c_cc[VERASE2] = CERASE2;
1217#endif
1205 tio->c_cc[VKILL] = CKILL; 1218 tio->c_cc[VKILL] = CKILL;
1206 tio->c_cc[VSTART] = CSTART; 1219 tio->c_cc[VSTART] = CSTART;
1207 tio->c_cc[VSTOP] = CSTOP; 1220 tio->c_cc[VSTOP] = CSTOP;
1208 tio->c_cc[VSUSP] = CSUSP; 1221 tio->c_cc[VSUSP] = CSUSP;
1209# ifdef VDSUSP 1222# ifdef VDSUSP
… …
1399 * the slave. 1412 * the slave.
1400 */ 1413 */
1401void 1414void
1402rxvt_term::run_command (const char *const *argv) 1415rxvt_term::run_command (const char *const *argv)
1403{ 1416{
1417 TEMP_ENV; // not very temporary...
1418
1404#if ENABLE_FRILLS 1419#if ENABLE_FRILLS
1405 if (rs[Rs_pty_fd]) 1420 if (rs[Rs_pty_fd])
1406 { 1421 {
1407 pty.pty = atoi (rs[Rs_pty_fd]); 1422 pty.pty = atoi (rs[Rs_pty_fd]);
1423
1424 if (pty.pty >= 0)
1425 {
1426 if (getfd_hook)
1427 pty.pty = (*getfd_hook) (pty.pty);
1428
1408 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1429 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1430 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1431 }
1409 } 1432 }
1410 else 1433 else
1411#endif 1434#endif
1412 if (!pty.get ()) 1435 if (!pty.get ())
1413 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1432 1455
1433#if ENABLE_FRILLS 1456#if ENABLE_FRILLS
1434 if (rs[Rs_pty_fd]) 1457 if (rs[Rs_pty_fd])
1435 return; 1458 return;
1436#endif 1459#endif
1437
1438 sw_chld.start (SIGCHLD);
1439 1460
1440#ifndef __QNX__ 1461#ifndef __QNX__
1441 /* spin off the command interpreter */ 1462 /* spin off the command interpreter */
1442 switch (cmd_pid = fork ()) 1463 switch (cmd_pid = fork ())
1443 { 1464 {
… …
1516{ 1537{
1517 char *login; 1538 char *login;
1518 1539
1519 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1520 1541
1521 if (options & Opt_console) 1542 if (OPTION (Opt_console))
1522 { /* be virtual console, fail silently */ 1543 { /* be virtual console, fail silently */
1523#ifdef TIOCCONS 1544#ifdef TIOCCONS
1524 unsigned int on = 1; 1545 unsigned int on = 1;
1525 1546
1526 ioctl (STDIN_FILENO, TIOCCONS, &on); 1547 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1569 execvp (argv[0], (char *const *)argv); 1590 execvp (argv[0], (char *const *)argv);
1570 /* no error message: STDERR is closed! */ 1591 /* no error message: STDERR is closed! */
1571 } 1592 }
1572 else 1593 else
1573 { 1594 {
1574 const char *argv0, *shell; 1595 const char *argv0, *shell;
1575 1596
1576 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1577 shell = "/bin/sh"; 1598 shell = "/bin/sh";
1578 1599
1579 argv0 = (const char *)rxvt_r_basename (shell); 1600 argv0 = (const char *)rxvt_r_basename (shell);
1580 1601
1581 if (options & Opt_loginShell) 1602 if (OPTION (Opt_loginShell))
1582 { 1603 {
1583 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1584 1605
1585 login[0] = '-'; 1606 login[0] = '-';
1586 strcpy (&login[1], argv0); 1607 strcpy (&login[1], argv0);
1587 argv0 = login; 1608 argv0 = login;
1588 } 1609 }
1610
1589 execlp (shell, argv0, NULL); 1611 execlp (shell, argv0, NULL);
1590 /* no error message: STDERR is closed! */ 1612 /* no error message: STDERR is closed! */
1591 } 1613 }
1592 1614
1593#else /* __QNX__ uses qnxspawn () */ 1615#else /* __QNX__ uses qnxspawn () */
… …
1621 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1643 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1622 command = "/bin/sh"; 1644 command = "/bin/sh";
1623 1645
1624 arg_a[0] = my_basename (command); 1646 arg_a[0] = my_basename (command);
1625 1647
1626 if (options & Opt_loginShell) 1648 if (OPTION (Opt_loginShell))
1627 { 1649 {
1628 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1650 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1629 1651
1630 login[0] = '-'; 1652 login[0] = '-';
1631 strcpy (&login[1], arg_a[0]); 1653 strcpy (&login[1], arg_a[0]);

Diff Legend

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