nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add an <active> option for window placement, to try force new windows on the active monitor (for xinerama)

Browse source
This commit is contained in:
Dana Jansens 2008-01-11 19:32:45 -05:00
parent 602a73c15c
commit 22333336d3
5 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/rc.xml
View file

@ -35,6 +35,9 @@
<center>yes</center>
<!-- whether to place windows in the center of the free area found or
the top left corner -->
<active>no</active>
<!-- force new windows ont the active monitor on a multi-head system, unless
they are part of an application already on another monitor -->
</placement>
<theme>

1
data/rc.xsd
View file

@ -54,6 +54,7 @@
</xsd:annotation>
<xsd:element name="policy" type="ob:placementpolicy"/>
<xsd:element name="center" type="ob:bool"/>
<xsd:element name="active" type="ob:bool"/>
</xsd:complexType>
<xsd:complexType name="margins">
<xsd:annotation>

4
openbox/config.c
View file

@ -38,6 +38,7 @@ gboolean config_focus_under_mouse;
ObPlacePolicy config_place_policy;
gboolean config_place_center;
gboolean config_place_active;
StrutPartial config_margins;
@ -500,6 +501,8 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
config_place_policy = OB_PLACE_POLICY_MOUSE;
if ((n = parse_find_node("center", node)))
config_place_center = parse_bool(doc, n);
if ((n = parse_find_node("active", node)))
config_place_active = parse_bool(doc, n);
}
static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@ -880,6 +883,7 @@ void config_startup(ObParseInst *i)
config_place_policy = OB_PLACE_POLICY_SMART;
config_place_center = TRUE;
config_place_active = FALSE;
parse_register(i, "placement", parse_placement, NULL);

4
openbox/config.h
View file

@ -75,9 +75,13 @@ extern gboolean config_focus_last;
*/
extern gboolean config_focus_under_mouse;
/*! The algorithm to use for placing new windows */
extern ObPlacePolicy config_place_policy;
/*! Place windows in the center of the free area */
extern gboolean config_place_center;
/*! Place windows on the active monitor (unless they are part of an application
already on another monitor) */
extern gboolean config_place_active;
/*! User-specified margins around the edge of the screen(s) */
extern StrutPartial config_margins;

13
openbox/place.c
View file

@ -108,9 +108,9 @@ static Rect **pick_head(ObClient *c)
}
}
if (focus_client) {
if (focus_client && client_normal(focus_client)) {
add_choice(choice, client_monitor(focus_client));
ob_debug("placement adding choice %d for focused window\n",
ob_debug("placement adding choice %d for normal focused window\n",
client_monitor(focus_client));
}
@ -146,7 +146,7 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
guint i;
areas = pick_head(client);
i = g_random_int_range(0, screen_num_monitors);
i = config_place_active ? 0 : g_random_int_range(0, screen_num_monitors);
l = areas[i]->x;
t = areas[i]->y;
@ -254,8 +254,11 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
/* try ignoring different things to find empty space */
for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
/* try all monitors in order of preference */
for (i = 0; i < screen_num_monitors && !ret; ++i) {
/* try all monitors in order of preference, but only the first one
if config_place_active is true */
for (i = 0; (i < (config_place_active ? 1 : screen_num_monitors) &&
!ret); ++i)
{
GList *it;
/* add the whole monitor */