We want the ability to create a detached menu.
}
static void
-menu_func(struct window *window, struct input *input, int index, void *data)
+menu_func(void *data, struct input *input, int index)
{
printf("Selected index %d from a panel menu.\n", index);
}
}
static void
-menu_func(struct window *window,
- struct input *input, int index, void *user_data)
+menu_func(void *data, struct input *input, int index)
{
fprintf(stderr, "picked entry %d\n", index);
}
}
static void
-show_popup_cb(struct window *window, struct input *input, int index, void *data)
+show_popup_cb(void *data, struct input *input, int index)
{
/* Ignore the selected menu item. */
}
}
static void
-menu_func(struct window *window, struct input *input, int index, void *data)
+menu_func(void *data, struct input *input, int index)
{
- struct terminal *terminal = data;
+ struct window *window = data;
+ struct terminal *terminal = window_get_user_data(window);
fprintf(stderr, "picked entry %d\n", index);
};
struct menu {
+ void *user_data;
struct window *window;
- struct window *parent;
struct widget *widget;
struct input *input;
struct frame *frame;
}
static void
-frame_menu_func(struct window *window,
- struct input *input, int index, void *data)
+frame_menu_func(void *data, struct input *input, int index)
{
+ struct window *window = data;
struct display *display;
switch (index) {
(menu->release_count > 0 || time - menu->time > 500)) {
/* Either relase after press-drag-release or
* click-motion-click. */
- menu->func(menu->parent, input,
- menu->current, menu->parent->user_data);
+ menu->func(menu->user_data, input, menu->current);
input_ungrab(input);
menu_destroy(menu);
} else if (state == WL_POINTER_BUTTON_STATE_RELEASED) {
}
menu->window = window;
- menu->parent = parent;
+ menu->user_data = parent;
menu->widget = window_add_widget(menu->window, menu);
window_set_buffer_scale (menu->window, window_get_buffer_scale (parent));
window_set_buffer_transform (menu->window, window_get_buffer_transform (parent));
int
window_has_focus(struct window *window);
-typedef void (*menu_func_t)(struct window *window,
- struct input *input, int index, void *data);
+typedef void (*menu_func_t)(void *data, struct input *input, int index);
void
window_show_menu(struct display *display,