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.117 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.135 by root, Sat Jan 7 19:29:17 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
213 }; 216 };
214 217
215bool 218bool
216rxvt_term::init_vars () 219rxvt_term::init_vars ()
217{ 220{
218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
220
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 224#endif
225 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
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;
… …
369 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
371 } 371 }
372 372
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_SAVELINES);
375 375
376#if ENABLE_FRILLS 376#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 385#endif
384 386
385#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 389 pointerBlankDelay = i;
388 else 390 else
389 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
390#endif 392#endif
391 393
392 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 395 if (!saveLines)
394 options &= ~Opt_scrollBar; 396 CLR_OPTION (Opt_scrollBar);
395 397
396#ifdef PRINTPIPE 398#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 401#endif
… …
442 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443#endif 445#endif
444 446
445#ifdef XTERM_REVERSE_VIDEO 447#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 448 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 449 if (OPTION (Opt_reverseVideo))
448 { 450 {
449 if (!rs[Rs_color + Color_fg]) 451 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 452 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 453 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 454 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 459 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
459 461
460#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 464 if (OPTION (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 466#endif
465 467
466 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 469 color_aliases (Color_fg);
468 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 521
520 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
521 523
522 /* avoiding the math library: 524 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 527 ;
526 MAX_IT (i, 1); 528 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 530
529 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
531 533
532 /* add entries to the environment: 534 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
644 * Initialize the command connection. 646 * Initialize the command connection.
645 * This should be called after the X server connection is established. 647 * This should be called after the X server connection is established.
646 */ 648 */
647 649
648#ifdef META8_OPTION 650#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 651 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 652#endif
651 653
652 get_ourmods (); 654 get_ourmods ();
653 655
654 if (!(options & Opt_scrollTtyOutput)) 656 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 657 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 658 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 659 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 660 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 661 priv_modes |= PrivMode_smoothScroll;
660 662
661#ifndef NO_BACKSPACE_KEY 663#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 664 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 665 priv_modes |= PrivMode_HaveBackSpace;
… …
673 if (menubar_visible ()) 675 if (menubar_visible ())
674 { 676 {
675 priv_modes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
677 } 679 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 680
684 run_command (argv); 681 run_command (argv);
685} 682}
686 683
687/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
… …
702 continue; 699 continue;
703 700
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 701 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 702 {
706#ifndef XTERM_REVERSE_VIDEO 703#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 704 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 705 rs[Rs_color + i] = def_colorName[!i];
709 else 706 else
710#endif 707#endif
711 rs[Rs_color + i] = def_colorName[i]; 708 rs[Rs_color + i] = def_colorName[i];
712 709
… …
737 } 734 }
738 } 735 }
739 } 736 }
740 737
741 pix_colors[i] = xcol; 738 pix_colors[i] = xcol;
739 SET_PIXCOLOR (i);
740 }
741
742#ifdef OFF_FOCUS_FADING 742#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 743 if (rs[Rs_fade])
744 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 745 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 746#endif
746 SET_PIXCOLOR (i);
747 }
748 747
749 if (display->depth <= 2) 748 if (display->depth <= 2)
750 { 749 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 750 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
752 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 751 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
760 * from the fvwm window manager. 759 * from the fvwm window manager.
761 */ 760 */
762#ifdef KEEP_SCROLLCOLOR 761#ifdef KEEP_SCROLLCOLOR
763 762
764 if (display->depth <= 2) 763 if (display->depth <= 2)
764 {
765 { /* Monochrome */ 765 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 766 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 767 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 769 }
770 else 770 else
… …
806 int i = atoi (rs[Rs_color + idx]); 806 int i = atoi (rs[Rs_color + idx]);
807 807
808 if (i >= 8 && i <= 15) 808 if (i >= 8 && i <= 15)
809 { /* bright colors */ 809 { /* bright colors */
810 i -= 8; 810 i -= 8;
811#ifndef NO_BRIGHTCOLOR
812 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 811 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
813 return; 812 return;
814#endif
815 } 813 }
816 814
817 if (i >= 0 && i <= 7) /* normal colors */ 815 if (i >= 0 && i <= 7) /* normal colors */
818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
819 } 817 }
… …
932#endif 930#endif
933 931
934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
936 934
937 if (options & Opt_transparent) 935 if (OPTION (Opt_transparent))
938 { 936 {
939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
940 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 938 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
941 } 939 }
942 940
943#if ENABLE_FRILLS 941#if ENABLE_FRILLS
944 if (options & Opt_borderLess) 942 if (OPTION (Opt_borderLess))
945 { 943 {
946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
947 945
948 if (prop == None) 946 if (prop == None)
949 { 947 {
… …
981 if (!XGetWindowAttributes (disp, parent, &wattr)) 979 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 980 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983 981
984 window_calc (wattr.width, wattr.height); 982 window_calc (wattr.width, wattr.height);
985 } 983 }
986
987#endif 984#endif
985
988 window_calc (0, 0); 986 window_calc (0, 0);
989 987
990 /* sub-window placement & size in rxvt_resize_subwindows () */ 988 /* sub-window placement & size in rxvt_resize_subwindows () */
991#ifdef PREFER_24BIT 989#ifdef PREFER_24BIT
992 attributes.background_pixel = pix_colors_focused[Color_border]; 990 attributes.background_pixel = pix_colors_focused[Color_border];
993 attributes.border_pixel = pix_colors_focused[Color_border]; 991 attributes.border_pixel = pix_colors_focused[Color_border];
994 attributes.colormap = display->cmap; 992 attributes.colormap = display->cmap;
995 top = XCreateWindow (disp, parent, 993 top = XCreateWindow (disp, parent,
996 szHint.x, szHint.y, 994 szHint.x, szHint.y,
997 szHint.width, szHint.height, 995 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 996 ext_bwidth,
999 display->depth, InputOutput, 997 display->depth, InputOutput,
1000 display->visual, 998 display->visual,
1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 999 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1002#else 1000#else
1003 top = XCreateSimpleWindow (disp, parent, 1001 top = XCreateSimpleWindow (disp, parent,
1004 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
1005 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
1006 TermWin.ext_bwidth, 1004 ext_bwidth,
1007 pix_colors_focused[Color_border], 1005 pix_colors_focused[Color_border],
1008 pix_colors_focused[Color_border]); 1006 pix_colors_focused[Color_border]);
1009#endif 1007#endif
1010 1008
1011 TermWin.parent[0] = top; 1009 this->parent[0] = top;
1012 1010
1013 old_width = szHint.width; 1011 old_width = szHint.width;
1014 old_height = szHint.height; 1012 old_height = szHint.height;
1015 1013
1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1014 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1019 classHint.res_name = (char *)rs[Rs_name]; 1017 classHint.res_name = (char *)rs[Rs_name];
1020 classHint.res_class = (char *)RESCLASS; 1018 classHint.res_class = (char *)RESCLASS;
1021 1019
1022 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1020 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1023 wmHint.input = True; 1021 wmHint.input = True;
1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1025 wmHint.window_group = top; 1023 wmHint.window_group = top;
1026 1024
1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1028 &szHint, &wmHint, &classHint); 1026 &szHint, &wmHint, &classHint);
1029 1027
… …
1034#endif 1032#endif
1035 }; 1033 };
1036 1034
1037 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1035 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1038 1036
1037#if ENABLE_FRILLS
1038 if (rs[Rs_transient_for])
1039 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1040#endif
1041
1039#if ENABLE_EWMH 1042#if ENABLE_EWMH
1040 long pid = getpid (); 1043 long pid = getpid ();
1041 1044
1042 XChangeProperty (disp, top, 1045 XChangeProperty (disp, top,
1043 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1069 /* cursor (menuBar/scrollBar): Black-on-White */ 1072 /* cursor (menuBar/scrollBar): Black-on-White */
1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1071#endif 1074#endif
1072 1075
1073 /* the vt window */ 1076 /* the vt window */
1074 TermWin.vt = XCreateSimpleWindow (disp, top, 1077 vt = XCreateSimpleWindow (disp, top,
1075 window_vt_x, 1078 window_vt_x,
1076 window_vt_y, 1079 window_vt_y,
1077 TermWin_TotalWidth (), 1080 width,
1078 TermWin_TotalHeight (), 1081 height,
1079 0, 1082 0,
1080 pix_colors_focused[Color_fg], 1083 pix_colors_focused[Color_fg],
1081 pix_colors_focused[Color_bg]); 1084 pix_colors_focused[Color_bg]);
1082#ifdef DEBUG_X 1085#ifdef DEBUG_X
1083 XStoreName (disp, TermWin.vt, "vt window"); 1086 XStoreName (disp, vt, "vt window");
1084#endif 1087#endif
1085 1088
1086 attributes.bit_gravity = NorthWestGravity; 1089 attributes.bit_gravity = NorthWestGravity;
1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1088 1091
1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1090 1093
1091#ifdef POINTER_BLANK 1094 if (OPTION (Opt_pointerBlank)
1092 if (options & Opt_pointerBlank) 1095#ifdef ENABLE_PERL
1096 || perl.self
1097#endif
1098 )
1093 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1094 else 1100 else
1095#endif
1096 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1097 1102
1098 XSelectInput (disp, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1099 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1100 1105
1101#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1102 if (menuBar_height ()) 1107 if (menuBar_height ())
1103 { 1108 {
1104 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
1105 window_vt_x, 0, 1110 window_vt_x, 0,
1106 TermWin_TotalWidth (), 1111 width,
1107 menuBar_TotalHeight (), 1112 menuBar_TotalHeight (),
1108 0, 1113 0,
1109 pix_colors_focused[Color_fg], 1114 pix_colors_focused[Color_fg],
1110 pix_colors_focused[Color_scroll]); 1115 pix_colors_focused[Color_scroll]);
1111 1116
… …
1124 } 1129 }
1125#endif 1130#endif
1126 1131
1127#ifdef XPM_BACKGROUND 1132#ifdef XPM_BACKGROUND
1128 if (rs[Rs_backgroundPixmap] != NULL 1133 if (rs[Rs_backgroundPixmap] != NULL
1129 && ! (options & Opt_transparent)) 1134 && ! OPTION (Opt_transparent))
1130 { 1135 {
1131 const char *p = rs[Rs_backgroundPixmap]; 1136 const char *p = rs[Rs_backgroundPixmap];
1132 1137
1133 if ((p = strchr (p, ';')) != NULL) 1138 if ((p = strchr (p, ';')) != NULL)
1134 { 1139 {
… …
1143 1148
1144 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1145 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1146 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1147 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1148 TermWin.gc = XCreateGC (disp, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1149 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1150 &gcvalue); 1155 &gcvalue);
1151 1156
1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1153 1158
1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1155 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161#endif 1166#endif
1162 1167
1163#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1164 // initially we are in unfocused state 1169 // initially we are in unfocused state
1165 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
… …
1190 /* 1195 /*
1191 * standard System V termios interface 1196 * standard System V termios interface
1192 */ 1197 */
1193 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1194 { 1199 {
1195 /* return error - use system defaults */ 1200 // return error - use system defaults,
1201 // where possible, and zero elsewhere
1202 memset (tio, 0, sizeof (ttymode_t));
1203
1196 tio->c_cc[VINTR] = CINTR; 1204 tio->c_cc[VINTR] = CINTR;
1197 tio->c_cc[VQUIT] = CQUIT; 1205 tio->c_cc[VQUIT] = CQUIT;
1198 tio->c_cc[VERASE] = CERASE; 1206 tio->c_cc[VERASE] = CERASE;
1207#ifdef VERASE2
1208 tio->c_cc[VERASE2] = CERASE2;
1209#endif
1199 tio->c_cc[VKILL] = CKILL; 1210 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1211 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1212 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1213 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1214# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1215 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1216# endif
1207# ifdef VREPRINT 1217# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1218 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1219# endif
1211# ifdef VDISCRD 1220# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1221 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1222# endif
1215# ifdef VWERSE 1223# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1224 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1225# endif
1219# ifdef VLNEXT 1226# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1227 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1228# endif
1223
1224 } 1229 }
1230
1225 tio->c_cc[VEOF] = CEOF; 1231 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1232 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1233# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1234 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1235# endif
1231# ifdef VSWTC 1236# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1237 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1238# endif
1235# ifdef VSWTCH 1239# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1240 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1241# endif
1239# if VMIN != VEOF 1242# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1243 tio->c_cc[VMIN] = 1;
1242# endif 1244# endif
1243# if VTIME != VEOL 1245# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1246 tio->c_cc[VTIME] = 0;
1246# endif 1247# endif
1247 1248
1248 if (erase != -1) 1249 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1250 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1278 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1279 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1280 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1281 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1282 }
1283
1282 if (erase != -1) 1284 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1285 tio->sg.sg_erase = (char)erase;
1284 1286
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1287 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1288
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1294 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1295 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1296 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1297 tio->tc.t_brkc = -1;
1296 } 1298 }
1299
1297 /* get local special chars */ 1300 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1301 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1302 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1303 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1304 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1308 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1309 }
1307 /* get line discipline */ 1310 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1311 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1312# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1313 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1314# endif /* NTTYDISC */
1313 1315
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1316 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1317#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1340 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1341 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1342 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1343 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1344# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1345 FOO (IUCLC, "IUCLC");
1345# endif 1346# endif
1346# ifdef IXANY 1347# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1348 FOO (IXANY, "IXANY");
1349# endif 1349# endif
1350# ifdef IMAXBEL 1350# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1351 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1352# endif
1354 1353
1355 fprintf (stderr, "\n"); 1354 fprintf (stderr, "\n");
1356 1355
… …
1363 FOO (VERASE, "VERASE"); 1362 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1363 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1364 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1365 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1366# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1367 FOO (VEOL2, "VEOL2");
1370# endif 1368# endif
1371# ifdef VSWTC 1369# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1370 FOO (VSWTC, "VSWTC");
1374# endif 1371# endif
1375# ifdef VSWTCH 1372# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1373 FOO (VSWTCH, "VSWTCH");
1378# endif 1374# endif
1379
1380 FOO (VSTART, "VSTART"); 1375 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1376 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1377 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1378# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1379 FOO (VDSUSP, "VDSUSP");
1386# endif 1380# endif
1387# ifdef VREPRINT 1381# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1382 FOO (VREPRINT, "VREPRINT");
1390# endif 1383# endif
1391# ifdef VDISCRD 1384# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1385 FOO (VDISCRD, "VDISCRD");
1394# endif 1386# endif
1395# ifdef VWERSE 1387# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1388 FOO (VWERSE, "VWERSE");
1398# endif 1389# endif
1399# ifdef VLNEXT 1390# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1391 FOO (VLNEXT, "VLNEXT");
1402# endif 1392# endif
1403 1393
1404 fprintf (stderr, "\n"); 1394 fprintf (stderr, "\n");
1405# undef FOO 1395# undef FOO
… …
1418{ 1408{
1419#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1421 { 1411 {
1422 pty.pty = atoi (rs[Rs_pty_fd]); 1412 pty.pty = atoi (rs[Rs_pty_fd]);
1413
1414 if (pty.pty >= 0)
1415 {
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1423 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421 }
1424 } 1422 }
1425 else 1423 else
1426#endif 1424#endif
1427 if (!pty.get ()) 1425 if (!pty.get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1426 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1447 1445
1448#if ENABLE_FRILLS 1446#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1447 if (rs[Rs_pty_fd])
1450 return; 1448 return;
1451#endif 1449#endif
1452
1453 sw_chld.start (SIGCHLD);
1454 1450
1455#ifndef __QNX__ 1451#ifndef __QNX__
1456 /* spin off the command interpreter */ 1452 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1453 switch (cmd_pid = fork ())
1458 { 1454 {
… …
1531{ 1527{
1532 char *login; 1528 char *login;
1533 1529
1534 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1530 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1535 1531
1536 if (options & Opt_console) 1532 if (OPTION (Opt_console))
1537 { /* be virtual console, fail silently */ 1533 { /* be virtual console, fail silently */
1538#ifdef TIOCCONS 1534#ifdef TIOCCONS
1539 unsigned int on = 1; 1535 unsigned int on = 1;
1540 1536
1541 ioctl (STDIN_FILENO, TIOCCONS, &on); 1537 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1591 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1587 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1592 shell = "/bin/sh"; 1588 shell = "/bin/sh";
1593 1589
1594 argv0 = (const char *)rxvt_r_basename (shell); 1590 argv0 = (const char *)rxvt_r_basename (shell);
1595 1591
1596 if (options & Opt_loginShell) 1592 if (OPTION (Opt_loginShell))
1597 { 1593 {
1598 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1594 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1599 1595
1600 login[0] = '-'; 1596 login[0] = '-';
1601 strcpy (&login[1], argv0); 1597 strcpy (&login[1], argv0);
… …
1636 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1632 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1637 command = "/bin/sh"; 1633 command = "/bin/sh";
1638 1634
1639 arg_a[0] = my_basename (command); 1635 arg_a[0] = my_basename (command);
1640 1636
1641 if (options & Opt_loginShell) 1637 if (OPTION (Opt_loginShell))
1642 { 1638 {
1643 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1639 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1644 1640
1645 login[0] = '-'; 1641 login[0] = '-';
1646 strcpy (&login[1], arg_a[0]); 1642 strcpy (&login[1], arg_a[0]);

Diff Legend

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