Yadciel/c_tray
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added recursive procedure for submenu. Used one struct for submenu: tray_menu

Browse Source
This commit is contained in:
Max
2017-01-11 20:57:36 +03:00
parent 26009610c1
commit ed255d1a03
2 changed files with 82 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
example.c
View File

@@ -16,34 +16,34 @@
static struct tray tray; static struct tray tray;
// static void toggle_cb(struct tray_menu *item) { static void toggle_cb(struct tray_menu *item) {
// printf("toggle cb\n"); printf("toggle cb\n");
// item->checked = !item->checked; item->checked = !item->checked;
// tray_update(&tray); tray_update(&tray);
// } }
// static void hello_cb(struct tray_menu *item) { static void hello_cb(struct tray_menu *item) {
// (void)item; (void)item;
// printf("hello cb\n"); printf("hello cb\n");
// if (strcmp(tray.icon, TRAY_ICON1) == 0) { if (strcmp(tray.icon, TRAY_ICON1) == 0) {
// tray.icon = TRAY_ICON2; tray.icon = TRAY_ICON2;
// } else { } else {
// tray.icon = TRAY_ICON1; tray.icon = TRAY_ICON1;
// } }
// tray_update(&tray); tray_update(&tray);
// } }
// static void quit_cb(struct tray_menu *item) { static void quit_cb(struct tray_menu *item) {
// (void)item; (void)item;
// printf("quit cb\n"); printf("quit cb\n");
// tray_exit(); tray_exit();
// } }
// static void submenu_cb(struct tray_submenu *item) { static void submenu_cb(struct tray_menu *item) {
// (void)item; (void)item;
// printf("submenu cb\n"); printf("submenu cb!!!\n");
// tray_update(&tray); tray_update(&tray);
// } }
//struct tray_submenu *t_sm = (struct tray_submenu[]){{"First",submenu_cb}, {"Second",submenu_cb}, {NULL, NULL},}; //struct tray_submenu *t_sm = (struct tray_submenu[]){{"First",submenu_cb}, {"Second",submenu_cb}, {NULL, NULL},};
@@ -62,32 +62,27 @@ static struct tray tray;
// {"Quit", 0, 0, NULL, quit_cb, NULL}, // {"Quit", 0, 0, NULL, quit_cb, NULL},
// {NULL, 0, 0, NULL, NULL, NULL}}, // {NULL, 0, 0, NULL, NULL, NULL}},
// }; // };
//Test tray init
static struct tray tray = { static struct tray tray = {
.icon = TRAY_ICON1, .icon = TRAY_ICON1,
.menu = (struct tray_menu[]){{"Hello", NULL}, .menu = (struct tray_menu[]){{"Hello", 0, 0, NULL, hello_cb, NULL},
{"Checked", NULL}, {"Checked", 0, 1, NULL, toggle_cb, NULL},
{"SubMenu", (struct tray_menu[]){{"FIRST", NULL}, {"Disabled", 1, 0, NULL, NULL, NULL},
{"SECOND", (struct tray_menu[]){{"THIRD", (struct tray_menu[]){{"7", NULL}, {"-", 0, 0, NULL, NULL, NULL},
{"8", NULL}, {"Quit", 0, 0, NULL, quit_cb, NULL},
{NULL, NULL}}}, {"SubMenu", 0, 0, (struct tray_menu[]){{"FIRST", 0, 1, NULL, submenu_cb, NULL},
{"FOUR", (struct tray_menu[]){{"5", NULL}, {"SECOND", 0, 0, (struct tray_menu[]){{"THIRD", 0, 0, (struct tray_menu[]){{"7", 0, 0, NULL, submenu_cb, NULL},
{"6", NULL}, {"-", 0, 0, NULL, NULL, NULL},
{NULL, NULL}}}, {"8", 0, 0, NULL, submenu_cb, NULL},
{NULL, NULL}}}, {NULL, 0, 0, NULL, NULL, NULL}}, NULL, NULL},
{NULL, NULL}} {"FOUR", 0, 0, (struct tray_menu[]){{"5", 0, 0, NULL, submenu_cb, NULL},
}, {"6", 0, 0, NULL, submenu_cb, NULL},
{NULL, NULL}}, {NULL, 0, 0, NULL, NULL, NULL}}, NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}} , NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}} , NULL, NULL },
{NULL, 0, 0, NULL, NULL, NULL}},
}; };
// static struct tray tray = {
// .icon = TRAY_ICON1,
// .menu = (struct tray_menu[]){{"Hello", NULL},
// {"Checked", NULL},
// {"SubMenu", (struct tray_menu[]){{"FIRST", NULL},
// {"SECOND", NULL},
// {NULL, NULL}}
// },
// {NULL, NULL}},
// };
int main() { int main() {
if (tray_init(&tray) < 0) { if (tray_init(&tray) < 0) {
printf("failed to create tray\n"); printf("failed to create tray\n");

105
tray.h
View File

@@ -10,12 +10,12 @@ struct tray {
struct tray_menu { struct tray_menu {
char *text; char *text;
// int disabled; int disabled;
// int checked; int checked;
struct tray_menu *submenu; struct tray_menu *submenu;
// void (*cb)(struct tray_menu *); void (*cb)(struct tray_menu *);
// void *context; void *context;
}; };
static void tray_update(struct tray *tray); static void tray_update(struct tray *tray);
@@ -30,11 +30,11 @@ static void tray_update(struct tray *tray);
static AppIndicator *indicator = NULL; static AppIndicator *indicator = NULL;
static int loop_result = 0; static int loop_result = 0;
// static void _tray_menu_cb(GtkMenuItem *item, gpointer data) { static void _tray_menu_cb(GtkMenuItem *item, gpointer data) {
// (void)item; (void)item;
// struct tray_menu *m = (struct tray_menu *)data; struct tray_menu *m = (struct tray_menu *)data;
// m->cb(m); m->cb(m);
// } }
// static void _tray_submenu_cb(GtkMenuItem *item, gpointer data) { // static void _tray_submenu_cb(GtkMenuItem *item, gpointer data) {
// (void)item; // (void)item;
@@ -58,15 +58,13 @@ static int tray_loop(int blocking) {
return loop_result; return loop_result;
} }
//recursive proc
static void submenu_update(struct tray_menu *m, static void submenu_update(struct tray_menu *m,
GtkWidget *_item, GtkMenuShell *_submenu) { GtkWidget *_item, GtkMenuShell *_submenu) {
GtkMenuShell *submenu;
GtkMenuShell *submenu; //= (GtkMenuShell *)gtk_menu_new();
for (struct tray_menu *s_m = m->submenu; s_m!=NULL && s_m->text!=NULL; s_m++) { for (struct tray_menu *s_m = m->submenu; s_m!=NULL && s_m->text!=NULL; s_m++) {
GtkWidget *item; GtkWidget *item;
if (s_m->submenu != NULL) { if (s_m->submenu != NULL) {
printf("GO TO REC SUB %s\n", s_m->text);
item = gtk_menu_item_new_with_label(s_m->text); item = gtk_menu_item_new_with_label(s_m->text);
submenu = (GtkMenuShell *)gtk_menu_new(); submenu = (GtkMenuShell *)gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu);
@@ -74,16 +72,23 @@ static void submenu_update(struct tray_menu *m,
gtk_widget_show(item); gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item); gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item);
} }else if (strcmp(s_m->text, "-") == 0) {
else{ gtk_menu_item_set_submenu(GTK_MENU_ITEM(_item), (GtkWidget *)_submenu);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(_item), (GtkWidget *)_submenu); item = gtk_separator_menu_item_new();
item = gtk_menu_item_new_with_label(s_m->text);
printf("--%s add to %s\n", gtk_menu_item_get_label((GtkMenuItem*)item), gtk_menu_item_get_label((GtkMenuItem*)_item));
gtk_widget_show(item); gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item); gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item);
} }
else{
gtk_menu_item_set_submenu(GTK_MENU_ITEM(_item), (GtkWidget *)_submenu);
item = gtk_check_menu_item_new_with_label(s_m->text);
gtk_widget_set_sensitive(item, !s_m->disabled);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), !!s_m->checked);
gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(_submenu), item);
if (s_m->cb != NULL) {
g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), s_m);
}
}
} }
} }
@@ -91,63 +96,31 @@ static void tray_update(struct tray *tray) {
GtkMenuShell *menu = (GtkMenuShell *)gtk_menu_new(); GtkMenuShell *menu = (GtkMenuShell *)gtk_menu_new();
for (struct tray_menu *m = tray->menu; m != NULL && m->text != NULL; m++) { for (struct tray_menu *m = tray->menu; m != NULL && m->text != NULL; m++) {
GtkWidget *item; GtkWidget *item;
if (m->submenu != NULL) { if (m->submenu != NULL) {
printf("GO TO REC MAIN %s\n", m->text);
GtkMenuShell *submenu = (GtkMenuShell *)gtk_menu_new(); GtkMenuShell *submenu = (GtkMenuShell *)gtk_menu_new();
item = gtk_menu_item_new_with_label(m->text); item = gtk_menu_item_new_with_label(m->text);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu);
submenu_update(m, item, submenu); submenu_update(m, item, submenu);
} } else if (strcmp(m->text, "-") == 0) {
else { item = gtk_separator_menu_item_new();
item = gtk_menu_item_new_with_label(m->text); } else {
item = gtk_check_menu_item_new_with_label(m->text);
gtk_widget_set_sensitive(item, !m->disabled);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), !!m->checked);
} }
gtk_widget_show(item); gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
if (m->cb != NULL) {
g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), m);
}
} }
app_indicator_set_icon(indicator, tray->icon); app_indicator_set_icon(indicator, tray->icon);
// GTK is all about reference counting, so previous menu should be destroyed
// here
app_indicator_set_menu(indicator, GTK_MENU(menu)); app_indicator_set_menu(indicator, GTK_MENU(menu));
} }
// static void tray_update(struct tray *tray) {
// GtkMenuShell *menu = (GtkMenuShell *)gtk_menu_new();
// for (struct tray_menu *m = tray->menu; m != NULL && m->text != NULL; m++) {
// GtkWidget *item;
// if (m->submenu != NULL) {
// GtkMenuShell *submenu = (GtkMenuShell *)gtk_menu_new();
// item = gtk_menu_item_new_with_label(m->text);
// gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), (GtkWidget *)submenu);
// for (struct tray_submenu *s_m = m->submenu; s_m != NULL && s_m->text != NULL; s_m++) {
// GtkWidget* submenu_item;
// submenu_item = gtk_menu_item_new_with_label(s_m->text);
// gtk_widget_show(submenu_item);
// gtk_menu_shell_append(GTK_MENU_SHELL(submenu), submenu_item);
// if (s_m->cb != NULL) {
// g_signal_connect(submenu_item, "activate", G_CALLBACK(_tray_submenu_cb), s_m);
// }
// }
// }
// else if (strcmp(m->text, "-") == 0) {
// item = gtk_separator_menu_item_new();
// } else {
// item = gtk_check_menu_item_new_with_label(m->text);
// gtk_widget_set_sensitive(item, !m->disabled);
// gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), !!m->checked);
// }
// gtk_widget_show(item);
// gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
// if (m->cb != NULL) {
// g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), m);
// }
// }
// app_indicator_set_icon(indicator, tray->icon);
// // GTK is all about reference counting, so previous menu should be destroyed
// // here
// app_indicator_set_menu(indicator, GTK_MENU(menu));
// }
static void tray_exit() { loop_result = -1; } static void tray_exit() { loop_result = -1; }