Merge remote-tracking branch '4z3/set-user-specified-sizehints' into sizehints

Conflicts: window.c
2013-02-09 01:21:57 +01:00
parent f7301cf4f9 3f25b907bd
commit bf41012493
3 changed files with 53 additions and 19 deletions
--- a/window.h
+++ b/window.h
@ -20,6 +20,7 @@
 #define WINDOW_H

 #include <X11/Xlib.h>
+#include <X11/Xutil.h>

 #include "types.h"

@ -48,6 +49,8 @@ typedef struct {
 	unsigned int h; /* = win height - bar height */
 	unsigned int bw;

+	XSizeHints sizehints;
+
 	bool fullscreen;

 	struct {