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.119 by root, Thu Aug 11 02:05:07 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) */
… …
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
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 345 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 346 rs[Rs_display_name] = ":0";
349 347
350 get_options (r_argc, r_argv); 348 get_options (r_argc, r_argv);
351 349
352 if (!(display = displays.get (rs[Rs_display_name]))) 350 if (!(display = displays.get (rs[Rs_display_name])))
353 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]);
354 352
355 extract_resources (); 353 extract_resources ();
354
356 free (r_argv); 355 free (r_argv);
357 356
358 /* 357 /*
359 * set any defaults not already set 358 * set any defaults not already set
360 */ 359 */
… …
372 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
373 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
374 } 373 }
375 374
376 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
378 377
379#if ENABLE_FRILLS 378#if ENABLE_FRILLS
380 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)
381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
382 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)
383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
386#endif 387#endif
387 388
388#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
389 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390 pointerBlankDelay = i; 391 pointerBlankDelay = i;
391 else 392 else
392 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
393#endif 394#endif
394 395
395 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
396 if (!TermWin.saveLines) 397 if (!saveLines)
397 options &= ~Opt_scrollBar; 398 set_option (Opt_scrollBar, 0);
398 399
399#ifdef PRINTPIPE 400#ifdef PRINTPIPE
400 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
401 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
402#endif 403#endif
… …
445 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]);
446#endif 447#endif
447 448
448#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
449 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
450 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
451 { 452 {
452 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
453 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
454 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
455 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
460 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
461 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
462 463
463#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
464 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
465 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
466 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]);
467#endif 468#endif
468 469
469 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
470 color_aliases (Color_fg); 471 color_aliases (Color_fg);
471 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
521 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
522 523
523 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
524 525
525 /* avoiding the math library: 526 /* avoiding the math library:
526 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
527 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++)
528 ; 529 ;
529 MAX_IT (i, 1); 530 max_it (i, 1);
530 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
531 532
532 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
533 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
534 535
535 /* add entries to the environment: 536 /* add entries to the environment:
536 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
537 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
538 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
577 * This should support all European type languages. 578 * This should support all European type languages.
578 */ 579 */
579void 580void
580rxvt_term::set_locale (const char *locale) 581rxvt_term::set_locale (const char *locale)
581{ 582{
583 set_environ (envv);
584
582#if HAVE_XSETLOCALE || HAVE_SETLOCALE 585#if HAVE_XSETLOCALE || HAVE_SETLOCALE
583 free (this->locale); 586 free (this->locale);
584 this->locale = setlocale (LC_CTYPE, locale); 587 this->locale = setlocale (LC_CTYPE, locale);
585 588
586 if (!this->locale) 589 if (!this->locale)
587 { 590 {
588 if (*locale) 591 if (*locale)
589 { 592 {
590 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);
591 setlocale (LC_CTYPE, ""); 594 setlocale (LC_CTYPE, "C");
592 } 595 }
593 else 596 else
594 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");
595 598
596 this->locale = ""; 599 this->locale = "C";
597 } 600 }
598 601
599 602
600 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
601 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
… …
616} 619}
617 620
618void 621void
619rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
620{ 623{
624 set_environ (envv);
625
621#ifdef USE_XIM 626#ifdef USE_XIM
622 if (!locale) 627 if (!locale)
623 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
624 else 629 else
625 { 630 {
… …
647 * Initialize the command connection. 652 * Initialize the command connection.
648 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
649 */ 654 */
650 655
651#ifdef META8_OPTION 656#ifdef META8_OPTION
652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653#endif 658#endif
654 659
655 get_ourmods (); 660 get_ourmods ();
656 661
657 if (!(options & Opt_scrollTtyOutput)) 662 if (!OPTION (Opt_scrollTtyOutput))
658 priv_modes |= PrivMode_TtyOutputInh; 663 priv_modes |= PrivMode_TtyOutputInh;
659 if (options & Opt_scrollTtyKeypress) 664 if (OPTION (Opt_scrollTtyKeypress))
660 priv_modes |= PrivMode_Keypress; 665 priv_modes |= PrivMode_Keypress;
661 if (!(options & Opt_jumpScroll)) 666 if (!OPTION (Opt_jumpScroll))
662 priv_modes |= PrivMode_smoothScroll; 667 priv_modes |= PrivMode_smoothScroll;
663 668
664#ifndef NO_BACKSPACE_KEY 669#ifndef NO_BACKSPACE_KEY
665 if (strcmp (key_backspace, "DEC") == 0) 670 if (strcmp (key_backspace, "DEC") == 0)
666 priv_modes |= PrivMode_HaveBackSpace; 671 priv_modes |= PrivMode_HaveBackSpace;
… …
676 if (menubar_visible ()) 681 if (menubar_visible ())
677 { 682 {
678 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
679 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
680 } 685 }
681
682#ifdef CURSOR_BLINK
683 if (options & Opt_cursorBlink)
684 (void)gettimeofday (&lastcursorchange, NULL);
685#endif
686 686
687 run_command (argv); 687 run_command (argv);
688} 688}
689 689
690/*----------------------------------------------------------------------*/ 690/*----------------------------------------------------------------------*/
… …
705 continue; 705 continue;
706 706
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 708 {
709#ifndef XTERM_REVERSE_VIDEO 709#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && (options & Opt_reverseVideo)) 710 if (i < 2 && OPTION (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 711 rs[Rs_color + i] = def_colorName[!i];
712 else 712 else
713#endif 713#endif
714 rs[Rs_color + i] = def_colorName[i]; 714 rs[Rs_color + i] = def_colorName[i];
715 715
… …
812 int i = atoi (rs[Rs_color + idx]); 812 int i = atoi (rs[Rs_color + idx]);
813 813
814 if (i >= 8 && i <= 15) 814 if (i >= 8 && i <= 15)
815 { /* bright colors */ 815 { /* bright colors */
816 i -= 8; 816 i -= 8;
817#ifndef NO_BRIGHTCOLOR
818 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
819 return; 818 return;
820#endif
821 } 819 }
822 820
823 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825 } 823 }
… …
924#if ENABLE_FRILLS 922#if ENABLE_FRILLS
925 Atom prop = None; 923 Atom prop = None;
926 MWMHints mwmhints; 924 MWMHints mwmhints;
927#endif 925#endif
928 XGCValues gcvalue; 926 XGCValues gcvalue;
929 long vt_emask;
930 XSetWindowAttributes attributes; 927 XSetWindowAttributes attributes;
931 XWindowAttributes gattr; 928 XWindowAttributes gattr;
932 Window top, parent; 929 Window top, parent;
933 dDisp; 930 dDisp;
934 931
… …
938#endif 935#endif
939 936
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
942 939
943 if (options & Opt_transparent) 940 if (OPTION (Opt_transparent))
944 { 941 {
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 943 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
947 } 944 }
948 945
949#if ENABLE_FRILLS 946#if ENABLE_FRILLS
950 if (options & Opt_borderLess) 947 if (OPTION (Opt_borderLess))
951 { 948 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
953 950
954 if (prop == None) 951 if (prop == None)
955 { 952 {
… …
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 984 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 986
990 window_calc (wattr.width, wattr.height); 987 window_calc (wattr.width, wattr.height);
991 } 988 }
992
993#endif 989#endif
990
994 window_calc (0, 0); 991 window_calc (0, 0);
995 992
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 993 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT 994#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 995 attributes.background_pixel = pix_colors_focused[Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 996 attributes.border_pixel = pix_colors_focused[Color_border];
1000 attributes.colormap = display->cmap; 997 attributes.colormap = display->cmap;
1001 top = XCreateWindow (disp, parent, 998 top = XCreateWindow (disp, parent,
1002 szHint.x, szHint.y, 999 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 1000 szHint.width, szHint.height,
1004 TermWin.ext_bwidth, 1001 ext_bwidth,
1005 display->depth, InputOutput, 1002 display->depth, InputOutput,
1006 display->visual, 1003 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1008#else 1005#else
1009 top = XCreateSimpleWindow (disp, parent, 1006 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y, 1007 szHint.x, szHint.y,
1011 szHint.width, szHint.height, 1008 szHint.width, szHint.height,
1012 TermWin.ext_bwidth, 1009 ext_bwidth,
1013 pix_colors_focused[Color_border], 1010 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]); 1011 pix_colors_focused[Color_border]);
1015#endif 1012#endif
1016 1013
1017 TermWin.parent[0] = top; 1014 this->parent[0] = top;
1018 1015
1019 old_width = szHint.width; 1016 old_width = szHint.width;
1020 old_height = szHint.height; 1017 old_height = szHint.height;
1021 1018
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1025 classHint.res_name = (char *)rs[Rs_name]; 1022 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 1023 classHint.res_class = (char *)RESCLASS;
1027 1024
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1025 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 1026 wmHint.input = True;
1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1027 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 1028 wmHint.window_group = top;
1032 1029
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 1031 &szHint, &wmHint, &classHint);
1035 1032
… …
1040#endif 1037#endif
1041 }; 1038 };
1042 1039
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044 1041
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
1045#if ENABLE_EWMH 1047#if ENABLE_EWMH
1046 long pid = getpid (); 1048 long pid = getpid ();
1047 1049
1048 XChangeProperty (disp, top, 1050 XChangeProperty (disp, top,
1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1051 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1075 /* cursor (menuBar/scrollBar): Black-on-White */ 1077 /* cursor (menuBar/scrollBar): Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1077#endif 1079#endif
1078 1080
1079 /* the vt window */ 1081 /* the vt window */
1080 TermWin.vt = XCreateSimpleWindow (disp, top, 1082 vt = XCreateSimpleWindow (disp, top,
1081 window_vt_x, 1083 window_vt_x,
1082 window_vt_y, 1084 window_vt_y,
1083 TermWin_TotalWidth (), 1085 width,
1084 TermWin_TotalHeight (), 1086 height,
1085 0, 1087 0,
1086 pix_colors_focused[Color_fg], 1088 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_bg]); 1089 pix_colors_focused[Color_bg]);
1088#ifdef DEBUG_X 1090#ifdef DEBUG_X
1089 XStoreName (disp, TermWin.vt, "vt window"); 1091 XStoreName (disp, vt, "vt window");
1090#endif 1092#endif
1091 1093
1092 attributes.bit_gravity = NorthWestGravity; 1094 attributes.bit_gravity = NorthWestGravity;
1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1094 1096
1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1096 1098
1097#ifdef POINTER_BLANK 1099 if (OPTION (Opt_pointerBlank))
1098 if (options & Opt_pointerBlank)
1099 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1100 else 1101 else
1101#endif
1102 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1103 1103
1104 XSelectInput (disp, TermWin.vt, vt_emask); 1104 vt_select_input ();
1105
1105 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1106 1107
1107#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108 if (menuBar_height ()) 1109 if (menuBar_height ())
1109 { 1110 {
1110 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
1111 window_vt_x, 0, 1112 window_vt_x, 0,
1112 TermWin_TotalWidth (), 1113 width,
1113 menuBar_TotalHeight (), 1114 menuBar_TotalHeight (),
1114 0, 1115 0,
1115 pix_colors_focused[Color_fg], 1116 pix_colors_focused[Color_fg],
1116 pix_colors_focused[Color_scroll]); 1117 pix_colors_focused[Color_scroll]);
1117 1118
… …
1130 } 1131 }
1131#endif 1132#endif
1132 1133
1133#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1134 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1135 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1136 { 1137 {
1137 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1138 1139
1139 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1140 { 1141 {
… …
1149 1150
1150 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1151 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1152 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1153 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1154 TermWin.gc = XCreateGC (disp, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1155 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1156 &gcvalue); 1157 &gcvalue);
1157 1158
1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1159 1160
1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1161 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1163 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167#endif 1168#endif
1168 1169
1169#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1170 // initially we are in unfocused state 1171 // initially we are in unfocused state
1171 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
… …
1196 /* 1197 /*
1197 * standard System V termios interface 1198 * standard System V termios interface
1198 */ 1199 */
1199 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1200 { 1201 {
1201 /* 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
1202 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1203 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1204 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1205 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1206 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1207 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1208 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1209# ifdef VDSUSP 1216# ifdef VDSUSP
1210
1211 tio->c_cc[VDSUSP] = CDSUSP; 1217 tio->c_cc[VDSUSP] = CDSUSP;
1212# endif 1218# endif
1213# ifdef VREPRINT 1219# ifdef VREPRINT
1214
1215 tio->c_cc[VREPRINT] = CRPRNT; 1220 tio->c_cc[VREPRINT] = CRPRNT;
1216# endif 1221# endif
1217# ifdef VDISCRD 1222# ifdef VDISCRD
1218
1219 tio->c_cc[VDISCRD] = CFLUSH; 1223 tio->c_cc[VDISCRD] = CFLUSH;
1220# endif 1224# endif
1221# ifdef VWERSE 1225# ifdef VWERSE
1222
1223 tio->c_cc[VWERSE] = CWERASE; 1226 tio->c_cc[VWERSE] = CWERASE;
1224# endif 1227# endif
1225# ifdef VLNEXT 1228# ifdef VLNEXT
1226
1227 tio->c_cc[VLNEXT] = CLNEXT; 1229 tio->c_cc[VLNEXT] = CLNEXT;
1228# endif 1230# endif
1229
1230 } 1231 }
1232
1231 tio->c_cc[VEOF] = CEOF; 1233 tio->c_cc[VEOF] = CEOF;
1232 tio->c_cc[VEOL] = VDISABLE; 1234 tio->c_cc[VEOL] = VDISABLE;
1233# ifdef VEOL2 1235# ifdef VEOL2
1234
1235 tio->c_cc[VEOL2] = VDISABLE; 1236 tio->c_cc[VEOL2] = VDISABLE;
1236# endif 1237# endif
1237# ifdef VSWTC 1238# ifdef VSWTC
1238
1239 tio->c_cc[VSWTC] = VDISABLE; 1239 tio->c_cc[VSWTC] = VDISABLE;
1240# endif 1240# endif
1241# ifdef VSWTCH 1241# ifdef VSWTCH
1242
1243 tio->c_cc[VSWTCH] = VDISABLE; 1242 tio->c_cc[VSWTCH] = VDISABLE;
1244# endif 1243# endif
1245# if VMIN != VEOF 1244# if VMIN != VEOF
1246
1247 tio->c_cc[VMIN] = 1; 1245 tio->c_cc[VMIN] = 1;
1248# endif 1246# endif
1249# if VTIME != VEOL 1247# if VTIME != VEOL
1250
1251 tio->c_cc[VTIME] = 0; 1248 tio->c_cc[VTIME] = 0;
1252# endif 1249# endif
1253 1250
1254 if (erase != -1) 1251 if (erase != -1)
1255 tio->c_cc[VERASE] = (char)erase; 1252 tio->c_cc[VERASE] = (char)erase;
… …
1283 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1284 { 1281 {
1285 tio->sg.sg_erase = CERASE; /* ^H */ 1282 tio->sg.sg_erase = CERASE; /* ^H */
1286 tio->sg.sg_kill = CKILL; /* ^U */ 1283 tio->sg.sg_kill = CKILL; /* ^U */
1287 } 1284 }
1285
1288 if (erase != -1) 1286 if (erase != -1)
1289 tio->sg.sg_erase = (char)erase; 1287 tio->sg.sg_erase = (char)erase;
1290 1288
1291 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1292 1290
… …
1298 tio->tc.t_startc = CSTART; /* ^Q */ 1296 tio->tc.t_startc = CSTART; /* ^Q */
1299 tio->tc.t_stopc = CSTOP; /* ^S */ 1297 tio->tc.t_stopc = CSTOP; /* ^S */
1300 tio->tc.t_eofc = CEOF; /* ^D */ 1298 tio->tc.t_eofc = CEOF; /* ^D */
1301 tio->tc.t_brkc = -1; 1299 tio->tc.t_brkc = -1;
1302 } 1300 }
1301
1303 /* get local special chars */ 1302 /* get local special chars */
1304 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1305 { 1304 {
1306 tio->lc.t_suspc = CSUSP; /* ^Z */ 1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1307 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1311 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1312 } 1311 }
1313 /* get line discipline */ 1312 /* get line discipline */
1314 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1315# ifdef NTTYDISC 1314# ifdef NTTYDISC
1316
1317 tio->line = NTTYDISC; 1315 tio->line = NTTYDISC;
1318# endif /* NTTYDISC */ 1316# endif /* NTTYDISC */
1319 1317
1320 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1321#endif /* HAVE_TERMIOS_H */ 1319#endif /* HAVE_TERMIOS_H */
… …
1344 FOO (IGNCR, "IGNCR"); 1342 FOO (IGNCR, "IGNCR");
1345 FOO (ICRNL, "ICRNL"); 1343 FOO (ICRNL, "ICRNL");
1346 FOO (IXON, "IXON"); 1344 FOO (IXON, "IXON");
1347 FOO (IXOFF, "IXOFF"); 1345 FOO (IXOFF, "IXOFF");
1348# ifdef IUCLC 1346# ifdef IUCLC
1349
1350 FOO (IUCLC, "IUCLC"); 1347 FOO (IUCLC, "IUCLC");
1351# endif 1348# endif
1352# ifdef IXANY 1349# ifdef IXANY
1353
1354 FOO (IXANY, "IXANY"); 1350 FOO (IXANY, "IXANY");
1355# endif 1351# endif
1356# ifdef IMAXBEL 1352# ifdef IMAXBEL
1357
1358 FOO (IMAXBEL, "IMAXBEL"); 1353 FOO (IMAXBEL, "IMAXBEL");
1359# endif 1354# endif
1360 1355
1361 fprintf (stderr, "\n"); 1356 fprintf (stderr, "\n");
1362 1357
… …
1369 FOO (VERASE, "VERASE"); 1364 FOO (VERASE, "VERASE");
1370 FOO (VKILL, "VKILL"); 1365 FOO (VKILL, "VKILL");
1371 FOO (VEOF, "VEOF"); 1366 FOO (VEOF, "VEOF");
1372 FOO (VEOL, "VEOL"); 1367 FOO (VEOL, "VEOL");
1373# ifdef VEOL2 1368# ifdef VEOL2
1374
1375 FOO (VEOL2, "VEOL2"); 1369 FOO (VEOL2, "VEOL2");
1376# endif 1370# endif
1377# ifdef VSWTC 1371# ifdef VSWTC
1378
1379 FOO (VSWTC, "VSWTC"); 1372 FOO (VSWTC, "VSWTC");
1380# endif 1373# endif
1381# ifdef VSWTCH 1374# ifdef VSWTCH
1382
1383 FOO (VSWTCH, "VSWTCH"); 1375 FOO (VSWTCH, "VSWTCH");
1384# endif 1376# endif
1385
1386 FOO (VSTART, "VSTART"); 1377 FOO (VSTART, "VSTART");
1387 FOO (VSTOP, "VSTOP"); 1378 FOO (VSTOP, "VSTOP");
1388 FOO (VSUSP, "VSUSP"); 1379 FOO (VSUSP, "VSUSP");
1389# ifdef VDSUSP 1380# ifdef VDSUSP
1390
1391 FOO (VDSUSP, "VDSUSP"); 1381 FOO (VDSUSP, "VDSUSP");
1392# endif 1382# endif
1393# ifdef VREPRINT 1383# ifdef VREPRINT
1394
1395 FOO (VREPRINT, "VREPRINT"); 1384 FOO (VREPRINT, "VREPRINT");
1396# endif 1385# endif
1397# ifdef VDISCRD 1386# ifdef VDISCRD
1398
1399 FOO (VDISCRD, "VDISCRD"); 1387 FOO (VDISCRD, "VDISCRD");
1400# endif 1388# endif
1401# ifdef VWERSE 1389# ifdef VWERSE
1402
1403 FOO (VWERSE, "VWERSE"); 1390 FOO (VWERSE, "VWERSE");
1404# endif 1391# endif
1405# ifdef VLNEXT 1392# ifdef VLNEXT
1406
1407 FOO (VLNEXT, "VLNEXT"); 1393 FOO (VLNEXT, "VLNEXT");
1408# endif 1394# endif
1409 1395
1410 fprintf (stderr, "\n"); 1396 fprintf (stderr, "\n");
1411# undef FOO 1397# undef FOO
… …
1424{ 1410{
1425#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1426 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1427 { 1413 {
1428 pty.pty = atoi (rs[Rs_pty_fd]); 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
1429 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1421 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1422 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1423 }
1430 } 1424 }
1431 else 1425 else
1432#endif 1426#endif
1433 if (!pty.get ()) 1427 if (!pty.get ())
1434 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1453 1447
1454#if ENABLE_FRILLS 1448#if ENABLE_FRILLS
1455 if (rs[Rs_pty_fd]) 1449 if (rs[Rs_pty_fd])
1456 return; 1450 return;
1457#endif 1451#endif
1458
1459 sw_chld.start (SIGCHLD);
1460 1452
1461#ifndef __QNX__ 1453#ifndef __QNX__
1462 /* spin off the command interpreter */ 1454 /* spin off the command interpreter */
1463 switch (cmd_pid = fork ()) 1455 switch (cmd_pid = fork ())
1464 { 1456 {
… …
1537{ 1529{
1538 char *login; 1530 char *login;
1539 1531
1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1532 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541 1533
1542 if (options & Opt_console) 1534 if (OPTION (Opt_console))
1543 { /* be virtual console, fail silently */ 1535 { /* be virtual console, fail silently */
1544#ifdef TIOCCONS 1536#ifdef TIOCCONS
1545 unsigned int on = 1; 1537 unsigned int on = 1;
1546 1538
1547 ioctl (STDIN_FILENO, TIOCCONS, &on); 1539 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1590 execvp (argv[0], (char *const *)argv); 1582 execvp (argv[0], (char *const *)argv);
1591 /* no error message: STDERR is closed! */ 1583 /* no error message: STDERR is closed! */
1592 } 1584 }
1593 else 1585 else
1594 { 1586 {
1595 const char *argv0, *shell; 1587 const char *argv0, *shell;
1596 1588
1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1589 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1598 shell = "/bin/sh"; 1590 shell = "/bin/sh";
1599 1591
1600 argv0 = (const char *)rxvt_r_basename (shell); 1592 argv0 = (const char *)rxvt_r_basename (shell);
1601 1593
1602 if (options & Opt_loginShell) 1594 if (OPTION (Opt_loginShell))
1603 { 1595 {
1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1596 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1605 1597
1606 login[0] = '-'; 1598 login[0] = '-';
1607 strcpy (&login[1], argv0); 1599 strcpy (&login[1], argv0);
1608 argv0 = login; 1600 argv0 = login;
1609 } 1601 }
1602
1610 execlp (shell, argv0, NULL); 1603 execlp (shell, argv0, NULL);
1611 /* no error message: STDERR is closed! */ 1604 /* no error message: STDERR is closed! */
1612 } 1605 }
1613 1606
1614#else /* __QNX__ uses qnxspawn () */ 1607#else /* __QNX__ uses qnxspawn () */
… …
1642 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1635 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1643 command = "/bin/sh"; 1636 command = "/bin/sh";
1644 1637
1645 arg_a[0] = my_basename (command); 1638 arg_a[0] = my_basename (command);
1646 1639
1647 if (options & Opt_loginShell) 1640 if (OPTION (Opt_loginShell))
1648 { 1641 {
1649 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1642 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1650 1643
1651 login[0] = '-'; 1644 login[0] = '-';
1652 strcpy (&login[1], arg_a[0]); 1645 strcpy (&login[1], arg_a[0]);

Diff Legend

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