}
#endif
- return 1;
+ //return 1;
}
/* click to focus */
con_focus(con);
tree_render();
- xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
- xcb_flush(conn);
+ Con *clicked_into = NULL;
+
+ Con *child;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ if (!rect_contains(child->deco_rect, event->event_x, event->event_y))
+ continue;
+
+ clicked_into = child;
+ break;
+ }
+
+ /* check if this was a click on the window border (and on which one) */
+ Rect bsr = con_border_style_rect(con);
+ DLOG("BORDER x = %d, y = %d for con %p, window 0x%08x, border_click = %d, clicked_into = %p\n",
+ event->event_x, event->event_y, con, event->event, border_click, clicked_into);
+ DLOG("checks for right >= %d\n", con->window_rect.x + con->window_rect.width);
+ Con *first = NULL, *second = NULL;
+ if (clicked_into) {
+ DLOG("BORDER top\n");
+ second = clicked_into;
+ first = TAILQ_PREV(clicked_into, nodes_head, nodes);
+
+ if (first == TAILQ_END(&(con->parent->nodes_head))) {
+ DLOG("cannot go further\n");
+ return 0;
+ }
+
+ resize_graphical_handler(first, second, VERT, event);
+ } else if (event->event_x >= 0 && event->event_x <= bsr.x &&
+ event->event_y >= bsr.y && event->event_y <= con->rect.height + bsr.height) {
+ DLOG("BORDER left\n");
+ second = con;
+ first = TAILQ_PREV(con, nodes_head, nodes);
+ if (first == TAILQ_END(&(con->parent->nodes_head))) {
+ DLOG("cannot go further\n");
+ return 0;
+ }
+
+ resize_graphical_handler(first, second, HORIZ, event);
+ } else if (event->event_x >= (con->window_rect.x + con->window_rect.width) &&
+ event->event_y >= bsr.y && event->event_y <= con->rect.height + bsr.height) {
+ DLOG("BORDER right\n");
+ first = con;
+ second = TAILQ_NEXT(con, nodes);
+ if (second == TAILQ_END(&(con->parent->nodes_head))) {
+ DLOG("cannot go further\n");
+ return 0;
+ }
+
+ resize_graphical_handler(first, second, HORIZ, event);
+ } else if (event->event_y >= (con->window_rect.y + con->window_rect.height)) {
+ DLOG("BORDER bottom\n");
+
+ first = con;
+ second = TAILQ_NEXT(con, nodes);
+ if (second == TAILQ_END(&(con->parent->nodes_head))) {
+ DLOG("cannot go further\n");
+ return 0;
+ }
+
+ resize_graphical_handler(first, second, VERT, event);
+ } else {
+ /* No border click, replay the click */
+ xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
+ xcb_flush(conn);
+ }
+
+ tree_render();
+
return 0;
#if 0
if (client == NULL) {
--- /dev/null
+/*
+ * vim:ts=4:sw=4:expandtab
+ */
+#include "all.h"
+
+extern xcb_connection_t *conn;
+
+/*
+ * This is an ugly data structure which we need because there is no standard
+ * way of having nested functions (only available as a gcc extension at the
+ * moment, clang doesn’t support it) or blocks (only available as a clang
+ * extension and only on Mac OS X systems at the moment).
+ *
+ */
+struct callback_params {
+ orientation_t orientation;
+ Con *output;
+ xcb_window_t helpwin;
+ uint32_t *new_position;
+};
+
+DRAGGING_CB(resize_callback) {
+ struct callback_params *params = extra;
+ Con *output = params->output;
+ DLOG("new x = %d, y = %d\n", new_x, new_y);
+ if (params->orientation == HORIZ) {
+ /* Check if the new coordinates are within screen boundaries */
+ if (new_x > (output->rect.x + output->rect.width - 25) ||
+ new_x < (output->rect.x + 25))
+ return;
+
+ *(params->new_position) = new_x;
+ xcb_configure_window(conn, params->helpwin, XCB_CONFIG_WINDOW_X, params->new_position);
+ } else {
+ if (new_y > (output->rect.y + output->rect.height - 25) ||
+ new_y < (output->rect.y + 25))
+ return;
+
+ *(params->new_position) = new_y;
+ xcb_configure_window(conn, params->helpwin, XCB_CONFIG_WINDOW_Y, params->new_position);
+ }
+
+ xcb_flush(conn);
+}
+
+int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, xcb_button_press_event_t *event) {
+ DLOG("resize handler\n");
+
+ uint32_t new_position;
+
+ /* TODO: previously, we were getting a rect containing all screens. why? */
+ Con *output = con_get_output(first);
+ DLOG("x = %d, width = %d\n", output->rect.x, output->rect.width);
+
+ uint32_t mask = 0;
+ uint32_t values[2];
+
+ mask = XCB_CW_OVERRIDE_REDIRECT;
+ values[0] = 1;
+
+ /* Open a new window, the resizebar. Grab the pointer and move the window around
+ as the user moves the pointer. */
+ xcb_window_t grabwin = create_window(conn, output->rect, XCB_WINDOW_CLASS_INPUT_ONLY, XCURSOR_CURSOR_POINTER, true, mask, values);
+
+ Rect helprect;
+ if (orientation == HORIZ) {
+ helprect.x = event->root_x;
+ helprect.y = output->rect.y;
+ helprect.width = 2;
+ helprect.height = output->rect.height;
+ new_position = event->root_x;
+ } else {
+ helprect.x = output->rect.x;
+ helprect.y = event->root_y;
+ helprect.width = output->rect.width;
+ helprect.height = 2;
+ new_position = event->root_y;
+ }
+
+ mask = XCB_CW_BACK_PIXEL;
+ values[0] = config.client.focused.border;
+
+ mask |= XCB_CW_OVERRIDE_REDIRECT;
+ values[1] = 1;
+
+ xcb_window_t helpwin = create_window(conn, helprect, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+ (orientation == HORIZ ?
+ XCURSOR_CURSOR_RESIZE_HORIZONTAL :
+ XCURSOR_CURSOR_RESIZE_VERTICAL), true, mask, values);
+
+ xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, helpwin);
+
+ xcb_flush(conn);
+
+ struct callback_params params = { orientation, output, helpwin, &new_position };
+
+ drag_pointer(NULL, event, grabwin, BORDER_TOP, resize_callback, ¶ms);
+
+ xcb_destroy_window(conn, helpwin);
+ xcb_destroy_window(conn, grabwin);
+ xcb_flush(conn);
+
+ int pixels;
+ if (orientation == HORIZ)
+ pixels = (new_position - event->root_x);
+ else pixels = (new_position - event->root_y);
+
+ DLOG("Done, pixels = %d\n", pixels);
+
+ double new_percent, difference;
+ int children = con_num_children(first->parent);
+ double percent = 1.0 / children;
+ if (first->percent > 0.0)
+ percent = first->percent;
+ DLOG("percent = %f\n", percent);
+ int original = (orientation == HORIZ ? first->rect.width : first->rect.height);
+ DLOG("original = %d\n", original);
+ new_percent = (original + pixels) * (percent / original);
+ difference = percent - new_percent;
+ DLOG("difference = %f\n", difference);
+ DLOG("new percent = %f\n", new_percent);
+
+ first->percent = new_percent;
+
+ double s_percent = 1.0 / children;
+ if (second->percent > 0.0)
+ s_percent = second->percent;
+
+ second->percent = s_percent + difference;
+ DLOG("second->percent = %f\n", second->percent);
+
+ return 0;
+}
projects / i3 / i3 / commitdiff