dwm: layout.c@d2ae55f83f9f (annotated)

858 b797071ebbd4 yet another fix of copyright compactisition Anselm R. Garbe <arg@suckless.org> parents: 857 diff changeset	1	/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
b797071ebbd4 yet another fix of copyright compactisition Anselm R. Garbe <arg@suckless.org> parents: 857 diff changeset	2	* © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
857 453788ae925c making Copyright notices more compact Anselm R. Garbe <arg@suckless.org> parents: 837 diff changeset	3	* See LICENSE file for license details. */
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	4	#include "dwm.h"
825 bef1854ce739 fixed some issues due to the Arg->const char * transition Anselm R. Garbe <arg@suckless.org> parents: 823 diff changeset	5	#include <stdlib.h>
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	6
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	7	unsigned int blw = 0;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	8	Layout *lt = NULL;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	9
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	10	/* static */
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	11
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	12	static unsigned int nlayouts = 0;
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	13	static unsigned int masterw = MASTERWIDTH;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	14	static unsigned int nmaster = NMASTER;
191 56fee1dc9d53 switched to regexp matching for Rules arg@10ksloc.org parents: 178 diff changeset	15
784 74722317b171 renamed floating into swimming (this does not clash with C naming conventions and fits better the fish symbol) - also in man page Anselm R. Garbe <arg@suckless.org> parents: 782 diff changeset	16	static void
74722317b171 renamed floating into swimming (this does not clash with C naming conventions and fits better the fish symbol) - also in man page Anselm R. Garbe <arg@suckless.org> parents: 782 diff changeset	17	tile(void) {
871 75aa81011594 s/remain/remainder/ Anselm R. Garbe <arg@suckless.org> parents: 870 diff changeset	18	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remainder;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	19	Client *c;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	20
776 be103ae46dbc renamed view.c into screen.c Anselm R. Garbe <arg@suckless.org> parents: 775 diff changeset	21	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	22	n++;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	23	/* window geoms */
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	24	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	25	mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	26	th = (n > nmaster) ? wah / (n - nmaster) : 0;
871 75aa81011594 s/remain/remainder/ Anselm R. Garbe <arg@suckless.org> parents: 870 diff changeset	27	remainder = (n > nmaster) ? wah - th * (n - nmaster) : 0;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	28	tw = waw - mw;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	29
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	30	for(i = 0, c = clients; c; c = c->next)
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	31	if(isvisible(c)) {
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	32	if(c->isbanned)
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	33	XMoveWindow(dpy, c->win, c->x, c->y);
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	34	c->isbanned = False;
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	35	if(c->isfloating)
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	36	continue;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	37	c->ismax = False;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	38	nx = wax;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	39	ny = way;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	40	if(i < nmaster) {
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	41	ny += i * mh;
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	42	nw = mw - 2 * c->border;
55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	43	nh = mh - 2 * c->border;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	44	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	45	else { /* tile window */
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	46	nx += mw;
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	47	nw = tw - 2 * c->border;
55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	48	if(th > 2 * c->border) {
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	49	ny += (i - nmaster) * th;
870 21632814ba18 fixing remaining space calculation Anselm R. Garbe <arg@suckless.org> parents: 867 diff changeset	50	nh = th - 2 * c->border;
21632814ba18 fixing remaining space calculation Anselm R. Garbe <arg@suckless.org> parents: 867 diff changeset	51	if (i == n - 1)
871 75aa81011594 s/remain/remainder/ Anselm R. Garbe <arg@suckless.org> parents: 870 diff changeset	52	nh += remainder;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	53	}
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	54	else /* fallback if th <= 2 * c->border */
55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	55	nh = wah - 2 * c->border;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	56	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	57	resize(c, nx, ny, nw, nh, False);
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	58	i++;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	59	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	60	else {
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	61	c->isbanned = True;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	62	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	63	}
875 73cd10af065a applied dfenze cleanups, fixed some comments in dwm.h Anselm R. Garbe <arg@suckless.org> parents: 871 diff changeset	64	if(!sel \|\| !isvisible(sel))
73cd10af065a applied dfenze cleanups, fixed some comments in dwm.h Anselm R. Garbe <arg@suckless.org> parents: 871 diff changeset	65	focustopvisible();
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	66	restack();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	67	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	68
784 74722317b171 renamed floating into swimming (this does not clash with C naming conventions and fits better the fish symbol) - also in man page Anselm R. Garbe <arg@suckless.org> parents: 782 diff changeset	69	LAYOUTS
74722317b171 renamed floating into swimming (this does not clash with C naming conventions and fits better the fish symbol) - also in man page Anselm R. Garbe <arg@suckless.org> parents: 782 diff changeset	70
74722317b171 renamed floating into swimming (this does not clash with C naming conventions and fits better the fish symbol) - also in man page Anselm R. Garbe <arg@suckless.org> parents: 782 diff changeset	71	/* extern */
74722317b171 renamed floating into swimming (this does not clash with C naming conventions and fits better the fish symbol) - also in man page Anselm R. Garbe <arg@suckless.org> parents: 782 diff changeset	72
74722317b171 renamed floating into swimming (this does not clash with C naming conventions and fits better the fish symbol) - also in man page Anselm R. Garbe <arg@suckless.org> parents: 782 diff changeset	73	void
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	74	floating(void) {
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	75	Client *c;
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	76
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	77	for(c = clients; c; c = c->next) {
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	78	if(isvisible(c)) {
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	79	if(c->isbanned)
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	80	XMoveWindow(dpy, c->win, c->x, c->y);
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	81	c->isbanned = False;
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	82	resize(c, c->x, c->y, c->w, c->h, True);
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	83	}
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	84	else {
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	85	c->isbanned = True;
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	86	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	87	}
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	88	}
875 73cd10af065a applied dfenze cleanups, fixed some comments in dwm.h Anselm R. Garbe <arg@suckless.org> parents: 871 diff changeset	89	if(!sel \|\| !isvisible(sel))
73cd10af065a applied dfenze cleanups, fixed some comments in dwm.h Anselm R. Garbe <arg@suckless.org> parents: 871 diff changeset	90	focustopvisible();
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	91	restack();
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	92	}
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	93
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	94	void
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	95	focusclient(const char *arg) {
799 30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	96	Client *c;
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	97
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	98	if(!sel \|\| !arg)
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	99	return;
831 8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	100	if(atoi(arg) < 0) {
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	101	for(c = sel->prev; c && !isvisible(c); c = c->prev);
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	102	if(!c) {
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	103	for(c = clients; c && c->next; c = c->next);
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	104	for(; c && !isvisible(c); c = c->prev);
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	105	}
831 8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	106	}
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	107	else {
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	108	for(c = sel->next; c && !isvisible(c); c = c->next);
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	109	if(!c)
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	110	for(c = clients; c && !isvisible(c); c = c->next);
799 30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	111	}
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	112	if(c) {
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	113	focus(c);
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	114	restack();
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	115	}
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	116	}
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	117
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	118	void
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	119	incmasterw(const char *arg) {
fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	120	int i;
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	121	if(lt->arrange != tile)
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	122	return;
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	123	if(!arg)
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	124	masterw = MASTERWIDTH;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	125	else {
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	126	i = atoi(arg);
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	127	if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	128	\|\| waw * (masterw + i) / 1000 <= 2 * BORDERPX)
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	129	return;
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	130	masterw += i;
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	131	}
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	132	lt->arrange();
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	133	}
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	134
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	135	void
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	136	incnmaster(const char *arg) {
826 d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	137	int i;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	138
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	139	if(!arg)
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	140	nmaster = NMASTER;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	141	else {
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	142	i = atoi(arg);
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	143	if((lt->arrange != tile) \|\| (nmaster + i < 1)
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	144	\|\| (wah / (nmaster + i) <= 2 * BORDERPX))
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	145	return;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	146	nmaster += i;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	147	}
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	148	if(sel)
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	149	lt->arrange();
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	150	else
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	151	drawstatus();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	152	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	153
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	154	void
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	155	initlayouts(void) {
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	156	unsigned int i, w;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	157
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	158	lt = &layout[0];
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	159	nlayouts = sizeof layout / sizeof layout[0];
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	160	for(blw = i = 0; i < nlayouts; i++) {
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	161	w = textw(layout[i].symbol);
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	162	if(w > blw)
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	163	blw = w;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	164	}
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	165	}
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	166
799 30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	167	Client *
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	168	nexttiled(Client *c) {
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	169	for(; c && (c->isfloating \|\| !isvisible(c)); c = c->next);
799 30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	170	return c;
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	171	}
30ec8b96a7f6 moved focus{next,prev} and nexttiled from client.c to layout.c (because those are not client-specific), moved toggleversatile() from layout.c to client.c (because those are client-specific) Anselm R. Garbe <arg@suckless.org> parents: 790 diff changeset	172
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	173	void
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	174	restack(void) {
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	175	Client *c;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	176	XEvent ev;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	177
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	178	drawstatus();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	179	if(!sel)
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	180	return;
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	181	if(sel->isfloating \|\| lt->arrange == floating)
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	182	XRaiseWindow(dpy, sel->win);
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	183	if(lt->arrange != floating) {
123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	184	if(!sel->isfloating)
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	185	XLowerWindow(dpy, sel->win);
776 be103ae46dbc renamed view.c into screen.c Anselm R. Garbe <arg@suckless.org> parents: 775 diff changeset	186	for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	187	if(c == sel)
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	188	continue;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	189	XLowerWindow(dpy, c->win);
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	190	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	191	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	192	XSync(dpy, False);
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	193	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	194	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	195
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	196	void
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	197	setlayout(const char *arg) {
826 d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	198	int i;
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	199
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	200	if(!arg) {
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	201	for(i = 0; i < nlayouts && lt != &layout[i]; i++);
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	202	if(i == nlayouts - 1)
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	203	lt = &layout[0];
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	204	else
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	205	lt = &layout[++i];
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	206	}
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	207	else {
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	208	i = atoi(arg);
fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	209	if(i < 0 \|\| i >= nlayouts)
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	210	return;
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	211	lt = &layout[i];
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	212	}
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	213	if(sel)
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	214	lt->arrange();
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	215	else
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	216	drawstatus();
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	217	}
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	218
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	219	void
878 d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	220	togglebar(const char *arg) {
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	221	bpos = (bpos == BarOff) ? BARPOS : BarOff;
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	222	updatebarpos();
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	223	}
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	224
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	225	void
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	226	togglemax(const char *arg) {
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	227	XEvent ev;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	228
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	229	if(!sel \|\| (lt->arrange != floating && !sel->isfloating) \|\| sel->isfixed)
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	230	return;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	231	if((sel->ismax = !sel->ismax)) {
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	232	sel->rx = sel->x;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	233	sel->ry = sel->y;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	234	sel->rw = sel->w;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	235	sel->rh = sel->h;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	236	resize(sel, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	237	}
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	238	else
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	239	resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
819 21562c2567a6 status needs update even in togglemax() - since we got an indicator for this Anselm R. Garbe <arg@suckless.org> parents: 815 diff changeset	240	drawstatus();
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	241	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	242	}
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	243
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	244	void
823 fb5cbf0bd923 replaced Arg union with const char arg, seems cleaner to me, even if we need atoi() in some places Anselm R. Garbe <arg@suckless.org>* parents: 819 diff changeset	245	zoom(const char *arg) {
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	246	Client *c;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	247
837 123231b9eb87 renamed untiled into floating, keeping tiled instead of tiling (afaik tiled sounds more correct) - English speakers convinced me Anselm R. Garbe <arg@suckless.org> parents: 831 diff changeset	248	if(!sel \|\| lt->arrange != tile \|\| sel->isfloating)
813 0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	249	return;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	250	if((c = sel) == nexttiled(clients))
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	251	if(!(c = nexttiled(c->next)))
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	252	return;
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	253	detach(c);
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	254	attach(c);
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	255	focus(c);
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	256	lt->arrange();
0ed770c96e51 several changes, made togglemax extern and separated it from zoom() - moved zoom() and togglemax() into layout.c, changed void (func)(Arg ) into void (func)(Arg), changed default keybindings of focusnext/focusprev and incmasterw to h/j/k/l accordingly, made keys in configh appear alphabetically (special keys first), renamed resizemaster into incmasterw, renamed MASTER into MASTERWIDTH Anselm R. Garbe <arg@suckless.org> parents: 799 diff changeset	257	}

author	Anselm R. Garbe <arg@suckless.org>
	Tue, 15 May 2007 12:09:18 +0200
changeset 878	d2ae55f83f9f
parent 875	73cd10af065a
child 880	f330be522eca
permissions	-rw-r--r--