From b0855c19bc358be53282c8f9f842dd29f69bc7b1 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 14 Aug 2003 06:00:38 +0000 Subject: [PATCH] add a menu destructor callback. fix a possible crasher where a callback was called with a different menu. --- openbox/menu.c | 8 ++++++-- openbox/menu.h | 12 +++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/openbox/menu.c b/openbox/menu.c index b29594d7..0905cb16 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -115,6 +115,8 @@ void menu_destroy_hash_value(ObMenu *self) { GList *it; + if (self->destroy) self->destroy(self); + for (it = self->entries; it; it = it->next) menu_entry_free(it->data); g_list_free(self->entries); @@ -215,7 +217,8 @@ ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, menu_controller_show show, menu_controller_update update, menu_controller_selected selected, menu_controller_hide hide, - menu_controller_mouseover mouseover) + menu_controller_mouseover mouseover, + menu_controller_destroy destroy) { XSetWindowAttributes attrib; ObMenu *self; @@ -233,6 +236,7 @@ ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, self->invalid = TRUE; /* default controllers */ + self->destroy = destroy; self->show = (show != NULL ? show : menu_show_full); self->hide = (hide != NULL ? hide : menu_hide); self->update = (update != NULL ? update : menu_render); @@ -513,7 +517,7 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter) ob_rr_theme->bwidth - ob_rr_theme->menu_overlap; /* need to get the width. is this bad?*/ - self->parent->update(self->submenu); + self->submenu->update(self->submenu); a = screen_physical_area_monitor(self->parent->xin_area); diff --git a/openbox/menu.h b/openbox/menu.h index 1adac022..de0929e5 100644 --- a/openbox/menu.h +++ b/openbox/menu.h @@ -14,6 +14,7 @@ struct _ObParseInst; typedef struct _ObMenu ObMenu; typedef struct _ObMenuEntry ObMenuEntry; +typedef void(*menu_controller_destroy)(ObMenu *self); typedef void(*menu_controller_show)(ObMenu *self, int x, int y, struct _ObClient *); typedef void(*menu_controller_update)(ObMenu *self); @@ -54,6 +55,9 @@ struct _ObMenu ObMenu *open_submenu; GList *over; + /* destructor */ + menu_controller_destroy destroy; + /* behaviour callbacks TODO: Document and split code that HAS to be in the overridden callback */ /* place a menu on screen */ @@ -142,13 +146,15 @@ void menu_noop(); #define menu_new(l, n, p) \ menu_new_full(l, n, p, menu_show_full, menu_render, menu_entry_fire, \ - menu_hide, menu_control_mouseover) + menu_hide, menu_control_mouseover, NULL) ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, - menu_controller_show show, menu_controller_update update, + menu_controller_show show, + menu_controller_update update, menu_controller_selected selected, menu_controller_hide hide, - menu_controller_mouseover mouseover); + menu_controller_mouseover mouseover, + menu_controller_destroy destroy); void menu_free(char *name); -- 2.39.2