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.311 by root, Tue Nov 4 13:28:40 2008 UTC vs.
Revision 1.313 by root, Tue Nov 4 16:43:50 2008 UTC

625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626 626
627 if (recalc_y) 627 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 629
630 ncol = width / fwidth; 630 ncol = width / fwidth;
631 nrow = height / fheight; 631 nrow = height / fheight;
632} 632}
633 633
634/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
635/* 635/*
911 int old_width = szHint.width; 911 int old_width = szHint.width;
912 int old_height = szHint.height; 912 int old_height = szHint.height;
913 913
914 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
915 915
916 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);
917 XSetWMNormalHints (dpy, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
918 925
919 if (!ignoreparent) 926 if (!ignoreparent)
920 { 927 {
921#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
922 /* 929 /*
981#endif 988#endif
982 989
983 scr_clear (); 990 scr_clear ();
984 } 991 }
985 992
993 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint);
995
986 if (fix_screen || old_height == 0) 996 if (fix_screen || old_height == 0)
987 scr_reset (); 997 scr_reset ();
988 998
989 // 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
990 //scr_touch (false); 1000 //scr_touch (false);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines