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.195 by ayin, Thu Jul 26 18:09:36 2007 UTC vs.
Revision 1.200 by ayin, Fri Aug 3 23:15:34 2007 UTC

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(ENABLE_TRANSPARENCY)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 want_refresh = 1; 191 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
202 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
203 200
204 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
205 202
206 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; */
207#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
210 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
211#endif 215#endif
212 216
213 last_bot = last_state = -1; 217 last_bot = last_state = -1;
214 218
882rxvt_term::create_windows (int argc, const char *const *argv) 886rxvt_term::create_windows (int argc, const char *const *argv)
883{ 887{
884 XClassHint classHint; 888 XClassHint classHint;
885 XWMHints wmHint; 889 XWMHints wmHint;
886#if ENABLE_FRILLS 890#if ENABLE_FRILLS
887 MWMHints mwmhints; 891 MWMHints mwmhints = { };
888#endif 892#endif
889 XGCValues gcvalue; 893 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 894 XSetWindowAttributes attributes;
891 Window top, parent; 895 Window top, parent;
892 896
1038 vt_select_input (); 1042 vt_select_input ();
1039 1043
1040 vt_ev.start (display, vt); 1044 vt_ev.start (display, vt);
1041 1045
1042#ifdef XPM_BACKGROUND 1046#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL 1047 if (rs[Rs_backgroundPixmap] != NULL)
1044#ifndef HAVE_AFTERIMAGE
1045 && !option (Opt_transparent)
1046#endif
1047 )
1048 { 1048 {
1049 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1050 1050
1051 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1052 { 1052 {
1053 p++; 1053 p++;
1054 scale_pixmap (p); 1054 bgPixmap.handle_geometry (p);
1055 } 1055 }
1056 1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]); 1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true); 1058 scr_touch (true);
1059 } 1059 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines