#include "screen.h"
#include "frame.h"
#include "focus.h"
+#include "config.h"
static Rect* pick_head(ObClient *c)
{
return NULL;
}
+#if 0
static gboolean place_random(ObClient *client, gint *x, gint *y)
{
int l, r, t, b;
if (b > t) *y = g_random_int_range(t, b + 1);
else *y = 0;
- /* get where the client should be */
- frame_frame_gravity(client->frame, x, y);
-
return TRUE;
}
+#endif
static GSList* area_add(GSList *list, Rect *a)
{
return g_slist_prepend(list, r);
}
-
static GSList* area_remove(GSList *list, Rect *a)
{
GSList *sit;
} else {
Rect isect, extra;
- /* Use an intersection of win and curr to determine the space
- around curr that we can use.
+ /* Use an intersection of a and r to determine the space
+ around r that we can use.
NOTE: the spaces calculated can overlap.
*/
for (it = list; it; it = g_list_next(it)) {
ObClient *c = it->data;
- if (c == client || c->shaded)
- continue;
- spaces = area_remove(spaces, &c->frame->area);
+ if (c != client && !c->shaded && client_normal(c))
+ spaces = area_remove(spaces, &c->frame->area);
}
spaces = g_slist_sort(spaces, area_cmp);
return ret;
}
+static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
+{
+ guint i;
+ gint l, r, t, b;
+ gint px, py;
+ Rect *area;
+
+ 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 = MIN(MAX(*x, l), r);
+ *y = py - client->area.height / 2 - client->frame->size.top;
+ *y = MIN(MAX(*y, t), b);
+
+ return TRUE;
+}
+
static gboolean place_transient(ObClient *client, gint *x, gint *y)
{
if (client->transient_for) {
{
if (client->positioned)
return;
- if (place_transient(client, x, y))
- return;
- if (place_dialog(client, x, y))
- return;
- if (place_smart(client, x, y))
- return;
- if (place_random(client, x, y))
- return;
- g_assert_not_reached(); /* the last one better succeed */
+ if (place_transient(client, x, y) ||
+ place_dialog(client, x, y) ||
+ place_smart(client, x, y) ||
+ place_under_mouse(client, x, y))
+ {
+ /* get where the client should be */
+ frame_frame_gravity(client->frame, x, y);
+ } else
+ g_assert_not_reached(); /* the last one better succeed */
}