- if (event->value_mask & XCB_CONFIG_WINDOW_X)
- client->rect.x = event->x;
- if (event->value_mask & XCB_CONFIG_WINDOW_Y)
- client->rect.y = event->y;
+ if (event->value_mask & XCB_CONFIG_WINDOW_X) {
+ if (mode == MODE_STACK || mode == MODE_TABBED) {
+ client->rect.x = event->x - 2;
+ } else {
+ if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
+ client->rect.x = event->x;
+ else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
+ client->rect.x = event->x - 1;
+ else client->rect.x = event->x - 2;
+ }
+ }
+ if (event->value_mask & XCB_CONFIG_WINDOW_Y) {
+ if (mode == MODE_STACK || mode == MODE_TABBED) {
+ client->rect.y = event->y - 2;
+ } else {
+ if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
+ client->rect.y = event->y;
+ else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
+ client->rect.y = event->y - 1;
+ else client->rect.y = event->y - font->height - 2 - 2;
+ }
+ }