gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-18 20:10:29 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: Fix whitespace in menu.h; passes checkpatch.pl inspection.

Browse Source
This commit is contained in:
Doug Torrance
2016-01-20 23:19:03 -05:00
committed by Carlos R. Mafra
parent ac33bb9d1b
commit c7c0b43629
1 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/menu.h
View File

@@ -30,76 +30,76 @@
#define MI_SHADED 4
typedef struct WMenuEntry {
int order;
char *text; /* entry text */
char *rtext; /* text to show in the right part */
void (*callback)(struct WMenu *menu, struct WMenuEntry *entry);
void (*free_cdata)(void *data); /* proc to be used to free clientdata */
void *clientdata; /* data to pass to callback */
int cascade; /* cascade menu index */
int order;
char *text; /* entry text */
char *rtext; /* text to show in the right part */
void (*callback)(struct WMenu *menu, struct WMenuEntry *entry);
void (*free_cdata)(void *data); /* proc to be used to free clientdata */
void *clientdata; /* data to pass to callback */
int cascade; /* cascade menu index */
#ifdef USER_MENU
WMPropList *instances; /* allowed instances */
WMPropList *instances; /* allowed instances */
#endif /* USER_MENU */
struct {
unsigned int enabled:1; /* entry is selectable */
unsigned int indicator:1; /* left indicator */
unsigned int indicator_on:1;
unsigned int indicator_type:3;
unsigned int editable:1;
} flags;
struct {
unsigned int enabled:1; /* entry is selectable */
unsigned int indicator:1; /* left indicator */
unsigned int indicator_on:1;
unsigned int indicator_type:3;
unsigned int editable:1;
} flags;
} WMenuEntry;
typedef struct WMenu {
struct WMenu *parent;
struct WMenu *brother;
struct WMenu *parent;
struct WMenu *brother;
time_t timestamp; /* for the root menu. Last time
* menu was reloaded */
time_t timestamp; /* for the root menu. Last time
* menu was reloaded */
/* decorations */
struct WFrameWindow *frame;
WCoreWindow *menu; /* the window menu */
Pixmap menu_texture_data;
int frame_x, frame_y; /* position of the frame in root*/
/* decorations */
struct WFrameWindow *frame;
WCoreWindow *menu; /* the window menu */
Pixmap menu_texture_data;
int frame_x, frame_y; /* position of the frame in root*/
WMenuEntry **entries; /* array of entries. This is shared
* by the menu and it's "brother" */
short alloced_entries; /* number of entries allocated in
* entry array */
struct WMenu **cascades; /* array of cascades */
short cascade_no;
WMenuEntry **entries; /* array of entries. This is shared
* by the menu and it's "brother" */
short alloced_entries; /* number of entries allocated in
* entry array */
struct WMenu **cascades; /* array of cascades */
short cascade_no;
short entry_no; /* number of entries */
short selected_entry;
short entry_no; /* number of entries */
short selected_entry;
short entry_height; /* height of each entry */
short entry_height; /* height of each entry */
WMHandlerID timer; /* timer for the autoscroll */
WMHandlerID timer; /* timer for the autoscroll */
void *jump_back; /* jump back data */
void *jump_back; /* jump back data */
/* to be called when some entry is edited */
void (*on_edit)(struct WMenu *menu, struct WMenuEntry *entry);
/* to be called when destroyed */
void (*on_destroy)(struct WMenu *menu);
/* to be called when some entry is edited */
void (*on_edit)(struct WMenu *menu, struct WMenuEntry *entry);
/* to be called when destroyed */
void (*on_destroy)(struct WMenu *menu);
struct {
unsigned int titled:1;
unsigned int realized:1; /* whether the window was configured */
unsigned int app_menu:1; /* this is a application or root menu */
unsigned int mapped:1; /* if menu is already mapped on screen*/
unsigned int buttoned:1; /* if the close button is visible
* (menu was torn off) */
unsigned int open_to_left:1; /* direction to open submenus */
unsigned int lowered:1;
struct {
unsigned int titled:1;
unsigned int realized:1; /* whether the window was configured */
unsigned int app_menu:1; /* this is a application or root menu */
unsigned int mapped:1; /* if menu is already mapped on screen*/
unsigned int buttoned:1; /* if the close button is visible
* (menu was torn off) */
unsigned int open_to_left:1; /* direction to open submenus */
unsigned int lowered:1;
unsigned int brother:1; /* if this is a copy of the menu*/
unsigned int editing:1;
unsigned int jump_back_pending:1;
unsigned int brother:1; /* if this is a copy of the menu*/
unsigned int editing:1;
unsigned int jump_back_pending:1;
unsigned int inside_handler:1;
} flags;
unsigned int inside_handler:1;
} flags;
} WMenu;
@@ -107,15 +107,15 @@ void wMenuPaint(WMenu *menu);
void wMenuDestroy(WMenu *menu, int recurse);
void wMenuRealize(WMenu *menu);
WMenuEntry *wMenuInsertCascade(WMenu *menu, int index, const char *text,
WMenu *cascade);
WMenu *cascade);
WMenuEntry *wMenuInsertCallback(WMenu *menu, int index, const char *text,
void (*callback)(WMenu *menu, WMenuEntry *entry),
void *clientdata);
void (*callback)(WMenu *menu, WMenuEntry *entry),
void *clientdata);
void wMenuEntrySetCascade(WMenu *menu, WMenuEntry *entry, WMenu *cascade);
#define wMenuAddCallback(menu, text, callback, data) \
wMenuInsertCallback(menu, -1, text, callback, data)
#define wMenuAddCallback(menu, text, callback, data) \
wMenuInsertCallback(menu, -1, text, callback, data)
void wMenuRemoveItem(WMenu *menu, int index);