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

Diff Legend

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