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.158 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.205 by sasha, Fri Aug 10 22:10:36 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif 176#endif
177 }; 177 };
178 178
179bool 179bool
180rxvt_term::init_vars () 180rxvt_term::init_vars ()
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
216 227
217 return true; 228 return true;
218} 229}
219 230
220void 231void
… …
258 int i, r_argc; 269 int i, r_argc;
259 char *val; 270 char *val;
260 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
261 272
262 /* 273 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 275 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
267 break; 278 break;
268 279
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 281
271 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
298 309
299 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 312
313 // using a local pointer decreases code size a lot
302 xa = display->xa; 314 xa = display->xa;
303 315
304#if ENABLE_FRILLS 316 set (display);
317 extract_resources ();
318
319#if XFT
305 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 322#endif
309 set (display);
310 323
311 extract_resources (); 324#ifdef HAVE_AFTERIMAGE
312 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
313 free (r_argv); 327 free (r_argv);
328
329 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef)
331 rs [i] = 0;
314 332
315#if ENABLE_PERL 333#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 334 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 335 rs[Rs_perl_ext_1] = "default";
318 336
… …
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 436#endif
419 437
420#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 440 if (option (Opt_reverseVideo))
423 { 441 {
424 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
444
426 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 446 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 447 }
429#endif 448#endif
430 449
… …
432 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
434 453
435#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 456 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 458#endif
440 459
441 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 501 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 502 rs[Rs_display_name] = (const char *)val;
484 503
485 if (val == NULL) 504 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 505#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 506 val = XDisplayString (dpy);
488 507
489 if (rs[Rs_display_name] == NULL) 508 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 509 rs[Rs_display_name] = val; /* use broken `:0' value */
491 510
492 i = strlen (val); 511 i = strlen (val);
… …
616 * Initialize the command connection. 635 * Initialize the command connection.
617 * This should be called after the X server connection is established. 636 * This should be called after the X server connection is established.
618 */ 637 */
619 638
620#ifdef META8_OPTION 639#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 640 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 641#endif
623 642
624 get_ourmods (); 643 get_ourmods ();
625 644
626 if (!OPTION (Opt_scrollTtyOutput)) 645 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 646 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 647 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 648 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 649 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 650 priv_modes |= PrivMode_smoothScroll;
632 651
633#ifndef NO_BACKSPACE_KEY 652#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 653 if (strcmp (key_backspace, "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 654 priv_modes |= PrivMode_HaveBackSpace;
… …
655 pix_colors = pix_colors_focused; 674 pix_colors = pix_colors_focused;
656#endif 675#endif
657 676
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 677 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 678 {
679 const char *name = rs[Rs_color + i];
680
681 if (!name)
682 continue;
683
660 rxvt_color xcol; 684 rxvt_color xcol;
661 685
662 if (!rs[Rs_color + i]) 686 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 687 {
667#ifndef XTERM_REVERSE_VIDEO 688#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 689 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 690 name = def_colorName [1 - i];
670 else 691 else
671#endif 692#endif
672 rs[Rs_color + i] = def_colorName[i]; 693 name = def_colorName [i];
673 694
674 if (!rs[Rs_color + i]) 695 if (!name)
675 continue; 696 continue;
676 697
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 698 if (!set_color (xcol, name))
678 { 699 {
679 switch (i) 700 switch (i)
680 { 701 {
681 case Color_fg: 702 case Color_fg:
682 case Color_bg: 703 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 704 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 705 name = "";
686 break; 706 break;
687#ifndef NO_CURSORCOLOR 707#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 708 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 709#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 710 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 711 name = rs[Rs_color + Color_fg];
712 xcol.set (this, name);
694 break; 713 break;
695 default: 714 default:
696 xcol = pix_colors[Color_bg]; /* None */ 715 name = rs[Rs_color + Color_bg];
716 xcol.set (this, name);
697 break; 717 break;
698 } 718 }
699 } 719 }
700 } 720 }
701 721
702 pix_colors[i] = xcol; 722 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 723 rs[Rs_color + i] = name;
704 } 724 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 725
712 if (depth <= 2) 726 if (depth <= 2)
713 { 727 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 728 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 729 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 730 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 731 }
718 732
719 /* 733 /*
720 * get scrollBar shadow colors 734 * get scrollBar shadow colors
721 * 735 *
722 * The calculations of topShadow/bottomShadow values are adapted 736 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 737 * from the fvwm window manager.
724 */ 738 */
725#ifdef KEEP_SCROLLCOLOR 739#ifdef KEEP_SCROLLCOLOR
726
727 if (depth <= 2) 740 if (depth <= 2)
728 { 741 {
729 /* Monochrome */ 742 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 743 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 744 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 745 alias_color (Color_bottomShadow, Color_bg);
733 } 746 }
734 else 747 else
735 { 748 {
736 rxvt_color xcol[2]; 749 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737 /* xcol[0] == white
738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */
740 750
741 xcol[1] = pix_colors[Color_scroll]; 751 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 752 pix_colors [Color_scroll].get (cscroll);
743
744 rxvt_rgba c0, c1;
745
746 xcol[0].get (this, c0);
747 xcol[1].get (this, c1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 753
751 /* topShadowColor */ 754 /* topShadowColor */
752 if (!xcol[1].set (this, 755 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 756 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 757 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 758 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 759 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 760 cscroll.a)
758 )); 761 ))
759 xcol[1] = pix_colors[Color_White]; 762 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 763 }
763#endif /* KEEP_SCROLLCOLOR */ 764#endif /* KEEP_SCROLLCOLOR */
765
766#ifdef OFF_FOCUS_FADING
767 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
768 update_fade_color (i);
769#endif
764} 770}
765 771
766/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 773/* color aliases, fg/bg bright-bold */
768void 774void
… …
807 813
808 if (rsmod 814 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
811 817
812 map = XGetModifierMapping (xdisp); 818 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 819 kc = map->modifiermap;
814 820
815 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
816 { 822 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
820 { 826 {
821 if (kc[k] == 0) 827 if (kc[k] == 0)
822 break; 828 break;
823 829
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 830 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 831 {
826 case XK_Num_Lock: 832 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
828 continue; 834 continue;
829 835
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
880{ 886{
881 XClassHint classHint; 887 XClassHint classHint;
882 XWMHints wmHint; 888 XWMHints wmHint;
883#if ENABLE_FRILLS 889#if ENABLE_FRILLS
884 MWMHints mwmhints; 890 MWMHints mwmhints = { };
885#endif 891#endif
886 XGCValues gcvalue; 892 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
888 Window top, parent; 894 Window top, parent;
889 895
890 dLocal (Display *, xdisp); 896 dLocal (Display *, dpy);
891 897
892 /* grab colors before netscape does */ 898 /* grab colors before netscape does */
893 Get_Colours (); 899 Get_Colours ();
894 900
895 if (!set_fonts ()) 901 if (!set_fonts ())
896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897 903
898 parent = display->root; 904 parent = display->root;
899 905
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 906 attributes.override_redirect = !!option (Opt_override_redirect);
901 907
902#if ENABLE_FRILLS 908#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 909 if (option (Opt_borderLess))
904 { 910 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 911 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 912 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 913 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
908 attributes.override_redirect = true; 914 attributes.override_redirect = true;
909 mwmhints.flags = 0; 915 mwmhints.flags = 0;
910 } 916 }
… …
923 { 929 {
924 XWindowAttributes wattr; 930 XWindowAttributes wattr;
925 931
926 parent = strtol (rs[Rs_embed], 0, 0); 932 parent = strtol (rs[Rs_embed], 0, 0);
927 933
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 934 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 935 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 936
931 window_calc (wattr.width, wattr.height); 937 window_calc (wattr.width, wattr.height);
932 } 938 }
933#endif 939#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 943 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 944 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 945 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 946 attributes.colormap = cmap;
941 947
942 top = XCreateWindow (xdisp, parent, 948 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 949 szHint.x, szHint.y,
944 szHint.width, szHint.height, 950 szHint.width, szHint.height,
945 ext_bwidth, 951 ext_bwidth,
946 depth, InputOutput, visual, 952 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 953 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
958 classHint.res_name = (char *)rs[Rs_name]; 964 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 965 classHint.res_class = (char *)RESCLASS;
960 966
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 967 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 968 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 969 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 970 wmHint.window_group = top;
965 971
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 972 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 973 &szHint, &wmHint, &classHint);
968 974
969#if ENABLE_FRILLS 975#if ENABLE_FRILLS
970 if (mwmhints.flags) 976 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 977 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 978 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 979#endif
974 980
975 Atom protocols[] = { 981 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 982 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 983#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 984 xa[XA_NET_WM_PING],
979#endif 985#endif
980 }; 986 };
981 987
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 988 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 989
984#if ENABLE_FRILLS 990#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 991 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 992 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 993#endif
988 994
989#if ENABLE_EWMH 995#if ENABLE_EWMH
990 long pid = getpid (); 996 long pid = getpid ();
991 997
992 XChangeProperty (xdisp, top, 998 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 999 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 1000 PropModeReplace, (unsigned char *)&pid, 1);
995 1001
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1002 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 1003#endif
998 1004
999 XSelectInput (xdisp, top, 1005 XSelectInput (dpy, top,
1000 KeyPressMask 1006 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1007#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1008 | KeyReleaseMask
1003#endif 1009#endif
1004 | FocusChangeMask | VisibilityChangeMask 1010 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1011 | ExposureMask | StructureNotifyMask);
1006 1012
1007 termwin_ev.start (display, top); 1013 termwin_ev.start (display, top);
1008 1014
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1015 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1016 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011 1017
1012#ifdef HAVE_SCROLLBARS 1018#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */ 1019 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1020 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1015#endif 1021#endif
1016 1022
1017 /* the vt window */ 1023 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1024 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1025 window_vt_x, window_vt_y,
1020 width, height, 1026 width, height,
1021 0, 1027 0,
1022 pix_colors_focused[Color_fg], 1028 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1029 pix_colors_focused[Color_bg]);
1024 1030
1025 attributes.bit_gravity = NorthWestGravity; 1031 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1032 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1033
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1035
1030 if (OPTION (Opt_pointerBlank)) 1036 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1037 vt_emask |= PointerMotionMask;
1032 else 1038 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1039 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1040
1035 vt_select_input (); 1041 vt_select_input ();
1036 1042
1037 vt_ev.start (display, vt); 1043 vt_ev.start (display, vt);
1038 1044
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041 && !OPTION (Opt_transparent))
1042 {
1043 const char *p = rs[Rs_backgroundPixmap];
1044
1045 if ((p = strchr (p, ';')) != NULL)
1046 {
1047 p++;
1048 scale_pixmap (p);
1049 }
1050
1051 set_bgPixmap (rs[Rs_backgroundPixmap]);
1052 scr_touch (true);
1053 }
1054#endif
1055
1056 /* graphics context for the vt window */ 1045 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1046 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1047 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1048 gcvalue.graphics_exposures = 0;
1060 1049
1061 gc = XCreateGC (xdisp, vt, 1050 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1051 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1052 &gcvalue);
1064 1053
1065 drawable = new rxvt_drawable (this, vt); 1054 drawable = new rxvt_drawable (this, vt);
1066 1055
1067#ifdef RXVT_SCROLLBAR 1056#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow]; 1057 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1058 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1059 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1060 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1061 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1062 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074#endif 1063#endif
1075 1064
1076#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1066 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1067 if (rs[Rs_fade])
… …
1087 * GET TTY CURRENT STATE * 1076 * GET TTY CURRENT STATE *
1088 * ------------------------------------------------------------------------- */ 1077 * ------------------------------------------------------------------------- */
1089void 1078void
1090rxvt_get_ttymode (ttymode_t *tio, int erase) 1079rxvt_get_ttymode (ttymode_t *tio, int erase)
1091{ 1080{
1092#ifdef HAVE_TERMIOS_H
1093 /* 1081 /*
1094 * standard System V termios interface 1082 * standard System V termios interface
1095 */ 1083 */
1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1084 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1097 { 1085 {
… …
1164 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1152 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1165# if defined (ECHOCTL) && defined (ECHOKE) 1153# if defined (ECHOCTL) && defined (ECHOKE)
1166 | ECHOCTL | ECHOKE 1154 | ECHOCTL | ECHOKE
1167# endif 1155# endif
1168 | ECHOE | ECHOK); 1156 | ECHOE | ECHOK);
1169# else /* HAVE_TERMIOS_H */
1170
1171 /*
1172 * sgtty interface
1173 */
1174
1175 /* get parameters -- gtty */
1176 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1177 {
1178 tio->sg.sg_erase = CERASE; /* ^H */
1179 tio->sg.sg_kill = CKILL; /* ^U */
1180 }
1181
1182 if (erase != -1)
1183 tio->sg.sg_erase = (char)erase;
1184
1185 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1186
1187 /* get special characters */
1188 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1189 {
1190 tio->tc.t_intrc = CINTR; /* ^C */
1191 tio->tc.t_quitc = CQUIT; /* ^\ */
1192 tio->tc.t_startc = CSTART; /* ^Q */
1193 tio->tc.t_stopc = CSTOP; /* ^S */
1194 tio->tc.t_eofc = CEOF; /* ^D */
1195 tio->tc.t_brkc = -1;
1196 }
1197
1198 /* get local special chars */
1199 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1200 {
1201 tio->lc.t_suspc = CSUSP; /* ^Z */
1202 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1203 tio->lc.t_rprntc = CRPRNT; /* ^R */
1204 tio->lc.t_flushc = CFLUSH; /* ^O */
1205 tio->lc.t_werasc = CWERASE; /* ^W */
1206 tio->lc.t_lnextc = CLNEXT; /* ^V */
1207 }
1208 /* get line discipline */
1209 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1210# ifdef NTTYDISC
1211 tio->line = NTTYDISC;
1212# endif /* NTTYDISC */
1213
1214 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1215#endif /* HAVE_TERMIOS_H */
1216 1157
1217 /* 1158 /*
1218 * Debugging 1159 * Debugging
1219 */ 1160 */
1220#ifdef DEBUG_TTYMODE 1161#ifdef DEBUG_TTYMODE
… …
1321 else 1262 else
1322#endif 1263#endif
1323 if (!pty->get ()) 1264 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1265 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 1266
1326 pty->set_utf8_mode (enc_utf8);
1327
1328 /* set initial window size */
1329 tt_winch ();
1330
1331 int er; 1267 int er;
1332 1268
1333#ifndef NO_BACKSPACE_KEY 1269#ifndef NO_BACKSPACE_KEY
1334 if (key_backspace[0] && !key_backspace[1]) 1270 if (key_backspace[0] && !key_backspace[1])
1335 er = key_backspace[0]; 1271 er = key_backspace[0];
… …
1338 else 1274 else
1339#endif 1275#endif
1340 er = -1; 1276 er = -1;
1341 1277
1342 rxvt_get_ttymode (&tio, er); 1278 rxvt_get_ttymode (&tio, er);
1279 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1280 pty->set_utf8_mode (enc_utf8);
1281
1282 /* set initial window size */
1283 tt_winch ();
1343 1284
1344#if ENABLE_FRILLS 1285#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1286 if (rs[Rs_pty_fd])
1346 return; 1287 return;
1347#endif 1288#endif
… …
1378 } 1319 }
1379 1320
1380 _exit (EXIT_FAILURE); 1321 _exit (EXIT_FAILURE);
1381 1322
1382 default: 1323 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1324 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1325 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1326
1386 pty->close_tty (); 1327 pty->close_tty ();
1387 1328
1388 child_ev.start (cmd_pid); 1329 child_ev.start (cmd_pid);
1389 1330
… …
1402int 1343int
1403rxvt_term::run_child (const char *const *argv) 1344rxvt_term::run_child (const char *const *argv)
1404{ 1345{
1405 char *login; 1346 char *login;
1406 1347
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1348 if (option (Opt_console))
1410 { /* be virtual console, fail silently */ 1349 { /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1350#ifdef TIOCCONS
1412 unsigned int on = 1; 1351 unsigned int on = 1;
1413 1352
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1353 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1402 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1403 shell = "/bin/sh";
1465 1404
1466 argv0 = (const char *)rxvt_r_basename (shell); 1405 argv0 = (const char *)rxvt_r_basename (shell);
1467 1406
1468 if (OPTION (Opt_loginShell)) 1407 if (option (Opt_loginShell))
1469 { 1408 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1409 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1471 1410
1472 login[0] = '-'; 1411 login[0] = '-';
1473 strcpy (&login[1], argv0); 1412 strcpy (&login[1], argv0);

Diff Legend

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