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

Diff Legend

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