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.182 by root, Tue May 1 21:30:01 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>
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;
206 refresh_type = SLOW_REFRESH; 205 refresh_type = SLOW_REFRESH;
207 206
208 oldcursor.row = oldcursor.col = -1; 207 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 208#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 209 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 211 bgPixmap.pixmap = None;
213#endif 212#endif
214 213
215 last_bot = last_state = -1; 214 last_bot = last_state = -1;
215
216 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
216 223
217 return true; 224 return true;
218} 225}
219 226
220void 227void
258 int i, r_argc; 265 int i, r_argc;
259 char *val; 266 char *val;
260 const char **cmd_argv, **r_argv; 267 const char **cmd_argv, **r_argv;
261 268
262 /* 269 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 270 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 271 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 272 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 273 if (!strcmp (argv[r_argc], "-e"))
267 break; 274 break;
268 275
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 277
271 for (i = 0; i < r_argc; i++) 278 for (i = 0; i < r_argc; i++)
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 308
302 // using a local pointer decreases code size a lot 309 // using a local pointer decreases code size a lot
303 xa = display->xa; 310 xa = display->xa;
304 311
312 set (display);
313 extract_resources ();
314
305#if XFT 315#if XFT
306 if (rs[Rs_depth]) 316 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 317 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 318#endif
310 set (display);
311
312 extract_resources ();
313 319
314 free (r_argv); 320 free (r_argv);
315 321
316 for (int i = NUM_RESOURCES; i--; ) 322 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 323 if (rs [i] == resval_undef)
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 429#endif
424 430
425#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 433 if (option (Opt_reverseVideo))
428 { 434 {
429 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 437
432 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
438 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
440 446
441#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 449 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 451#endif
446 452
447 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 454 color_aliases (Color_fg);
488 val = rxvt_network_display (rs[Rs_display_name]); 494 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 495 rs[Rs_display_name] = (const char *)val;
490 496
491 if (val == NULL) 497 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 498#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 499 val = XDisplayString (dpy);
494 500
495 if (rs[Rs_display_name] == NULL) 501 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 502 rs[Rs_display_name] = val; /* use broken `:0' value */
497 503
498 i = strlen (val); 504 i = strlen (val);
622 * Initialize the command connection. 628 * Initialize the command connection.
623 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
624 */ 630 */
625 631
626#ifdef META8_OPTION 632#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 634#endif
629 635
630 get_ourmods (); 636 get_ourmods ();
631 637
632 if (!OPTION (Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 640 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
638 644
639#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
671 rxvt_color xcol; 677 rxvt_color xcol;
672 678
673 if (!set_color (xcol, name)) 679 if (!set_color (xcol, name))
674 { 680 {
675#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 683 name = def_colorName [1 - i];
678 else 684 else
679#endif 685#endif
680 name = def_colorName [i]; 686 name = def_colorName [i];
681 687
694#ifndef NO_CURSORCOLOR 700#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 701 case Color_cursor2:
696#endif 702#endif
697 case Color_pointer_fg: 703 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 704 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 705 xcol.set (this, name);
700 break; 706 break;
701 default: 707 default:
702 name = rs[Rs_color + Color_bg]; 708 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 709 xcol.set (this, name);
704 break; 710 break;
705 } 711 }
706 } 712 }
707 } 713 }
708 714
709 pix_colors[i] = xcol; 715 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 716 rs[Rs_color + i] = name;
711 } 717 }
712 718
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) 719 if (depth <= 2)
724 { 720 {
725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 721 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]; 722 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]; 723 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
728 } 724 }
729 725
730 /* 726 /*
731 * get scrollBar shadow colors 727 * get scrollBar shadow colors
732 * 728 *
733 * The calculations of topShadow/bottomShadow values are adapted 729 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 730 * from the fvwm window manager.
735 */ 731 */
736#ifdef KEEP_SCROLLCOLOR 732#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 733 if (depth <= 2)
739 { 734 {
740 /* Monochrome */ 735 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 alias_color (Color_bottomShadow, Color_bg);
744 } 739 }
745 else 740 else
746 { 741 {
747 rxvt_color xcol[2]; 742 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 743
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; 744 rgba cscroll;
756 745 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 746
762 /* topShadowColor */ 747 /* topShadowColor */
763 if (!xcol[1].set (this, 748 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 749 rgba (
765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 750 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), 751 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), 752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary 753 cscroll.a)
769 )); 754 ))
770 xcol[1] = pix_colors[Color_White]; 755 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 756 }
774#endif /* KEEP_SCROLLCOLOR */ 757#endif /* KEEP_SCROLLCOLOR */
758
759#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i);
762#endif
775} 763}
776 764
777/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
779void 767void
818 806
819 if (rsmod 807 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 809 requestedmeta = rsmod[3] - '0';
822 810
823 map = XGetModifierMapping (xdisp); 811 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 812 kc = map->modifiermap;
825 813
826 for (i = 1; i < 6; i++) 814 for (i = 1; i < 6; i++)
827 { 815 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
830 for (j = map->max_keypermod; j--; k++) 818 for (j = map->max_keypermod; j--; k++)
831 { 819 {
832 if (kc[k] == 0) 820 if (kc[k] == 0)
833 break; 821 break;
834 822
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 823 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 824 {
837 case XK_Num_Lock: 825 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 826 ModNumLockMask = modmasks[i - 1];
839 continue; 827 continue;
840 828
896#endif 884#endif
897 XGCValues gcvalue; 885 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 886 XSetWindowAttributes attributes;
899 Window top, parent; 887 Window top, parent;
900 888
901 dLocal (Display *, xdisp); 889 dLocal (Display *, dpy);
902 890
903 /* grab colors before netscape does */ 891 /* grab colors before netscape does */
904 Get_Colours (); 892 Get_Colours ();
905 893
906 if (!set_fonts ()) 894 if (!set_fonts ())
907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
908 896
909 parent = display->root; 897 parent = display->root;
910 898
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!option (Opt_override_redirect);
912 900
913#if ENABLE_FRILLS 901#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
915 { 903 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 905 {
918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
919 attributes.override_redirect = true; 907 attributes.override_redirect = true;
920 mwmhints.flags = 0; 908 mwmhints.flags = 0;
921 } 909 }
934 { 922 {
935 XWindowAttributes wattr; 923 XWindowAttributes wattr;
936 924
937 parent = strtol (rs[Rs_embed], 0, 0); 925 parent = strtol (rs[Rs_embed], 0, 0);
938 926
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 927 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 929
942 window_calc (wattr.width, wattr.height); 930 window_calc (wattr.width, wattr.height);
943 } 931 }
944#endif 932#endif
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 936 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 937 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 938 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 939 attributes.colormap = cmap;
952 940
953 top = XCreateWindow (xdisp, parent, 941 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 942 szHint.x, szHint.y,
955 szHint.width, szHint.height, 943 szHint.width, szHint.height,
956 ext_bwidth, 944 ext_bwidth,
957 depth, InputOutput, visual, 945 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
969 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
970 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
971 959
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 961 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 963 wmHint.window_group = top;
976 964
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
979 967
980#if ENABLE_FRILLS 968#if ENABLE_FRILLS
981 if (mwmhints.flags) 969 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 972#endif
985 973
986 Atom protocols[] = { 974 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 975 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 976#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 977 xa[XA_NET_WM_PING],
990#endif 978#endif
991 }; 979 };
992 980
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 981 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 982
995#if ENABLE_FRILLS 983#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 984 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 985 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 986#endif
999 987
1000#if ENABLE_EWMH 988#if ENABLE_EWMH
1001 long pid = getpid (); 989 long pid = getpid ();
1002 990
1003 XChangeProperty (xdisp, top, 991 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 992 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 993 PropModeReplace, (unsigned char *)&pid, 1);
1006 994
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 996#endif
1009 997
1010 XSelectInput (xdisp, top, 998 XSelectInput (dpy, top,
1011 KeyPressMask 999 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 1001 | KeyReleaseMask
1014#endif 1002#endif
1015 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
1017 1005
1018 termwin_ev.start (display, top); 1006 termwin_ev.start (display, top);
1019 1007
1020 /* vt cursor: Black-on-White is standard, but this is more popular */ 1008 /* vt cursor: Black-on-White is standard, but this is more popular */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 1010
1023#ifdef HAVE_SCROLLBARS 1011#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 1014#endif
1027 1015
1028 /* the vt window */ 1016 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 1017 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 1018 window_vt_x, window_vt_y,
1031 width, height, 1019 width, height,
1032 0, 1020 0,
1033 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1035 1023
1036 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 1026
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 1028
1041 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1043 else 1031 else
1044 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1045 1033
1046 vt_select_input (); 1034 vt_select_input ();
1047 1035
1048 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1049 1037
1050#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1051 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1052 && !OPTION (Opt_transparent)) 1040 && !option (Opt_transparent))
1053 { 1041 {
1054 const char *p = rs[Rs_backgroundPixmap]; 1042 const char *p = rs[Rs_backgroundPixmap];
1055 1043
1056 if ((p = strchr (p, ';')) != NULL) 1044 if ((p = strchr (p, ';')) != NULL)
1057 { 1045 {
1065#endif 1053#endif
1066 1054
1067 /* graphics context for the vt window */ 1055 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1056 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1057 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1058 gcvalue.graphics_exposures = 0;
1071 1059
1072 gc = XCreateGC (xdisp, vt, 1060 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1061 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1062 &gcvalue);
1075 1063
1076 drawable = new rxvt_drawable (this, vt); 1064 drawable = new rxvt_drawable (this, vt);
1077 1065
1078#ifdef RXVT_SCROLLBAR 1066#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1067 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1068 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1069 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1070 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1072 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1073#endif
1086 1074
1087#ifdef OFF_FOCUS_FADING 1075#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1076 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1077 if (rs[Rs_fade])
1098 * GET TTY CURRENT STATE * 1086 * GET TTY CURRENT STATE *
1099 * ------------------------------------------------------------------------- */ 1087 * ------------------------------------------------------------------------- */
1100void 1088void
1101rxvt_get_ttymode (ttymode_t *tio, int erase) 1089rxvt_get_ttymode (ttymode_t *tio, int erase)
1102{ 1090{
1103#ifdef HAVE_TERMIOS_H
1104 /* 1091 /*
1105 * standard System V termios interface 1092 * standard System V termios interface
1106 */ 1093 */
1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1108 { 1095 {
1175 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1176# if defined (ECHOCTL) && defined (ECHOKE) 1163# if defined (ECHOCTL) && defined (ECHOKE)
1177 | ECHOCTL | ECHOKE 1164 | ECHOCTL | ECHOKE
1178# endif 1165# endif
1179 | ECHOE | ECHOK); 1166 | 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 1167
1228 /* 1168 /*
1229 * Debugging 1169 * Debugging
1230 */ 1170 */
1231#ifdef DEBUG_TTYMODE 1171#ifdef DEBUG_TTYMODE
1332 else 1272 else
1333#endif 1273#endif
1334 if (!pty->get ()) 1274 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336 1276
1337 pty->set_utf8_mode (enc_utf8);
1338
1339 /* set initial window size */
1340 tt_winch ();
1341
1342 int er; 1277 int er;
1343 1278
1344#ifndef NO_BACKSPACE_KEY 1279#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1]) 1280 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0]; 1281 er = key_backspace[0];
1349 else 1284 else
1350#endif 1285#endif
1351 er = -1; 1286 er = -1;
1352 1287
1353 rxvt_get_ttymode (&tio, er); 1288 rxvt_get_ttymode (&tio, er);
1289 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1290 pty->set_utf8_mode (enc_utf8);
1291
1292 /* set initial window size */
1293 tt_winch ();
1354 1294
1355#if ENABLE_FRILLS 1295#if ENABLE_FRILLS
1356 if (rs[Rs_pty_fd]) 1296 if (rs[Rs_pty_fd])
1357 return; 1297 return;
1358#endif 1298#endif
1389 } 1329 }
1390 1330
1391 _exit (EXIT_FAILURE); 1331 _exit (EXIT_FAILURE);
1392 1332
1393 default: 1333 default:
1394 if (!OPTION (Opt_utmpInhibit)) 1334 if (!option (Opt_utmpInhibit))
1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1335 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1396 1336
1397 pty->close_tty (); 1337 pty->close_tty ();
1398 1338
1399 child_ev.start (cmd_pid); 1339 child_ev.start (cmd_pid);
1400 1340
1413int 1353int
1414rxvt_term::run_child (const char *const *argv) 1354rxvt_term::run_child (const char *const *argv)
1415{ 1355{
1416 char *login; 1356 char *login;
1417 1357
1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1419
1420 if (OPTION (Opt_console)) 1358 if (option (Opt_console))
1421 { /* be virtual console, fail silently */ 1359 { /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1360#ifdef TIOCCONS
1423 unsigned int on = 1; 1361 unsigned int on = 1;
1424 1362
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1363 ioctl (STDIN_FILENO, TIOCCONS, &on);
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1413 shell = "/bin/sh";
1476 1414
1477 argv0 = (const char *)rxvt_r_basename (shell); 1415 argv0 = (const char *)rxvt_r_basename (shell);
1478 1416
1479 if (OPTION (Opt_loginShell)) 1417 if (option (Opt_loginShell))
1480 { 1418 {
1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1482 1420
1483 login[0] = '-'; 1421 login[0] = '-';
1484 strcpy (&login[1], argv0); 1422 strcpy (&login[1], argv0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines