Commits

Paul Barbu - Gheorghe committed 88cf18e

added all object, orig and rej files to .hgignore

  • Participants
  • Parent commits 1f3e9de

Comments (0)

Files changed (4)

 # HG changeset patch
-# Parent 36b76a14fc6a8fc369d060b9344e144146bb1f9e
+# Parent bda93e953d967a23a922e9b47d0006b4ca05e6f0
 Using dejavu sans mono medium:pixelsize=11 as the font
 
-diff -r 36b76a14fc6a config.def.h
---- a/config.def.h	Fri Nov 16 20:35:23 2012 +0200
-+++ b/config.def.h	Fri Nov 16 21:04:09 2012 +0200
+diff -r bda93e953d96 config.def.h
+--- a/config.def.h	Sun Nov 25 00:19:46 2012 +0200
++++ b/config.def.h	Sun Nov 25 00:20:33 2012 +0200
 @@ -13,7 +13,7 @@
  }
  
 # HG changeset patch
-# Parent 8fd60414e4f57224e946fbd62adc4298bf4f0bd6
-added .hgignore file
+# Parent e399e128ef84d4d9cf5d077eb283f3767b88a097
+added all object, orig and rej files to .hgignore
 
-diff -r 8fd60414e4f5 .hgignore
+diff -r e399e128ef84 .hgignore
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/.hgignore	Fri Nov 23 20:06:48 2012 +0200
-@@ -0,0 +1,3 @@
++++ b/.hgignore	Sun Nov 25 00:28:04 2012 +0200
+@@ -0,0 +1,6 @@
++syntax: glob
 +dwm
-+dwm.o
++*.o
 +config.h
++*.rej
++*.orig
 # HG changeset patch
 # Date 1353693473 -7200
 # User Barbu Paul - Gheorghe <barbu.paul.gheorghe@gmail.com>
-# Parent 1f779e0c96f3f2ab111443507be97d859264b064
+# Parent 9b5820954e5087bdd3d330217fb074bd6c176951
 Control MPD with keybinds
 
-diff -r 1f779e0c96f3 Makefile
---- a/Makefile	Fri Nov 23 19:56:31 2012 +0200
-+++ b/Makefile	Fri Nov 23 19:57:57 2012 +0200
+diff -r 9b5820954e50 Makefile
+--- a/Makefile	Sun Nov 25 00:20:34 2012 +0200
++++ b/Makefile	Sun Nov 25 00:21:53 2012 +0200
 @@ -18,7 +18,7 @@
  	@echo CC $<
  	@${CC} -c ${CFLAGS} $<
  
  config.h: config.def.h
  	@echo creating $@ from config.def.h
-diff -r 1f779e0c96f3 config.def.h
---- a/config.def.h	Fri Nov 23 19:56:31 2012 +0200
-+++ b/config.def.h	Fri Nov 23 19:57:57 2012 +0200
+diff -r 9b5820954e50 config.def.h
+--- a/config.def.h	Sun Nov 25 00:20:34 2012 +0200
++++ b/config.def.h	Sun Nov 25 00:21:53 2012 +0200
 @@ -123,6 +123,8 @@
  static const char *rebootcmd[]  = { "systemctl", "reboot", NULL };
  static const char *poweroffcmd[]  = { "systemctl", "poweroff", NULL };
  };
  
  /* button definitions */
-diff -r 1f779e0c96f3 config.mk
---- a/config.mk	Fri Nov 23 19:56:31 2012 +0200
-+++ b/config.mk	Fri Nov 23 19:57:57 2012 +0200
+diff -r 9b5820954e50 config.mk
+--- a/config.mk	Sun Nov 25 00:20:34 2012 +0200
++++ b/config.mk	Sun Nov 25 00:21:53 2012 +0200
 @@ -16,7 +16,7 @@
  
  # includes and libs
  
  # flags
  CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-diff -r 1f779e0c96f3 mpdcontrol.c
+diff -r 9b5820954e50 mpdcontrol.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mpdcontrol.c	Fri Nov 23 19:57:57 2012 +0200
++++ b/mpdcontrol.c	Sun Nov 25 00:21:53 2012 +0200
 @@ -0,0 +1,140 @@
 +#include <stdlib.h>
 +#include <string.h>
 updated systray to work with changeset 1606
 
-diff --git a/config.def.h b/config.def.h
---- a/config.def.h
-+++ b/config.def.h
+diff -r 5c2231502d47 config.def.h
+--- a/config.def.h	Sun Nov 25 00:17:40 2012 +0200
++++ b/config.def.h	Sun Nov 25 00:19:46 2012 +0200
 @@ -22,6 +22,8 @@
  static const char selfgcolor[]      = "#eeeeee";
  static const unsigned int borderpx  = 1;        /* border pixel of windows */
  static const Bool showbar           = True;     /* False means no bar */
  static const Bool topbar            = True;     /* False means bottom bar */
  
-diff --git a/dwm.c b/dwm.c
---- a/dwm.c
-+++ b/dwm.c
+diff -r 5c2231502d47 dwm.c
+--- a/dwm.c	Sun Nov 25 00:17:40 2012 +0200
++++ b/dwm.c	Sun Nov 25 00:19:46 2012 +0200
 @@ -58,12 +58,30 @@
  #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
  #define TEXTW(X)                (textnw(X, strlen(X)) + dc.font.height)
  }
  
  void
-@@ -922,16 +1012,23 @@
- 	unsigned long dl;
+@@ -923,15 +1013,23 @@
  	unsigned char *p = NULL;
  	Atom da, atom = None;
+ 
+-	if(XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
 +	/* FIXME getatomprop should return the number of items and a pointer to
 +	 * the stored data instead of this workaround */
 +	Atom req = XA_ATOM;
 +	if(prop == xatom[XembedInfo])
 +		req = xatom[XembedInfo];
- 
--	if(XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
++
 +	if(XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
  	                      &da, &di, &dl, &dl, &p) == Success && p) {
  		atom = *(Atom *)p;
  getcolor(const char *colstr) {
  	XftColor color;
  
-@@ -967,6 +1064,15 @@
+@@ -967,6 +1065,15 @@
  	return result;
  }
  
  Bool
  gettextprop(Window w, Atom atom, char *text, unsigned int size) {
  	char **list = NULL;
-@@ -1079,7 +1185,7 @@
+@@ -1079,7 +1186,7 @@
  killclient(const Arg *arg) {
  	if(!selmon->sel)
  		return;
  		XGrabServer(dpy);
  		XSetErrorHandler(xerrordummy);
  		XSetCloseDownMode(dpy, DestroyAll);
-@@ -1165,6 +1271,12 @@
+@@ -1165,6 +1272,12 @@
  maprequest(XEvent *e) {
  	static XWindowAttributes wa;
  	XMapRequestEvent *ev = &e->xmaprequest;
  
  	if(!XGetWindowAttributes(dpy, ev->window, &wa))
  		return;
-@@ -1281,6 +1393,16 @@
+@@ -1281,6 +1394,16 @@
  	Window trans;
  	XPropertyEvent *ev = &e->xproperty;
  
  	if((ev->window == root) && (ev->atom == XA_WM_NAME))
  		updatestatus();
  	else if(ev->state == PropertyDelete)
-@@ -1330,12 +1452,33 @@
+@@ -1330,12 +1453,33 @@
  }
  
  void
  resizeclient(Client *c, int x, int y, int w, int h) {
  	XWindowChanges wc;
  
-@@ -1402,6 +1545,18 @@
+@@ -1402,6 +1546,18 @@
  }
  
  void
  restack(Monitor *m) {
  	Client *c;
  	XEvent ev;
-@@ -1485,25 +1640,35 @@
+@@ -1485,25 +1641,35 @@
  }
  
  Bool
  	}
  	return exists;
  }
-@@ -1516,7 +1681,7 @@
+@@ -1516,7 +1682,7 @@
   		                XA_WINDOW, 32, PropModeReplace,
   		                (unsigned char *) &(c->win), 1);
  	}
  }
  
  void
-@@ -1596,12 +1761,18 @@
+@@ -1596,12 +1762,18 @@
  	wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
  	netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
  	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
  	/* init cursors */
  	cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
  	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
-@@ -1616,6 +1787,8 @@
+@@ -1616,6 +1788,8 @@
  	dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
  	dc.gc = XCreateGC(dpy, root, 0, NULL);
  	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
  	/* init bars */
  	updatebars();
  	updatestatus();
-@@ -1721,7 +1894,18 @@
+@@ -1721,7 +1895,18 @@
  togglebar(const Arg *arg) {
  	selmon->showbar = !selmon->showbar;
  	updatebarpos(selmon);
  	arrange(selmon);
  }
  
-@@ -1811,11 +1995,18 @@
+@@ -1811,11 +1996,18 @@
  		else
  			unmanage(c, False);
  	}
  	XSetWindowAttributes wa = {
  		.override_redirect = True,
  		.background_pixmap = ParentRelative,
-@@ -1824,10 +2015,15 @@
+@@ -1824,10 +2016,15 @@
  	for(m = mons; m; m = m->next) {
  		if (m->barwin)
  			continue;
  		XMapRaised(dpy, m->barwin);
  	}
  }
-@@ -2021,6 +2217,104 @@
+@@ -2021,6 +2218,104 @@
  }
  
  void
  updatewindowtype(Client *c) {
  	Atom state = getatomprop(c, netatom[NetWMState]);
  	Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-@@ -2089,6 +2383,16 @@
+@@ -2089,6 +2384,16 @@
  	return selmon;
  }