From 8ded860d0b73bf90203bf5e0297ba82837340fd1 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 13 Feb 2010 19:55:53 +0100 Subject: Change source code indentation (indent -kr -i8 -hnl, mainly) --- src/menu.h | 121 +++++++++++++++++++++++++++---------------------------------- 1 file changed, 53 insertions(+), 68 deletions(-) (limited to 'src/menu.h') diff --git a/src/menu.h b/src/menu.h index 214e8a2..9b28a92 100644 --- a/src/menu.h +++ b/src/menu.h @@ -30,7 +30,6 @@ typedef struct _feh_menu feh_menu; typedef struct _feh_menu_item feh_menu_item; typedef struct _feh_menu_list feh_menu_list; - #define MENU_ITEM_STATE_NORMAL 0x00 #define MENU_ITEM_STATE_SELECTED 0x01 #define MENU_ITEM_STATE_ON 0x02 @@ -53,13 +52,11 @@ typedef struct _feh_menu_list feh_menu_list; #define MENU_ITEM_TOGGLE(item) \ (((item)->state & MENU_ITEM_STATE_ON) ? MENU_ITEM_TOGGLE_OFF(item) : MENU_ITEM_TOGGLE_ON(item)) - #define RECTS_INTERSECT(x, y, w, h, xx, yy, ww, hh) \ ((SPANS_COMMON((x), (w), (xx), (ww))) && (SPANS_COMMON((y), (h), (yy), (hh)))) #define SPANS_COMMON(x1, w1, x2, w2) \ (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1))))) - #define FEH_MENU_PAD_LEFT 3 #define FEH_MENU_PAD_RIGHT 3 #define FEH_MENU_PAD_TOP 3 @@ -80,50 +77,46 @@ typedef struct _feh_menu_list feh_menu_list; #define FEH_MENU_TOGGLE_PAD 3 typedef void (*menu_func) (feh_menu * m, feh_menu_item * i, void *data); -typedef feh_menu *(*menuitem_func_gen) (feh_menu * m, feh_menu_item * i, - void *data); +typedef feh_menu *(*menuitem_func_gen) (feh_menu * m, feh_menu_item * i, void *data); -struct _feh_menu_list -{ - feh_menu *menu; - feh_menu_list *next; +struct _feh_menu_list { + feh_menu *menu; + feh_menu_list *next; }; -struct _feh_menu_item -{ - int state; - Imlib_Image icon; - char *text; - char *submenu; - menu_func func; - void (*func_free) (void *data); - void *data; - feh_menu_item *next; - feh_menu_item *prev; - unsigned char is_toggle; - int text_x, icon_x, sub_x, toggle_x; - int x, y, w, h; - menuitem_func_gen func_gen_sub; +struct _feh_menu_item { + int state; + Imlib_Image icon; + char *text; + char *submenu; + menu_func func; + void (*func_free) (void *data); + void *data; + feh_menu_item *next; + feh_menu_item *prev; + unsigned char is_toggle; + int text_x, icon_x, sub_x, toggle_x; + int x, y, w, h; + menuitem_func_gen func_gen_sub; }; -struct _feh_menu -{ - char *name; - winwidget fehwin; - Window win; - Pixmap pmap; - int x, y, w, h; - int item_w, item_h; - int visible; - feh_menu_item *items; - feh_menu *next; - feh_menu *prev; - Imlib_Updates updates; - Imlib_Image bg; - int needs_redraw; - void *data; - int calc; - void (*func_free) (feh_menu * m, void *data); +struct _feh_menu { + char *name; + winwidget fehwin; + Window win; + Pixmap pmap; + int x, y, w, h; + int item_w, item_h; + int visible; + feh_menu_item *items; + feh_menu *next; + feh_menu *prev; + Imlib_Updates updates; + Imlib_Image bg; + int needs_redraw; + void *data; + int calc; + void (*func_free) (feh_menu * m, void *data); }; feh_menu *feh_menu_new(void); @@ -134,21 +127,18 @@ void feh_menu_deselect_selected(feh_menu * m); void feh_menu_select(feh_menu * m, feh_menu_item * i); void feh_menu_show_at(feh_menu * m, int x, int y); void feh_menu_show_at_xy(feh_menu * m, winwidget winwin, int x, int y); -void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, - feh_menu_item * i); +void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, feh_menu_item * i); 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, menu_func func, void *data, - void (*func_free) (void *data)); -feh_menu_item * -feh_menu_add_toggle_entry(feh_menu * m, char *text, Imlib_Image icon, - char *submenu, menu_func func, void *data, - void (*func_free) (void *data), int setting); +feh_menu_item *feh_menu_add_entry(feh_menu * m, char *text, + Imlib_Image icon, char *submenu, + menu_func func, void *data, void (*func_free) (void *data)); +feh_menu_item *feh_menu_add_toggle_entry(feh_menu * m, char *text, + Imlib_Image icon, char *submenu, + menu_func func, 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); void feh_menu_calc_size(feh_menu * m); -void feh_menu_draw_item(feh_menu * m, feh_menu_item * i, Imlib_Image im, - int ox, int oy); +void feh_menu_draw_item(feh_menu * m, feh_menu_item * i, Imlib_Image im, int ox, int oy); void feh_menu_redraw(feh_menu * m); void feh_menu_move(feh_menu * m, int x, int y); void feh_menu_slide_all_menus_relative(int dx, int dy); @@ -160,27 +150,22 @@ void feh_menu_init_thumbnail_viewer(void); void feh_menu_init_thumbnail_win(void); void feh_menu_draw_to_buf(feh_menu * m, Imlib_Image im, int ox, int oy); void feh_menu_draw_menu_bg(feh_menu * m, Imlib_Image im, int ox, int oy); -void feh_menu_draw_submenu_at(int x, int y, int w, int h, Imlib_Image dst, - int ox, int oy, int selected); -void feh_menu_draw_separator_at(int x, int y, int w, int h, Imlib_Image dst, - int ox, int oy); -void feh_menu_item_draw_at(int x, int y, int w, int h, Imlib_Image dst, - int ox, int oy, int selected); -void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst, - int ox, int oy, int on); +void feh_menu_draw_submenu_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int selected); +void feh_menu_draw_separator_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy); +void feh_menu_item_draw_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int selected); +void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int on); void feh_redraw_menus(void); feh_menu *feh_menu_find(char *name); void feh_redraw_menus(void); feh_menu *feh_menu_get_from_window(Window win); void feh_raise_all_menus(void); void feh_menu_free(feh_menu * m); -feh_menu_item *feh_menu_find_selected_r(feh_menu *m, feh_menu **parent); -void feh_menu_select_prev(feh_menu *selected_menu, feh_menu_item *selected_item); -void feh_menu_select_next(feh_menu *selected_menu, feh_menu_item *selected_item); -void feh_menu_item_activate(feh_menu *selected_menu, - feh_menu_item *selected_item); -void feh_menu_select_parent(feh_menu *selected_menu, feh_menu_item *selected_item); -void feh_menu_select_submenu(feh_menu *selected_menu, feh_menu_item *selected_item); +feh_menu_item *feh_menu_find_selected_r(feh_menu * m, feh_menu ** parent); +void feh_menu_select_prev(feh_menu * selected_menu, feh_menu_item * selected_item); +void feh_menu_select_next(feh_menu * selected_menu, feh_menu_item * selected_item); +void feh_menu_item_activate(feh_menu * selected_menu, feh_menu_item * selected_item); +void feh_menu_select_parent(feh_menu * selected_menu, feh_menu_item * selected_item); +void feh_menu_select_submenu(feh_menu * selected_menu, feh_menu_item * selected_item); extern feh_menu *menu_root; extern feh_menu *menu_single_win; -- cgit v1.2.3