X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=f9da57629a39722db7c6d9a7e881ff3ec4809acc;hb=9d1949f0b168650e38dcb9adf1ad93e8b90a9b44;hp=70c3cdd3336b21d5ebd5f706d5c0dfd5e8859373;hpb=90abec9c3017f05b14f85d85105df0c62622ad9a;p=chaz%2Fopenbox diff --git a/openbox/place.c b/openbox/place.c index 70c3cdd3..f9da5762 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -1,6 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- place.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -23,8 +24,12 @@ #include "focus.h" #include "config.h" -static Rect* pick_head(ObClient *c) +static Rect *pick_head(ObClient *c) { + Rect *area = NULL; + guint i; + gint px, py; + /* try direct parent first */ if (c->transient_for && c->transient_for != OB_TRAN_GROUP) { return screen_area_monitor(c->desktop, @@ -54,18 +59,30 @@ static Rect* pick_head(ObClient *c) } } - return NULL; + screen_pointer_pos(&px, &py); + + for (i = 0; i < screen_num_monitors; i++) { + area = screen_area_monitor(c->desktop, i); + if (RECT_CONTAINS(*area, px, py)) + break; + } + if (i == screen_num_monitors) + area = screen_area_monitor(c->desktop, 0); + + /* Last resort */ + if (!area) + area = screen_area_monitor(c->desktop, + g_random_int_range(0, screen_num_monitors)); + + return area; } static gboolean place_random(ObClient *client, gint *x, gint *y) { - int l, r, t, b; + gint l, r, t, b; Rect *area; area = pick_head(client); - if (!area) - area = screen_area_monitor(client->desktop, - g_random_int_range(0, screen_num_monitors)); l = area->x; t = area->y; @@ -175,6 +192,8 @@ static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data) 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; @@ -202,21 +221,21 @@ typedef enum static gboolean place_smart(ObClient *client, gint *x, gint *y, ObSmartType type) { - guint i; gboolean ret = FALSE; GSList *spaces = NULL, *sit; GList *it; - for (i = 0; i < screen_num_monitors; ++i) - spaces = area_add(spaces, screen_area_monitor(client->desktop, i)); + spaces = area_add(spaces, pick_head(client)); /* stay out from under windows in higher layers */ for (it = stacking_list; it; it = g_list_next(it)) { ObClient *c; - if (WINDOW_IS_CLIENT(it->data)) + if (WINDOW_IS_CLIENT(it->data)) { c = it->data; - else + if (c->fullscreen) + continue; + } else continue; if (c->layer > client->layer) { @@ -239,9 +258,11 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, for (; it && !stop; it = g_list_next(it)) { ObClient *c; - if (WINDOW_IS_CLIENT(it->data)) + if (WINDOW_IS_CLIENT(it->data)) { c = it->data; - else + if (c->fullscreen) + continue; + } else continue; if (!SMART_IGNORE(client, c)) { @@ -299,21 +320,13 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, static gboolean place_under_mouse(ObClient *client, gint *x, gint *y) { - guint i; gint l, r, t, b; gint px, py; Rect *area; + area = pick_head(client); 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; @@ -327,6 +340,33 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y) return TRUE; } +static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y, + ObAppSettings *settings) +{ + Rect *screen; + + if (!settings || (settings && !settings->pos_given)) + return FALSE; + + /* Find which head the pointer is on */ + if (settings->head == -1) + screen = pick_head(client); + 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; +} + static gboolean place_transient(ObClient *client, gint *x, gint *y) { if (client->transient_for) { @@ -341,8 +381,8 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y) } else { GSList *it; gboolean first = TRUE; - int l, r, t, b; - for (it = client->group->members; it; it = it->next) { + gint l, r, t, b; + for (it = client->group->members; it; it = g_slist_next(it)) { ObClient *m = it->data; if (!(m == client || m->transient_for)) { if (first) { @@ -369,20 +409,25 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y) return FALSE; } -void place_client(ObClient *client, gint *x, gint *y) +/* Return TRUE if we want client.c to enforce on-screen-keeping */ +gboolean place_client(ObClient *client, gint *x, gint *y, + ObAppSettings *settings) { + gboolean ret = FALSE; if (client->positioned) - return; - if (place_transient(client, x, y) || + return FALSE; + if (place_transient(client, x, y)) + ret = TRUE; + else if (!( + 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_GROUP) || place_smart(client, x, y, SMART_FOCUSED) || - place_random(client, x, y))) - { - /* get where the client should be */ - frame_frame_gravity(client->frame, x, y); - } else + place_random(client, x, y)))) g_assert_not_reached(); /* the last one better succeed */ + /* get where the client should be */ + frame_frame_gravity(client->frame, x, y); + return ret; }