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

1)deleted old struct; 2) formated code

Browse Source
This commit is contained in:
angelskieglazki
2017-01-12 11:02:46 +03:00
parent 22f65a80a9
commit a66de7c433
2 changed files with 54 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
example.c
View File

@@ -41,48 +41,42 @@ static void quit_cb(struct tray_menu *item) {
static void submenu_cb(struct tray_menu *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},}; // Test tray init
// static struct tray tray = {
// .icon = TRAY_ICON1,
// .menu = (struct tray_menu[]){{"Hello", 0, 0, NULL, hello_cb, NULL},
// {"Checked", 0, 1, NULL, toggle_cb, NULL},
// {"Disabled", 1, 0, NULL, NULL, NULL},
// {"-", 0, 0, NULL, NULL, NULL},
// {"SubMenu", 0, 0, (struct tray_submenu[]){{"First", NULL,submenu_cb, NULL},
// {"Second",
// (struct tray_submenu[]){{"Third", NULL,submenu_cb, NULL},
// {NULL, NULL, NULL, NULL},},
// submenu_cb, NULL},
// {NULL, NULL, NULL},}, NULL, NULL},
// {"Quit", 0, 0, NULL, quit_cb, 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", 0, 0, NULL, hello_cb, NULL}, .menu = (struct tray_menu[]){
{"Checked", 0, 1, NULL, toggle_cb, NULL}, {"Hello", 0, 0, NULL, hello_cb, NULL},
{"Disabled", 1, 0, NULL, NULL, NULL}, {"Checked", 0, 1, NULL, toggle_cb, NULL},
{"-", 0, 0, NULL, NULL, NULL}, {"Disabled", 1, 0, NULL, NULL, NULL},
{"Quit", 0, 0, NULL, quit_cb, NULL}, {"-", 0, 0, NULL, NULL, NULL},
{"SubMenu", 0, 0, (struct tray_menu[]){{"FIRST", 0, 1, NULL, submenu_cb, NULL}, {"Quit", 0, 0, NULL, quit_cb, NULL},
{"SECOND", 0, 0, (struct tray_menu[]){{"THIRD", 0, 0, (struct tray_menu[]){{"7", 0, 0, NULL, submenu_cb, NULL}, {"SubMenu", 0, 0,
{"-", 0, 0, NULL, NULL, NULL}, (struct tray_menu[]){
{"8", 0, 0, NULL, submenu_cb, NULL}, {"FIRST", 0, 1, NULL, submenu_cb, NULL},
{NULL, 0, 0, NULL, NULL, NULL}}, NULL, NULL}, {"SECOND", 0, 0,
{"FOUR", 0, 0, (struct tray_menu[]){{"5", 0, 0, NULL, submenu_cb, NULL}, (struct tray_menu[]){
{"6", 0, 0, NULL, submenu_cb, NULL}, {"THIRD", 0, 0,
{NULL, 0, 0, NULL, NULL, NULL}}, NULL, NULL}, (struct tray_menu[]){{"7", 0, 0, NULL, submenu_cb, NULL},
{NULL, 0, 0, NULL, NULL, NULL}} , NULL, NULL}, {"-", 0, 0, NULL, NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}} , NULL, NULL }, {"8", 0, 0, NULL, submenu_cb, NULL},
{NULL, 0, 0, NULL, NULL, NULL}}, {NULL, 0, 0, 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, 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}},
}; };
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");
@@ -92,4 +86,4 @@ int main() {
printf("iteration\n"); printf("iteration\n");
} }
return 0; return 0;
} }

48
tray.h
View File

@@ -52,27 +52,26 @@ static int tray_loop(int blocking) {
return loop_result; return loop_result;
} }
//recursive proc // recursive proc
static void submenu_update(struct tray_menu *m, static void submenu_update(struct tray_menu *m, GtkWidget *_item,
GtkWidget *_item, GtkMenuShell *_submenu) { GtkMenuShell *_submenu) {
GtkMenuShell *submenu; GtkMenuShell *submenu;
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) {
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);
submenu_update(s_m, item, submenu); submenu_update(s_m, item, submenu);
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 if (strcmp(s_m->text, "-") == 0) {
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_separator_menu_item_new();
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 {
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_check_menu_item_new_with_label(s_m->text); item = gtk_check_menu_item_new_with_label(s_m->text);
gtk_widget_set_sensitive(item, !s_m->disabled); gtk_widget_set_sensitive(item, !s_m->disabled);
@@ -83,27 +82,27 @@ static void submenu_update(struct tray_menu *m,
g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), s_m); g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), s_m);
} }
} }
} }
} }
static void tray_update(struct tray *tray) { 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) {
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 if (strcmp(m->text, "-") == 0) {
item = gtk_separator_menu_item_new(); item = gtk_separator_menu_item_new();
} else { } else {
item = gtk_check_menu_item_new_with_label(m->text); item = gtk_check_menu_item_new_with_label(m->text);
gtk_widget_set_sensitive(item, !m->disabled); gtk_widget_set_sensitive(item, !m->disabled);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), !!m->checked); 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) { if (m->cb != NULL) {
g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), m); g_signal_connect(item, "activate", G_CALLBACK(_tray_menu_cb), m);
@@ -115,7 +114,6 @@ static void tray_update(struct tray *tray) {
app_indicator_set_menu(indicator, GTK_MENU(menu)); app_indicator_set_menu(indicator, GTK_MENU(menu));
} }
static void tray_exit() { loop_result = -1; } static void tray_exit() { loop_result = -1; }
#elif defined(TRAY_APPKIT) #elif defined(TRAY_APPKIT)
@@ -212,8 +210,8 @@ static NOTIFYICONDATA nid;
static HWND hwnd; static HWND hwnd;
static HMENU hmenu = NULL; static HMENU hmenu = NULL;
static LRESULT CALLBACK _tray_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, static LRESULT CALLBACK
LPARAM lparam) { _tray_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
switch (msg) { switch (msg) {
case WM_CLOSE: case WM_CLOSE:
DestroyWindow(hwnd); DestroyWindow(hwnd);
@@ -351,4 +349,4 @@ static void tray_update(struct tray *tray) {}
static void tray_exit(); static void tray_exit();
#endif #endif
#endif /* TRAY_H */ #endif /* TRAY_H */