nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-04 21:12:47 -05:00
Code Issues Projects Releases Wiki Activity

Minor refactoring of gtkapp.c -> gtkwin.c menu triggers.

Browse Source 
Just to avoid an endless proliferation of functions too small to see,
I've arranged an enumeration of action ids and a single
app_menu_action function on the receiving end, and in gtkapp.c, a list
macro that means I at least don't have to define the tiny callback
functions and the GActionEntry records by hand and keep them in sync.
This commit is contained in:
Simon Tatham
2017-12-18 11:15:44 +00:00
parent 31080bf8a7
commit 2065fb647f
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
unix/gtkapp.c
View File

@ -135,23 +135,21 @@ static void startup(GApplication *app, gpointer user_data)
G_MENU_MODEL(menubar));
}
static void copy_cb(GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
copy_menu_action(user_data);
}
#define WIN_ACTION_LIST(X) \
X("copy", MA_COPY) \
X("paste", MA_PASTE) \
/* end of list */
static void paste_cb(GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
paste_menu_action(user_data);
}
#define WIN_ACTION_CALLBACK(name, id) \
static void win_action_cb_ ## id(GSimpleAction *a, GVariant *p, gpointer d) \
{ app_menu_action(d, id); }
WIN_ACTION_LIST(WIN_ACTION_CALLBACK)
#undef WIN_ACTION_CALLBACK
static const GActionEntry win_actions[] = {
{ "copy", copy_cb },
{ "paste", paste_cb },
#define WIN_ACTION_ENTRY(name, id) { name, win_action_cb_ ## id },
WIN_ACTION_LIST(WIN_ACTION_ENTRY)
#undef WIN_ACTION_ENTRY
};
static GtkApplication *app;