"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "modules/FvwmIconMan/xmanager.c" between
fvwm-2.6.7.tar.gz and fvwm-2.6.8.tar.gz

About: FVWM is a window manager providing a 3-D look for window decorations and a virtual desktop, nifty module interface.

xmanager.c  (fvwm-2.6.7):xmanager.c  (fvwm-2.6.8)
skipping to change at line 13 skipping to change at line 13
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, see: <http://www.gnu.org/licenses/>
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "config.h" #include "config.h"
#include "libs/fvwmlib.h" #include "libs/fvwmlib.h"
#include "libs/FShape.h" #include "libs/FShape.h"
#include "libs/Module.h" #include "libs/Module.h"
#include "FvwmIconMan.h" #include "FvwmIconMan.h"
#include "x.h" #include "x.h"
#include "xmanager.h" #include "xmanager.h"
skipping to change at line 377 skipping to change at line 376
return; return;
FGetWMNormalHints(theDisplay, man->theWindow, &size, &mask); FGetWMNormalHints(theDisplay, man->theWindow, &size, &mask);
size.min_width = w; size.min_width = w;
size.max_width = w; size.max_width = w;
size.min_height = h; size.min_height = h;
size.max_height = h; size.max_height = h;
XSetWMNormalHints(theDisplay, man->theWindow, &size); XSetWMNormalHints(theDisplay, man->theWindow, &size);
} }
static void release_manager_size(WinManager *man)
{
XSizeHints size;
long mask;
if (man->geometry.dir & GROW_FIXED)
return;
FGetWMNormalHints(theDisplay, man->theWindow, &size, &mask);
size.min_width = 1;
size.max_width = 65535;
size.min_height = 1;
size.max_height = 65535;
XSetWMNormalHints(theDisplay, man->theWindow, &size);
}
/* Like XMoveResizeWindow(), but can move in arbitary directions */ /* Like XMoveResizeWindow(), but can move in arbitary directions */
static void resize_window(WinManager *man) static void resize_window(WinManager *man)
{ {
ManGeometry *g; ManGeometry *g;
int x_changed, y_changed, dir; int x_changed, y_changed, dir;
dir = man->geometry.dir; dir = man->geometry.dir;
fix_manager_size(man, man->geometry.width, man->geometry.height); /* Remove any size limits so that the window can be resized without
* warnings. */
release_manager_size(man);
if ((dir & GROW_DOWN) && (dir & GROW_RIGHT)) { if ((dir & GROW_DOWN) && (dir & GROW_RIGHT)) {
XResizeWindow(theDisplay, man->theWindow, man->geometry.width, XResizeWindow(theDisplay, man->theWindow, man->geometry.width,
man->geometry.height); man->geometry.height);
} }
else { else {
MyXGrabServer(theDisplay); MyXGrabServer(theDisplay);
g = query_geometry(man); g = query_geometry(man);
x_changed = y_changed = 0; x_changed = y_changed = 0;
if (dir & GROW_LEFT) { if (dir & GROW_LEFT) {
skipping to change at line 424 skipping to change at line 441
man->geometry.x, man->geometry.x,
man->geometry.y, man->geometry.y,
man->geometry.width, man->geometry.height); man->geometry.width, man->geometry.height);
} }
else { else {
XResizeWindow(theDisplay, man->theWindow, man->geometry.width, XResizeWindow(theDisplay, man->theWindow, man->geometry.width,
man->geometry.height); man->geometry.height);
} }
MyXUngrabServer(theDisplay); MyXUngrabServer(theDisplay);
} }
fix_manager_size(man, man->geometry.width, man->geometry.height);
} }
static char *make_display_string(WinData *win, char *format, int len) static char *make_display_string(WinData *win, char *format, int len)
{ {
#define MAX_DISPLAY_SIZE 1024 #define MAX_DISPLAY_SIZE 1024
#define COPY(field) \ #define COPY(field) \
temp_p = win->field; \ temp_p = win->field; \
if (temp_p) \ if (temp_p) \
while (*temp_p && out_p - buf < len - 1) \ while (*temp_p && out_p - buf < len - 1) \
*out_p++ = *temp_p++; \ *out_p++ = *temp_p++; \
 End of changes. 4 change blocks. 
3 lines changed or deleted 21 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)