fixed several things, nearly feature complete
This commit is contained in:
		
							parent
							
								
									3aad92202d
								
							
						
					
					
						commit
						7fe717c29f
					
				| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					- improve mouse based resizals with quadrant approach (then I think we have feature completeness already)
 | 
				
			||||||
							
								
								
									
										55
									
								
								client.c
								
								
								
								
							
							
						
						
									
										55
									
								
								client.c
								
								
								
								
							| 
						 | 
					@ -52,7 +52,7 @@ max(Arg *arg)
 | 
				
			||||||
	sel->w = sw - 2 * sel->border;
 | 
						sel->w = sw - 2 * sel->border;
 | 
				
			||||||
	sel->h = sh - 2 * sel->border;
 | 
						sel->h = sh - 2 * sel->border;
 | 
				
			||||||
	craise(sel);
 | 
						craise(sel);
 | 
				
			||||||
	resize(sel);
 | 
						resize(sel, False);
 | 
				
			||||||
	discard_events(EnterWindowMask);
 | 
						discard_events(EnterWindowMask);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -100,7 +100,7 @@ floating(Arg *arg)
 | 
				
			||||||
	arrange = floating;
 | 
						arrange = floating;
 | 
				
			||||||
	for(c = clients; c; c = c->next) {
 | 
						for(c = clients; c; c = c->next) {
 | 
				
			||||||
		if(c->tags[tsel])
 | 
							if(c->tags[tsel])
 | 
				
			||||||
			resize(c);
 | 
								resize(c, True);
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
			ban_client(c);
 | 
								ban_client(c);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					@ -125,29 +125,29 @@ tiling(Arg *arg)
 | 
				
			||||||
		if(c->tags[tsel])
 | 
							if(c->tags[tsel])
 | 
				
			||||||
			n++;
 | 
								n++;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	h = (n > 2) ? sh / (n - 2) : sh;
 | 
						h = (n > 1) ? sh / (n - 1) : sh;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for(i = 0, c = clients; c; c = c->next) {
 | 
						for(i = 0, c = clients; c; c = c->next) {
 | 
				
			||||||
		if(c->tags[tsel]) {
 | 
							if(c->tags[tsel]) {
 | 
				
			||||||
			if(n == 1) {
 | 
								if(n == 1) {
 | 
				
			||||||
				c->x = sx;
 | 
									c->x = sx;
 | 
				
			||||||
				c->y = sy;
 | 
									c->y = sy;
 | 
				
			||||||
				c->w = sw;
 | 
									c->w = sw - 2 * c->border;
 | 
				
			||||||
				c->h = sh;
 | 
									c->h = sh - 2 * c->border;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			else if(i == 1) {
 | 
								else if(i == 0) {
 | 
				
			||||||
				c->x = sx;
 | 
									c->x = sx;
 | 
				
			||||||
				c->y = sy;
 | 
									c->y = sy;
 | 
				
			||||||
				c->w = mw;
 | 
									c->w = mw - 2 * c->border;
 | 
				
			||||||
				c->h = sh;
 | 
									c->h = sh - 2 * c->border;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			else {
 | 
								else {
 | 
				
			||||||
				c->x = sx + mw;
 | 
									c->x = sx + mw;
 | 
				
			||||||
				c->y = sy + (i - 2) * h;
 | 
									c->y = sy + (i - 1) * h;
 | 
				
			||||||
				c->w = w;
 | 
									c->w = w - 2 * c->border;
 | 
				
			||||||
				c->h = h;
 | 
									c->h = h - 2 * c->border;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			resize(c);
 | 
								resize(c, False);
 | 
				
			||||||
			i++;
 | 
								i++;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
| 
						 | 
					@ -304,14 +304,11 @@ lower(Client *c)
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
focus(Client *c)
 | 
					focus(Client *c)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if(sel && sel != c) {
 | 
						Client *old = sel;
 | 
				
			||||||
		XSetWindowBorder(dpy, sel->win, dc.bg);
 | 
					
 | 
				
			||||||
		XMapWindow(dpy, sel->title);
 | 
					 | 
				
			||||||
		draw_client(sel);
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	sel = c;
 | 
						sel = c;
 | 
				
			||||||
	XUnmapWindow(dpy, c->title);
 | 
						if(old && old != c)
 | 
				
			||||||
	XSetWindowBorder(dpy, c->win, dc.fg);
 | 
							draw_client(old);
 | 
				
			||||||
	draw_client(c);
 | 
						draw_client(c);
 | 
				
			||||||
	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 | 
						XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 | 
				
			||||||
	XFlush(dpy);
 | 
						XFlush(dpy);
 | 
				
			||||||
| 
						 | 
					@ -463,14 +460,16 @@ gravitate(Client *c, Bool invert)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
resize(Client *c)
 | 
					resize(Client *c, Bool inc)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	XConfigureEvent e;
 | 
						XConfigureEvent e;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if(c->incw)
 | 
						if(inc) {
 | 
				
			||||||
		c->w -= (c->w - c->basew) % c->incw;
 | 
							if(c->incw)
 | 
				
			||||||
	if(c->inch)
 | 
								c->w -= (c->w - c->basew) % c->incw;
 | 
				
			||||||
		c->h -= (c->h - c->baseh) % c->inch;
 | 
							if(c->inch)
 | 
				
			||||||
 | 
								c->h -= (c->h - c->baseh) % c->inch;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
	if(c->minw && c->w < c->minw)
 | 
						if(c->minw && c->w < c->minw)
 | 
				
			||||||
		c->w = c->minw;
 | 
							c->w = c->minw;
 | 
				
			||||||
	if(c->minh && c->h < c->minh)
 | 
						if(c->minh && c->h < c->minh)
 | 
				
			||||||
| 
						 | 
					@ -554,8 +553,14 @@ void
 | 
				
			||||||
draw_client(Client *c)
 | 
					draw_client(Client *c)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int i;
 | 
						int i;
 | 
				
			||||||
	if(c == sel)
 | 
						if(c == sel) {
 | 
				
			||||||
 | 
							XUnmapWindow(dpy, c->title);
 | 
				
			||||||
 | 
							XSetWindowBorder(dpy, c->win, dc.fg);
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						XSetWindowBorder(dpy, c->win, dc.bg);
 | 
				
			||||||
 | 
						XMapWindow(dpy, c->title);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	dc.x = dc.y = 0;
 | 
						dc.x = dc.y = 0;
 | 
				
			||||||
	dc.h = c->th;
 | 
						dc.h = c->th;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								dev.c
								
								
								
								
							
							
						
						
									
										4
									
								
								dev.c
								
								
								
								
							| 
						 | 
					@ -104,7 +104,7 @@ mresize(Client *c)
 | 
				
			||||||
			c->h = abs(ocy - ev.xmotion.y);
 | 
								c->h = abs(ocy - ev.xmotion.y);
 | 
				
			||||||
			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
 | 
								c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
 | 
				
			||||||
			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
 | 
								c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
 | 
				
			||||||
			resize(c);
 | 
								resize(c, True);
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
		case ButtonRelease:
 | 
							case ButtonRelease:
 | 
				
			||||||
			XUngrabPointer(dpy, CurrentTime);
 | 
								XUngrabPointer(dpy, CurrentTime);
 | 
				
			||||||
| 
						 | 
					@ -138,7 +138,7 @@ mmove(Client *c)
 | 
				
			||||||
			XFlush(dpy);
 | 
								XFlush(dpy);
 | 
				
			||||||
			c->x = ocx + (ev.xmotion.x - x1);
 | 
								c->x = ocx + (ev.xmotion.x - x1);
 | 
				
			||||||
			c->y = ocy + (ev.xmotion.y - y1);
 | 
								c->y = ocy + (ev.xmotion.y - y1);
 | 
				
			||||||
			resize(c);
 | 
								resize(c, False);
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
		case ButtonRelease:
 | 
							case ButtonRelease:
 | 
				
			||||||
			XUngrabPointer(dpy, CurrentTime);
 | 
								XUngrabPointer(dpy, CurrentTime);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								dwm.h
								
								
								
								
							
							
						
						
									
										2
									
								
								dwm.h
								
								
								
								
							| 
						 | 
					@ -106,7 +106,7 @@ extern Client *getclient(Window w);
 | 
				
			||||||
extern void focus(Client *c);
 | 
					extern void focus(Client *c);
 | 
				
			||||||
extern void update_name(Client *c);
 | 
					extern void update_name(Client *c);
 | 
				
			||||||
extern void draw_client(Client *c);
 | 
					extern void draw_client(Client *c);
 | 
				
			||||||
extern void resize(Client *c);
 | 
					extern void resize(Client *c, Bool inc);
 | 
				
			||||||
extern void update_size(Client *c);
 | 
					extern void update_size(Client *c);
 | 
				
			||||||
extern Client *gettitle(Window w);
 | 
					extern Client *gettitle(Window w);
 | 
				
			||||||
extern void craise(Client *c);
 | 
					extern void craise(Client *c);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								main.c
								
								
								
								
							
							
						
						
									
										2
									
								
								main.c
								
								
								
								
							| 
						 | 
					@ -168,7 +168,7 @@ static void
 | 
				
			||||||
cleanup()
 | 
					cleanup()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	while(sel) {
 | 
						while(sel) {
 | 
				
			||||||
		resize(sel);
 | 
							resize(sel, True);
 | 
				
			||||||
		unmanage(sel);
 | 
							unmanage(sel);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 | 
						XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue