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

Move common gravity application to screen.c

Browse source
This commit is contained in:
Mikael Magnusson 2014-10-06 19:52:14 +02:00
parent c5c5b7b455
commit 1b3afcff1f
4 changed files with 36 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
openbox/menuframe.c
View file

@ -232,41 +232,13 @@ void menu_frame_move(ObMenuFrame *self, gint x, gint y)
XMoveWindow(obt_display, self->window, self->area.x, self->area.y);
}
static void calc_position(ObMenuFrame *self, GravityPoint *position,
gint *x, gint *y, gint monitor)
{
const Rect *area = screen_physical_area_monitor(monitor);
if (position->x.center)
*x = area->width / 2 - self->area.width / 2;
else {
*x = position->x.pos;
if (position->x.denom)
*x = (*x * area->width) / position->x.denom;
if (position->x.opposite)
*x = area->width - self->area.width - *x;
}
if (position->y.center)
*y = area->height / 2 - self->area.height / 2;
else {
*y = position->y.pos;
if (position->y.denom)
*y = (*y * area->height) / position->y.denom;
if (position->y.opposite)
*y = area->height - self->area.height - *y;
}
*x += area->x;
*y += area->y;
}
static void menu_frame_place_topmenu(ObMenuFrame *self, GravityPoint *pos,
gint *x, gint *y, gint monitor)
{
gint dx, dy;
calc_position(self, pos, x, y, monitor);
screen_apply_gravity_point(x, y, self->area.width, self->area.height,
pos, screen_physical_area_monitor(monitor));
if (config_menu_middle) {
gint myx;

24
openbox/place.c
View file

@ -295,28 +295,8 @@ static gboolean place_per_app_setting_position(ObClient *client, Rect *screen,
ob_debug("placing by per-app settings");
if (settings->position.x.center)
*x = screen->width / 2 - client->area.width / 2;
else {
*x = settings->position.x.pos;
if (settings->position.x.denom)
*x = (*x * screen->width) / settings->position.x.denom;
if (settings->position.x.opposite)
*x = screen->width - frame_size.width - *x;
}
if (settings->position.y.center)
*y = screen->height / 2 - client->area.height / 2;
else {
*y = settings->position.y.pos;
if (settings->position.y.denom)
*y = (*y * screen->height) / settings->position.y.denom;
if (settings->position.y.opposite)
*y = screen->height - frame_size.height - *y;
}
*x += screen->x;
*y += screen->y;
screen_apply_gravity_point(x, y, frame_size.width, frame_size.height,
&settings->position, screen);
return TRUE;
}

27
openbox/screen.c
View file

@ -1928,3 +1928,30 @@ gboolean screen_compare_desktops(guint a, guint b)
b = screen_desktop;
return a == b;
}
void screen_apply_gravity_point(gint *x, gint *y, gint width, gint height,
GravityPoint *position, const Rect *area)
{
if (position->x.center)
*x = area->width / 2 - width / 2;
else {
*x = position->x.pos;
if (position->x.denom)
*x = (*x * area->width) / position->x.denom;
if (position->x.opposite)
*x = area->width - width - *x;
}
if (position->y.center)
*y = area->height / 2 - height / 2;
else {
*y = position->y.pos;
if (position->y.denom)
*y = (*y * area->height) / position->y.denom;
if (position->y.opposite)
*y = area->height - height - *y;
}
*x += area->x;
*y += area->y;
}

5
openbox/screen.h
View file

@ -182,4 +182,9 @@ guint screen_monitor_pointer(void);
*/
gboolean screen_compare_desktops(guint a, guint b);
/*! Resolve a gravity point into absolute coordinates.
* width and height are the size of the object being placed, used for
* aligning to right/bottom edges of the area. */
void screen_apply_gravity_point(gint *x, gint *y, gint width, gint height,
GravityPoint *position, const Rect *area);
#endif