X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=95763d06341ea57c5c21f780183867c5dfd2f003;hb=f07b18cf3a9d5be1445f6aac9f1380da374fa7f4;hp=cf03b72d6874690977f9f5e2a5d1ce2cb5d8f204;hpb=380af80a136214e15ff8efa9f5c8ad6dd511872a;p=chaz%2Fopenbox diff --git a/openbox/place.c b/openbox/place.c index cf03b72d..95763d06 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -59,7 +59,7 @@ static Rect* pick_head(ObClient *c) 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); @@ -175,6 +175,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; @@ -210,63 +212,68 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, for (i = 0; i < screen_num_monitors; ++i) spaces = area_add(spaces, screen_area_monitor(client->desktop, i)); - if (type == SMART_FULL || type == SMART_FOCUSED) { - gboolean found_foc = FALSE, stop = FALSE; - ObClient *foc; - GList *list; - - list = focus_order[client->desktop == DESKTOP_ALL ? - screen_desktop : client->desktop]; - foc = list ? list->data : NULL; + /* stay out from under windows in higher layers */ + for (it = stacking_list; it; it = g_list_next(it)) { + ObClient *c; - for (it = stacking_list; it && !stop; it = g_list_next(it)) { - ObClient *c; - - if (WINDOW_IS_CLIENT(it->data)) - c = it->data; - else + if (WINDOW_IS_CLIENT(it->data)) { + c = it->data; + if (c->fullscreen) continue; + } else + continue; - if (!SMART_IGNORE(client, c)) { - if (type == SMART_FOCUSED) { - if (c->layer <= client->layer && found_foc) - stop = TRUE; - } - if (!stop) - spaces = area_remove(spaces, &c->frame->area); - } - - if (c == foc) - found_foc = TRUE; - } - } else if (type == SMART_GROUP) { - /* has to be more than me in the group */ - if (!client_has_group_siblings(client)) - return FALSE; - - for (sit = client->group->members; sit; sit = g_slist_next(sit)) { - ObClient *c = sit->data; + if (c->layer > client->layer) { if (!SMART_IGNORE(client, c)) spaces = area_remove(spaces, &c->frame->area); - } + } else + break; + } - /* stay out from under windows in higher layers */ - for (it = stacking_list; it; it = g_list_next(it)) { - ObClient *c; + if (client->type == OB_CLIENT_TYPE_NORMAL) { + if (type == SMART_FULL || type == SMART_FOCUSED) { + gboolean found_foc = FALSE, stop = FALSE; + ObClient *foc; + GList *list; + + list = focus_order[client->desktop == DESKTOP_ALL ? + screen_desktop : client->desktop]; + foc = list ? list->data : NULL; + + for (; it && !stop; it = g_list_next(it)) { + ObClient *c; + + if (WINDOW_IS_CLIENT(it->data)) { + c = it->data; + if (c->fullscreen) + continue; + } else + continue; + + if (!SMART_IGNORE(client, c)) { + if (type == SMART_FOCUSED) + if (found_foc) + stop = TRUE; + if (!stop) + spaces = area_remove(spaces, &c->frame->area); + } - if (WINDOW_IS_CLIENT(it->data)) - c = it->data; - else - continue; + if (c == foc) + found_foc = TRUE; + } + } else if (type == SMART_GROUP) { + /* has to be more than me in the group */ + if (!client_has_group_siblings(client)) + return FALSE; - if (c->layer > client->layer) { + for (sit = client->group->members; sit; sit = g_slist_next(sit)) { + ObClient *c = sit->data; if (!SMART_IGNORE(client, c)) spaces = area_remove(spaces, &c->frame->area); - } else - break; - } - } else - g_assert_not_reached(); + } + } else + g_assert_not_reached(); + } spaces = g_slist_sort_with_data(spaces, area_cmp, client); @@ -277,7 +284,9 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, if (r->width >= client->frame->area.width && r->height >= client->frame->area.height) { ret = TRUE; - if (type != SMART_FULL) { + if (client->type == OB_CLIENT_TYPE_DIALOG || + type != SMART_FULL) + { *x = r->x + (r->width - client->frame->area.width) / 2; *y = r->y + (r->height - client->frame->area.height) / 2; } else { @@ -324,6 +333,43 @@ 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) +{ + 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; +} + static gboolean place_transient(ObClient *client, gint *x, gint *y) { if (client->transient_for) { @@ -338,8 +384,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) { @@ -366,29 +412,12 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y) return FALSE; } -static gboolean place_dialog(ObClient *client, gint *x, gint *y) -{ - /* center parentless dialogs on the screen */ - if (client->type == OB_CLIENT_TYPE_DIALOG) { - Rect *area; - - area = pick_head(client); - if (!area) - area = screen_area_monitor(client->desktop, 0); - - *x = (area->width - client->frame->area.width) / 2 + area->x; - *y = (area->height - client->frame->area.height) / 2 + area->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) { if (client->positioned) return; if (place_transient(client, x, y) || - place_dialog(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) ||