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

Diff Legend

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