diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/client.c | 14 | ||||
| -rw-r--r-- | openbox/place.c | 7 |
2 files changed, 13 insertions, 8 deletions
diff --git a/openbox/client.c b/openbox/client.c index 8b2087d0..b8a2ea24 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -382,7 +382,8 @@ void client_manage(Window window) */ ob_state() == OB_STATE_RUNNING && (transient || - (!(self->positioned & USPosition) && + (!((self->positioned & USPosition) || + (settings && settings->pos_given)) && client_normal(self) && !self->session))); } @@ -983,10 +984,15 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, for (i = 0; i < screen_num_monitors; ++i) { Rect *a; - if (!screen_physical_area_monitor_contains(i, &desired)) - continue; + if (!screen_physical_area_monitor_contains(i, &desired)) { + if (i < screen_num_monitors - 1) + continue; - a = screen_area(self->desktop, SCREEN_AREA_ONE_MONITOR, &desired); + /* the window is not inside any monitor! so just use the first + one */ + a = screen_area(self->desktop, 0, NULL); + } else + a = screen_area(self->desktop, SCREEN_AREA_ONE_MONITOR, &desired); /* This makes sure windows aren't entirely outside of the screen so you can't see them at all. diff --git a/openbox/place.c b/openbox/place.c index 37626231..99911966 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -411,8 +411,6 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y, else *x = screen->x + settings->position.x; - ob_debug("x %d settings %d\n", *x, settings->position.x); - if (settings->center_y) *y = screen->y + screen->height / 2 - client->area.height / 2; else if (settings->opposite_y) @@ -480,6 +478,7 @@ gboolean place_client(ObClient *client, gint *x, gint *y, ObAppSettings *settings) { gboolean ret; + gboolean userplaced = FALSE; /* per-app settings override program specified position * but not user specified */ @@ -490,7 +489,7 @@ gboolean place_client(ObClient *client, gint *x, gint *y, /* try a number of methods */ ret = place_transient_splash(client, x, y) || - place_per_app_setting(client, x, y, settings) || + (userplaced = place_per_app_setting(client, x, y, settings)) || (config_place_policy == OB_PLACE_POLICY_MOUSE && place_under_mouse(client, x, y)) || place_nooverlap(client, x, y) || @@ -499,5 +498,5 @@ gboolean place_client(ObClient *client, gint *x, gint *y, /* get where the client should be */ frame_frame_gravity(client->frame, x, y); - return ret; + return !userplaced; } |