>From 4c1b83160ce6a25753c381e33de5223de9b01684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 25 Jun 2012 21:56:19 +0200
Subject: [PATCH 08/11] Variables user_changed_* can be removed
The variables user_changed_ are set to value, but
the value is not checked/used in the code, so can be removed.
---
src/moveres.c | 18 ++++--------------
src/window.h | 2 --
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/moveres.c b/src/moveres.c
index 6563258..3d3ff7e 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1471,7 +1471,6 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
if (opaqueMoveResize) {
XUngrabServer(dpy);
- wwin->flags.user_changed_width = 1;
wWindowConfigure(wwin, src_x + off_x,
src_y + off_y, ww, wh - vert_border);
};
@@ -1518,15 +1517,11 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
}
}
} else {
- if (wwin->client.width != ww) {
- wwin->flags.user_changed_width
= 1;
+ if (wwin->client.width != ww)
wwin->flags.maximized &=
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- }
- if (wwin->client.height != wh -
vert_border) {
- wwin->flags.user_changed_height
= 1;
+ if (wwin->client.height != wh -
vert_border)
wwin->flags.maximized &=
~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
- }
wWindowConfigure(wwin, src_x + off_x,
src_y + off_y, ww, wh - vert_border);
wWindowSynthConfigureNotify(wwin);
@@ -2047,7 +2042,6 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
showGeometry(wwin, fx, fy, fx + fw, fy
+ fh, res);
/* Now, continue drawing */
XUngrabServer(dpy);
- wwin->flags.user_changed_width = 1;
moveGeometryDisplayCentered(scr, fx +
fw / 2, fy + fh / 2);
wWindowConfigure(wwin, fx, fy, fw, fh -
vert_border);
showGeometry(wwin, fx, fy, fx + fw, fy
+ fh, res);
@@ -2072,15 +2066,11 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
WMUnmapWidget(scr->gview);
XUngrabServer(dpy);
- if (wwin->client.width != fw) {
- wwin->flags.user_changed_width = 1;
+ if (wwin->client.width != fw)
wwin->flags.maximized &=
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- }
- if (wwin->client.height != fh - vert_border) {
- wwin->flags.user_changed_height = 1;
+ if (wwin->client.height != fh - vert_border)
wwin->flags.maximized &= ~(MAX_VERTICAL
| MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
- }
wWindowConfigure(wwin, fx, fy, fw, fh -
vert_border);
wWindowSynthConfigureNotify(wwin);
diff --git a/src/window.h b/src/window.h
index ae1e704..dfe53b6 100644
--- a/src/window.h
+++ b/src/window.h
@@ -288,8 +288,6 @@ typedef struct WWindow {
unsigned int dragged_while_fmaximized;
- unsigned int user_changed_width:1;
- unsigned int user_changed_height:1;
unsigned int net_skip_pager:1;
unsigned int net_handle_icon:1;
unsigned int net_show_desktop:1;
--
1.7.10
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 4c1b83160ce6a25753c381e33de5223de9b01684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 25 Jun 2012 21:56:19 +0200
Subject: [PATCH 08/11] Variables user_changed_* can be removed
The variables user_changed_ are set to value, but
the value is not checked/used in the code, so can be removed.
---
src/moveres.c | 18 ++++--------------
src/window.h | 2 --
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/moveres.c b/src/moveres.c
index 6563258..3d3ff7e 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1471,7 +1471,6 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
if (opaqueMoveResize) {
XUngrabServer(dpy);
- wwin->flags.user_changed_width = 1;
wWindowConfigure(wwin, src_x + off_x, src_y + off_y, ww, wh - vert_border);
};
@@ -1518,15 +1517,11 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
}
}
} else {
- if (wwin->client.width != ww) {
- wwin->flags.user_changed_width = 1;
+ if (wwin->client.width != ww)
wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_MAXIMUS);
- }
- if (wwin->client.height != wh - vert_border) {
- wwin->flags.user_changed_height = 1;
+ if (wwin->client.height != wh - vert_border)
wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
- }
wWindowConfigure(wwin, src_x + off_x, src_y + off_y, ww, wh - vert_border);
wWindowSynthConfigureNotify(wwin);
@@ -2047,7 +2042,6 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
showGeometry(wwin, fx, fy, fx + fw, fy + fh, res);
/* Now, continue drawing */
XUngrabServer(dpy);
- wwin->flags.user_changed_width = 1;
moveGeometryDisplayCentered(scr, fx + fw / 2, fy + fh / 2);
wWindowConfigure(wwin, fx, fy, fw, fh - vert_border);
showGeometry(wwin, fx, fy, fx + fw, fy + fh, res);
@@ -2072,15 +2066,11 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
WMUnmapWidget(scr->gview);
XUngrabServer(dpy);
- if (wwin->client.width != fw) {
- wwin->flags.user_changed_width = 1;
+ if (wwin->client.width != fw)
wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_MAXIMUS);
- }
- if (wwin->client.height != fh - vert_border) {
- wwin->flags.user_changed_height = 1;
+ if (wwin->client.height != fh - vert_border)
wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
- }
wWindowConfigure(wwin, fx, fy, fw, fh - vert_border);
wWindowSynthConfigureNotify(wwin);
diff --git a/src/window.h b/src/window.h
index ae1e704..dfe53b6 100644
--- a/src/window.h
+++ b/src/window.h
@@ -288,8 +288,6 @@ typedef struct WWindow {
unsigned int dragged_while_fmaximized;
- unsigned int user_changed_width:1;
- unsigned int user_changed_height:1;
unsigned int net_skip_pager:1;
unsigned int net_handle_icon:1;
unsigned int net_show_desktop:1;
--
1.7.10
