merge kbfunc_{ptrmove,client_{move,resize}} into one function that takes a flag,

this code was almost identical...

ok okan.

1 files changed, 10 insertions, 8 deletions

diff --git a/calmwm.h b/calmwm.h
index f22acc1..e38fd3d 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.h,v 1.36 2008/04/16 13:40:34 oga Exp $
+ * $Id: calmwm.h,v 1.37 2008/04/16 13:47:29 oga Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -205,10 +205,14 @@ struct xevent {
 
 TAILQ_HEAD(xevent_q, xevent);
 
-#define CWM_BIGMOVE	0x1000
-enum directions {
-	CWM_UP = 0, CWM_DOWN, CWM_LEFT, CWM_RIGHT,
-};
+#define CWM_MOVE	0x01
+#define CWM_RESIZE	0x02
+#define CWM_PTRMOVE	0x04
+#define CWM_BIGMOVE	0x08
+#define CWM_UP		0x10
+#define CWM_DOWN	0x20
+#define CWM_LEFT	0x40
+#define CWM_RIGHT	0x80
 
 /*
  * Match a window.
@@ -447,11 +451,9 @@ void			 kbfunc_client_nogroup(struct client_ctx *, void *);
 void			 kbfunc_client_maximize(struct client_ctx *, void *);
 void			 kbfunc_client_vmaximize(struct client_ctx *, void *);
 void			 kbfunc_quit_wm(struct client_ctx *, void *);
-void			 kbfunc_client_move(struct client_ctx *, void *);
-void			 kbfunc_client_resize(struct client_ctx *, void *);
+void			 kbfunc_moveresize(struct client_ctx *, void *);
 void			 kbfunc_menu_search(struct client_ctx *, void *);
 void			 kbfunc_exec(struct client_ctx *, void *);
-void			 kbfunc_ptrmove(struct client_ctx *, void *);
 void			 kbfunc_ssh(struct client_ctx *, void *);
 void			 kbfunc_term(struct client_ctx *, void *);
 void			 kbfunc_lock(struct client_ctx *, void *);