rinri
/
dwm-rinri
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
My dwm build
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
12 Commits
1 Branch
2.8 MiB
 
 
 
 
 
Tree: 8cc69be156
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '8cc69be156'
${ noResults }
dwm-rinri/dwm.c.rej

234 lines
6.3 KiB
Raw Blame History 

  1. --- dwm.c

  2. +++ dwm.c

  3. @@ -112,25 +112,35 @@ typedef struct {

  4.  	void (*arrange)(Monitor *);

  5.  } Layout;

  6.  

  7. +#define MAXTABS 50

  8. +

  9. +typedef struct Pertag Pertag;

  10.  struct Monitor {

  11.  	char ltsymbol[16];

  12.  	float mfact;

  13.  	int nmaster;

  14.  	int num;

  15.  	int by;               /* bar geometry */

  16. +	int ty;               /* tab bar geometry */

  17.  	int mx, my, mw, mh;   /* screen size */

  18.  	int wx, wy, ww, wh;   /* window area  */

  19.  	unsigned int seltags;

  20.  	unsigned int sellt;

  21.  	unsigned int tagset[2];

  22.  	int showbar;

  23. +	int showtab;

  24.  	int topbar;

  25. +	int toptab;

  26.  	Client *clients;

  27.  	Client *sel;

  28.  	Client *stack;

  29.  	Monitor *next;

  30.  	Window barwin;

  31. +	Window tabwin;

  32. +	int ntabs;

  33. +	int tab_widths[MAXTABS];

  34.  	const Layout *lt[2];

  35. +	Pertag *pertag;

  36.  };

  37.  

  38.  typedef struct {

  39. @@ -461,14 +488,33 @@ buttonpress(XEvent *e)

  40.  			click = ClkStatusText;

  41.  		else

  42.  			click = ClkWinTitle;

  43. -	} else if ((c = wintoclient(ev->window))) {

  44. +	}

  45. +	if(ev->window == selmon->tabwin) {

  46. +		i = 0; x = 0;

  47. +		for(c = selmon->clients; c; c = c->next){

  48. +		  if(!ISVISIBLE(c)) continue;

  49. +		  x += selmon->tab_widths[i];

  50. +		  if (ev->x > x)

  51. +		    ++i;

  52. +		  else

  53. +		    break;

  54. +		  if(i >= m->ntabs) break;

  55. +		}

  56. +		if(c) {

  57. +		  click = ClkTabBar;

  58. +		  arg.ui = i;

  59. +		}

  60. +	}

  61. +	else if((c = wintoclient(ev->window))) {

  62.  		focus(c);

  63.  		click = ClkClientWin;

  64.  	}

  65. -	for (i = 0; i < LENGTH(buttons); i++)

  66. -		if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button

  67. -		&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))

  68. -			buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);

  69. +	for(i = 0; i < LENGTH(buttons); i++)

  70. +		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button

  71. +		   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)){

  72. +		  buttons[i].func(((click == ClkTagBar || click == ClkTabBar)

  73. +				   && buttons[i].arg.i == 0) ? &arg : &buttons[i].arg);

  74. +		}

  75.  }

  76.  

  77.  void

  78. @@ -556,6 +605,8 @@ clientmessage(XEvent *e)

  79.  		if (!ISVISIBLE(c)) {

  80.  			c->mon->seltags ^= 1;

  81.  			c->mon->tagset[c->mon->seltags] = c->tags;

  82. +			for(i=0; !(c->tags & 1 << i); i++);

  83. +			view(&(Arg){.ui = 1 << i});

  84.  		}

  85.  		pop(c);

  86.  	}

  87. @@ -662,16 +711,41 @@ Monitor *

  88.  createmon(void)

  89.  {

  90.  	Monitor *m;

  91. +	int i;

  92.  

  93.  	m = ecalloc(1, sizeof(Monitor));

  94.  	m->tagset[0] = m->tagset[1] = 1;

  95.  	m->mfact = mfact;

  96.  	m->nmaster = nmaster;

  97.  	m->showbar = showbar;

  98. +	m->showtab = showtab;

  99.  	m->topbar = topbar;

  100. -	m->lt[0] = &layouts[0];

  101. +	m->toptab = toptab;

  102. +	m->ntabs = 0;

  103. +	m->lt[0] = &layouts[def_layouts[1] % LENGTH(layouts)];

  104.  	m->lt[1] = &layouts[1 % LENGTH(layouts)];

  105.  	strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);

  106. +	if(!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))

  107. +		die("fatal: could not malloc() %u bytes\n", sizeof(Pertag));

  108. +	m->pertag->curtag = m->pertag->prevtag = 1;

  109. +	for(i=0; i <= LENGTH(tags); i++) {

  110. +		/* init nmaster */

  111. +		m->pertag->nmasters[i] = m->nmaster;

  112. +

  113. +		/* init mfacts */

  114. +		m->pertag->mfacts[i] = m->mfact;

  115. +

  116. +		/* init layouts */

  117. +		m->pertag->ltidxs[i][0] = &layouts[def_layouts[i % LENGTH(def_layouts)] % LENGTH(layouts)];

  118. +		m->pertag->ltidxs[i][1] = m->lt[1];

  119. +		m->pertag->sellts[i] = m->sellt;

  120. +

  121. +		/* init showbar */

  122. +		m->pertag->showbars[i] = m->showbar;

  123. +

  124. +		/* swap focus and zoomswap*/

  125. +		m->pertag->prevzooms[i] = NULL;

  126. +	}

  127.  	return m;

  128.  }

  129.  

  130. @@ -1294,11 +1482,13 @@ movemouse(const Arg *arg)

  131.  		return;

  132.  	if (c->isfullscreen) /* no support moving fullscreen windows by mouse */

  133.  		return;

  134. +	if(c->isfullscreen) /* no support moving fullscreen windows by mouse */

  135. +		return;

  136.  	restack(selmon);

  137.  	ocx = c->x;

  138.  	ocy = c->y;

  139.  	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

  140. -	None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)

  141. +			 None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)

  142.  		return;

  143.  	if (!getrootptr(&x, &y))

  144.  		return;

  145. @@ -1454,11 +1646,13 @@ resizemouse(const Arg *arg)

  146.  		return;

  147.  	if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */

  148.  		return;

  149. +	if(c->isfullscreen) /* no support resizing fullscreen windows by mouse */

  150. +		return;

  151.  	restack(selmon);

  152.  	ocx = c->x;

  153.  	ocy = c->y;

  154.  	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

  155. -	                None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)

  156. +			 None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)

  157.  		return;

  158.  	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);

  159.  	do {

  160. @@ -1615,11 +1810,11 @@ sendevent(Client *c, Atom proto)

  161.  void

  162.  setfocus(Client *c)

  163.  {

  164. -	if (!c->neverfocus) {

  165. +	if(!c->neverfocus) {

  166.  		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

  167.  		XChangeProperty(dpy, root, netatom[NetActiveWindow],

  168. -		                XA_WINDOW, 32, PropModeReplace,

  169. -		                (unsigned char *) &(c->win), 1);

  170. + 		                XA_WINDOW, 32, PropModeReplace,

  171. + 		                (unsigned char *) &(c->win), 1);

  172.  	}

  173.  	sendevent(c, wmatom[WMTakeFocus]);

  174.  }

  175. @@ -1978,20 +2208,44 @@ updatebars(void)

  176.  		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);

  177.  		XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);

  178.  		XMapRaised(dpy, m->barwin);

  179. +		m->tabwin = XCreateWindow(dpy, root, m->wx, m->ty, m->ww, th, 0, DefaultDepth(dpy, screen),

  180. +					  CopyFromParent, DefaultVisual(dpy, screen),

  181. +					  CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);

  182. +		XDefineCursor(dpy, m->tabwin, cursor[CurNormal]->cursor);

  183. +		XMapRaised(dpy, m->tabwin);

  184.  	}

  185.  }

  186.  

  187.  void

  188.  updatebarpos(Monitor *m)

  189.  {

  190. +	Client *c;

  191. +	int nvis = 0;

  192. +	

  193.  	m->wy = m->my;

  194.  	m->wh = m->mh;

  195.  	if (m->showbar) {

  196.  		m->wh -= bh;

  197.  		m->by = m->topbar ? m->wy : m->wy + m->wh;

  198. -		m->wy = m->topbar ? m->wy + bh : m->wy;

  199. -	} else

  200. +		if ( m->topbar )

  201. +			m->wy += bh;

  202. +	} else {

  203.  		m->by = -bh;

  204. +	}

  205. +

  206. +	for(c = m->clients; c; c = c->next){

  207. +	  if(ISVISIBLE(c)) ++nvis;

  208. +	}

  209. +

  210. +	if(m->showtab == showtab_always

  211. +	   || ((m->showtab == showtab_auto) && (nvis > 1) && (m->lt[m->sellt]->arrange == monocle))){

  212. +		m->wh -= th;

  213. +		m->ty = m->toptab ? m->wy : m->wy + m->wh;

  214. +		if ( m->toptab )

  215. +			m->wy += th;

  216. +	} else {

  217. +		m->ty = -th;

  218. +	}

  219.  }

  220.  

  221.  void

  222. @@ -2173,9 +2427,9 @@ updatewindowtype(Client *c)

  223.  	Atom wtype = getatomprop(c, netatom[NetWMWindowType]);

  224.  

  225.  	if (state == netatom[NetWMFullscreen])

  226. -		setfullscreen(c, 1);

  227. +		setfullscreen(c, True);

  228.  	if (wtype == netatom[NetWMWindowTypeDialog])

  229. -		c->isfloating = 1;

  230. +		c->isfloating = True;

  231.  }

  232.  

  233.  void