ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.184 by sf-exg, Sun Dec 25 17:07:00 2011 UTC vs.
Revision 1.185 by sf-exg, Mon Dec 26 14:53:56 2011 UTC

181{ 181{
182 bool changed = false; 182 bool changed = false;
183 int geom_flags = 0; 183 int geom_flags = 0;
184 int x = 0, y = 0; 184 int x = 0, y = 0;
185 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS; 186 unsigned long new_flags = 0;
187 187
188 if (geom == NULL) 188 if (geom == NULL)
189 return false; 189 return false;
190 190
191 if (geom[0]) 191 if (geom[0])
283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
284 } /* done parsing ops */ 284 } /* done parsing ops */
285 285
286 rxvt_free_strsplit (arr); 286 rxvt_free_strsplit (arr);
287 } 287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
288 290
289 if (!update) 291 if (!update)
290 { 292 {
291 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
292 x = y = defaultAlign; 294 x = y = defaultAlign;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines