floating: re-implement floating_modifier + left/right mouse button to drag/resize

[i3/i3] / src / click.c

diff --git a/src/click.c b/src/click.c
index 61328e0604c30f755fa5901bc543e803681a3ca3..bb4af66aa5c5e952b5183a1ee6ea62fde30c7507 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -238,7 +238,7 @@ static bool floating_mod_on_tiled_client(xcb_connection_t *conn, Client *client,
 
 int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_event_t *event) {
         Con *con;
-        LOG("Button %d pressed\n", event->state);
+        LOG("Button %d pressed on window 0x%08x\n", event->state, event->event);
 
         con = con_by_window_id(event->event);
         bool border_click = false;
@@ -246,50 +246,61 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 con = con_by_frame_id(event->event);
                 border_click = true;
         }
+        LOG("border_click = %d\n", border_click);
         //if (con && con->type == CT_FLOATING_CON)
                 //con = TAILQ_FIRST(&(con->nodes_head));
 
         /* See if this was a click with the configured modifier. If so, we need
          * to move around the client if it was floating. if not, we just process
          * as usual. */
-        //if (config.floating_modifier != 0 &&
-            //(event->state & config.floating_modifier) == config.floating_modifier) {
+        LOG("state = %d, floating_modifier = %d\n", event->state, config.floating_modifier);
+        if (border_click ||
+            (config.floating_modifier != 0 &&
+             (event->state & config.floating_modifier) == config.floating_modifier)) {
                 if (con == NULL) {
                         LOG("Not handling, floating_modifier was pressed and no client found\n");
                         return 1;
                 }
+                LOG("handling\n");
 #if 0
                 if (con->fullscreen) {
                         LOG("Not handling, client is in fullscreen mode\n");
                         return 1;
                 }
 #endif
-                if (con->type == CT_FLOATING_CON) {
+                if ((border_click && con->type == CT_FLOATING_CON) ||
+                    (!border_click && con_is_floating(con))) {
+                        /* floating operations are always on the container around
+                         * the "payload container", so make sure we use the right one */
+                        Con *floatingcon = (border_click ? con : con->parent);
                         LOG("button %d pressed\n", event->detail);
                         if (event->detail == 1) {
                                 LOG("left mouse button, dragging\n");
-                                floating_drag_window(con, event);
+                                floating_drag_window(floatingcon, event);
                         } 
-#if 0
                         else if (event->detail == 3) {
                                 bool proportional = (event->state & BIND_SHIFT);
                                 DLOG("right mouse button\n");
-                                floating_resize_window(conn, client, proportional, event);
+                                floating_resize_window(floatingcon, proportional, event);
                         }
-#endif
                         return 1;
                 }
 
 #if 0
                 if (!floating_mod_on_tiled_client(conn, client, event)) {
+#endif
                         xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
                         xcb_flush(conn);
+#if 0
                 }
 #endif
 
                 return 1;
-        //}
+        }
 
+        xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
+        xcb_flush(conn);
+        return 0;
 #if 0
         if (client == NULL) {
                 /* The client was neither on a client’s titlebar nor on a client itself, maybe on a stack_window? */