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

Allow application rules to control window size (Fix bug 4661)

Browse source 
Use the following in your per-app rules:

<size>
  <width>A</width>
  <height>B</height>
</size>

A and B can be integer values to specify a size in pixels. They can also be
percentages or fractions to be relative to the size of the monitor the window
is placed on.
This commit is contained in:
Dana Jansens 2012-10-01 21:43:56 -04:00
parent 5e282dae08
commit 10a833b2cb
8 changed files with 190 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/rc.xml
View file

@ -686,14 +686,25 @@
# applications who refuse to behave
<x>center</x>
# a number like 50, or 'center' to center on screen. use a negative number
# to start from the right (or bottom for <y>), ie -50 is 50 pixels from the
# right edge (or bottom).
# to start from the right (or bottom for <y>), ie -50 is 50 pixels from
# the right edge (or bottom). use 'default' to specify using value
# provided by the application, or chosen by openbox, instead.
<y>200</y>
<monitor>1</monitor>
# specifies the monitor in a xinerama setup.
# 1 is the first head, or 'mouse' for wherever the mouse is
</position>
<size>
# the size to make the window.
<width>20</width>
# a number like 20, or 'default' to use the size given by the application.
# you can use fractions such as 1/2 or percentages such as 75% in which
# case the value is relative to the size of the monitor that the window
# appears on.
<height>30%</height>
</size>
<focus>yes</focus>
# if the window should try be given focus when it appears. if this is set
# to yes it doesn't guarantee the window will be given focus. some

14
data/rc.xsd
View file

@ -233,11 +233,18 @@
</xsd:all>
<xsd:attribute name="force" type="ob:bool"/>
</xsd:complexType>
<xsd:complexType name="window_size">
<xsd:all>
<xsd:element name="width" type="ob:size_value"/>
<xsd:element name="height" type="ob:size_value"/>
</xsd:all>
</xsd:complexType>
<xsd:complexType name="application">
<xsd:all>
<xsd:element minOccurs="0" name="decor" type="ob:bool"/>
<xsd:element minOccurs="0" name="shade" type="ob:bool"/>
<xsd:element minOccurs="0" name="position" type="ob:window_position"/>
<xsd:element minOccurs="0" name="size" type="ob:window_size"/>
<xsd:element minOccurs="0" name="focus" type="xsd:string"/>
<xsd:element minOccurs="0" name="desktop" type="xsd:integer"/>
<xsd:element minOccurs="0" name="layer" type="ob:layer"/>
@ -418,7 +425,12 @@
<xsd:restriction base="xsd:string">
<!-- ob: atoi($_) unless $_ eq 'center'; -->
<!-- I think the regexp DTRT WRT atoi. -->
<xsd:pattern value="center|-?(0|[1-9][0-9]*)"/>
<xsd:pattern value="default|center|-?(0|[1-9][0-9]*)(|%|/[1-9][0-9]*)"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="size_value">
<xsd:restriction base="xsd:string">
<xsd:pattern value="default|([1-9][0-9]*)(|%|/[1-9][0-9]*)"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="mouse_or_int">

3
openbox/client.c
View file

@ -370,8 +370,7 @@ void client_manage(Window window, ObPrompt *prompt)
"program + user specified" :
"BADNESS !?")))), place.width, place.height);
obplaced = place_client(self, do_activate, &place.x, &place.y,
settings);
obplaced = place_client(self, do_activate, &place, settings);
/* watch for buggy apps that ask to be placed at (0,0) when there is
a strut there */

45
openbox/config.c
View file

@ -153,6 +153,14 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src,
dst->position = src->position;
/* monitor is copied above */
}
if (src->size_given) {
dst->size_given = TRUE;
dst->width_num = src->width_num;
dst->width_denom = src->width_denom;
dst->height_num = src->height_num;
dst->height_denom = src->height_denom;
}
}
void config_parse_relative_number(gchar *s, gint *num, gint *denom)
@ -219,9 +227,10 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d)
group_name_set, group_class_set;
ObClientType type;
gboolean x_pos_given;
gboolean width_given;
while (app) {
x_pos_given = FALSE;
x_pos_given = width_given = FALSE;
class_set = obt_xml_attr_string(app, "class", &class);
name_set = obt_xml_attr_string(app, "name", &name);
@ -322,6 +331,40 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d)
obt_xml_attr_bool(n, "force", &settings->pos_force);
}
if ((n = obt_xml_find_node(app->children, "size"))) {
if ((c = obt_xml_find_node(n->children, "width"))) {
if (!obt_xml_node_contains(c, "default")) {
gchar *s = obt_xml_node_string(c);
config_parse_relative_number(
s,
&settings->width_num,
&settings->width_denom);
if (settings->width_num > 0 &&
settings->width_denom >= 0)
{
width_given = TRUE;
}
g_free(s);
}
}
if (width_given &&
(c = obt_xml_find_node(n->children, "height")))
{
gchar *s = obt_xml_node_string(c);
config_parse_relative_number(
s,
&settings->height_num,
&settings->height_denom);
if (settings->height_num > 0 &&
settings->height_denom >= 0)
{
settings->size_given = TRUE;
}
g_free(s);
}
}
if ((n = obt_xml_find_node(app->children, "focus")))
if (!obt_xml_node_contains(n, "default"))
settings->focus = obt_xml_node_bool(n);

6
openbox/config.h
View file

@ -47,6 +47,12 @@ struct _ObAppSettings
gboolean pos_given;
gboolean pos_force;
gint width_num;
gint width_denom;
gint height_num;
gint height_denom;
gboolean size_given;
guint desktop;
gint shade;
gint decor;

154
openbox/place.c
View file

@ -29,12 +29,12 @@
extern ObDock *dock;
static Rect *pick_pointer_head(ObClient *c)
static Rect *choose_pointer_monitor(ObClient *c)
{
return screen_area(c->desktop, screen_monitor_pointer(), NULL);
}
/* use the following priority lists for pick_head()
/* use the following priority lists for choose_monitor()
When a window is being placed in the FOREGROUND, use a monitor chosen in
the following order:
@ -156,8 +156,8 @@ gint cmp_background(const void *a, const void *b)
}
/*! Pick a monitor to place a window on. */
static Rect *pick_head(ObClient *c, gboolean foreground,
ObAppSettings *settings)
static Rect* choose_monitor(ObClient *c, gboolean client_to_be_foregrounded,
ObAppSettings *settings)
{
Rect *area;
ObPlaceHead *choice;
@ -230,7 +230,7 @@ static Rect *pick_head(ObClient *c, gboolean foreground,
}
qsort(choice, screen_num_monitors, sizeof(ObPlaceHead),
foreground ? cmp_foreground : cmp_background);
client_to_be_foregrounded ? cmp_foreground : cmp_background);
/* save the areas of the monitors in order of their being chosen */
for (i = 0; i < screen_num_monitors; ++i)
@ -256,8 +256,12 @@ static Rect *pick_head(ObClient *c, gboolean foreground,
return area;
}
static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
static gboolean place_under_mouse(ObClient *client, gint *x, gint *y,
Size frame_size)
{
if (config_place_policy != OB_PLACE_POLICY_MOUSE)
return FALSE;
gint l, r, t, b;
gint px, py;
Rect *area;
@ -266,16 +270,16 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
if (!screen_pointer_pos(&px, &py))
return FALSE;
area = pick_pointer_head(client);
area = choose_pointer_monitor(client);
l = area->x;
t = area->y;
r = area->x + area->width - client->frame->area.width;
b = area->y + area->height - client->frame->area.height;
r = area->x + area->width - frame_size.width;
b = area->y + area->height - frame_size.height;
*x = px - client->area.width / 2 - client->frame->size.left;
*x = px - frame_size.width / 2;
*x = MIN(MAX(*x, l), r);
*y = py - client->area.height / 2 - client->frame->size.top;
*y = py - frame_size.height / 2;
*y = MIN(MAX(*y, t), b);
g_slice_free(Rect, area);
@ -283,11 +287,12 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
return TRUE;
}
static gboolean place_per_app_setting(ObClient *client, Rect *screen,
gint *x, gint *y,
ObAppSettings *settings)
static gboolean place_per_app_setting_position(ObClient *client, Rect *screen,
gint *x, gint *y,
ObAppSettings *settings,
Size frame_size)
{
if (!settings || (settings && !settings->pos_given))
if (!settings || !settings->pos_given)
return FALSE;
ob_debug("placing by per-app settings");
@ -295,7 +300,7 @@ static gboolean place_per_app_setting(ObClient *client, Rect *screen,
if (settings->position.x.center)
*x = screen->x + screen->width / 2 - client->area.width / 2;
else if (settings->position.x.opposite)
*x = screen->x + screen->width - client->frame->area.width -
*x = screen->x + screen->width - frame_size.width -
settings->position.x.pos;
else
*x = screen->x + settings->position.x.pos;
@ -305,7 +310,7 @@ static gboolean place_per_app_setting(ObClient *client, Rect *screen,
if (settings->position.y.center)
*y = screen->y + screen->height / 2 - client->area.height / 2;
else if (settings->position.y.opposite)
*y = screen->y + screen->height - client->frame->area.height -
*y = screen->y + screen->height - frame_size.height -
settings->position.y.pos;
else
*y = screen->y + settings->position.y.pos;
@ -315,8 +320,37 @@ static gboolean place_per_app_setting(ObClient *client, Rect *screen,
return TRUE;
}
static void place_per_app_setting_size(ObClient *client, Rect *screen,
gint *w, gint *h,
ObAppSettings *settings)
{
if (!settings || !settings->size_given)
return;
ob_debug("sizing by per-app settings");
g_assert(settings->width_num > 0);
g_assert(settings->width_denom >= 0);
g_assert(settings->height_num > 0);
g_assert(settings->height_denom >= 0);
if (!settings->width_denom)
*w = settings->width_num;
else {
*w = screen->width * settings->width_num / settings->width_denom;
*w = MIN(*w, screen->width);
}
if (!settings->height_denom)
*h = settings->height_num;
else {
*h = screen->height * settings->height_num / settings->height_denom;
*h = MIN(*h, screen->height);
}
}
static gboolean place_transient_splash(ObClient *client, Rect *area,
gint *x, gint *y)
gint *x, gint *y, Size frame_size)
{
if (client->type == OB_CLIENT_TYPE_DIALOG) {
GSList *it;
@ -342,8 +376,8 @@ static gboolean place_transient_splash(ObClient *client, Rect *area,
}
}
if (!first) {
*x = ((r + 1 - l) - client->frame->area.width) / 2 + l;
*y = ((b + 1 - t) - client->frame->area.height) / 2 + t;
*x = ((r + 1 - l) - frame_size.width) / 2 + l;
*y = ((b + 1 - t) - frame_size.height) / 2 + t;
return TRUE;
}
}
@ -354,21 +388,21 @@ static gboolean place_transient_splash(ObClient *client, Rect *area,
{
ob_debug("placing dialog or splash");
*x = (area->width - client->frame->area.width) / 2 + area->x;
*y = (area->height - client->frame->area.height) / 2 + area->y;
*x = (area->width - frame_size.width) / 2 + area->x;
*y = (area->height - frame_size.height) / 2 + area->y;
return TRUE;
}
return FALSE;
}
static gboolean place_least_overlap(ObClient *c, Rect * const head,
gint *x, gint *y)
static gboolean place_least_overlap(ObClient *c, Rect *head, int *x, int *y,
Size frame_size)
{
/* Assemble the list of windows that could overlap with @c in the user's
current view. */
GSList* potential_overlap_clients = NULL;
int n_client_rects = 0;
gint n_client_rects = 0;
/* if we're "showing desktop", ignore all existing windows */
if (!screen_showing_desktop) {
@ -397,8 +431,9 @@ static gboolean place_least_overlap(ObClient *c, Rect * const head,
}
}
Rect client_rects[n_client_rects];
GSList* it;
unsigned int i = 0;
guint i = 0;
for (it = potential_overlap_clients; it != NULL; it = g_slist_next(it)) {
ObClient* potential_overlap_client = (ObClient*)it->data;
client_rects[i] = potential_overlap_client->frame->area;
@ -407,43 +442,64 @@ static gboolean place_least_overlap(ObClient *c, Rect * const head,
g_slist_free(potential_overlap_clients);
Point result;
Size req_size;
SIZE_SET(req_size, c->frame->area.width, c->frame->area.height);
place_overlap_find_least_placement(client_rects, n_client_rects, head,
&req_size, &result);
&frame_size, &result);
*x = result.x;
*y = result.y;
return TRUE;
}
/*! Return TRUE if openbox chose the position for the window, and FALSE if
the application chose it */
gboolean place_client(ObClient *client, gboolean foreground, gint *x, gint *y,
ObAppSettings *settings)
static gboolean should_set_client_position(ObClient *client,
ObAppSettings *settings)
{
Rect *area;
gboolean ret;
gboolean has_position = settings && settings->pos_given;
gboolean has_forced_position = has_position && settings->pos_force;
/* per-app settings override program specified position
* but not user specified, unless pos_force is enabled */
if (((client->positioned & USPosition) &&
!(settings && settings->pos_given && settings->pos_force)) ||
((client->positioned & PPosition) &&
!(settings && settings->pos_given)))
gboolean user_positioned = client->positioned & USPosition;
if (user_positioned && !has_forced_position)
return FALSE;
area = pick_head(client, foreground, settings);
gboolean program_positioned = client->positioned & PPosition;
if (program_positioned && !has_position)
return FALSE;
/* try a number of methods */
ret = place_per_app_setting(client, area, x, y, settings) ||
place_transient_splash(client, area, x, y) ||
(config_place_policy == OB_PLACE_POLICY_MOUSE &&
place_under_mouse(client, x, y)) ||
place_least_overlap(client, area, x, y);
return TRUE;
}
gboolean place_client(ObClient *client, gboolean client_to_be_foregrounded,
Rect* client_area, ObAppSettings *settings)
{
gboolean ret;
Rect *monitor_area;
int *x, *y, *w, *h;
Size frame_size;
monitor_area = choose_monitor(client, client_to_be_foregrounded, settings);
w = &client_area->width;
h = &client_area->height;
place_per_app_setting_size(client, monitor_area, w, h, settings);
if (!should_set_client_position(client, settings))
return FALSE;
x = &client_area->x;
y = &client_area->y;
SIZE_SET(frame_size,
*w + client->frame->size.left + client->frame->size.right,
*h + client->frame->size.top + client->frame->size.bottom);
ret =
place_per_app_setting_position(client, monitor_area, x, y, settings,
frame_size) ||
place_transient_splash(client, monitor_area, x, y, frame_size) ||
place_under_mouse(client, x, y, frame_size) ||
place_least_overlap(client, monitor_area, x, y, frame_size);
g_assert(ret);
g_slice_free(Rect, area);
g_slice_free(Rect, monitor_area);
/* get where the client should be */
frame_frame_gravity(client->frame, x, y);

9
openbox/place.h
View file

@ -20,6 +20,8 @@
#ifndef ob__place_h
#define ob__place_h
#include "geom.h"
#include <glib.h>
struct _ObClient;
@ -39,7 +41,10 @@ typedef enum
OB_PLACE_MONITOR_PRIMARY
} ObPlaceMonitor;
gboolean place_client(struct _ObClient *client, gboolean foreground,
gint *x, gint *y, struct _ObAppSettings *settings);
/*! Return TRUE if openbox chose the position for the window, and FALSE if
the application chose it */
gboolean place_client(struct _ObClient *client,
gboolean client_to_be_foregrounded,
Rect* client_area, struct _ObAppSettings *settings);
#endif

2
openbox/place_overlap.c
View file

@ -39,7 +39,7 @@ void place_overlap_find_least_placement(const Rect* client_rects,
const Size* req_size,
Point* result)
{
result->x = result->y = 0;
POINT_SET(*result, 0, 0);
int overlap = G_MAXINT;
int max_edges = 2 * (n_client_rects + 1);