Merge branch 'next'

[i3/i3] / include / resize.h

diff --git a/include/resize.h b/include/resize.h
index c187e837a8b6098ef98470a579dd6a5196107e24..fa0216c88ac3597e45193a32d7b1376e874d9860 100644 (file)
--- a/include/resize.h
+++ b/include/resize.h
@@ -1,36 +1,15 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * (c) 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * resize.c: Interactive resizing.
  *
  */
+#ifndef I3_RESIZE_H
+#define I3_RESIZE_H
 
-#ifndef _RESIZE_H
-#define _RESIZE_H
-
-#include <xcb/xcb.h>
-
-typedef enum { O_HORIZONTAL, O_VERTICAL } resize_orientation_t;
-
-/**
- * Renders the resize window between the first/second container and resizes
- * the table column/row.
- *
- */
-int resize_graphical_handler(xcb_connection_t *conn, Workspace *ws, int first,
-                             int second, resize_orientation_t orientation,
-                             xcb_button_press_event_t *event);
-/**
- * Resizes a column/row by the given amount of pixels. Called by
- * resize_graphical_handler (the user clicked) or parse_resize_command (the
- * user issued the command)
- *
- */
-void resize_container(xcb_connection_t *conn, Workspace *ws, int first, int second,
-                      resize_orientation_t orientation, int pixels);
+int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, const xcb_button_press_event_t *event);
 
 #endif