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

Diff Legend

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