dwm: layout.c@2032654a0c6d (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"
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	3	#include <stdio.h>
825 bef1854ce739 fixed some issues due to the Arg->const char * transition Anselm R. Garbe <arg@suckless.org> parents: 823 diff changeset	4	#include <stdlib.h>
75 f08271b7cb20 rearranged several stuff Anselm R. Garbe <garbeam@wmii.de> parents: diff changeset	5
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	6	unsigned int blw = 0;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	7	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	8
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	9	/* static */
76 4bd49f404f10 proceeded with cleaning up, sorting functions, etc Anselm R. Garbe <garbeam@wmii.de> parents: 75 diff changeset	10
933 f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	11	static double hratio = HRATIO;
f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	12	static double vratio = VRATIO;
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	13	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	14	static unsigned int nmaster = NMASTER;
191 56fee1dc9d53 switched to regexp matching for Rules arg@10ksloc.org parents: 178 diff changeset	15
932 df47d77ec9a6 removed a C++ style comment Anselm R. Garbe <garbeam@gmail.com> parents: 931 diff changeset	16	static double /* simple pow() */
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	17	spow(double x, double y)
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	18	{
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	19	if(y == 0)
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	20	return 1;
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	21	while(--y)
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	22	x *= x;
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	23	return x;
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	24	}
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	25
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	26	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	27	tile(void) {
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	28	Bool mmaxtile = False, smaxtile = False; /* fallback tiling */
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	29	double mscale = 0, sscale = 0, sum = 0;
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	30	unsigned int i, n, nx, ny, nw, nh, mw, tw;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	31	Client *c;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	32
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	33	/* preparation */
776 be103ae46dbc renamed view.c into screen.c Anselm R. Garbe <arg@suckless.org> parents: 775 diff changeset	34	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	35	n++;
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	36	nx = wax;
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	37	ny = way;
933 f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	38	mw = (n <= nmaster) ? waw : waw / (1 + hratio);
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	39	tw = waw - mw;
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	40	if(n > 0) {
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	41	if(n <= nmaster) {
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	42	for(i = 0; i < n; i++)
933 f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	43	sum += spow(vratio, i);
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	44	mscale = wah / sum;
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	45	if(vratio >= 1)
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	46	mmaxtile = bh > (mscale * spow(vratio, 0));
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	47	else
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	48	mmaxtile = bh > (mscale * spow(vratio, n - 1));
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	49	}
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	50	else {
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	51	for(i = 0; i < nmaster; i++)
933 f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	52	sum += spow(vratio, i);
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	53	mscale = wah / sum;
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	54	for(sum = 0, i = 0; i < (n - nmaster); i++)
933 f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	55	sum += spow(vratio, i);
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	56	sscale = wah / sum;
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	57	if(vratio >= 1) {
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	58	mmaxtile = bh > (mscale * spow(vratio, 0));
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	59	smaxtile = bh > (sscale * spow(vratio, 0));
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	60	}
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	61	else {
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	62	mmaxtile = bh > (mscale * spow(vratio, nmaster - 1));
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	63	smaxtile = bh > (sscale * spow(vratio, n - nmaster - 1));
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	64	}
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	65	}
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	66	}
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	67	/* tiling */
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	68	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	69	if(isvisible(c)) {
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	70	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	71	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	72	continue;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	73	c->ismax = False;
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	74	if(i < nmaster) { /* master window */
861 55691060ffa3 changed border handling Anselm R. Garbe <arg@suckless.org> parents: 858 diff changeset	75	nw = mw - 2 * c->border;
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	76	if(mmaxtile) {
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	77	ny = way;
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	78	nh = wah - 2 * c->border;
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	79	}
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	80	else if(i + 1 == (n < nmaster ? n : nmaster))
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	81	nh = (way + wah) - ny - 2 * c->border;
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	82	else
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	83	nh = (mscale * spow(vratio, i)) - 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	84	}
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	85	else { /* tile window */
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	86	nw = tw - 2 * c->border;
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	87	if(i == nmaster) {
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	88	ny = way;
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	89	nx = wax + mw;
8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	90	}
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	91	if(smaxtile) {
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	92	ny = way;
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	93	nh = wah - 2 * c->border;
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	94	}
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	95	else if(i + 1 == n)
2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	96	nh = (way + wah) - ny - 2 * c->border;
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	97	else
935 2032654a0c6d changed shortcuts as described on the mailinglist, added sanity checks for ratios during tile (fallback to wah if clients would get too small), documented that new stuff/shortcuts in dwm(1) Anselm R. Garbe <garbeam@gmail.com> parents: 934 diff changeset	98	nh = (sscale * spow(vratio, i - nmaster)) - 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	99	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	100	resize(c, nx, ny, nw, nh, False);
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	101	ny += nh;
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	102	i++;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	103	}
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	104	else
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	105	ban(c);
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	106	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	107	restack();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	108	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	109
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	110	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	111
934 1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	112	static void
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	113	incratio(const char arg, double ratio, double def) {
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	114	double delta;
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	115
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	116	if(lt->arrange != tile)
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	117	return;
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	118	if(!arg)
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	119	*ratio = def;
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	120	else {
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	121	if(1 == sscanf(arg, "%lf", &delta)) {
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	122	if(delta + (ratio) < .1 \|\| delta + (ratio) > 1.9)
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	123	return;
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	124	*ratio += delta;
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	125	}
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	126	}
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	127	lt->arrange();
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	128	}
1e8e98b7544d small fix of static function order Anselm R. Garbe <garbeam@gmail.com> parents: 933 diff changeset	129
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	130	/* 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	131
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	132	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	133	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	134	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	135
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	136	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	137	if(isvisible(c)) {
914 dad36921af06 applied anudots [un]ban repair patch Anselm R. Garbe <arg@suckless.org> parents: 912 diff changeset	138	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	139	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	140	}
904 2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	141	else
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	142	ban(c);
2dfd50e4cfde applied anydot's 3 minor patches, thank you anydot Anselm R. Garbe <arg@suckless.org> parents: 901 diff changeset	143	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	144	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	145	}
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	146
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	147	void
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	148	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	149	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	150
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	151	if(!sel \|\| !arg)
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	152	return;
831 8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	153	if(atoi(arg) < 0) {
829 f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	154	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	155	if(!c) {
f1ec35606dbc merged focus{prev.next} into focusclient(1/-1) Anselm R. Garbe <arg@suckless.org> parents: 826 diff changeset	156	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	157	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	158	}
831 8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	159	}
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	160	else {
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	161	for(c = sel->next; c && !isvisible(c); c = c->next);
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	162	if(!c)
8b84189854dc simplified focusclient() Anselm R. Garbe <arg@suckless.org> parents: 830 diff changeset	163	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	164	}
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	165	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	166	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	167	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	168	}
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	169	}
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
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	void
933 f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	172	inchratio(const char *arg) {
f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	173	incratio(arg, &hratio, HRATIO);
f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	174	}
931 8ff0f913999e implemented ratio tile as described on the mailinglist Anselm R. Garbe <garbeam@gmail.com> parents: 918 diff changeset	175
933 f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	176	void
f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	177	incvratio(const char *arg) {
f7619f63380a I introduced {H,V}RATIO and inc{h,v,}ratio() functions - the default behaves like in dwm-4.3, config.arg.h shows how I prefer the ratio being handled (for the future I plan to change const char arg into ..., and renaming Client into Win.) Anselm R. Garbe <garbeam@gmail.com>* parents: 932 diff changeset	178	incratio(arg, &vratio, VRATIO);
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	179	}
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	180
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	181	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	182	incnmaster(const char *arg) {
826 d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	183	int i;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	184
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	185	if(!arg)
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	186	nmaster = NMASTER;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	187	else {
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	188	i = atoi(arg);
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	189	if((lt->arrange != tile) \|\| (nmaster + i < 1)
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	190	\|\| (wah / (nmaster + i) <= 2 * BORDERPX))
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	191	return;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	192	nmaster += i;
d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	193	}
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	194	if(sel)
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	195	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	196	else
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	197	drawstatus();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	198	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	199
782 92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	200	void
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	201	initlayouts(void) {
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	202	unsigned int i, w;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	203
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	204	lt = &layout[0];
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	205	nlayouts = sizeof layout / sizeof layout[0];
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	206	for(blw = i = 0; i < nlayouts; i++) {
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	207	w = textw(layout[i].symbol);
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	208	if(w > blw)
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	209	blw = w;
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	210	}
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	211	}
92862ab407d5 introduced Layout struct Anselm R. Garbe <arg@suckless.org> parents: 780 diff changeset	212
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	213	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	214	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	215	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	216	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	217	}
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	218
773 81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	219	void
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	220	restack(void) {
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	221	Client *c;
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	222	XEvent ev;
918 7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	223	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	224
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	225	drawstatus();
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	226	if(!sel)
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	227	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	228	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	229	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	230	if(lt->arrange != floating) {
918 7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	231	wc.stack_mode = Below;
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	232	wc.sibling = barwin;
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	233	if(!sel->isfloating) {
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	234	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	235	wc.sibling = sel->win;
7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	236	}
776 be103ae46dbc renamed view.c into screen.c Anselm R. Garbe <arg@suckless.org> parents: 775 diff changeset	237	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	238	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	239	continue;
918 7c556b28f1f6 applied restack patch of anydot, with slight changes Anselm R. Garbe <arg@suckless.org> parents: 915 diff changeset	240	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	241	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	242	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	243	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	244	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	245	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	246	}
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	247
81c5237a53b8 merged tag.c, view.c and tile.c to manage.c Anselm R. Garbe <arg@suckless.org> parents: 769 diff changeset	248	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	249	setlayout(const char *arg) {
826 d900a3f821a3 small bugfix Anselm R. Garbe <arg@suckless.org> parents: 825 diff changeset	250	int i;
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	251
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	252	if(!arg) {
891 b940ac76c22f applied Szabolcs proposal to simplify setlayout() Anselm R. Garbe <arg@suckless.org> parents: 889 diff changeset	253	lt++;
b940ac76c22f applied Szabolcs proposal to simplify setlayout() Anselm R. Garbe <arg@suckless.org> parents: 889 diff changeset	254	if(lt == layout + nlayouts)
b940ac76c22f applied Szabolcs proposal to simplify setlayout() Anselm R. Garbe <arg@suckless.org> parents: 889 diff changeset	255	lt = layout;
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	256	}
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	257	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	258	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	259	if(i < 0 \|\| i >= nlayouts)
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	260	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	261	lt = &layout[i];
788 a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	262	}
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	263	if(sel)
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	264	lt->arrange();
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	265	else
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	266	drawstatus();
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	267	}
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	268
a61fcdf7b4c1 replaced togglelayout with setlayout Anselm R. Garbe <arg@suckless.org> parents: 786 diff changeset	269	void
878 d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	270	togglebar(const char *arg) {
887 44755dcf1ad4 simplification Anselm R. Garbe <arg@suckless.org> parents: 883 diff changeset	271	if(bpos == BarOff)
44755dcf1ad4 simplification Anselm R. Garbe <arg@suckless.org> parents: 883 diff changeset	272	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	273	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	274	bpos = BarOff;
878 d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	275	updatebarpos();
880 f330be522eca another fix, call lt->arrange() in togglebar only Anselm R. Garbe <arg@suckless.org> parents: 878 diff changeset	276	lt->arrange();
878 d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	277	}
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	278
d2ae55f83f9f made bar togglalble Anselm R. Garbe <arg@suckless.org> parents: 875 diff changeset	279	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	280	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	281	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	282
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	283	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	284	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	285	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	286	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	287	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	288	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	289	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	290	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	291	}
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	292	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	293	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	294	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	295	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	296	}
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	297
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	298	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	299	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	300	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	301
892 42bf8e618d52 applied Szabolcs proposal for zoom() as well Anselm R. Garbe <arg@suckless.org> parents: 891 diff changeset	302	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	303	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	304	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	305	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	306	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	307	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	308	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	309	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	310	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	311	}

author	Anselm R. Garbe <garbeam@gmail.com>
	Sun, 05 Aug 2007 12:47:52 +0200
changeset 935	2032654a0c6d
parent 934	1e8e98b7544d
child 937	453ee57a297c
permissions	-rw-r--r--