diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/client.c | 14 | ||||
| -rw-r--r-- | openbox/client.h | 11 | ||||
| -rw-r--r-- | openbox/event.c | 4 | ||||
| -rw-r--r-- | openbox/moveresize.c | 15 |
4 files changed, 21 insertions, 23 deletions
diff --git a/openbox/client.c b/openbox/client.c index 57d39249..f1cbdc8d 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -407,9 +407,9 @@ void client_manage(Window window) do this after adjusting the frame. otherwise it gets all weird and clients don't work right */ - client_configure_full(self, self->area.x, self->area.y, - self->area.width, self->area.height, - FALSE, TRUE); + client_configure(self, self->area.x, self->area.y, + self->area.width, self->area.height, + FALSE, TRUE); /* do this after the window is placed, so the premax/prefullscreen numbers won't be all wacko!! @@ -1771,8 +1771,8 @@ void client_reconfigure(ObClient *self) /* by making this pass FALSE for user, we avoid the emacs event storm where every configurenotify causes an update in its normal hints, i think this is generally what we want anyways... */ - client_configure_full(self, self->area.x, self->area.y, - self->area.width, self->area.height, FALSE, TRUE); + client_configure(self, self->area.x, self->area.y, + self->area.width, self->area.height, FALSE, TRUE); } void client_update_wmhints(ObClient *self) @@ -2704,8 +2704,8 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, } -void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h, - gboolean user, gboolean final) +void client_configure(ObClient *self, gint x, gint y, gint w, gint h, + gboolean user, gboolean final) { gint oldw, oldh; gboolean send_resize_client; diff --git a/openbox/client.h b/openbox/client.h index 3dcf62fc..2cc64a5c 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -369,12 +369,11 @@ void client_convert_gravity(ObClient *self, gint gravity, gint *x, gint *y, gint w, gint h); #define client_move(self, x, y) \ - client_configure_full(self, x, y, self->area.width, self->area.height, \ - TRUE, TRUE) + client_configure(self, x, y, self->area.width, self->area.height, TRUE, TRUE) #define client_resize(self, w, h) \ - client_configure_full(self, self->area.x, self->area.y, w, h, TRUE, TRUE) + client_configure(self, self->area.x, self->area.y, w, h, TRUE, TRUE) #define client_move_resize(self, x, y, w, h) \ - client_configure_full(self, x, y, w, h, TRUE, TRUE) + client_configure(self, x, y, w, h, TRUE, TRUE) /*! Figure out where a window will end up and what size it will be if you told it to move/resize to these coordinates. @@ -415,8 +414,8 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, @param force_reply Send a ConfigureNotify to the client regardless of if the position changed. */ -void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h, - gboolean user, gboolean final); +void client_configure(ObClient *self, gint x, gint y, gint w, gint h, + gboolean user, gboolean final); void client_reconfigure(ObClient *self); diff --git a/openbox/event.c b/openbox/event.c index e265f4de..6a5e3540 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1085,7 +1085,7 @@ static void event_handle_client(ObClient *client, XEvent *e) /* don't create enter events from clients moving themselves */ grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); - client_configure_full(client, x, y, w, h, FALSE, TRUE); + client_configure(client, x, y, w, h, FALSE, TRUE); ungrab_pointer(); } break; @@ -1266,7 +1266,7 @@ static void event_handle_client(ObClient *client, XEvent *e) /* don't create enter events from clients moving themselves */ grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); - client_configure_full(client, x, y, w, h, FALSE, TRUE); + client_configure(client, x, y, w, h, FALSE, TRUE); ungrab_pointer(); } else if (msgtype == prop_atoms.net_restack_window) { if (e->xclient.data.l[0] != 2) { diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 8b31dbfa..837f3e92 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -295,9 +295,9 @@ void moveresize_end(gboolean cancel) #endif get_resize_position(&x, &y, cancel); - client_configure_full(moveresize_client, x, y, - (cancel ? start_cw : cur_x), - (cancel ? start_ch : cur_y), TRUE, TRUE); + client_configure(moveresize_client, x, y, + (cancel ? start_cw : cur_x), + (cancel ? start_ch : cur_y), TRUE, TRUE); } moveresize_in_progress = FALSE; @@ -314,9 +314,9 @@ static void do_move(gboolean keyboard) if (!keyboard) resist = config_resist_edge; resist_move_monitors(moveresize_client, resist, &cur_x, &cur_y); - client_configure_full(moveresize_client, cur_x, cur_y, - moveresize_client->area.width, - moveresize_client->area.height, TRUE, FALSE); + client_configure(moveresize_client, cur_x, cur_y, + moveresize_client->area.width, + moveresize_client->area.height, TRUE, FALSE); if (config_resize_popup_show == 2) /* == "Always" */ popup_coords(moveresize_client, "%d x %d", moveresize_client->frame->area.x, @@ -375,8 +375,7 @@ static void do_resize() { gint x, y; get_resize_position(&x, &y, FALSE); - client_configure_full(moveresize_client, - x, y, cur_x, cur_y, TRUE, FALSE); + client_configure(moveresize_client, x, y, cur_x, cur_y, TRUE, FALSE); } /* this would be better with a fixed width font ... XXX can do it better |