dwm: layout.c@7f8c81c4bc9a (annotated)

910 c13cb8c6b7a5 referred to LICENSE file Anselm R. Garbe <arg@suckless.org> parents: 909 diff changeset	1	/* See LICENSE file for copyright and license details. */
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	2	#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	3	#include <stdlib.h>
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	4
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	5	unsigned int blw = 0;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	6	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	7
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	8	/* static */
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	9
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	10	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	11	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	12	static unsigned int nmaster = NMASTER;
191 56fee1dc9d53 switched to regexp matching for Rules arg@10ksloc.org parents: 178 diff changeset	13
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	14	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	15	tile(void) {
898 6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	16	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	17	Client *c;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	18
776 be103ae46dbc renamed view.c into screen.c Anselm R. Garbe <arg@suckless.org> parents: 775 diff changeset	19	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	20	n++;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	21	/* window geoms */
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	22	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	23	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	24	th = (n > nmaster) ? wah / (n - nmaster) : 0;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	25	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	26
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	27	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	28	if(isvisible(c)) {
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	29	unban(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	30	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	31	continue;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	32	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	33	nx = wax;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	34	ny = way;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	35	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	36	ny += i * mh;
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	37	nw = mw - 2 * c->border;
898 6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	38	nh = mh;
901 8f6f61e07567 fix if n < nmaster of remainer calculation for master windows Anselm R. Garbe <arg@suckless.org> parents: 898 diff changeset	39	if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */
898 6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	40	nh = wah - mh * i;
6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	41	nh -= 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	42	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	43	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	44	nx += mw;
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	45	nw = tw - 2 * c->border;
55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	46	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	47	ny += (i - nmaster) * th;
898 6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	48	nh = th;
6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	49	if(i + 1 == n) /* remainder */
6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	50	nh = wah - th * (i - nmaster);
6c8b43d7b616 calculating the remainder for master and stack area correctly Anselm R. Garbe <arg@suckless.org> parents: 892 diff changeset	51	nh -= 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	52	}
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	53	else /* fallback if th <= 2 * c->border */
55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	54	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	55	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	56	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	57	i++;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	58	}
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	59	else
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	60	ban(c);
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	61	focus(NULL);
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	62	restack();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	63	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	64
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	65	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	66
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	67	/* 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	68
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	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	70	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	71	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	72
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	73	for(c = clients; c; c = c->next)
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	if(isvisible(c)) {
914 dad36921af06 applied anudots [un]ban repair patch Anselm R. Garbe <arg@suckless.org> parents: 912 diff changeset	75	unban(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	76	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	77	}
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	78	else
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	79	ban(c);
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	80	focus(NULL);
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	81	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	82	}
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	void
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	85	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	86	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	87
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	88	if(!sel \|\| !arg)
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	89	return;
831 8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	90	if(atoi(arg) < 0) {
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	91	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	92	if(!c) {
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	93	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	94	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	95	}
831 8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	96	}
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	97	else {
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	98	for(c = sel->next; c && !isvisible(c); c = c->next);
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	99	if(!c)
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	100	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	101	}
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	102	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	103	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	104	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	105	}
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	106	}
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	107
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	108	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	109	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	110	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	111	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	112	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	113	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	114	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	115	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	116	i = atoi(arg);
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	117	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	118	\|\| 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	119	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	120	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	121	}
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	122	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	123	}
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
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	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	126	incnmaster(const char *arg) {
826 d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	127	int i;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	128
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	129	if(!arg)
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	130	nmaster = NMASTER;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	131	else {
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	132	i = atoi(arg);
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	133	if((lt->arrange != tile) \|\| (nmaster + i < 1)
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	134	\|\| (wah / (nmaster + i) <= 2 * BORDERPX))
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	135	return;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	136	nmaster += i;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	137	}
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	138	if(sel)
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	139	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	140	else
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	141	drawstatus();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	142	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	143
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	144	void
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	145	initlayouts(void) {
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	146	unsigned int i, w;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	147
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	148	lt = &layout[0];
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	149	nlayouts = sizeof layout / sizeof layout[0];
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	150	for(blw = i = 0; i < nlayouts; i++) {
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	151	w = textw(layout[i].symbol);
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	152	if(w > blw)
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	153	blw = w;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	154	}
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	155	}
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	156
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	157	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	158	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	159	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	160	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	161	}
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	162
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	163	void
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	164	restack(void) {
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	165	Client *c;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	166	XEvent ev;
918 7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	167	XWindowChanges wc;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	168
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	169	drawstatus();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	170	if(!sel)
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	171	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	172	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	173	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	174	if(lt->arrange != floating) {
918 7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	175	wc.stack_mode = Below;
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	176	wc.sibling = barwin;
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	177	if(!sel->isfloating) {
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	178	XConfigureWindow(dpy, sel->win, CWSibling \| CWStackMode, &wc);
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	179	wc.sibling = sel->win;
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	180	}
776 be103ae46dbc renamed view.c into screen.c Anselm R. Garbe <arg@suckless.org> parents: 775 diff changeset	181	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	182	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	183	continue;
918 7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	184	XConfigureWindow(dpy, c->win, CWSibling \| CWStackMode, &wc);
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	185	wc.sibling = c->win;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	186	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	187	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	188	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	189	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	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	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	193	setlayout(const char *arg) {
826 d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	194	int i;
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	195
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	196	if(!arg) {
891 b940ac76c22f applied Szabolcs proposal to simplify setlayout() Anselm R. Garbe <arg@suckless.org> parents: 889 diff changeset	197	lt++;
b940ac76c22f applied Szabolcs proposal to simplify setlayout() Anselm R. Garbe <arg@suckless.org> parents: 889 diff changeset	198	if(lt == layout + nlayouts)
b940ac76c22f applied Szabolcs proposal to simplify setlayout() Anselm R. Garbe <arg@suckless.org> parents: 889 diff changeset	199	lt = layout;
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	200	}
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	201	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	202	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	203	if(i < 0 \|\| i >= nlayouts)
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	204	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	205	lt = &layout[i];
788 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	if(sel)
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	208	lt->arrange();
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	209	else
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	210	drawstatus();
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	211	}
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	void
878 d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	214	togglebar(const char *arg) {
887 44755dcf1ad4 simplification Anselm R. Garbe <arg@suckless.org> parents: 883 diff changeset	215	if(bpos == BarOff)
44755dcf1ad4 simplification Anselm R. Garbe <arg@suckless.org> parents: 883 diff changeset	216	bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
883 2cbf1010be11 using BarTop as fallback if BARPOS is set to BarOff as default for toggling Anselm R. Garbe <arg@suckless.org> parents: 880 diff changeset	217	else
2cbf1010be11 using BarTop as fallback if BARPOS is set to BarOff as default for toggling Anselm R. Garbe <arg@suckless.org> parents: 880 diff changeset	218	bpos = BarOff;
878 d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	219	updatebarpos();
880 f330be522eca another fix, call lt->arrange() in togglebar only Anselm R. Garbe <arg@suckless.org> parents: 878 diff changeset	220	lt->arrange();
878 d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	221	}
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	222
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	223	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	224	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	225	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	226
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	227	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	228	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	229	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	230	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	231	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	232	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	233	sel->rh = sel->h;
912 f7b26d6efc9f replaced BORDERPX with sel->border in togglemax(), in other places this is not possible. Anselm R. Garbe <arg@suckless.org> parents: 910 diff changeset	234	resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
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	235	}
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	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	237	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	238	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	239	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	240	}
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
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	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	243	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	244	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	245
892 42bf8e618d52 applied Szabolcs proposal for zoom() as well Anselm R. Garbe <arg@suckless.org> parents: 891 diff changeset	246	if(!sel \|\| lt->arrange == floating \|\| 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	247	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	248	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	249	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	250	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	251	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	252	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	253	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	254	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	255	}

author	Anselm R. Garbe <arg@suckless.org>
	Tue, 19 Jun 2007 09:08:15 +0200
changeset 920	7f8c81c4bc9a
parent 918	7c556b28f1f6
child 931	8ff0f913999e
permissions	-rw-r--r--