| … | |
… | |
| 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 | /* |
| … | |
… | |
| 962 | #else |
969 | #else |
| 963 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
970 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
| 964 | #endif |
971 | #endif |
| 965 | } |
972 | } |
| 966 | |
973 | |
|
|
974 | if (set_hint) |
|
|
975 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
976 | |
| 967 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
977 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
| 968 | |
978 | |
| 969 | if (fix_screen || newwidth != old_width || newheight != old_height) |
979 | if (fix_screen || newwidth != old_width || newheight != old_height) |
| 970 | { |
980 | { |
| 971 | if (scrollBar.state) |
981 | if (scrollBar.state) |
| … | |
… | |
| 977 | |
987 | |
| 978 | #ifdef HAVE_BG_PIXMAP |
988 | #ifdef HAVE_BG_PIXMAP |
| 979 | if (bgPixmap.window_size_sensitive ()) |
989 | if (bgPixmap.window_size_sensitive ()) |
| 980 | update_background (); |
990 | update_background (); |
| 981 | #endif |
991 | #endif |
| 982 | |
|
|
| 983 | scr_clear (); |
|
|
| 984 | } |
992 | } |
| 985 | |
993 | |
| 986 | if (fix_screen || old_height == 0) |
994 | if (fix_screen || old_height == 0) |
|
|
995 | { |
| 987 | scr_reset (); |
996 | scr_reset (); |
|
|
997 | } |
| 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); |
| 991 | |
1001 | |
| 992 | #ifdef HAVE_BG_PIXMAP |
1002 | #ifdef HAVE_BG_PIXMAP |
