jazzman/xoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multi-head support

Browse Source
This commit is contained in:
seanpringle
2012-08-31 17:56:09 +10:00
parent a34082631a
commit 56d11f240e
4 changed files with 166 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
cerberus.c
View File

@@ -150,6 +150,7 @@ void ewmh_active_window(Window w)
// build a client struct
client* window_client(Window win)
{
int i;
if (win == None) return NULL;
client *c = calloc(1, sizeof(client));
@@ -170,8 +171,15 @@ client* window_client(Window win)
c->trans = c->transient_for ? 1:0;
c->spot = c->attr.x > screen_x+screen_w/2
? (c->attr.y > screen_y+screen_h/2 ? SPOT3: SPOT2)
for (i = 0; i < nmonitors; i++)
if (INTERSECT(monitors[i].x, monitors[i].y, monitors[i].w, monitors[i].h,
c->attr.x, c->attr.y, c->attr.width, c->attr.height))
{ c->monitor = i; break; }
monitor *m = &monitors[c->monitor];
c->spot = c->attr.x > m->x + m->w/2
? (c->attr.y > m->y + m->h/2 ? SPOT3: SPOT2)
: SPOT1;
if (c->visible)
@@ -203,6 +211,7 @@ void windows_visible(stack *s)
memmove(s, &inplay, sizeof(stack));
return;
}
s->depth = 0;
unsigned int nwins; int i; Window w1, w2, *wins;
if (XQueryTree(display, root, &w1, &w2, &wins, &nwins) && wins)
{
@@ -310,40 +319,43 @@ void client_position(client *c, int x, int y, int w, int h)
if (w < sw) x += (sw-w)/2;
if (h < sh) y += (sh-h)/2;
monitor *m = &monitors[c->monitor];
// bump onto screen
x = MAX(0, MIN(x, screen_x + screen_w - w - BORDER*2));
y = MAX(0, MIN(y, screen_y + screen_h - h - BORDER*2));
x = MAX(0, MIN(x, m->x + m->w - w - BORDER*2));
y = MAX(0, MIN(y, m->y + m->h - h - BORDER*2));
XMoveResizeWindow(display, c->window, x, y, w, h);
}
// return co-ords for a screen "spot"
void spot_xywh(int spot, int *x, int *y, int *w, int *h)
void spot_xywh(int spot, int mon, int *x, int *y, int *w, int *h)
{
spot = MAX(SPOT1, MIN(SPOT3, spot));
monitor *m = &monitors[MIN(nmonitors-1, MAX(0, mon))];
int width_spot1 = (double)screen_w / 100 * MIN(90, MAX(10, SPOT1_WIDTH_PCT));
int height_spot2 = (double)screen_h / 100 * MIN(90, MAX(10, SPOT2_HEIGHT_PCT));
int width_spot1 = (double)m->w / 100 * MIN(90, MAX(10, SPOT1_WIDTH_PCT));
int height_spot2 = (double)m->h / 100 * MIN(90, MAX(10, SPOT2_HEIGHT_PCT));
// default, left 2/3 of screen
*x = screen_x, *y = screen_y, *w = width_spot1, *h = screen_h;
*x = m->x, *y = m->y, *w = width_spot1, *h = m->h;
switch (spot)
{
// right top 2/9 of screen
case SPOT2:
*x = screen_x + width_spot1;
*y = screen_y;
*w = screen_w - width_spot1;
*x = m->x + width_spot1;
*y = m->y;
*w = m->w - width_spot1;
*h = height_spot2;
break;
// right bottom 1/9 of screen
case SPOT3:
*x = screen_x + width_spot1;
*y = screen_y + height_spot2;
*w = screen_w - width_spot1;
*h = screen_h - height_spot2;
*x = m->x + width_spot1;
*y = m->y + height_spot2;
*w = m->w - width_spot1;
*h = m->h - height_spot2;
break;
}
}
@@ -361,7 +373,7 @@ void client_spot(client *c, int spot, int force)
spot = t->spot;
client_free(t);
}
spot_xywh(spot, &x, &y, &w, &h);
spot_xywh(spot, c->monitor, &x, &y, &w, &h);
if (c->type == atoms[_NET_WM_WINDOW_TYPE_DIALOG])
{
@@ -378,15 +390,15 @@ void client_spot(client *c, int spot, int force)
// cycle through windows in a screen "spot"
void client_cycle(client *c)
{
spot_active(c->spot, c->window);
spot_active(c->spot, c->monitor, c->window);
client_lower(c);
}
// find a window within a screen "spot" and raise/activate
Window spot_active(int spot, Window except)
Window spot_active(int spot, int mon, Window except)
{
int x, y, w, h;
spot_xywh(spot, &x, &y, &w, &h);
spot_xywh(spot, mon, &x, &y, &w, &h);
int i; stack wins;
memset(&wins, 0, sizeof(stack));
@@ -489,6 +501,7 @@ void client_active(client *c)
Window old = current;
current = c->window;
current_spot = c->spot;
current_mon = c->monitor;
if (old && (o = window_client(old)))
{
@@ -602,14 +615,21 @@ void map_request(XMapEvent *e)
int x, y, w, h;
spot = SPOT1;
spot_xywh(SPOT2, &x, &y, &w, &h);
spot_xywh(SPOT2, c->monitor, &x, &y, &w, &h);
if (c->attr.width <= w && c->attr.height <= h)
spot = SPOT2;
spot_xywh(SPOT3, &x, &y, &w, &h);
spot_xywh(SPOT3, c->monitor, &x, &y, &w, &h);
if (c->attr.width <= w && c->attr.height <= h)
spot = SPOT3;
}
int monitor = MAX(nmonitors-1, MIN(0, MONITOR_START));
if (MONITOR_START == MONITOR_CURRENT)
monitor = current_mon;
c->monitor = monitor;
client_spot(c, spot, 0);
}
client_free(c);
@@ -642,12 +662,12 @@ void map_notify(XMapEvent *e)
void unmap_notify(XUnmapEvent *e)
{
if (e->window == current && !spot_active(current_spot, current))
if (e->window == current && !spot_active(current_spot, current_mon, current))
{
// find something to activate
if (!spot_active(SPOT1, current)
&& !spot_active(SPOT2, current)
&& !spot_active(SPOT3, current))
if (!spot_active(SPOT1, current_mon, current)
&& !spot_active(SPOT2, current_mon, current)
&& !spot_active(SPOT3, current_mon, current))
current = None;
}
@@ -695,23 +715,37 @@ void key_press(XKeyEvent *e)
client_cycle(c);
break;
case ACTION_OTHER:
spot_active(c->spot, c->window);
spot_active(c->spot, c->monitor, c->window);
break;
case ACTION_CLOSE:
client_close(c);
break;
case ACTION_MOVE_MONITOR_INC:
if (c->monitor < nmonitors-1)
{
c->monitor++;
client_spot(c, c->spot, 1);
}
break;
case ACTION_MOVE_MONITOR_DEC:
if (c->monitor > 0)
{
c->monitor--;
client_spot(c, c->spot, 1);
}
break;
}
}
switch (act)
{
case ACTION_FOCUS_SPOT1:
spot_active(SPOT1, None);
spot_active(SPOT1, current_mon, None);
break;
case ACTION_FOCUS_SPOT2:
spot_active(SPOT2, None);
spot_active(SPOT2, current_mon, None);
break;
case ACTION_FOCUS_SPOT3:
spot_active(SPOT3, None);
spot_active(SPOT3, current_mon, None);
break;
case ACTION_COMMAND:
exec_cmd(data);
@@ -719,6 +753,24 @@ void key_press(XKeyEvent *e)
case ACTION_FIND_OR_START:
find_or_start(data);
break;
case ACTION_FOCUS_MONITOR_INC:
if (current_mon < nmonitors-1)
{
if (spot_active(current_spot, current_mon+1, None)) break;
if (spot_active(SPOT1, current_mon+1, None)) break;
if (spot_active(SPOT2, current_mon+1, None)) break;
if (spot_active(SPOT3, current_mon+1, None)) break;
}
break;
case ACTION_FOCUS_MONITOR_DEC:
if (current_mon > 0)
{
if (spot_active(current_spot, current_mon-1, None)) break;
if (spot_active(SPOT1, current_mon-1, None)) break;
if (spot_active(SPOT2, current_mon-1, None)) break;
if (spot_active(SPOT3, current_mon-1, None)) break;
}
break;
}
client_free(c);
ewmh_client_list();
@@ -776,6 +828,7 @@ void focus_change(XFocusChangeEvent *e)
int main(int argc, char *argv[])
{
int i, j;
signal(SIGCHLD, catch_exit);
if(!(display = XOpenDisplay(0))) return 1;
@@ -784,10 +837,12 @@ int main(int argc, char *argv[])
scr_id = DefaultScreen(display);
root = DefaultRootWindow(display);
xerror = XSetErrorHandler(oops);
screen_x = 0;
screen_y = 0;
screen_w = WidthOfScreen(screen);
screen_h = HeightOfScreen(screen);
monitors[0].x = 0;
monitors[0].y = 0;
monitors[0].w = WidthOfScreen(screen);
monitors[0].h = HeightOfScreen(screen);
nmonitors = 1;
XSelectInput(display, root, StructureNotifyMask | SubstructureRedirectMask | SubstructureNotifyMask);
@@ -820,11 +875,10 @@ int main(int argc, char *argv[])
stack wins;
memset(&wins, 0, sizeof(stack));
// panel struts
windows_visible(&wins);
current = None;
current_spot = 0;
inplay.depth = 0;
for (i = 0; i < wins.depth; i++)
{
client *c = wins.clients[i];
@@ -840,6 +894,41 @@ int main(int argc, char *argv[])
struts[BOTTOM] = MAX(struts[BOTTOM], strut[BOTTOM]);
}
}
client_free(c);
}
// support multi-head.
if (XineramaIsActive(display))
{
XineramaScreenInfo *info = XineramaQueryScreens(display, &nmonitors);
if (info)
{
nmonitors = MIN(nmonitors, MAX_MONITORS);
for (i = 0; i < nmonitors; i++)
{
monitors[i].x = info[i].x_org;
monitors[i].y = info[i].y_org + struts[TOP];
monitors[i].w = info[i].width;
monitors[i].h = info[i].height - struts[TOP] - struts[BOTTOM];
if (!i)
{
monitors[i].x += struts[LEFT];
monitors[i].w -= struts[LEFT];
}
if (i == nmonitors-1)
{
monitors[i].w -= struts[RIGHT];
}
}
XFree(info);
}
}
// setup exiting managable windows
windows_visible(&wins);
inplay.depth = 0;
for (i = 0; i < wins.depth; i++)
{
client *c = wins.clients[i];
if (c && c->manage)
{
window_listen(c->window);
@@ -851,12 +940,9 @@ int main(int argc, char *argv[])
if (c->visible)
client_review(c);
}
client_free(c);
}
screen_x += struts[LEFT];
screen_y += struts[TOP];
screen_w -= struts[LEFT] + struts[RIGHT];
screen_h -= struts[TOP] + struts[BOTTOM];
// main event loop
for (;;)
{
while (inplay.depth)

24
cerberus.h
View File

@@ -31,6 +31,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include <X11/XKBlib.h>
#include <X11/extensions/Xinerama.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -54,6 +55,14 @@ int scr_id;
Window root;
Time latest;
typedef struct {
short x, y, w, h;
} monitor;
#define MAX_MONITORS 3
monitor monitors[MAX_MONITORS];
int nmonitors;
typedef struct {
Window window;
XWindowAttributes attr;
@@ -61,7 +70,7 @@ typedef struct {
XSizeHints size;
Window transient_for;
Atom type;
short spot, visible, trans, manage, input, urgent;
short monitor, spot, visible, trans, manage, input, urgent;
} client;
#define STACK 64
@@ -72,15 +81,14 @@ typedef struct {
Window windows[STACK];
} stack;
short current_spot = 0;
Window current;
short current_spot = 0, current_mon = 0;
Window current = None;
stack inplay;
static int (*xerror)(Display *, XErrorEvent *);
enum { LEFT, RIGHT, TOP, BOTTOM };
int struts[4] = { 0, 0, 0, 0 };
short screen_x, screen_y, screen_w, screen_h;
#define ATOM_ENUM(x) x
#define ATOM_CHAR(x) #x
@@ -122,6 +130,10 @@ enum {
ACTION_OTHER,
ACTION_COMMAND,
ACTION_FIND_OR_START,
ACTION_MOVE_MONITOR_INC,
ACTION_MOVE_MONITOR_DEC,
ACTION_FOCUS_MONITOR_INC,
ACTION_FOCUS_MONITOR_DEC,
ACTIONS
};
@@ -132,6 +144,10 @@ typedef struct {
void *data;
} binding;
enum {
MONITOR_CURRENT=-1
};
enum {
SPOT_CURRENT,
SPOT_SMART,

17
config.h
View File

@@ -35,6 +35,13 @@
// If spot is not current, window won't steal focus.
//#define SPOT_START SPOT1
// If on multi-head, place windows on monitor N.
// (0-based index, same order as xrandr list)
//#define MONITOR_START 0
// If on multi-head, place windows on monitor holding current window.
#define MONITOR_START MONITOR_CURRENT
binding keys[] = {
// Focus the top-most window in a spot.
@@ -56,6 +63,14 @@ binding keys[] = {
// Gracefully close the current window.
{ .mod = Mod4Mask, .key = XK_Escape, .act = ACTION_CLOSE },
// Switch focus between monitors.
{ .mod = Mod4Mask, .key = XK_Right, .act = ACTION_FOCUS_MONITOR_INC },
{ .mod = Mod4Mask, .key = XK_Left, .act = ACTION_FOCUS_MONITOR_DEC },
// Move windows between monitors.
{ .mod = ShiftMask|Mod4Mask, .key = XK_Right, .act = ACTION_MOVE_MONITOR_INC },
{ .mod = ShiftMask|Mod4Mask, .key = XK_Left, .act = ACTION_MOVE_MONITOR_DEC },
// Launcher
{ .mod = Mod4Mask, .key = XK_x, .act = ACTION_COMMAND, .data = "dmenu_run" },
@@ -67,4 +82,4 @@ binding keys[] = {
{ .mod = AnyModifier, .key = XK_F5, .act = ACTION_FIND_OR_START, .data = "firefox" },
{ .mod = AnyModifier, .key = XK_F6, .act = ACTION_FIND_OR_START, .data = "xchat" },
};
};

4
proto.h
View File

@@ -16,10 +16,10 @@ void client_free(client *c);
int client_protocol(client *c, Atom protocol);
void client_close(client *c);
void client_position(client *c, int x, int y, int w, int h);
void spot_xywh(int spot, int *x, int *y, int *w, int *h);
void spot_xywh(int spot, int mon, int *x, int *y, int *w, int *h);
void client_spot(client *c, int spot, int force);
void client_cycle(client *c);
Window spot_active(int spot, Window except);
Window spot_active(int spot, int mon, Window except);
void client_stack(client *c, stack *all, stack *raise);
void client_raise(client *c);
void client_lower(client *c);