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.190 by sasha, Thu Jul 12 22:33:16 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",
… …
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 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) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
189 pixmap = None; 189 pixmap = None;
190#endif 190#endif
191 191
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 194 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 196 ncol = 80;
198 nrow = 24; 197 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 201 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
204 203
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
207 205
208 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
213#endif 211#endif
214 212
215 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
216 224
217 return true; 225 return true;
218} 226}
219 227
220void 228void
… …
258 int i, r_argc; 266 int i, r_argc;
259 char *val; 267 char *val;
260 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
261 269
262 /* 270 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 271 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 272 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
267 break; 275 break;
268 276
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 278
271 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
298 306
299 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 309
310 // using a local pointer decreases code size a lot
302 xa = display->xa; 311 xa = display->xa;
303 312
304#if ENABLE_FRILLS 313 set (display);
314 extract_resources ();
315
316#if XFT
305 if (rs[Rs_depth]) 317 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 318 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 319#endif
309 set (display);
310 320
311 extract_resources (); 321#ifdef HAVE_AFTERIMAGE
312 322 ::dpy = NULL ; /* init global var from libAfter... */
323 asv = AFTERIMAGE_DPY_OP(create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
324#endif
313 free (r_argv); 325 free (r_argv);
326
327 for (int i = NUM_RESOURCES; i--; )
328 if (rs [i] == resval_undef)
329 rs [i] = 0;
314 330
315#if ENABLE_PERL 331#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 332 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 333 rs[Rs_perl_ext_1] = "default";
318 334
… …
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 433 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 434#endif
419 435
420#ifdef XTERM_REVERSE_VIDEO 436#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 437 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 438 if (option (Opt_reverseVideo))
423 { 439 {
424 if (!rs[Rs_color + Color_fg]) 440 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 441 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
442
426 if (!rs[Rs_color + Color_bg]) 443 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 444 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 445 }
429#endif 446#endif
430 447
… …
432 if (!rs[Rs_color + i]) 449 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 450 rs[Rs_color + i] = def_colorName[i];
434 451
435#ifndef XTERM_REVERSE_VIDEO 452#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 453 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 454 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 455 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 456#endif
440 457
441 /* convenient aliases for setting fg/bg to colors */ 458 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 459 color_aliases (Color_fg);
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 499 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 500 rs[Rs_display_name] = (const char *)val;
484 501
485 if (val == NULL) 502 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 503#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 504 val = XDisplayString (dpy);
488 505
489 if (rs[Rs_display_name] == NULL) 506 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 507 rs[Rs_display_name] = val; /* use broken `:0' value */
491 508
492 i = strlen (val); 509 i = strlen (val);
… …
616 * Initialize the command connection. 633 * Initialize the command connection.
617 * This should be called after the X server connection is established. 634 * This should be called after the X server connection is established.
618 */ 635 */
619 636
620#ifdef META8_OPTION 637#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 638 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 639#endif
623 640
624 get_ourmods (); 641 get_ourmods ();
625 642
626 if (!OPTION (Opt_scrollTtyOutput)) 643 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 644 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 645 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 646 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 647 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 648 priv_modes |= PrivMode_smoothScroll;
632 649
633#ifndef NO_BACKSPACE_KEY 650#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 651 if (strcmp (key_backspace, "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 652 priv_modes |= PrivMode_HaveBackSpace;
… …
655 pix_colors = pix_colors_focused; 672 pix_colors = pix_colors_focused;
656#endif 673#endif
657 674
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 675 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 676 {
677 const char *name = rs[Rs_color + i];
678
679 if (!name)
680 continue;
681
660 rxvt_color xcol; 682 rxvt_color xcol;
661 683
662 if (!rs[Rs_color + i]) 684 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 685 {
667#ifndef XTERM_REVERSE_VIDEO 686#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 687 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 688 name = def_colorName [1 - i];
670 else 689 else
671#endif 690#endif
672 rs[Rs_color + i] = def_colorName[i]; 691 name = def_colorName [i];
673 692
674 if (!rs[Rs_color + i]) 693 if (!name)
675 continue; 694 continue;
676 695
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 696 if (!set_color (xcol, name))
678 { 697 {
679 switch (i) 698 switch (i)
680 { 699 {
681 case Color_fg: 700 case Color_fg:
682 case Color_bg: 701 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 702 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 703 name = "";
686 break; 704 break;
687#ifndef NO_CURSORCOLOR 705#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 706 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 707#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 708 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 709 name = rs[Rs_color + Color_fg];
710 xcol.set (this, name);
694 break; 711 break;
695 default: 712 default:
696 xcol = pix_colors[Color_bg]; /* None */ 713 name = rs[Rs_color + Color_bg];
714 xcol.set (this, name);
697 break; 715 break;
698 } 716 }
699 } 717 }
700 } 718 }
701 719
702 pix_colors[i] = xcol; 720 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 721 rs[Rs_color + i] = name;
704 } 722 }
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 723
712 if (depth <= 2) 724 if (depth <= 2)
713 { 725 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 726 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]; 727 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]; 728 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 729 }
718 730
719 /* 731 /*
720 * get scrollBar shadow colors 732 * get scrollBar shadow colors
721 * 733 *
722 * The calculations of topShadow/bottomShadow values are adapted 734 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 735 * from the fvwm window manager.
724 */ 736 */
725#ifdef KEEP_SCROLLCOLOR 737#ifdef KEEP_SCROLLCOLOR
726
727 if (depth <= 2) 738 if (depth <= 2)
728 { 739 {
729 /* Monochrome */ 740 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 alias_color (Color_bottomShadow, Color_bg);
733 } 744 }
734 else 745 else
735 { 746 {
736 rxvt_color xcol[2]; 747 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 748
741 xcol[1] = pix_colors[Color_scroll]; 749 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 750 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 751
751 /* topShadowColor */ 752 /* topShadowColor */
752 if (!xcol[1].set (this, 753 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 754 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 755 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), 756 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), 757 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 758 cscroll.a)
758 )); 759 ))
759 xcol[1] = pix_colors[Color_White]; 760 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 761 }
763#endif /* KEEP_SCROLLCOLOR */ 762#endif /* KEEP_SCROLLCOLOR */
763
764#ifdef OFF_FOCUS_FADING
765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
766 update_fade_color (i);
767#endif
764} 768}
765 769
766/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 771/* color aliases, fg/bg bright-bold */
768void 772void
… …
807 811
808 if (rsmod 812 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 813 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 814 requestedmeta = rsmod[3] - '0';
811 815
812 map = XGetModifierMapping (xdisp); 816 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 817 kc = map->modifiermap;
814 818
815 for (i = 1; i < 6; i++) 819 for (i = 1; i < 6; i++)
816 { 820 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 821 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 823 for (j = map->max_keypermod; j--; k++)
820 { 824 {
821 if (kc[k] == 0) 825 if (kc[k] == 0)
822 break; 826 break;
823 827
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 828 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 829 {
826 case XK_Num_Lock: 830 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 831 ModNumLockMask = modmasks[i - 1];
828 continue; 832 continue;
829 833
… …
885#endif 889#endif
886 XGCValues gcvalue; 890 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 891 XSetWindowAttributes attributes;
888 Window top, parent; 892 Window top, parent;
889 893
890 dLocal (Display *, xdisp); 894 dLocal (Display *, dpy);
891 895
892 /* grab colors before netscape does */ 896 /* grab colors before netscape does */
893 Get_Colours (); 897 Get_Colours ();
894 898
895 if (!set_fonts ()) 899 if (!set_fonts ())
896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 900 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897 901
898 parent = display->root; 902 parent = display->root;
899 903
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 904 attributes.override_redirect = !!option (Opt_override_redirect);
901 905
902#if ENABLE_FRILLS 906#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 907 if (option (Opt_borderLess))
904 { 908 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 910 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 911 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
908 attributes.override_redirect = true; 912 attributes.override_redirect = true;
909 mwmhints.flags = 0; 913 mwmhints.flags = 0;
910 } 914 }
… …
923 { 927 {
924 XWindowAttributes wattr; 928 XWindowAttributes wattr;
925 929
926 parent = strtol (rs[Rs_embed], 0, 0); 930 parent = strtol (rs[Rs_embed], 0, 0);
927 931
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 932 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 933 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 934
931 window_calc (wattr.width, wattr.height); 935 window_calc (wattr.width, wattr.height);
932 } 936 }
933#endif 937#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 941 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 942 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 943 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 944 attributes.colormap = cmap;
941 945
942 top = XCreateWindow (xdisp, parent, 946 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 947 szHint.x, szHint.y,
944 szHint.width, szHint.height, 948 szHint.width, szHint.height,
945 ext_bwidth, 949 ext_bwidth,
946 depth, InputOutput, visual, 950 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 951 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
958 classHint.res_name = (char *)rs[Rs_name]; 962 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 963 classHint.res_class = (char *)RESCLASS;
960 964
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 965 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 966 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 967 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 968 wmHint.window_group = top;
965 969
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 970 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 971 &szHint, &wmHint, &classHint);
968 972
969#if ENABLE_FRILLS 973#if ENABLE_FRILLS
970 if (mwmhints.flags) 974 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 975 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 976 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 977#endif
974 978
975 Atom protocols[] = { 979 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 980 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 981#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 982 xa[XA_NET_WM_PING],
979#endif 983#endif
980 }; 984 };
981 985
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 986 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 987
984#if ENABLE_FRILLS 988#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 989 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 990 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 991#endif
988 992
989#if ENABLE_EWMH 993#if ENABLE_EWMH
990 long pid = getpid (); 994 long pid = getpid ();
991 995
992 XChangeProperty (xdisp, top, 996 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 997 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 998 PropModeReplace, (unsigned char *)&pid, 1);
995 999
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1000 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 1001#endif
998 1002
999 XSelectInput (xdisp, top, 1003 XSelectInput (dpy, top,
1000 KeyPressMask 1004 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1006 | KeyReleaseMask
1003#endif 1007#endif
1004 | FocusChangeMask | VisibilityChangeMask 1008 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1009 | ExposureMask | StructureNotifyMask);
1006 1010
1007 termwin_ev.start (display, top); 1011 termwin_ev.start (display, top);
1008 1012
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1013 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1014 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011 1015
1012#ifdef HAVE_SCROLLBARS 1016#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */ 1017 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1018 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1015#endif 1019#endif
1016 1020
1017 /* the vt window */ 1021 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1022 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1023 window_vt_x, window_vt_y,
1020 width, height, 1024 width, height,
1021 0, 1025 0,
1022 pix_colors_focused[Color_fg], 1026 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1027 pix_colors_focused[Color_bg]);
1024 1028
1025 attributes.bit_gravity = NorthWestGravity; 1029 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1030 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1031
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1032 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1033
1030 if (OPTION (Opt_pointerBlank)) 1034 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1035 vt_emask |= PointerMotionMask;
1032 else 1036 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1037 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1038
1035 vt_select_input (); 1039 vt_select_input ();
1036 1040
1037 vt_ev.start (display, vt); 1041 vt_ev.start (display, vt);
1038 1042
1039#ifdef XPM_BACKGROUND 1043#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL 1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1041 && !OPTION (Opt_transparent)) 1046 && !option (Opt_transparent)
1047#endif
1048 )
1042 { 1049 {
1043 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1044 1051
1045 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1046 { 1053 {
… …
1054#endif 1061#endif
1055 1062
1056 /* graphics context for the vt window */ 1063 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1064 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1065 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1066 gcvalue.graphics_exposures = 0;
1060 1067
1061 gc = XCreateGC (xdisp, vt, 1068 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1069 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1070 &gcvalue);
1064 1071
1065 drawable = new rxvt_drawable (this, vt); 1072 drawable = new rxvt_drawable (this, vt);
1066 1073
1067#ifdef RXVT_SCROLLBAR 1074#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow]; 1075 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1076 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1077 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1078 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1079 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1080 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074#endif 1081#endif
1075 1082
1076#ifdef OFF_FOCUS_FADING 1083#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1084 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1085 if (rs[Rs_fade])
… …
1087 * GET TTY CURRENT STATE * 1094 * GET TTY CURRENT STATE *
1088 * ------------------------------------------------------------------------- */ 1095 * ------------------------------------------------------------------------- */
1089void 1096void
1090rxvt_get_ttymode (ttymode_t *tio, int erase) 1097rxvt_get_ttymode (ttymode_t *tio, int erase)
1091{ 1098{
1092#ifdef HAVE_TERMIOS_H
1093 /* 1099 /*
1094 * standard System V termios interface 1100 * standard System V termios interface
1095 */ 1101 */
1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1097 { 1103 {
… …
1164 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1170 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1165# if defined (ECHOCTL) && defined (ECHOKE) 1171# if defined (ECHOCTL) && defined (ECHOKE)
1166 | ECHOCTL | ECHOKE 1172 | ECHOCTL | ECHOKE
1167# endif 1173# endif
1168 | ECHOE | ECHOK); 1174 | 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 1175
1217 /* 1176 /*
1218 * Debugging 1177 * Debugging
1219 */ 1178 */
1220#ifdef DEBUG_TTYMODE 1179#ifdef DEBUG_TTYMODE
… …
1321 else 1280 else
1322#endif 1281#endif
1323 if (!pty->get ()) 1282 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 1284
1326 pty->set_utf8_mode (enc_utf8);
1327
1328 /* set initial window size */
1329 tt_winch ();
1330
1331 int er; 1285 int er;
1332 1286
1333#ifndef NO_BACKSPACE_KEY 1287#ifndef NO_BACKSPACE_KEY
1334 if (key_backspace[0] && !key_backspace[1]) 1288 if (key_backspace[0] && !key_backspace[1])
1335 er = key_backspace[0]; 1289 er = key_backspace[0];
… …
1338 else 1292 else
1339#endif 1293#endif
1340 er = -1; 1294 er = -1;
1341 1295
1342 rxvt_get_ttymode (&tio, er); 1296 rxvt_get_ttymode (&tio, er);
1297 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1298 pty->set_utf8_mode (enc_utf8);
1299
1300 /* set initial window size */
1301 tt_winch ();
1343 1302
1344#if ENABLE_FRILLS 1303#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1304 if (rs[Rs_pty_fd])
1346 return; 1305 return;
1347#endif 1306#endif
… …
1378 } 1337 }
1379 1338
1380 _exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1381 1340
1382 default: 1341 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1342 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1343 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1344
1386 pty->close_tty (); 1345 pty->close_tty ();
1387 1346
1388 child_ev.start (cmd_pid); 1347 child_ev.start (cmd_pid);
1389 1348
… …
1402int 1361int
1403rxvt_term::run_child (const char *const *argv) 1362rxvt_term::run_child (const char *const *argv)
1404{ 1363{
1405 char *login; 1364 char *login;
1406 1365
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1366 if (option (Opt_console))
1410 { /* be virtual console, fail silently */ 1367 { /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1368#ifdef TIOCCONS
1412 unsigned int on = 1; 1369 unsigned int on = 1;
1413 1370
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1371 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1421 shell = "/bin/sh";
1465 1422
1466 argv0 = (const char *)rxvt_r_basename (shell); 1423 argv0 = (const char *)rxvt_r_basename (shell);
1467 1424
1468 if (OPTION (Opt_loginShell)) 1425 if (option (Opt_loginShell))
1469 { 1426 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1471 1428
1472 login[0] = '-'; 1429 login[0] = '-';
1473 strcpy (&login[1], argv0); 1430 strcpy (&login[1], argv0);

Diff Legend

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