X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=6669a28e4c5fa42723c064e3acb527ed2c8f5ffc;hb=5648f0d75c22c817c740a9345e50dfd2ac2f6ffc;hp=29d58734c6601ada8d9814755779aa320770ae06;hpb=64772cc6d85ba852dbdae8f1b148db1215bbc7d8;p=chaz%2Fopenbox diff --git a/openbox/place.c b/openbox/place.c index 29d58734..6669a28e 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -324,9 +324,9 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y) b = area->y + area->height - client->frame->area.height; *x = px - client->area.width / 2 - client->frame->size.left; -// *x = MIN(MAX(*x, l), r); + *x = MIN(MAX(*x, l), r); *y = py - client->area.height / 2 - client->frame->size.top; -// *y = MIN(MAX(*y, t), b); + *y = MIN(MAX(*y, t), b); return TRUE; } @@ -375,13 +375,9 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y) void place_client(ObClient *client, gint *x, gint *y) { - /* non-normal clients has less rules, and windows that are being restored - * from a session do also. we can assume you want it back where you - * saved it */ - gint rude = client_normal(client) && !client->session; if (client->positioned) - rude = 0; - else if (place_transient(client, x, y) || + return; + if (place_transient(client, x, y) || ((config_place_policy == OB_PLACE_POLICY_MOUSE) ? place_under_mouse(client, x, y) : place_smart(client, x, y, SMART_FULL) || @@ -393,9 +389,4 @@ void place_client(ObClient *client, gint *x, gint *y) frame_frame_gravity(client->frame, x, y); } else g_assert_not_reached(); /* the last one better succeed */ - /* make sure the window is visible. */ - client_find_onscreen(client, x, y, - client->frame->area.width, - client->frame->area.height, - rude); }