diff options
Diffstat (limited to 'src/menu.h')
| -rw-r--r-- | src/menu.h | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -1,6 +1,7 @@ /* menu.h Copyright (C) 1999-2003 Tom Gilbert. +Copyright (C) 2010-2020 Birte Kristina Friesel. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to @@ -85,12 +86,11 @@ struct _feh_menu_list { struct _feh_menu_item { int state; - Imlib_Image icon; char *text; char *submenu; int action; void (*func_free) (void *data); - void *data; + unsigned short data; feh_menu_item *next; feh_menu_item *prev; unsigned char is_toggle; @@ -130,12 +130,12 @@ void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, feh_menu_item * void feh_menu_hide(feh_menu * m, int func_free); void feh_menu_show(feh_menu * m); feh_menu_item *feh_menu_add_entry(feh_menu * m, char *text, - Imlib_Image icon, char *submenu, - int action, void *data, void (*func_free) (void *data)); + char *submenu, + int action, unsigned short data, void (*func_free) (void *data)); feh_menu_item *feh_menu_add_toggle_entry(feh_menu * m, char *text, - Imlib_Image icon, char *submenu, - int action, void *data, void (*func_free) (void *data), int setting); -void feh_menu_entry_get_size(feh_menu * m, feh_menu_item * i, int *w, int *h); + char *submenu, + int action, unsigned short data, void (*func_free) (void *data), int setting); +void feh_menu_entry_get_size(feh_menu_item * i, int *w, int *h); void feh_menu_calc_size(feh_menu * m); void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy); void feh_menu_redraw(feh_menu * m); @@ -143,7 +143,6 @@ void feh_menu_move(feh_menu * m, int x, int y); void feh_menu_slide_all_menus_relative(int dx, int dy); void feh_menu_init_main(void); void feh_menu_init_single_win(void); -void feh_menu_init_about_win(void); void feh_menu_init_common(void); void feh_menu_init_thumbnail_viewer(void); void feh_menu_init_thumbnail_win(void); @@ -168,7 +167,6 @@ void feh_menu_select_submenu(feh_menu * selected_menu); extern feh_menu *menu_root; extern feh_menu *menu_single_win; -extern feh_menu *menu_about_win; extern feh_menu *menu_thumbnail_viewer; extern feh_menu *menu_thumbnail_win; extern Window menu_cover; |