all repos — openbox @ 39dfb7458a75ca502fb0c18ec0f1a107f5d51249

openbox fork - make it a bit more like ryudo 

Pass the GravityPoint as const* instead of by value
Mikael Magnusson mikachu@gmail.com
commit

39dfb7458a75ca502fb0c18ec0f1a107f5d51249

parent

d3359676e49b558cb7c6e24ea889c037d044b79f

7 files changed, 11 insertions(+), 11 deletions(-)

jump to
M openbox/actions/showmenu.c → openbox/actions/showmenu.c 
@@ -115,7 +115,7 @@ }
 
     /* 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;
M openbox/menu.c → openbox/menu.c 
@@ -457,7 +457,7 @@ menu_timeout_id = 0;
     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;
M openbox/menu.h → openbox/menu.h 
@@ -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);
M openbox/menuframe.c → openbox/menuframe.c 
@@ -232,7 +232,7 @@ self->monitor = screen_find_monitor_point(x, 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 @@ 
     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 @@ if (!menu_frame_show(self))
         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);
     }
M openbox/menuframe.h → openbox/menuframe.h 
@@ -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,
M openbox/screen.c → openbox/screen.c 
@@ -1930,7 +1930,7 @@ return a == 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;
M openbox/screen.h → openbox/screen.h 
@@ -186,5 +186,5 @@ /*! 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);
+                                const GravityPoint *position, const Rect *area);
 #endif