This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
discards e0b2196f7d2cefee2b835ba788a9fb225e56911e (commit)
discards a9259582198b471216489008b8e301bd08c62e05 (commit)
discards e38181da6f08f426ed693f9517aa3935a92ab92d (commit)
via 093cc181fa235a68feb688a1d906ac1244b287ce (commit)
via e019279cd5a3b4453f7b32d6f21093dd3b43ecef (commit)
via 6571b3f8286510b57be626ff981c287db6e7daa7 (commit)
via 23178edfa6d31173f5675a5473052c2084786fcf (commit)
via c5f853271705d82b00baab9841b3803c74a07486 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (e0b2196f7d2cefee2b835ba788a9fb225e56911e)
N -- N -- N (093cc181fa235a68feb688a1d906ac1244b287ce)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/093cc181fa235a68feb688a1d906ac1244b287ce
commit 093cc181fa235a68feb688a1d906ac1244b287ce
Author: Iain Patterson <[email protected]>
Date: Wed Nov 13 14:27:24 2013 +0000
Fix arrow keys in switchpanel.
A previous commit broke the behaviour of the left and right arrow keys
in the switchpanel. Releasing either of the keys would correctly select
a new window but the panel would then close. The original, and desired,
behaviour is for the panel to remain open after selecting a new window
with the arrow keys.
Reported by Yury Tarasievich.
diff --git a/src/cycling.c b/src/cycling.c
index 7a9afc9..e752aee 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -197,6 +197,9 @@ void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool
next, Bool class_only)
if (wPreferences.strict_windoze_cycle)
break;
+ if (ev.xkey.keycode == leftKey || ev.xkey.keycode ==
rightKey)
+ break;
+
if (ev.xkey.keycode == XK_Return)
break;
http://repo.or.cz/w/wmaker-crm.git/commit/e019279cd5a3b4453f7b32d6f21093dd3b43ecef
commit e019279cd5a3b4453f7b32d6f21093dd3b43ecef
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Wed Nov 13 15:43:41 2013 +0100
Fix implicit declaration
usermenu.c:257:12: warning: implicit declaration of function
âGetShortcutStringâ [-Wimplicit-function-declaration]
Signed-off-by: Amadeusz SÅawiÅski <[email protected]>
diff --git a/src/usermenu.c b/src/usermenu.c
index d3f6fcc..4a669c9 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -74,6 +74,7 @@
#include "actions.h"
#include "keybind.h"
#include "xmodifier.h"
+#include "misc.h"
#include "framewin.h"
http://repo.or.cz/w/wmaker-crm.git/commit/6571b3f8286510b57be626ff981c287db6e7daa7
commit 6571b3f8286510b57be626ff981c287db6e7daa7
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Wed Nov 13 15:39:13 2013 +0100
take dock into account when not covering icons next to it
Signed-off-by: Amadeusz SÅawiÅski <[email protected]>
diff --git a/src/actions.c b/src/actions.c
index 60e1174..4b336c9 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -397,6 +397,17 @@ void wMaximizeWindow(WWindow *wwin, int directions)
usableArea.x1 += offset;
}
+ /* check if icons are on the same side as dock, and adjust if not done
already */
+ if (scr->dock && wPreferences.no_window_over_icons &&
!wPreferences.no_window_over_dock && (wPreferences.icon_yard & IY_VERT)) {
+ int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
+
+ if (scr->dock->on_right_side && (wPreferences.icon_yard &
IY_RIGHT))
+ usableArea.x2 -= offset;
+ /* can't use IY_LEFT in if, it's 0 ... */
+ if (!scr->dock->on_right_side && !(wPreferences.icon_yard &
IY_RIGHT))
+ usableArea.x1 += offset;
+ }
+
/* Only save directions, not kbd or xinerama hints */
directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF |
MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
http://repo.or.cz/w/wmaker-crm.git/commit/23178edfa6d31173f5675a5473052c2084786fcf
commit 23178edfa6d31173f5675a5473052c2084786fcf
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Wed Nov 13 15:39:12 2013 +0100
make adjustments for dock when calculating area for miniwindows
Fixes bug report:
The 0.80.2 and older versions allowed the miniwindows to lay down in
parallel with wmdock (if one wanted it that way) but newer Windowmaker
versions could only partially simulate such behavior and that includes
to either setting an option NoWindowOverDock to yes or to manually set
the dock to "Keep on Top".
Reported-by: Josip Deanovic <[email protected]>
Signed-off-by: Amadeusz SÅawiÅski <[email protected]>
diff --git a/src/actions.c b/src/actions.c
index f9da91c..60e1174 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1740,7 +1740,19 @@ void wArrangeIcons(WScreen *scr, Bool arrangeAll)
for (head = 0; head < heads; ++head) {
WArea area = wGetUsableAreaForHead(scr, head, NULL, False);
- WMRect rect = wmkrect(area.x1, area.y1, area.x2 - area.x1,
area.y2 - area.y1);
+ WMRect rect;
+
+ if (scr->dock) {
+ int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
+
+ if (scr->dock->on_right_side)
+ area.x2 -= offset;
+ else
+ area.x1 += offset;
+ }
+
+ rect = wmkrect(area.x1, area.y1, area.x2 - area.x1, area.y2 -
area.y1);
+
vars[head].pi = vars[head].si = 0;
vars[head].sx1 = rect.pos.x;
vars[head].sy1 = rect.pos.y;
http://repo.or.cz/w/wmaker-crm.git/commit/c5f853271705d82b00baab9841b3803c74a07486
commit c5f853271705d82b00baab9841b3803c74a07486
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Wed Nov 13 15:39:11 2013 +0100
move maximization size adjustments to maximization function
now wGetUsableAreaForHead returns better result
Signed-off-by: Amadeusz SÅawiÅski <[email protected]>
diff --git a/src/actions.c b/src/actions.c
index 1087117..f9da91c 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -354,6 +354,7 @@ void wMaximizeWindow(WWindow *wwin, int directions)
WArea usableArea, totalArea;
Bool has_border = 1;
int adj_size;
+ WScreen *scr = wwin->screen_ptr;
if (!IS_RESIZABLE(wwin))
return;
@@ -362,14 +363,14 @@ void wMaximizeWindow(WWindow *wwin, int directions)
has_border = 0;
/* the size to adjust the geometry */
- adj_size = wwin->screen_ptr->frame_border_width * 2 * has_border;
+ adj_size = scr->frame_border_width * 2 * has_border;
/* save old coordinates before we change the current values */
if (!wwin->flags.maximized)
save_old_geometry(wwin, SAVE_GEOMETRY_ALL);
- totalArea.x2 = wwin->screen_ptr->scr_width;
- totalArea.y2 = wwin->screen_ptr->scr_height;
+ totalArea.x2 = scr->scr_width;
+ totalArea.y2 = scr->scr_height;
totalArea.x1 = 0;
totalArea.y1 = 0;
usableArea = totalArea;
@@ -386,6 +387,16 @@ void wMaximizeWindow(WWindow *wwin, int directions)
usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True);
}
+ /* check if user wants dock covered */
+ if (scr->dock && (!scr->dock->lowered ||
wPreferences.no_window_over_dock)) {
+ int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
+
+ if (scr->dock->on_right_side)
+ usableArea.x2 -= offset;
+ else
+ usableArea.x1 += offset;
+ }
+
/* Only save directions, not kbd or xinerama hints */
directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF |
MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
diff --git a/src/screen.c b/src/screen.c
index c7295f3..d40d333 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -710,16 +710,6 @@ void wScreenUpdateUsableArea(WScreen * scr)
scr->totalUsableArea[i].x2 = rect.pos.x + rect.size.width;
scr->totalUsableArea[i].y2 = rect.pos.y + rect.size.height;
- if (scr->dock && dock_head == i && (!scr->dock->lowered ||
wPreferences.no_window_over_dock)) {
- int offset = wPreferences.icon_size + DOCK_EXTRA_SPACE;
-
- if (scr->dock->on_right_side) {
- scr->totalUsableArea[i].x2 -= offset;
- } else {
- scr->totalUsableArea[i].x1 += offset;
- }
- }
-
if (wNETWMGetUsableArea(scr, i, &area)) {
scr->totalUsableArea[i].x1 =
WMAX(scr->totalUsableArea[i].x1, area.x1);
scr->totalUsableArea[i].y1 =
WMAX(scr->totalUsableArea[i].y1, area.y1);
-----------------------------------------------------------------------
Summary of changes:
src/actions.c | 28 +++++++++++-----------------
src/cycling.c | 3 +++
src/usermenu.c | 1 +
3 files changed, 15 insertions(+), 17 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
