This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via 28da4c98e38db6ac783e2b95ae96ec1928653672 (commit)
via 17a47af160fee0cecf4af55cb13d0b5c54bafeee (commit)
via 014a315f3a41b04028b3c1c3a8f612f73516dd8b (commit)
via e2f85257280bc290e674391849bd9bc1d753b198 (commit)
from 002d415d02b40de916a147d560ce9bcca01a9f43 (commit)
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 -----------------------------------------------------------------
commit 28da4c98e38db6ac783e2b95ae96ec1928653672
Author: gryf <gry...@gmail.com>
Date: Tue, 7 Feb 2017 21:05:17 +0100
URL: <http://repo.or.cz/wmaker-crm.git/28da4c98e38db6ac>
Added possibility for half-maximized windows to move across the screens.
Using MoveHalfMaximizedWindowsBetweenScreens option user can enable
ability for moving half-maximized windows not only within current
screen/head/display, but also to other heads, if they exists. Note, that
only vertically or horizontally maximized windows can be transfered to
another display. Quarter-maximized windows are not supported, since it
is ambiguous to predict in which direction such window should be moved.
---
NEWS | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/actions.c | 48 +++++++++++++++++++++++++++-
2 files changed, 133 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 4dcacb74e5bd..b407b7868440 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,92 @@ respectively. This setting can also be changed by
unchecking or checking
"Expert User Preferences" tab in WPrefs.app.
+Move half-maximized windows between the screens
+-----------------------------------------------
+
+New option was introduced to allow change of behaviour of half-maximize windows
+in multiple displays environment. In such environment it is more natural that
+half maximized windows would travel from one screen to another. Now it is
+possible to make that happen by setting an option
+"MoveHalfMaximizedWindowsBetweenScreens" to "Yes" in
+~/GNUstep/Defaults/WindowMaker config file, or by checking "Allow move
+half-maximized windows between multiple screens." in 'Expert User Preferences"
+tab in WPrefs.app.
+
+For example, given there are two screens in layout where one display is on the
+left and second display is on the right with window on first screen:
+
+ ┌┬────────────────┬─────────────────┬┐
+ ├┘ ┌───────┐ │ ├┤
+ │ ├───────┤ │ ├┤
+ │ │ │ │ ├┤
+ │ │ │ │ ├┤
+ │ └───────┘ │ └┤
+ ├┬┐ ├┬┬┐ │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+It can be right-half-maximized (using previously defined key combination), so
it
+become:
+
+ ┌┬───────┬────────┬─────────────────┬┐
+ ├┘ ├────────┤ ├┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ │ │ │ └┤
+ ├┬┐ └────────┼┬┬┐ │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+In this example there is an assumption that WindowMaker is configured, that
+maximized windows wont cover mini icons nor dock.
+
+Without setting new option to true, issuing another right-half-maximize will
+restore window dimensions and position to the original state (like on the first
+figure). With new option set to true it will move window to second screen like:
+
+ ┌┬────────────────┬────────┬────────┬┐
+ ├┘ ├────────┤ ├┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ │ │ │ └┤
+ ├┬┐ ├┬┬┬─────┘ │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+Another activation of right-half-maxmimize:
+
+ ┌┬────────────────┬────────┬────────┬┐
+ ├┘ │ ├────────┼┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ ├┬┐ ├┬┬┐ └────────┘│
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+And final activation of right-half-maxmimize:
+
+ ┌┬────────────────┬───────┬─────────┬┐
+ ├┘ ├───────┤ ├┤
+ │ │ │ ├┤
+ │ │ │ ├┤
+ │ ├───────┘ ├┤
+ │ │ └┤
+ ├┬┐ ├┬┬┐ │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+Where window is restored its size (but not position, since it it on different
+head now). Moving window in directions like left-half-maximize,
+top-half-maximize and bottom-half-maximize will behave in similar way depending
+on the layout of displays.
+
+Note, that only windows that are half-maximized vertically or horizontally can
+be moved to another screen due to the fact, that direction of movement of
+quarter-maximized windows is ambiguous. As for vertical/horizontal-maximize,
+since doesn't move the window but only strech it vertically/horizontally this
+feature also doesn't apply.
+
+
-- 0.95.7
Window snapping
diff --git a/src/actions.c b/src/actions.c
index b2a2bbba6b78..4a96ce31ef6d 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -496,7 +496,53 @@ void handleMaximize(WWindow *wwin, int directions)
if ((wwin->flags.old_maximized & MAX_MAXIMUS) &&
!(requested & MAX_MAXIMUS))
wMaximizeWindow(wwin, MAX_MAXIMUS | flags, head);
- else
+
+ else if (wPreferences.move_half_max_between_heads) {
+ /* Select windows, which are only horizontally or
vertically
+ * maximized. Quarters cannot be handled here, since
there is not
+ * clear on which direction user intend to move such
window. */
+ if ((current & MAX_VERTICAL) || (current &
MAX_HORIZONTAL)) {
+ if (requested & MAX_LEFTHALF && current &
MAX_LEFTHALF) {
+ head =
wGetHeadRelativeToCurrentHead(wwin->screen_ptr,
+ head, DIRECTION_LEFT);
+ if (head != -1) {
+ effective |= MAX_RIGHTHALF;
+ effective |= MAX_VERTICAL;
+ effective &= ~(MAX_HORIZONTAL |
MAX_LEFTHALF);
+ }
+ } else if (requested & MAX_RIGHTHALF &&
+ current & MAX_RIGHTHALF) {
+ head =
wGetHeadRelativeToCurrentHead(wwin->screen_ptr,
+ head, DIRECTION_RIGHT);
+ if (head != -1) {
+ effective |= MAX_LEFTHALF;
+ effective |= MAX_VERTICAL;
+ effective &= ~(MAX_HORIZONTAL |
MAX_RIGHTHALF);
+ }
+ } else if (requested & MAX_TOPHALF && current &
MAX_TOPHALF) {
+ head =
wGetHeadRelativeToCurrentHead(wwin->screen_ptr,
+ head, DIRECTION_UP);
+ if (head != -1) {
+ effective |= MAX_BOTTOMHALF;
+ effective |= MAX_HORIZONTAL;
+ effective &= ~(MAX_VERTICAL |
MAX_TOPHALF);
+ }
+ } else if (requested & MAX_BOTTOMHALF &&
+ current & MAX_BOTTOMHALF) {
+ head =
wGetHeadRelativeToCurrentHead(wwin->screen_ptr,
+ head, DIRECTION_DOWN);
+ if (head != -1) {
+ effective |= MAX_TOPHALF;
+ effective |= MAX_HORIZONTAL;
+ effective &= ~(MAX_VERTICAL |
MAX_BOTTOMHALF);
+ }
+ } if (head == -1)
+ wUnmaximizeWindow(wwin);
+ else
+ wMaximizeWindow(wwin, effective |
flags, head);
+ } else
+ wUnmaximizeWindow(wwin);
+ } else
wUnmaximizeWindow(wwin);
/* these alone mean vertical|horizontal toggle */
} else if ((effective == MAX_LEFTHALF) ||
commit 17a47af160fee0cecf4af55cb13d0b5c54bafeee
Author: gryf <gry...@gmail.com>
Date: Tue, 7 Feb 2017 21:05:16 +0100
URL: <http://repo.or.cz/wmaker-crm.git/17a47af160fee0ce>
Added option for ability to move half-maximized between heads.
Added new option to Window Maker preferences to enable half-maximized
windows movement on all available heads. Option can be found in WPrefs
app on Expert section.
---
WPrefs.app/Expert.c | 3 +++
src/WindowMaker.h | 1 +
src/defaults.c | 2 ++
3 files changed, 6 insertions(+)
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index 84c2eb5186df..e4c922ae5625 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -100,6 +100,9 @@ static const struct {
{ N_("Snapping a window to the top maximizes it to the full screen."),
/* default: */ False, OPTION_WMAKER, "SnapToTopMaximizesFullscreen" },
+ { N_("Allow move half-maximized windows betweem multiple screens."),
+ /* default: */ False, OPTION_WMAKER,
"MoveHalfMaximizedWindowsBetweenScreens" },
+
{ N_("Open dialogs in the same workspace as their owners."),
/* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" }
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ce07d82bbd91..2e727d3ba07b 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -365,6 +365,7 @@ extern struct WPreferences {
int snap_corner_detect; /* how far from corner to begin snap
*/
char snap_to_top_maximizes_fullscreen;
char drag_maximized_window; /* behavior when a maximized window
is dragged */
+ char move_half_max_between_heads; /* move half maximized window
between available heads */
char highlight_active_app; /* show the focused app by
highlighting its icon */
char auto_arrange_icons; /* automagically arrange icons */
diff --git a/src/defaults.c b/src/defaults.c
index 23468178a124..48b941f2d942 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -482,6 +482,8 @@ WDefaultEntry optionList[] = {
&wPreferences.snap_to_top_maximizes_fullscreen, getBool, NULL,
NULL, NULL},
{"DragMaximizedWindow", "Move", seDragMaximizedWindow,
&wPreferences.drag_maximized_window, getEnum, NULL, NULL, NULL},
+ {"MoveHalfMaximizedWindowsBetweenScreens", "NO", NULL,
+ &wPreferences.move_half_max_between_heads, getBool, NULL, NULL,
NULL},
{"HighlightActiveApp", "YES", NULL,
&wPreferences.highlight_active_app, getBool, NULL, NULL, NULL},
{"AutoArrangeIcons", "NO", NULL,
commit 014a315f3a41b04028b3c1c3a8f612f73516dd8b
Author: gryf <gry...@gmail.com>
Date: Tue, 7 Feb 2017 21:05:15 +0100
URL: <http://repo.or.cz/wmaker-crm.git/014a315f3a41b040>
Added wGetHeadRelativeToCurrentHead function
A new function for obtaining possible heads (displays) was added. It
allow to query for a head in four directions relative to the current
one.
---
src/xinerama.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/xinerama.h | 9 +++++++
2 files changed, 79 insertions(+)
diff --git a/src/xinerama.c b/src/xinerama.c
index 3d261396644a..483046c711ce 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -18,6 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <stdlib.h>
+
#include "wconfig.h"
#include "xinerama.h"
@@ -236,6 +238,74 @@ int wGetHeadForWindow(WWindow * wwin)
return wGetHeadForRect(wwin->screen_ptr, rect);
}
+/* Find head on left, right, up or down direction relative to current
+head. If there is no screen available on pointed direction, -1 will be
+returned.*/
+int wGetHeadRelativeToCurrentHead(WScreen *scr, int current_head, int
direction)
+{
+ short int found = 0;
+ int i;
+ int distance = 0;
+ int smallest_distance = 0;
+ int nearest_head = scr->xine_info.primary_head;
+ WMRect crect = wGetRectForHead(scr, current_head);
+
+ for (i = 0; i < scr->xine_info.count; i++) {
+ if (i == current_head)
+ continue;
+
+ WMRect *rect = &scr->xine_info.screens[i];
+
+ /* calculate distance from the next screen to current one */
+ switch (direction) {
+ case DIRECTION_LEFT:
+ if (rect->pos.x < crect.pos.x) {
+ found = 1;
+ distance = abs((rect->pos.x +
rect->size.width)
+ - crect.pos.x) +
abs(rect->pos.y + crect.pos.y);
+ }
+ break;
+ case DIRECTION_RIGHT:
+ if (rect->pos.x > crect.pos.x) {
+ found = 1;
+ distance = abs((crect.pos.x +
crect.size.width)
+ - rect->pos.x) +
abs(rect->pos.y + crect.pos.y);
+ }
+ break;
+ case DIRECTION_UP:
+ if (rect->pos.y < crect.pos.y) {
+ found = 1;
+ distance = abs((rect->pos.y +
rect->size.height)
+ - crect.pos.y) +
abs(rect->pos.x + crect.pos.x);
+ }
+ break;
+ case DIRECTION_DOWN:
+ if (rect->pos.y > crect.pos.y) {
+ found = 1;
+ distance = abs((crect.pos.y +
crect.size.height)
+ - rect->pos.y) +
abs(rect->pos.x + crect.pos.x);
+ }
+ break;
+ }
+
+ if (found && distance == 0)
+ return i;
+
+ if (smallest_distance == 0)
+ smallest_distance = distance;
+
+ if (abs(distance) <= smallest_distance) {
+ smallest_distance = distance;
+ nearest_head = i;
+ }
+ }
+
+ if (found && smallest_distance != 0 && nearest_head != current_head)
+ return nearest_head;
+
+ return -1;
+}
+
int wGetHeadForPoint(WScreen * scr, WMPoint point)
{
int i;
diff --git a/src/xinerama.h b/src/xinerama.h
index fd1d4692f930..291032583129 100644
--- a/src/xinerama.h
+++ b/src/xinerama.h
@@ -35,12 +35,21 @@ void wInitXinerama(WScreen *scr);
#define XFLAG_MULTIPLE 0x02
#define XFLAG_PARTIAL 0x04
+enum {
+ DIRECTION_LEFT,
+ DIRECTION_RIGHT,
+ DIRECTION_UP,
+ DIRECTION_DOWN
+};
+
int wGetRectPlacementInfo(WScreen *scr, WMRect rect, int *flags);
int wGetHeadForRect(WScreen *scr, WMRect rect);
int wGetHeadForWindow(WWindow *wwin);
+int wGetHeadRelativeToCurrentHead(WScreen *scr, int current_head, int
direction);
+
int wGetHeadForPoint(WScreen *scr, WMPoint point);
int wGetHeadForPointerLocation(WScreen *scr);
commit e2f85257280bc290e674391849bd9bc1d753b198
Author: gryf <gry...@gmail.com>
Date: Tue, 7 Feb 2017 21:05:14 +0100
URL: <http://repo.or.cz/wmaker-crm.git/e2f85257280bc290>
Added 'head' parameter to wMaximizeWindow
Additional 'head' parameter will help to select head (display) where
window should be maximized.
---
src/actions.c | 22 +++++-----------------
src/actions.h | 2 +-
src/event.c | 3 ++-
src/window.c | 2 +-
src/winmenu.c | 5 +++--
src/wmspec.c | 15 ++++++++++-----
6 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/src/actions.c b/src/actions.c
index 4bc3e075e59c..b2a2bbba6b78 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -359,7 +359,7 @@ void update_saved_geometry(WWindow *wwin)
save_old_geometry(wwin, SAVE_GEOMETRY_X);
}
-void wMaximizeWindow(WWindow *wwin, int directions)
+void wMaximizeWindow(WWindow *wwin, int directions, int head)
{
unsigned int new_width, new_height, half_scr_width, half_scr_height;
int new_x = 0;
@@ -393,20 +393,7 @@ void wMaximizeWindow(WWindow *wwin, int directions)
totalArea.y2 = scr->scr_height;
totalArea.x1 = 0;
totalArea.y1 = 0;
- usableArea = totalArea;
-
- if (!(directions & MAX_IGNORE_XINERAMA)) {
- WScreen *scr = wwin->screen_ptr;
- int head;
-
- if (directions & MAX_KEYBOARD)
- head = wGetHeadForWindow(wwin);
- else
- head = wGetHeadForPointerLocation(scr);
-
- usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True);
- }
-
+ usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True);
/* Only save directions, not kbd or xinerama hints */
directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF |
MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
@@ -502,12 +489,13 @@ void handleMaximize(WWindow *wwin, int directions)
int requested = directions & (MAX_HORIZONTAL | MAX_VERTICAL |
MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
int effective = requested ^ current;
int flags = directions & ~requested;
+ int head = wGetHeadForWindow(wwin);
if (!effective) {
/* allow wMaximizeWindow to restore the Maximusized size */
if ((wwin->flags.old_maximized & MAX_MAXIMUS) &&
!(requested & MAX_MAXIMUS))
- wMaximizeWindow(wwin, MAX_MAXIMUS | flags);
+ wMaximizeWindow(wwin, MAX_MAXIMUS | flags, head);
else
wUnmaximizeWindow(wwin);
/* these alone mean vertical|horizontal toggle */
@@ -557,7 +545,7 @@ void handleMaximize(WWindow *wwin, int directions)
effective &= ~(MAX_TOPHALF | MAX_BOTTOMHALF);
effective &= ~MAX_MAXIMUS;
}
- wMaximizeWindow(wwin, effective | flags);
+ wMaximizeWindow(wwin, effective | flags, head);
}
}
diff --git a/src/actions.h b/src/actions.h
index 8390e49c2f8a..a15cf488a9c6 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -57,7 +57,7 @@ void wSelectWindows(WScreen *scr, XEvent *ev);
void wSelectWindow(WWindow *wwin, Bool flag);
void wUnselectWindows(WScreen *scr);
-void wMaximizeWindow(WWindow *wwin, int directions);
+void wMaximizeWindow(WWindow *wwin, int directions, int head);
void wUnmaximizeWindow(WWindow *wwin);
void handleMaximize(WWindow *wwin, int directions);
diff --git a/src/event.c b/src/event.c
index 0b394e71db2b..5145e95fae03 100644
--- a/src/event.c
+++ b/src/event.c
@@ -632,7 +632,8 @@ static void handleMapRequest(XEvent * ev)
if (wwin) {
wClientSetState(wwin, NormalState, None);
if (wwin->flags.maximized) {
- wMaximizeWindow(wwin, wwin->flags.maximized);
+ wMaximizeWindow(wwin, wwin->flags.maximized,
+ wGetHeadForWindow(wwin));
}
if (wwin->flags.shaded) {
wwin->flags.shaded = 0;
diff --git a/src/window.c b/src/window.c
index 801d7b6cb83e..d1e351ef7f9c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2853,7 +2853,7 @@ static void titlebarDblClick(WCoreWindow *sender, void
*data, XEvent *event)
int ndir = dir ^ wwin->flags.maximized;
if (ndir != 0)
- wMaximizeWindow(wwin, ndir);
+ wMaximizeWindow(wwin, ndir,
wGetHeadForWindow(wwin));
else
wUnmaximizeWindow(wwin);
}
diff --git a/src/winmenu.c b/src/winmenu.c
index 2aa318740fda..af7fe62707b8 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -169,7 +169,7 @@ static void execWindowOptionCommand(WMenu * menu,
WMenuEntry * entry)
static void execMaximizeCommand(WMenu * menu, WMenuEntry * entry)
{
WWindow *wwin = (WWindow *) entry->clientdata;
-
+
/* Parameter not used, but tell the compiler that it is ok */
(void) menu;
@@ -277,7 +277,8 @@ static void execMenuCommand(WMenu * menu, WMenuEntry *
entry)
if (wwin->flags.maximized)
wUnmaximizeWindow(wwin);
else
- wMaximizeWindow(wwin, MAX_VERTICAL | MAX_HORIZONTAL);
+ wMaximizeWindow(wwin, MAX_VERTICAL | MAX_HORIZONTAL,
+ wGetHeadForWindow(wwin));
break;
case MC_SHADE:
diff --git a/src/wmspec.c b/src/wmspec.c
index 0bfc8648dce0..75fcddea7b2e 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -1120,9 +1120,11 @@ static void doStateAtom(WWindow *wwin, Atom state, int
set, Bool init)
wwin->flags.maximized |= (set ? MAX_VERTICAL : 0);
} else {
if (set)
- wMaximizeWindow(wwin, wwin->flags.maximized |
MAX_VERTICAL);
+ wMaximizeWindow(wwin, wwin->flags.maximized |
MAX_VERTICAL,
+ wGetHeadForWindow(wwin));
else
- wMaximizeWindow(wwin, wwin->flags.maximized &
~MAX_VERTICAL);
+ wMaximizeWindow(wwin, wwin->flags.maximized &
~MAX_VERTICAL,
+ wGetHeadForWindow(wwin));
}
} else if (state == net_wm_state_maximized_horz) {
if (set == _NET_WM_STATE_TOGGLE)
@@ -1132,9 +1134,11 @@ static void doStateAtom(WWindow *wwin, Atom state, int
set, Bool init)
wwin->flags.maximized |= (set ? MAX_HORIZONTAL : 0);
} else {
if (set)
- wMaximizeWindow(wwin, wwin->flags.maximized |
MAX_HORIZONTAL);
+ wMaximizeWindow(wwin, wwin->flags.maximized |
MAX_HORIZONTAL,
+ wGetHeadForWindow(wwin));
else
- wMaximizeWindow(wwin, wwin->flags.maximized &
~MAX_HORIZONTAL);
+ wMaximizeWindow(wwin, wwin->flags.maximized &
~MAX_HORIZONTAL,
+ wGetHeadForWindow(wwin));
}
} else if (state == net_wm_state_hidden) {
if (set == _NET_WM_STATE_TOGGLE)
@@ -1623,7 +1627,8 @@ Bool wNETWMProcessClientMessage(XClientMessageEvent
*event)
wwin->flags.maximized = maximized;
wUnmaximizeWindow(wwin);
} else {
- wMaximizeWindow(wwin, wwin->flags.maximized);
+ wMaximizeWindow(wwin, wwin->flags.maximized,
+ wGetHeadForWindow(wwin));
}
}
updateStateHint(wwin, False, False);
-----------------------------------------------------------------------
Summary of changes:
NEWS | 86 +++++++++++++++++++++++++++++++++++++++++++++
WPrefs.app/Expert.c | 3 ++
src/WindowMaker.h | 1 +
src/actions.c | 70 ++++++++++++++++++++++++++----------
src/actions.h | 2 +-
src/defaults.c | 2 ++
src/event.c | 3 +-
src/window.c | 2 +-
src/winmenu.c | 5 +--
src/wmspec.c | 15 +++++---
src/xinerama.c | 70 ++++++++++++++++++++++++++++++++++++
src/xinerama.h | 9 +++++
12 files changed, 240 insertions(+), 28 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
