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.168 by root, Wed Feb 1 21:15:33 2006 UTC vs.
Revision 1.206 by ayin, Mon Aug 13 07:17:48 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)
… …
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 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
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++)
… …
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
302 // using a local pointer decreases code size a lot 313 // using a local pointer decreases code size a lot
303 xa = display->xa; 314 xa = display->xa;
304 315
316 set (display);
317 extract_resources ();
318
305#if XFT 319#if XFT
306 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 322#endif
310 set (display);
311 323
312 extract_resources (); 324#ifdef HAVE_AFTERIMAGE
313 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
314 free (r_argv); 327 free (r_argv);
315 328
316 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
318 rs [i] = 0; 331 rs [i] = 0;
… …
422 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]);
423#endif 436#endif
424 437
425#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 440 if (option (Opt_reverseVideo))
428 { 441 {
429 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 444
432 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
440 453
441#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 456 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 458#endif
446 459
447 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
488 val = rxvt_network_display (rs[Rs_display_name]); 501 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 502 rs[Rs_display_name] = (const char *)val;
490 503
491 if (val == NULL) 504 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 505#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 506 val = XDisplayString (dpy);
494 507
495 if (rs[Rs_display_name] == NULL) 508 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 509 rs[Rs_display_name] = val; /* use broken `:0' value */
497 510
498 i = strlen (val); 511 i = strlen (val);
… …
622 * Initialize the command connection. 635 * Initialize the command connection.
623 * This should be called after the X server connection is established. 636 * This should be called after the X server connection is established.
624 */ 637 */
625 638
626#ifdef META8_OPTION 639#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 640 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 641#endif
629 642
630 get_ourmods (); 643 get_ourmods ();
631 644
632 if (!OPTION (Opt_scrollTtyOutput)) 645 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 646 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 647 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 648 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 649 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 650 priv_modes |= PrivMode_smoothScroll;
638 651
639#ifndef NO_BACKSPACE_KEY 652#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 653 if (strcmp (key_backspace, "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 654 priv_modes |= PrivMode_HaveBackSpace;
… …
671 rxvt_color xcol; 684 rxvt_color xcol;
672 685
673 if (!set_color (xcol, name)) 686 if (!set_color (xcol, name))
674 { 687 {
675#ifndef XTERM_REVERSE_VIDEO 688#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 689 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 690 name = def_colorName [1 - i];
678 else 691 else
679#endif 692#endif
680 name = def_colorName [i]; 693 name = def_colorName [i];
681 694
… …
749 alias_color (Color_topShadow, Color_White); 762 alias_color (Color_topShadow, Color_White);
750 } 763 }
751#endif /* KEEP_SCROLLCOLOR */ 764#endif /* KEEP_SCROLLCOLOR */
752 765
753#ifdef OFF_FOCUS_FADING 766#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 767 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 768 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 769#endif
762} 770}
763 771
764/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 773/* color aliases, fg/bg bright-bold */
… …
805 813
806 if (rsmod 814 if (rsmod
807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
808 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
809 817
810 map = XGetModifierMapping (xdisp); 818 map = XGetModifierMapping (dpy);
811 kc = map->modifiermap; 819 kc = map->modifiermap;
812 820
813 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
814 { 822 {
815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
817 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
818 { 826 {
819 if (kc[k] == 0) 827 if (kc[k] == 0)
820 break; 828 break;
821 829
822 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 830 switch (XKeycodeToKeysym (dpy, kc[k], 0))
823 { 831 {
824 case XK_Num_Lock: 832 case XK_Num_Lock:
825 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
826 continue; 834 continue;
827 835
… …
877rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
878{ 886{
879 XClassHint classHint; 887 XClassHint classHint;
880 XWMHints wmHint; 888 XWMHints wmHint;
881#if ENABLE_FRILLS 889#if ENABLE_FRILLS
882 MWMHints mwmhints; 890 MWMHints mwmhints = { };
883#endif 891#endif
884 XGCValues gcvalue; 892 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
886 Window top, parent; 894 Window top, parent;
887 895
888 dLocal (Display *, xdisp); 896 dLocal (Display *, dpy);
889 897
890 /* grab colors before netscape does */ 898 /* grab colors before netscape does */
891 Get_Colours (); 899 Get_Colours ();
892 900
893 if (!set_fonts ()) 901 if (!set_fonts ())
894 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");
895 903
896 parent = display->root; 904 parent = display->root;
897 905
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 906 attributes.override_redirect = !!option (Opt_override_redirect);
899 907
900#if ENABLE_FRILLS 908#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 909 if (option (Opt_borderLess))
902 { 910 {
903 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 911 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 912 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 913 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 914 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 915 }
909 else 916 else
910 { 917 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 918 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 919 }
914 } 920 }
915 else
916 mwmhints.flags = 0;
917#endif 921#endif
918 922
919#if ENABLE_XEMBED 923#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 924 if (rs[Rs_embed])
921 { 925 {
922 XWindowAttributes wattr; 926 XWindowAttributes wattr;
923 927
924 parent = strtol (rs[Rs_embed], 0, 0); 928 parent = strtol (rs[Rs_embed], 0, 0);
925 929
926 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 930 if (!XGetWindowAttributes (dpy, parent, &wattr))
927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 931 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
928 932
929 window_calc (wattr.width, wattr.height); 933 window_calc (wattr.width, wattr.height);
930 } 934 }
931#endif 935#endif
… …
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 939 /* sub-window placement & size in rxvt_resize_subwindows () */
936 attributes.background_pixel = pix_colors_focused [Color_border]; 940 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused [Color_border]; 941 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = cmap; 942 attributes.colormap = cmap;
939 943
940 top = XCreateWindow (xdisp, parent, 944 top = XCreateWindow (dpy, parent,
941 szHint.x, szHint.y, 945 szHint.x, szHint.y,
942 szHint.width, szHint.height, 946 szHint.width, szHint.height,
943 ext_bwidth, 947 ext_bwidth,
944 depth, InputOutput, visual, 948 depth, InputOutput, visual,
945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
956 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
958 962
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 964 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 965 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 966 wmHint.window_group = top;
963 967
964 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
966 970
967#if ENABLE_FRILLS 971#if ENABLE_FRILLS
968 if (mwmhints.flags) 972 if (mwmhints.flags)
969 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 973 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
971#endif 975#endif
972 976
973 Atom protocols[] = { 977 Atom protocols[] = {
974 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
975#if ENABLE_EWMH 979#if ENABLE_EWMH
976 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
977#endif 981#endif
978 }; 982 };
979 983
980 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 984 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
981 985
982#if ENABLE_FRILLS 986#if ENABLE_FRILLS
983 if (rs[Rs_transient_for]) 987 if (rs[Rs_transient_for])
984 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 988 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
985#endif 989#endif
986 990
987#if ENABLE_EWMH 991#if ENABLE_EWMH
988 long pid = getpid (); 992 long pid = getpid ();
989 993
990 XChangeProperty (xdisp, top, 994 XChangeProperty (dpy, top,
991 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 995 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
992 PropModeReplace, (unsigned char *)&pid, 1); 996 PropModeReplace, (unsigned char *)&pid, 1);
993 997
994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
995#endif 999#endif
996 1000
997 XSelectInput (xdisp, top, 1001 XSelectInput (dpy, top,
998 KeyPressMask 1002 KeyPressMask
999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1000 | KeyReleaseMask 1004 | KeyReleaseMask
1001#endif 1005#endif
1002 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1003 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1004 1008
1005 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1006 1010
1007 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1008 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1009 1013
1010#ifdef HAVE_SCROLLBARS 1014#ifdef HAVE_SCROLLBARS
1011 /* cursor scrollBar: Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1012 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1013#endif 1017#endif
1014 1018
1015 /* the vt window */ 1019 /* the vt window */
1016 vt = XCreateSimpleWindow (xdisp, top, 1020 vt = XCreateSimpleWindow (dpy, top,
1017 window_vt_x, window_vt_y, 1021 window_vt_x, window_vt_y,
1018 width, height, 1022 width, height,
1019 0, 1023 0,
1020 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1021 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1022 1026
1023 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1029
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1031
1028 if (OPTION (Opt_pointerBlank)) 1032 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1033 vt_emask |= PointerMotionMask;
1030 else 1034 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1035 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1036
1033 vt_select_input (); 1037 vt_select_input ();
1034 1038
1035 vt_ev.start (display, vt); 1039 vt_ev.start (display, vt);
1036 1040
1037#ifdef XPM_BACKGROUND
1038 if (rs[Rs_backgroundPixmap] != NULL
1039 && !OPTION (Opt_transparent))
1040 {
1041 const char *p = rs[Rs_backgroundPixmap];
1042
1043 if ((p = strchr (p, ';')) != NULL)
1044 {
1045 p++;
1046 scale_pixmap (p);
1047 }
1048
1049 set_bgPixmap (rs[Rs_backgroundPixmap]);
1050 scr_touch (true);
1051 }
1052#endif
1053
1054 /* graphics context for the vt window */ 1041 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1042 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1043 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 1; 1044 gcvalue.graphics_exposures = 0;
1058 1045
1059 gc = XCreateGC (xdisp, vt, 1046 gc = XCreateGC (dpy, vt,
1060 GCForeground | GCBackground | GCGraphicsExposures, 1047 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1048 &gcvalue);
1062 1049
1063 drawable = new rxvt_drawable (this, vt); 1050 drawable = new rxvt_drawable (this, vt);
1064 1051
1065#ifdef RXVT_SCROLLBAR 1052#ifdef RXVT_SCROLLBAR
1066 gcvalue.foreground = pix_colors[Color_topShadow]; 1053 gcvalue.foreground = pix_colors[Color_topShadow];
1067 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1054 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1068 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1055 gcvalue.foreground = pix_colors[Color_bottomShadow];
1069 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1056 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1057 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1071 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1058 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072#endif 1059#endif
1073 1060
1074#ifdef OFF_FOCUS_FADING 1061#ifdef OFF_FOCUS_FADING
1075 // initially we are in unfocused state 1062 // initially we are in unfocused state
1076 if (rs[Rs_fade]) 1063 if (rs[Rs_fade])
… …
1085 * GET TTY CURRENT STATE * 1072 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1073 * ------------------------------------------------------------------------- */
1087void 1074void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1075rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{ 1076{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1077 /*
1092 * standard System V termios interface 1078 * standard System V termios interface
1093 */ 1079 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1080 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 { 1081 {
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1148 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1149# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1150 | ECHOCTL | ECHOKE
1165# endif 1151# endif
1166 | ECHOE | ECHOK); 1152 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214 1153
1215 /* 1154 /*
1216 * Debugging 1155 * Debugging
1217 */ 1156 */
1218#ifdef DEBUG_TTYMODE 1157#ifdef DEBUG_TTYMODE
… …
1319 else 1258 else
1320#endif 1259#endif
1321 if (!pty->get ()) 1260 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1261 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1262
1324 pty->set_utf8_mode (enc_utf8);
1325
1326 /* set initial window size */
1327 tt_winch ();
1328
1329 int er; 1263 int er;
1330 1264
1331#ifndef NO_BACKSPACE_KEY 1265#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1]) 1266 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0]; 1267 er = key_backspace[0];
… …
1336 else 1270 else
1337#endif 1271#endif
1338 er = -1; 1272 er = -1;
1339 1273
1340 rxvt_get_ttymode (&tio, er); 1274 rxvt_get_ttymode (&tio, er);
1275 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1276 pty->set_utf8_mode (enc_utf8);
1277
1278 /* set initial window size */
1279 tt_winch ();
1341 1280
1342#if ENABLE_FRILLS 1281#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1282 if (rs[Rs_pty_fd])
1344 return; 1283 return;
1345#endif 1284#endif
… …
1376 } 1315 }
1377 1316
1378 _exit (EXIT_FAILURE); 1317 _exit (EXIT_FAILURE);
1379 1318
1380 default: 1319 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1320 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1321 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1322
1384 pty->close_tty (); 1323 pty->close_tty ();
1385 1324
1386 child_ev.start (cmd_pid); 1325 child_ev.start (cmd_pid);
1387 1326
… …
1400int 1339int
1401rxvt_term::run_child (const char *const *argv) 1340rxvt_term::run_child (const char *const *argv)
1402{ 1341{
1403 char *login; 1342 char *login;
1404 1343
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1344 if (option (Opt_console))
1408 { /* be virtual console, fail silently */ 1345 { /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1346#ifdef TIOCCONS
1410 unsigned int on = 1; 1347 unsigned int on = 1;
1411 1348
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1349 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1398 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1399 shell = "/bin/sh";
1463 1400
1464 argv0 = (const char *)rxvt_r_basename (shell); 1401 argv0 = (const char *)rxvt_r_basename (shell);
1465 1402
1466 if (OPTION (Opt_loginShell)) 1403 if (option (Opt_loginShell))
1467 { 1404 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1405 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1469 1406
1470 login[0] = '-'; 1407 login[0] = '-';
1471 strcpy (&login[1], argv0); 1408 strcpy (&login[1], argv0);

Diff Legend

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