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.167 by root, Tue Jan 31 19:54:39 2006 UTC vs.
Revision 1.199 by sasha, Fri Aug 3 22:40:10 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>
… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
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;
209#ifdef XPM_BACKGROUND 204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
210 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0;
211 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
213#endif 213#endif
214 214
215 last_bot = last_state = -1; 215 last_bot = last_state = -1;
216
217 set_option (Opt_scrollBar);
218 set_option (Opt_scrollTtyOutput);
219 set_option (Opt_jumpScroll);
220 set_option (Opt_skipScroll);
221 set_option (Opt_secondaryScreen);
222 set_option (Opt_secondaryScroll);
223 set_option (Opt_pastableTabs);
224 set_option (Opt_intensityStyles);
225 set_option (Opt_iso14755_52);
216 226
217 return true; 227 return true;
218} 228}
219 229
220void 230void
… …
258 int i, r_argc; 268 int i, r_argc;
259 char *val; 269 char *val;
260 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
261 271
262 /* 272 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 274 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 275 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 276 if (!strcmp (argv[r_argc], "-e"))
267 break; 277 break;
268 278
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 280
271 for (i = 0; i < r_argc; i++) 281 for (i = 0; i < r_argc; i++)
… …
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 311
302 // using a local pointer decreases code size a lot 312 // using a local pointer decreases code size a lot
303 xa = display->xa; 313 xa = display->xa;
304 314
315 set (display);
316 extract_resources ();
317
305#if XFT 318#if XFT
306 if (rs[Rs_depth]) 319 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 320 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 321#endif
310 set (display);
311 322
312 extract_resources (); 323#ifdef HAVE_AFTERIMAGE
313 324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
314 free (r_argv); 326 free (r_argv);
315 327
316 for (int i = NUM_RESOURCES; i--; ) 328 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 329 if (rs [i] == resval_undef)
318 rs [i] = 0; 330 rs [i] = 0;
… …
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 435#endif
424 436
425#ifdef XTERM_REVERSE_VIDEO 437#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 438 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 439 if (option (Opt_reverseVideo))
428 { 440 {
429 if (!rs[Rs_color + Color_fg]) 441 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 442 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 443
432 if (!rs[Rs_color + Color_bg]) 444 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 450 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 451 rs[Rs_color + i] = def_colorName[i];
440 452
441#ifndef XTERM_REVERSE_VIDEO 453#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 454 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 455 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 456 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 457#endif
446 458
447 /* convenient aliases for setting fg/bg to colors */ 459 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 460 color_aliases (Color_fg);
… …
488 val = rxvt_network_display (rs[Rs_display_name]); 500 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 501 rs[Rs_display_name] = (const char *)val;
490 502
491 if (val == NULL) 503 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 504#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 505 val = XDisplayString (dpy);
494 506
495 if (rs[Rs_display_name] == NULL) 507 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 508 rs[Rs_display_name] = val; /* use broken `:0' value */
497 509
498 i = strlen (val); 510 i = strlen (val);
… …
622 * Initialize the command connection. 634 * Initialize the command connection.
623 * This should be called after the X server connection is established. 635 * This should be called after the X server connection is established.
624 */ 636 */
625 637
626#ifdef META8_OPTION 638#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 639 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 640#endif
629 641
630 get_ourmods (); 642 get_ourmods ();
631 643
632 if (!OPTION (Opt_scrollTtyOutput)) 644 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 645 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 646 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 647 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 648 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 649 priv_modes |= PrivMode_smoothScroll;
638 650
639#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 652 if (strcmp (key_backspace, "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 653 priv_modes |= PrivMode_HaveBackSpace;
… …
671 rxvt_color xcol; 683 rxvt_color xcol;
672 684
673 if (!set_color (xcol, name)) 685 if (!set_color (xcol, name))
674 { 686 {
675#ifndef XTERM_REVERSE_VIDEO 687#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 688 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 689 name = def_colorName [1 - i];
678 else 690 else
679#endif 691#endif
680 name = def_colorName [i]; 692 name = def_colorName [i];
681 693
… …
694#ifndef NO_CURSORCOLOR 706#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 707 case Color_cursor2:
696#endif 708#endif
697 case Color_pointer_fg: 709 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 710 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 711 xcol.set (this, name);
700 break; 712 break;
701 default: 713 default:
702 name = rs[Rs_color + Color_bg]; 714 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 715 xcol.set (this, name);
704 break; 716 break;
705 } 717 }
706 } 718 }
707 } 719 }
708 720
709 pix_colors[i] = xcol; 721 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 722 rs[Rs_color + i] = name;
711 } 723 }
712 724
713#ifdef OFF_FOCUS_FADING
714 if (rs[Rs_fade])
715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
721#endif
722
723 if (depth <= 2) 725 if (depth <= 2)
724 { 726 {
725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 727 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
726 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 728 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 729 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
728 } 730 }
729 731
730 /* 732 /*
731 * get scrollBar shadow colors 733 * get scrollBar shadow colors
732 * 734 *
733 * The calculations of topShadow/bottomShadow values are adapted 735 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 736 * from the fvwm window manager.
735 */ 737 */
736#ifdef KEEP_SCROLLCOLOR 738#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 739 if (depth <= 2)
739 { 740 {
740 /* Monochrome */ 741 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 742 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 743 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 744 alias_color (Color_bottomShadow, Color_bg);
744 } 745 }
745 else 746 else
746 { 747 {
747 rxvt_color xcol[2]; 748 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
748 /* xcol[0] == white
749 * xcol[1] == top shadow
750 * xcol[2] == bot shadow */
751 749
752 xcol[1] = pix_colors[Color_scroll];
753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
754
755 rgba c0, c1; 750 rgba cscroll;
756 751 pix_colors [Color_scroll].get (cscroll);
757 xcol[0].get (c0);
758 xcol[1].get (c1);
759
760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
761 752
762 /* topShadowColor */ 753 /* topShadowColor */
763 if (!xcol[1].set (this, 754 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 755 rgba (
765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 756 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 757 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary 759 cscroll.a)
769 )); 760 ))
770 xcol[1] = pix_colors[Color_White]; 761 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 762 }
774#endif /* KEEP_SCROLLCOLOR */ 763#endif /* KEEP_SCROLLCOLOR */
764
765#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i);
768#endif
775} 769}
776 770
777/*----------------------------------------------------------------------*/ 771/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 772/* color aliases, fg/bg bright-bold */
779void 773void
… …
818 812
819 if (rsmod 813 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 814 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 815 requestedmeta = rsmod[3] - '0';
822 816
823 map = XGetModifierMapping (xdisp); 817 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 818 kc = map->modifiermap;
825 819
826 for (i = 1; i < 6; i++) 820 for (i = 1; i < 6; i++)
827 { 821 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 822 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
830 for (j = map->max_keypermod; j--; k++) 824 for (j = map->max_keypermod; j--; k++)
831 { 825 {
832 if (kc[k] == 0) 826 if (kc[k] == 0)
833 break; 827 break;
834 828
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 829 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 830 {
837 case XK_Num_Lock: 831 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 832 ModNumLockMask = modmasks[i - 1];
839 continue; 833 continue;
840 834
… …
890rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
891{ 885{
892 XClassHint classHint; 886 XClassHint classHint;
893 XWMHints wmHint; 887 XWMHints wmHint;
894#if ENABLE_FRILLS 888#if ENABLE_FRILLS
895 MWMHints mwmhints; 889 MWMHints mwmhints = { };
896#endif 890#endif
897 XGCValues gcvalue; 891 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
899 Window top, parent; 893 Window top, parent;
900 894
901 dLocal (Display *, xdisp); 895 dLocal (Display *, dpy);
902 896
903 /* grab colors before netscape does */ 897 /* grab colors before netscape does */
904 Get_Colours (); 898 Get_Colours ();
905 899
906 if (!set_fonts ()) 900 if (!set_fonts ())
907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
908 902
909 parent = display->root; 903 parent = display->root;
910 904
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 905 attributes.override_redirect = !!option (Opt_override_redirect);
912 906
913#if ENABLE_FRILLS 907#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 908 if (option (Opt_borderLess))
915 { 909 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 911 {
918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
919 attributes.override_redirect = true; 913 attributes.override_redirect = true;
920 mwmhints.flags = 0; 914 mwmhints.flags = 0;
921 } 915 }
… …
934 { 928 {
935 XWindowAttributes wattr; 929 XWindowAttributes wattr;
936 930
937 parent = strtol (rs[Rs_embed], 0, 0); 931 parent = strtol (rs[Rs_embed], 0, 0);
938 932
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 933 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 934 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 935
942 window_calc (wattr.width, wattr.height); 936 window_calc (wattr.width, wattr.height);
943 } 937 }
944#endif 938#endif
… …
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 942 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 943 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 944 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 945 attributes.colormap = cmap;
952 946
953 top = XCreateWindow (xdisp, parent, 947 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 948 szHint.x, szHint.y,
955 szHint.width, szHint.height, 949 szHint.width, szHint.height,
956 ext_bwidth, 950 ext_bwidth,
957 depth, InputOutput, visual, 951 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 952 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
969 classHint.res_name = (char *)rs[Rs_name]; 963 classHint.res_name = (char *)rs[Rs_name];
970 classHint.res_class = (char *)RESCLASS; 964 classHint.res_class = (char *)RESCLASS;
971 965
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 966 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 967 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 968 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 969 wmHint.window_group = top;
976 970
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 971 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 972 &szHint, &wmHint, &classHint);
979 973
980#if ENABLE_FRILLS 974#if ENABLE_FRILLS
981 if (mwmhints.flags) 975 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 976 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 977 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 978#endif
985 979
986 Atom protocols[] = { 980 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 981 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 982#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 983 xa[XA_NET_WM_PING],
990#endif 984#endif
991 }; 985 };
992 986
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 987 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 988
995#if ENABLE_FRILLS 989#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 990 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 991 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 992#endif
999 993
1000#if ENABLE_EWMH 994#if ENABLE_EWMH
1001 long pid = getpid (); 995 long pid = getpid ();
1002 996
1003 XChangeProperty (xdisp, top, 997 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 998 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 999 PropModeReplace, (unsigned char *)&pid, 1);
1006 1000
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1001 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 1002#endif
1009 1003
1010 XSelectInput (xdisp, top, 1004 XSelectInput (dpy, top,
1011 KeyPressMask 1005 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1006#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 1007 | KeyReleaseMask
1014#endif 1008#endif
1015 | FocusChangeMask | VisibilityChangeMask 1009 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 1010 | ExposureMask | StructureNotifyMask);
1017 1011
1018 termwin_ev.start (display, top); 1012 termwin_ev.start (display, top);
1019 1013
1020 /* vt cursor: Black-on-White is standard, but this is more popular */ 1014 /* vt cursor: Black-on-White is standard, but this is more popular */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1015 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 1016
1023#ifdef HAVE_SCROLLBARS 1017#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 1018 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1019 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 1020#endif
1027 1021
1028 /* the vt window */ 1022 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 1023 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 1024 window_vt_x, window_vt_y,
1031 width, height, 1025 width, height,
1032 0, 1026 0,
1033 pix_colors_focused[Color_fg], 1027 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 1028 pix_colors_focused[Color_bg]);
1035 1029
1036 attributes.bit_gravity = NorthWestGravity; 1030 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1031 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 1032
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1033 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 1034
1041 if (OPTION (Opt_pointerBlank)) 1035 if (option (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1036 vt_emask |= PointerMotionMask;
1043 else 1037 else
1044 vt_emask |= Button1MotionMask | Button3MotionMask; 1038 vt_emask |= Button1MotionMask | Button3MotionMask;
1045 1039
1046 vt_select_input (); 1040 vt_select_input ();
1047 1041
1048 vt_ev.start (display, vt); 1042 vt_ev.start (display, vt);
1049 1043
1050#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
1051 if (rs[Rs_backgroundPixmap] != NULL 1045 if (rs[Rs_backgroundPixmap] != NULL)
1052 && !OPTION (Opt_transparent))
1053 { 1046 {
1054 const char *p = rs[Rs_backgroundPixmap]; 1047 const char *p = rs[Rs_backgroundPixmap];
1055 1048
1056 if ((p = strchr (p, ';')) != NULL) 1049 if ((p = strchr (p, ';')) != NULL)
1057 { 1050 {
1058 p++; 1051 p++;
1059 scale_pixmap (p); 1052 bgPixmap.handle_geometry (p);
1060 } 1053 }
1061 1054
1062 set_bgPixmap (rs[Rs_backgroundPixmap]); 1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1063 scr_touch (true); 1056 scr_touch (true);
1064 } 1057 }
1065#endif 1058#endif
1066 1059
1067 /* graphics context for the vt window */ 1060 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1061 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1062 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1063 gcvalue.graphics_exposures = 0;
1071 1064
1072 gc = XCreateGC (xdisp, vt, 1065 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1066 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1067 &gcvalue);
1075 1068
1076 drawable = new rxvt_drawable (this, vt); 1069 drawable = new rxvt_drawable (this, vt);
1077 1070
1078#ifdef RXVT_SCROLLBAR 1071#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1072 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1073 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1074 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1075 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1076 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1077 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1078#endif
1086 1079
1087#ifdef OFF_FOCUS_FADING 1080#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1081 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1082 if (rs[Rs_fade])
… …
1098 * GET TTY CURRENT STATE * 1091 * GET TTY CURRENT STATE *
1099 * ------------------------------------------------------------------------- */ 1092 * ------------------------------------------------------------------------- */
1100void 1093void
1101rxvt_get_ttymode (ttymode_t *tio, int erase) 1094rxvt_get_ttymode (ttymode_t *tio, int erase)
1102{ 1095{
1103#ifdef HAVE_TERMIOS_H
1104 /* 1096 /*
1105 * standard System V termios interface 1097 * standard System V termios interface
1106 */ 1098 */
1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1108 { 1100 {
… …
1175 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1176# if defined (ECHOCTL) && defined (ECHOKE) 1168# if defined (ECHOCTL) && defined (ECHOKE)
1177 | ECHOCTL | ECHOKE 1169 | ECHOCTL | ECHOKE
1178# endif 1170# endif
1179 | ECHOE | ECHOK); 1171 | ECHOE | ECHOK);
1180# else /* HAVE_TERMIOS_H */
1181
1182 /*
1183 * sgtty interface
1184 */
1185
1186 /* get parameters -- gtty */
1187 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1188 {
1189 tio->sg.sg_erase = CERASE; /* ^H */
1190 tio->sg.sg_kill = CKILL; /* ^U */
1191 }
1192
1193 if (erase != -1)
1194 tio->sg.sg_erase = (char)erase;
1195
1196 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1197
1198 /* get special characters */
1199 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1200 {
1201 tio->tc.t_intrc = CINTR; /* ^C */
1202 tio->tc.t_quitc = CQUIT; /* ^\ */
1203 tio->tc.t_startc = CSTART; /* ^Q */
1204 tio->tc.t_stopc = CSTOP; /* ^S */
1205 tio->tc.t_eofc = CEOF; /* ^D */
1206 tio->tc.t_brkc = -1;
1207 }
1208
1209 /* get local special chars */
1210 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1211 {
1212 tio->lc.t_suspc = CSUSP; /* ^Z */
1213 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1214 tio->lc.t_rprntc = CRPRNT; /* ^R */
1215 tio->lc.t_flushc = CFLUSH; /* ^O */
1216 tio->lc.t_werasc = CWERASE; /* ^W */
1217 tio->lc.t_lnextc = CLNEXT; /* ^V */
1218 }
1219 /* get line discipline */
1220 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1221# ifdef NTTYDISC
1222 tio->line = NTTYDISC;
1223# endif /* NTTYDISC */
1224
1225 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1226#endif /* HAVE_TERMIOS_H */
1227 1172
1228 /* 1173 /*
1229 * Debugging 1174 * Debugging
1230 */ 1175 */
1231#ifdef DEBUG_TTYMODE 1176#ifdef DEBUG_TTYMODE
… …
1332 else 1277 else
1333#endif 1278#endif
1334 if (!pty->get ()) 1279 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1280 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336 1281
1337 pty->set_utf8_mode (enc_utf8);
1338
1339 /* set initial window size */
1340 tt_winch ();
1341
1342 int er; 1282 int er;
1343 1283
1344#ifndef NO_BACKSPACE_KEY 1284#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1]) 1285 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0]; 1286 er = key_backspace[0];
… …
1349 else 1289 else
1350#endif 1290#endif
1351 er = -1; 1291 er = -1;
1352 1292
1353 rxvt_get_ttymode (&tio, er); 1293 rxvt_get_ttymode (&tio, er);
1294 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1295 pty->set_utf8_mode (enc_utf8);
1296
1297 /* set initial window size */
1298 tt_winch ();
1354 1299
1355#if ENABLE_FRILLS 1300#if ENABLE_FRILLS
1356 if (rs[Rs_pty_fd]) 1301 if (rs[Rs_pty_fd])
1357 return; 1302 return;
1358#endif 1303#endif
… …
1389 } 1334 }
1390 1335
1391 _exit (EXIT_FAILURE); 1336 _exit (EXIT_FAILURE);
1392 1337
1393 default: 1338 default:
1394 if (!OPTION (Opt_utmpInhibit)) 1339 if (!option (Opt_utmpInhibit))
1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1340 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1396 1341
1397 pty->close_tty (); 1342 pty->close_tty ();
1398 1343
1399 child_ev.start (cmd_pid); 1344 child_ev.start (cmd_pid);
1400 1345
… …
1413int 1358int
1414rxvt_term::run_child (const char *const *argv) 1359rxvt_term::run_child (const char *const *argv)
1415{ 1360{
1416 char *login; 1361 char *login;
1417 1362
1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1419
1420 if (OPTION (Opt_console)) 1363 if (option (Opt_console))
1421 { /* be virtual console, fail silently */ 1364 { /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1365#ifdef TIOCCONS
1423 unsigned int on = 1; 1366 unsigned int on = 1;
1424 1367
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1368 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1417 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1418 shell = "/bin/sh";
1476 1419
1477 argv0 = (const char *)rxvt_r_basename (shell); 1420 argv0 = (const char *)rxvt_r_basename (shell);
1478 1421
1479 if (OPTION (Opt_loginShell)) 1422 if (option (Opt_loginShell))
1480 { 1423 {
1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1424 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1482 1425
1483 login[0] = '-'; 1426 login[0] = '-';
1484 strcpy (&login[1], argv0); 1427 strcpy (&login[1], argv0);

Diff Legend

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