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

Pass the GravityPoint as const* instead of by value

Browse source
This commit is contained in:
Mikael Magnusson 2014-10-06 21:54:16 +02:00
parent d3359676e4
commit 39dfb7458a
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/actions/showmenu.c
View file

@ -115,7 +115,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
/* you cannot call ShowMenu from inside a menu */
if (data->uact != OB_USER_ACTION_MENU_SELECTION && o->name)
menu_show(o->name, position, monitor,
menu_show(o->name, &position, monitor,
data->button != 0, o->use_position, data->client);
return FALSE;

2
openbox/menu.c
View file

@ -457,7 +457,7 @@ static gboolean menu_hide_delay_func(gpointer data)
return FALSE; /* no repeat */
}
void menu_show(gchar *name, GravityPoint pos, gint monitor,
void menu_show(gchar *name, const GravityPoint *pos, gint monitor,
gboolean mouse, gboolean user_positioned, ObClient *client)
{
ObMenu *self;

2
openbox/menu.h
View file

@ -181,7 +181,7 @@ void menu_clear_pipe_caches(void);
void menu_show_all_shortcuts(ObMenu *self, gboolean show);
void menu_show(gchar *name, GravityPoint pos, gint monitor,
void menu_show(gchar *name, const GravityPoint *pos, gint monitor,
gboolean mouse, gboolean user_positioned,
struct _ObClient *client);
gboolean menu_hide_delay_reached(void);

10
openbox/menuframe.c
View file

@ -232,7 +232,7 @@ void menu_frame_move(ObMenuFrame *self, gint x, gint y)
XMoveWindow(obt_display, self->window, self->area.x, self->area.y);
}
static void menu_frame_place_topmenu(ObMenuFrame *self, GravityPoint *pos,
static void menu_frame_place_topmenu(ObMenuFrame *self, const GravityPoint *pos,
gint *x, gint *y, gint monitor,
gboolean user_positioned)
{
@ -997,7 +997,7 @@ static gboolean menu_frame_show(ObMenuFrame *self)
return TRUE;
}
gboolean menu_frame_show_topmenu(ObMenuFrame *self, GravityPoint pos,
gboolean menu_frame_show_topmenu(ObMenuFrame *self, const GravityPoint *pos,
gint monitor, gboolean mouse,
gboolean user_positioned)
{
@ -1010,11 +1010,11 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, GravityPoint pos,
return FALSE;
if (self->menu->place_func) {
x = pos.x.pos;
y = pos.y.pos;
x = pos->x.pos;
y = pos->y.pos;
self->menu->place_func(self, &x, &y, mouse, self->menu->data);
} else {
menu_frame_place_topmenu(self, &pos, &x, &y, monitor,
menu_frame_place_topmenu(self, pos, &x, &y, monitor,
user_positioned);
}

2
openbox/menuframe.h
View file

@ -120,7 +120,7 @@ void menu_frame_move(ObMenuFrame *self, gint x, gint y);
void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
gint *dx, gint *dy);
gboolean menu_frame_show_topmenu(ObMenuFrame *self, GravityPoint pos,
gboolean menu_frame_show_topmenu(ObMenuFrame *self, const GravityPoint *pos,
gint monitor, gboolean mouse,
gboolean user_positioned);
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,

2
openbox/screen.c
View file

@ -1930,7 +1930,7 @@ gboolean screen_compare_desktops(guint a, guint b)
}
void screen_apply_gravity_point(gint *x, gint *y, gint width, gint height,
GravityPoint *position, const Rect *area)
const GravityPoint *position, const Rect *area)
{
if (position->x.center)
*x = area->width / 2 - width / 2;

2
openbox/screen.h
View file

@ -186,5 +186,5 @@ gboolean screen_compare_desktops(guint a, guint b);
* 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);
const GravityPoint *position, const Rect *area);
#endif