if (num[i] > num[most])
most = i;
+ g_free(num);
+
a = screen_physical_area_monitor(most);
if (RECT_CONTAINS(*a, a1->x, a1->y))
return -1;
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;
+}
+
+static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y, ObAppSettings *settings)
+{
+ gint px, py, i;
+ Rect *screen;
+
+ if (!settings || (settings && !settings->pos_given))
+ return FALSE;
+
+ /* Find which head the pointer is on */
+ if (settings->head == -1 && screen_num_monitors > 1) {
+ screen_pointer_pos(&px, &py);
+
+ for (i = 0; i < screen_num_monitors; i++) {
+ screen = screen_area_monitor(client->desktop, i);
+ if (RECT_CONTAINS(*screen, px, py))
+ break;
+ }
+
+ if (i == screen_num_monitors)
+ screen = screen_area_monitor(client->desktop, 0);
+ }
+ else
+ screen = screen_area_monitor(client->desktop, settings->head);
+
+ if (settings->center_x)
+ *x = screen->x + screen->width / 2 - client->area.width / 2;
+ else
+ *x = screen->x + settings->position.x;
+
+ if (settings->center_y)
+ *y = screen->y + screen->height / 2 - client->area.height / 2;
+ else
+ *y = screen->y + settings->position.y;
return TRUE;
}
return FALSE;
}
-void place_client(ObClient *client, gint *x, gint *y)
+void place_client(ObClient *client, gint *x, gint *y, ObAppSettings *settings)
{
- gint rude = 1;
if (client->positioned)
- rude = 0;
+ return;
if (place_transient(client, x, y) ||
+ place_per_app_setting(client, x, y, settings) ||
((config_place_policy == OB_PLACE_POLICY_MOUSE) ?
place_under_mouse(client, x, y) :
place_smart(client, x, y, SMART_FULL) ||
place_smart(client, x, y, SMART_FOCUSED) ||
place_random(client, x, y)))
{
- /* make sure the window is visible. */
- client_find_onscreen(client, x, y,
- client->frame->area.width,
- client->frame->area.height,
- /* 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 */
- client_normal(client) && !client->session);
/* get where the client should be */
frame_frame_gravity(client->frame, x, y);
} else