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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.313 by root, Tue Nov 4 16:43:50 2008 UTC

227 delete fontset[0]; 227 delete fontset[0];
228 228
229#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 230 bgPixmap.destroy ();
231#endif 231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
232 238
233 if (display) 239 if (display)
234 { 240 {
235 selection_clear (); 241 selection_clear ();
236 242
619 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
620 626
621 if (recalc_y) 627 if (recalc_y)
622 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
623 629
624 ncol = width / fwidth; 630 ncol = width / fwidth;
625 nrow = height / fheight; 631 nrow = height / fheight;
626} 632}
627 633
628/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
629/* 635/*
905 int old_width = szHint.width; 911 int old_width = szHint.width;
906 int old_height = szHint.height; 912 int old_height = szHint.height;
907 913
908 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
909 915
910 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint)
920 {
921 szHint.flags &= ~(PBaseSize | PResizeInc);
911 XSetWMNormalHints (dpy, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
912 925
913 if (!ignoreparent) 926 if (!ignoreparent)
914 { 927 {
915#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
916 /* 929 /*
975#endif 988#endif
976 989
977 scr_clear (); 990 scr_clear ();
978 } 991 }
979 992
993 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint);
995
980 if (fix_screen || old_height == 0) 996 if (fix_screen || old_height == 0)
981 scr_reset (); 997 scr_reset ();
982 998
983 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 999 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
984 //scr_touch (false); 1000 //scr_touch (false);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines