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.199 by sasha, Fri Aug 3 22:40:10 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;
207#ifdef XPM_BACKGROUND 204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0; 209 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0;
211 bgPixmap.flags = 0;
210 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
211#endif 213#endif
212 214
213 last_bot = last_state = -1; 215 last_bot = last_state = -1;
214 216
882rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
883{ 885{
884 XClassHint classHint; 886 XClassHint classHint;
885 XWMHints wmHint; 887 XWMHints wmHint;
886#if ENABLE_FRILLS 888#if ENABLE_FRILLS
887 MWMHints mwmhints; 889 MWMHints mwmhints = { };
888#endif 890#endif
889 XGCValues gcvalue; 891 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
891 Window top, parent; 893 Window top, parent;
892 894
1038 vt_select_input (); 1040 vt_select_input ();
1039 1041
1040 vt_ev.start (display, vt); 1042 vt_ev.start (display, vt);
1041 1043
1042#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL 1045 if (rs[Rs_backgroundPixmap] != NULL)
1044#ifndef HAVE_AFTERIMAGE
1045 && !option (Opt_transparent)
1046#endif
1047 )
1048 { 1046 {
1049 const char *p = rs[Rs_backgroundPixmap]; 1047 const char *p = rs[Rs_backgroundPixmap];
1050 1048
1051 if ((p = strchr (p, ';')) != NULL) 1049 if ((p = strchr (p, ';')) != NULL)
1052 { 1050 {
1053 p++; 1051 p++;
1054 scale_pixmap (p); 1052 bgPixmap.handle_geometry (p);
1055 } 1053 }
1056 1054
1057 set_bgPixmap (rs[Rs_backgroundPixmap]); 1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true); 1056 scr_touch (true);
1059 } 1057 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines