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

apply gravity to the chosen coords, bound the undermouse placement

Browse source
This commit is contained in:
Dana Jansens 2003-09-15 02:34:07 +00:00
parent e8c1967aa2
commit a9ae2f481a
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
openbox/place.c
View file

@ -60,9 +60,6 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
if (b > t) *y = g_random_int_range(t, b + 1); if (b > t) *y = g_random_int_range(t, b + 1);
else *y = 0; else *y = 0;
/* get where the client should be */
frame_frame_gravity(client->frame, x, y);
return TRUE; return TRUE;
} }
#endif #endif
@ -183,12 +180,30 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y)
static gboolean place_under_mouse(ObClient *client, gint *x, gint *y) static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
{ {
int px, py; guint i;
gint l, r, t, b;
gint px, py;
Rect *area;
screen_pointer_pos(&px, &py); screen_pointer_pos(&px, &py);
for (i = 0; i < screen_num_monitors; ++i) {
area = screen_area_monitor(client->desktop, i);
if (RECT_CONTAINS(*area, px, py))
break;
}
if (i == screen_num_monitors)
area = screen_area_monitor(client->desktop, 0);
l = area->x;
t = area->y;
r = area->x + area->width - client->frame->area.width;
b = area->y + area->height - client->frame->area.height;
*x = px - client->area.width / 2 - client->frame->size.left; *x = px - client->area.width / 2 - client->frame->size.left;
*x = MIN(MAX(*x, l), r);
*y = py - client->area.height / 2 - client->frame->size.top; *y = py - client->area.height / 2 - client->frame->size.top;
*y = MIN(MAX(*y, t), b);
return TRUE; return TRUE;
} }
@ -256,13 +271,13 @@ void place_client(ObClient *client, gint *x, gint *y)
{ {
if (client->positioned) if (client->positioned)
return; return;
if (place_transient(client, x, y)) if (place_transient(client, x, y) ||
return; place_dialog(client, x, y) ||
if (place_dialog(client, x, y)) place_smart(client, x, y) ||
return; place_under_mouse(client, x, y))
if (place_smart(client, x, y)) {
return; /* get where the client should be */
if (place_under_mouse(client, x, y)) frame_frame_gravity(client->frame, x, y);
return; } else
g_assert_not_reached(); /* the last one better succeed */ g_assert_not_reached(); /* the last one better succeed */
} }