screen_pointer_pos(&px, &py);
- for (i = 0; i < screen_num_monitors; ++i) {
- if (RECT_CONTAINS(*screen_physical_area_monitor(i), px, py)) {
- return screen_area_monitor(c->desktop, i);
- }
+ for (i = 0; i < screen_num_monitors; ++i) {
+ Rect *monitor = screen_physical_area_monitor(i);
+ gboolean contain = RECT_CONTAINS(*monitor, px, py);
+ g_free(monitor);
+ if (contain)
+ return screen_area_monitor(c->desktop, i, NULL);
}
g_assert_not_reached();
}
-/*! Pick a monitor to place a window on.
- The returned array value should be freed with g_free. The areas within the
- array should not be freed. */
+/*! Pick a monitor to place a window on. */
static Rect **pick_head(ObClient *c)
{
Rect **area;
screen_pointer_pos(&px, &py);
for (i = 0; i < screen_num_monitors; i++)
- if (RECT_CONTAINS(*screen_physical_area_monitor(i), px, py)) {
+ Rect *monitor = screen_physical_area_monitor(i);
+ gboolean contain = RECT_CONTAINS(*monitor, px, py);
+ g_free(monitor);
+ if (contain)
add_choice(choice, i);
ob_debug("placement adding choice %d for mouse pointer\n", i);
break;
add_choice(choice, i);
for (i = 0; i < screen_num_monitors; ++i)
- area[i] = screen_area_monitor(c->desktop, choice[i]);
+ area[i] = screen_area_monitor(c->desktop, choice[i], NULL);
return area;
}
if (b > t) *y = g_random_int_range(t, b + 1);
else *y = areas[i]->y;
+ for (i = 0; i < screen_num_monitors; ++i)
+ g_free(areas[i]);
g_free(areas);
return TRUE;
IGNORE_FULLSCREEN = 1 << 0,
IGNORE_MAXIMIZED = 1 << 1,
IGNORE_MENUTOOL = 1 << 2,
- IGNORE_SHADED = 1 << 3,
- IGNORE_NONGROUP = 1 << 4,
- IGNORE_BELOW = 1 << 5,
- IGNORE_NONFOCUS = 1 << 6,
- IGNORE_END = 1 << 7
+ /*IGNORE_SHADED = 1 << 3,*/
+ IGNORE_NONGROUP = 1 << 3,
+ IGNORE_BELOW = 1 << 4,
+ IGNORE_NONFOCUS = 1 << 5,
+ IGNORE_END = 1 << 6
};
static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
gboolean ret;
gint maxsize;
GSList *spaces = NULL, *sit, *maxit;
+ guint i;
areas = pick_head(c);
ret = FALSE;
(test->type == OB_CLIENT_TYPE_MENU ||
test->type == OB_CLIENT_TYPE_TOOLBAR) &&
client_has_parent(c)) continue;
+ /*
if ((ignore & IGNORE_SHADED) &&
test->shaded) continue;
+ */
if ((ignore & IGNORE_NONGROUP) &&
- client_has_group_siblings(test) &&
+ client_has_group_siblings(c) &&
test->group != c->group) continue;
if ((ignore & IGNORE_BELOW) &&
test->layer < c->layer) continue;
}
}
+ for (i = 0; i < screen_num_monitors; ++i)
+ g_free(areas[i]);
g_free(areas);
return ret;
}
gint px, py;
Rect *area;
+ if (!screen_pointer_pos(&px, &py))
+ return FALSE;
area = pick_pointer_head(client);
- screen_pointer_pos(&px, &py);
l = area->x;
t = area->y;
else if (settings->monitor > 0 &&
(guint)settings->monitor <= screen_num_monitors)
screen = screen_area_monitor(client->desktop,
- (guint)settings->monitor - 1);
+ (guint)settings->monitor - 1, NULL);
else {
- Rect **all = NULL;
- all = pick_head(client);
- screen = all[0];
- g_free(all); /* the areas themselves don't need to be freed */
+ Rect **areas;
+ guint i;
+
+ areas = pick_head(client);
+ screen = areas[0];
+
+ for (i = 0; i < screen_num_monitors; ++i)
+ g_free(areas[i]);
+ g_free(areas);
}
if (settings->center_x)
client->type == OB_CLIENT_TYPE_SPLASH)
{
Rect **areas;
+ guint i;
areas = pick_head(client);
*x = (areas[0]->width - client->frame->area.width) / 2 + areas[0]->x;
*y = (areas[0]->height - client->frame->area.height) / 2 + areas[0]->y;
+ for (i = 0; i < screen_num_monitors; ++i)
+ g_free(areas[i]);
g_free(areas);
return TRUE;
}
(config_place_policy == OB_PLACE_POLICY_MOUSE &&
place_under_mouse(client, x, y)) ||
place_nooverlap(client, x, y) ||
+ place_under_mouse(client, x, y) ||
place_random(client, x, y);
g_assert(ret);