summaryrefslogtreecommitdiff
path: root/openbox/place.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/place.c')
-rw-r--r--openbox/place.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/openbox/place.c b/openbox/place.c
index d1d0481b..c396e8fa 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -63,7 +63,7 @@ static Rect **pick_head(ObClient *c)
/* try direct parent first */
if ((p = client_direct_parent(c))) {
add_choice(choice, client_monitor(p));
- ob_debug("placement adding choice %d for parent\n",
+ ob_debug("placement adding choice %d for parent",
client_monitor(p));
}
@@ -79,7 +79,7 @@ static Rect **pick_head(ObClient *c)
itc->desktop == DESKTOP_ALL || c->desktop == DESKTOP_ALL))
{
add_choice(choice, client_monitor(it->data));
- ob_debug("placement adding choice %d for group sibling\n",
+ ob_debug("placement adding choice %d for group sibling",
client_monitor(it->data));
}
}
@@ -90,7 +90,7 @@ static Rect **pick_head(ObClient *c)
if (itc != c) {
add_choice(choice, client_monitor(it->data));
ob_debug("placement adding choice %d for group sibling on "
- "another desktop\n", client_monitor(it->data));
+ "another desktop", client_monitor(it->data));
}
}
}
@@ -100,7 +100,7 @@ static Rect **pick_head(ObClient *c)
config_place_monitor != OB_PLACE_MONITOR_MOUSE)
{
add_choice(choice, client_monitor(focus_client));
- ob_debug("placement adding choice %d for normal focused window\n",
+ ob_debug("placement adding choice %d for normal focused window",
client_monitor(focus_client));
}
@@ -112,7 +112,7 @@ static Rect **pick_head(ObClient *c)
g_free(monitor);
if (contain) {
add_choice(choice, i);
- ob_debug("placement adding choice %d for mouse pointer\n", i);
+ ob_debug("placement adding choice %d for mouse pointer", i);
break;
}
}
@@ -468,12 +468,12 @@ static gboolean place_transient_splash(ObClient *client, gint *x, gint *y)
return FALSE;
}
-/* Return TRUE if we want client.c to enforce on-screen-keeping */
+/*! Return TRUE if openbox chose the position for the window, and FALSE if
+ the application chose it */
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, unless pos_force is enabled */
@@ -484,8 +484,8 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
return FALSE;
/* try a number of methods */
- ret = place_transient_splash(client, x, y) ||
- (userplaced = place_per_app_setting(client, x, y, settings)) ||
+ ret = place_per_app_setting(client, x, y, settings) ||
+ place_transient_splash(client, x, y) ||
(config_place_policy == OB_PLACE_POLICY_MOUSE &&
place_under_mouse(client, x, y)) ||
place_nooverlap(client, x, y) ||
@@ -494,5 +494,5 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
/* get where the client should be */
frame_frame_gravity(client->frame, x, y);
- return !userplaced;
+ return TRUE;
}