nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename client_configure_full to client_configure

Browse source
This commit is contained in:
Dana Jansens 2007-05-17 01:45:00 +00:00
parent cfce6b8f4d
commit b1076c9333
4 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
openbox/client.c
View file

@ -407,9 +407,9 @@ void client_manage(Window window)
do this after adjusting the frame. otherwise it gets all weird and do this after adjusting the frame. otherwise it gets all weird and
clients don't work right */ clients don't work right */
client_configure_full(self, self->area.x, self->area.y, client_configure(self, self->area.x, self->area.y,
self->area.width, self->area.height, self->area.width, self->area.height,
FALSE, TRUE); FALSE, TRUE);
/* do this after the window is placed, so the premax/prefullscreen numbers /* do this after the window is placed, so the premax/prefullscreen numbers
won't be all wacko!! 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 /* 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 every configurenotify causes an update in its normal hints, i think this
is generally what we want anyways... */ is generally what we want anyways... */
client_configure_full(self, self->area.x, self->area.y, client_configure(self, self->area.x, self->area.y,
self->area.width, self->area.height, FALSE, TRUE); self->area.width, self->area.height, FALSE, TRUE);
} }
void client_update_wmhints(ObClient *self) 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, void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
gboolean user, gboolean final) gboolean user, gboolean final)
{ {
gint oldw, oldh; gint oldw, oldh;
gboolean send_resize_client; gboolean send_resize_client;

11
openbox/client.h
View file

@ -369,12 +369,11 @@ void client_convert_gravity(ObClient *self, gint gravity, gint *x, gint *y,
gint w, gint h); gint w, gint h);
#define client_move(self, x, y) \ #define client_move(self, x, y) \
client_configure_full(self, x, y, self->area.width, self->area.height, \ client_configure(self, x, y, self->area.width, self->area.height, TRUE, TRUE)
TRUE, TRUE)
#define client_resize(self, w, h) \ #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) \ #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 /*! Figure out where a window will end up and what size it will be if you
told it to move/resize to these coordinates. 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 @param force_reply Send a ConfigureNotify to the client regardless of if
the position changed. the position changed.
*/ */
void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h, void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
gboolean user, gboolean final); gboolean user, gboolean final);
void client_reconfigure(ObClient *self); void client_reconfigure(ObClient *self);

4
openbox/event.c
View file

@ -1085,7 +1085,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
/* don't create enter events from clients moving themselves */ /* don't create enter events from clients moving themselves */
grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); 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(); ungrab_pointer();
} }
break; break;
@ -1266,7 +1266,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
/* don't create enter events from clients moving themselves */ /* don't create enter events from clients moving themselves */
grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); 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(); ungrab_pointer();
} else if (msgtype == prop_atoms.net_restack_window) { } else if (msgtype == prop_atoms.net_restack_window) {
if (e->xclient.data.l[0] != 2) { if (e->xclient.data.l[0] != 2) {

15
openbox/moveresize.c
View file

@ -295,9 +295,9 @@ void moveresize_end(gboolean cancel)
#endif #endif
get_resize_position(&x, &y, cancel); get_resize_position(&x, &y, cancel);
client_configure_full(moveresize_client, x, y, client_configure(moveresize_client, x, y,
(cancel ? start_cw : cur_x), (cancel ? start_cw : cur_x),
(cancel ? start_ch : cur_y), TRUE, TRUE); (cancel ? start_ch : cur_y), TRUE, TRUE);
} }
moveresize_in_progress = FALSE; moveresize_in_progress = FALSE;
@ -314,9 +314,9 @@ static void do_move(gboolean keyboard)
if (!keyboard) resist = config_resist_edge; if (!keyboard) resist = config_resist_edge;
resist_move_monitors(moveresize_client, resist, &cur_x, &cur_y); resist_move_monitors(moveresize_client, resist, &cur_x, &cur_y);
client_configure_full(moveresize_client, cur_x, cur_y, client_configure(moveresize_client, cur_x, cur_y,
moveresize_client->area.width, moveresize_client->area.width,
moveresize_client->area.height, TRUE, FALSE); moveresize_client->area.height, TRUE, FALSE);
if (config_resize_popup_show == 2) /* == "Always" */ if (config_resize_popup_show == 2) /* == "Always" */
popup_coords(moveresize_client, "%d x %d", popup_coords(moveresize_client, "%d x %d",
moveresize_client->frame->area.x, moveresize_client->frame->area.x,
@ -375,8 +375,7 @@ static void do_resize()
{ {
gint x, y; gint x, y;
get_resize_position(&x, &y, FALSE); get_resize_position(&x, &y, FALSE);
client_configure_full(moveresize_client, client_configure(moveresize_client, x, y, cur_x, cur_y, TRUE, FALSE);
x, y, cur_x, cur_y, TRUE, FALSE);
} }
/* this would be better with a fixed width font ... XXX can do it better /* this would be better with a fixed width font ... XXX can do it better