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.154 by root, Wed Jan 25 02:45:36 2006 UTC vs.
Revision 1.156 by root, Wed Jan 25 21:03:04 2006 UTC

… …
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 195 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
197 focus = 0;
198 ncol = 80; 197 ncol = 80;
199 nrow = 24; 198 nrow = 24;
200 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
201 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
202 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
203 saveLines = SAVELINES; 202 saveLines = SAVELINES;
204 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
205 204
206 refresh_limit = 1; 205 refresh_limit = 1;
207 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
208 prev_nrow = prev_ncol = 0;
209 207
210 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
211#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
212 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
213 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
315 { 313 {
316 rxvt_perl.init (this); 314 rxvt_perl.init (this);
317 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 315 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
318 } 316 }
319#endif 317#endif
318
319 xa = display->xa;
320
321#if ENABLE_FRILLS
322 if (rs[Rs_depth])
323 set (display, strtol (rs[Rs_depth], 0, 0));
324 else
325#endif
326 set (display);
320 327
321 /* 328 /*
322 * set any defaults not already set 329 * set any defaults not already set
323 */ 330 */
324 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
485 i = strlen (val); 492 i = strlen (val);
486 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
487 494
488 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
489 496
490 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
491 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
492 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
493 ;
494 max_it (i, 1);
495 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
496
497 sprintf (env_windowid, "WINDOWID=%u",
498 (unsigned int)parent[0]);
499 498
500 /* add entries to the environment: 499 /* add entries to the environment:
501 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
502 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
503 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
505 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
506 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
507 */ 506 */
508 putenv (env_display); 507 putenv (env_display);
509 putenv (env_windowid); 508 putenv (env_windowid);
509
510 if (env_colorfgbg) 510 if (env_colorfgbg)
511 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
512 512
513#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
514 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
515#endif 515#endif
516 516
517 if (display->depth <= 2) 517 if (depth <= 2)
518 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
519 else 519 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
521 521
522 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
653 653
654#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
656#endif 656#endif
657 657
658 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 659 {
660 rxvt_color xcol; 660 rxvt_color xcol;
661 661
662 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
663 continue; 663 continue;
… …
703 SET_PIXCOLOR (i); 703 SET_PIXCOLOR (i);
704 } 704 }
705 705
706#ifdef OFF_FOCUS_FADING 706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade]) 707 if (rs[Rs_fade])
708 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif 710#endif
711 711
712 if (display->depth <= 2) 712 if (depth <= 2)
713 { 713 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
717 } 717 }
… …
722 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 723 * from the fvwm window manager.
724 */ 724 */
725#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
726 726
727 if (display->depth <= 2) 727 if (depth <= 2)
728 { 728 {
729 /* Monochrome */ 729 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 pix_colors[Color_scroll] = pix_colors[Color_fg];
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_topShadow] = pix_colors[Color_bg];
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
737 /* xcol[0] == white 737 /* xcol[0] == white
738 * xcol[1] == top shadow 738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
740 740
741 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
742 xcol[0].set (display, 65535, 65535, 65535); 742 xcol[0].set (this, 65535, 65535, 65535);
743 743
744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
745 745
746 xcol[0].get (display, pr0, pg0, pb0); 746 xcol[0].get (this, pr0, pg0, pb0);
747 xcol[1].get (display, pr1, pg1, pb1); 747 xcol[1].get (this, pr1, pg1, pb1);
748 748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 750
751 /* topShadowColor */ 751 /* topShadowColor */
752 if (!xcol[1].set (display, 752 if (!xcol[1].set (this,
753 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
756 xcol[1] = pix_colors[Color_White]; 756 xcol[1] = pix_colors[Color_White];
757 757
… …
881 MWMHints mwmhints; 881 MWMHints mwmhints;
882#endif 882#endif
883 XGCValues gcvalue; 883 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
885 Window top, parent; 885 Window top, parent;
886 dDisp;
887 886
888 xa = display->xa; 887 dLocal (Display *, xdisp);
889 888
890 /* grab colors before netscape does */ 889 /* grab colors before netscape does */
891 Get_Colours (); 890 Get_Colours ();
892 891
893 if (!set_fonts ()) 892 if (!set_fonts ())
… …
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
899 898
900#if ENABLE_FRILLS 899#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 900 if (OPTION (Opt_borderLess))
902 { 901 {
903 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
904 { 903 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
906 attributes.override_redirect = TRUE; 905 attributes.override_redirect = TRUE;
907 mwmhints.flags = 0; 906 mwmhints.flags = 0;
908 } 907 }
… …
921 { 920 {
922 XWindowAttributes wattr; 921 XWindowAttributes wattr;
923 922
924 parent = strtol (rs[Rs_embed], 0, 0); 923 parent = strtol (rs[Rs_embed], 0, 0);
925 924
926 if (!XGetWindowAttributes (disp, parent, &wattr)) 925 if (!XGetWindowAttributes (xdisp, parent, &wattr))
927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
928 927
929 window_calc (wattr.width, wattr.height); 928 window_calc (wattr.width, wattr.height);
930 } 929 }
931#endif 930#endif
932 931
933 window_calc (0, 0); 932 window_calc (0, 0);
934 933
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 934 /* sub-window placement & size in rxvt_resize_subwindows () */
936 attributes.background_pixel = pix_colors_focused[Color_border]; 935 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused[Color_border]; 936 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = display->cmap; 937 attributes.colormap = cmap;
939 938
940 top = XCreateWindow (disp, parent, 939 top = XCreateWindow (xdisp, parent,
941 szHint.x, szHint.y, 940 szHint.x, szHint.y,
942 szHint.width, szHint.height, 941 szHint.width, szHint.height,
943 ext_bwidth, 942 ext_bwidth,
944 display->depth, InputOutput, 943 depth, InputOutput, visual,
945 display->visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
947 &attributes); 945 &attributes);
948 946
949 this->parent[0] = top; 947 this->parent[0] = top;
950 948
… …
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 959 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 961 wmHint.window_group = top;
964 962
965 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
967 965
968#if ENABLE_FRILLS 966#if ENABLE_FRILLS
969 if (mwmhints.flags) 967 if (mwmhints.flags)
970 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 968 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 970#endif
973 971
974 Atom protocols[] = { 972 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 973 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 974#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 975 xa[XA_NET_WM_PING],
978#endif 976#endif
979 }; 977 };
980 978
981 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 979 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982 980
983#if ENABLE_FRILLS 981#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 982 if (rs[Rs_transient_for])
985 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 983 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 984#endif
987 985
988#if ENABLE_EWMH 986#if ENABLE_EWMH
989 long pid = getpid (); 987 long pid = getpid ();
990 988
991 XChangeProperty (disp, top, 989 XChangeProperty (xdisp, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
994 992
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 994#endif
997 995
998 XSelectInput (disp, top, 996 XSelectInput (xdisp, top,
999 KeyPressMask 997 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 999 | KeyReleaseMask
1002#endif 1000#endif
1003 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1005 1003
1006 termwin_ev.start (display, top); 1004 termwin_ev.start (display, top);
1007 1005
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1006 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1010 1008
1011#ifdef HAVE_SCROLLBARS 1009#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1011 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1014#endif 1012#endif
1015 1013
1016 /* the vt window */ 1014 /* the vt window */
1017 vt = XCreateSimpleWindow (disp, top, 1015 vt = XCreateSimpleWindow (xdisp, top,
1018 window_vt_x, window_vt_y, 1016 window_vt_x, window_vt_y,
1019 width, height, 1017 width, height,
1020 0, 1018 0,
1021 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1023 1021
1024 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1026 1024
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1026
1029 if (OPTION (Opt_pointerBlank)) 1027 if (OPTION (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
… …
1055 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 1;
1059 1057
1060 gc = XCreateGC (disp, vt, 1058 gc = XCreateGC (xdisp, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1060 &gcvalue);
1063 1061
1064 drawable = new rxvt_drawable (display, vt); 1062 drawable = new rxvt_drawable (this, vt);
1065 1063
1066#ifdef RXVT_SCROLLBAR 1064#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1073#endif 1071#endif
1074 1072
1075#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1074 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])

Diff Legend

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