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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.455 by sf-exg, Sun Aug 22 09:36:33 2010 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

975rxvt_term::flush () 975rxvt_term::flush ()
976{ 976{
977 flush_ev.stop (); 977 flush_ev.stop ();
978 978
979#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
981 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
982// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
983 scr_touch (false); 984 scr_touch (false);
984 } 985 }
985#endif 986#endif
986 987
1430 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1432 focus_out ();
1432 break; 1433 break;
1433 1434
1434 case ConfigureNotify: 1435 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1439 { 1437 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1439 ;
1442 1440
3450 { 3448 {
3451 int changed = 0; 3449 int changed = 0;
3452 3450
3453 if (*str != ';') 3451 if (*str != ';')
3454 { 3452 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */ 3453 if (bgPixmap.set_file (str)) /* change pixmap */
3458 changed++; 3454 changed++;
3459 str = strchr (str, ';'); 3455 str = strchr (str, ';');
3460 if (str == NULL) 3456 if (str == NULL)
3461 bgPixmap.set_defaultGeometry (); 3457 bgPixmap.set_defaultGeometry ();
3458 else
3459 bgPixmap.set_geometry (str+1);
3462 } 3460 }
3463 3461 else
3464 while (str)
3465 { 3462 {
3466 str++; 3463 str++;
3467 if (bgPixmap.set_geometry (str)) 3464 if (bgPixmap.set_geometry (str, true))
3468 changed++; 3465 changed++;
3469 str = strchr (str, ';');
3470 } 3466 }
3471 3467
3472 if (changed) 3468 if (changed)
3473 update_background (); 3469 update_background ();
3474 } 3470 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines