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.198 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.204 by sasha, Thu Aug 9 22:08:21 2007 UTC

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
199 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
200 200
201 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
202 202
203 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY) 204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
205#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
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
213 last_bot = last_state = -1; 216 last_bot = last_state = -1;
214 217
215 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
320 323
321#ifdef HAVE_AFTERIMAGE 324#ifdef HAVE_AFTERIMAGE
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif 326#endif
324 free (r_argv); 327 free (r_argv);
328
329 bgPixmap.set_target (this);
325 330
326 for (int i = NUM_RESOURCES; i--; ) 331 for (int i = NUM_RESOURCES; i--; )
327 if (rs [i] == resval_undef) 332 if (rs [i] == resval_undef)
328 rs [i] = 0; 333 rs [i] = 0;
329 334
1045 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1046 1051
1047 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1048 { 1053 {
1049 p++; 1054 p++;
1050 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1051 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1052 1059
1053 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true); 1061 scr_touch (true);
1055 } 1062 }
1056#endif 1063#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines