From 8f213f22e7a9ec761e6f6fd77bd8e582ba7c7280 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 24 Jul 2016 15:10:58 +0100 Subject: Moved tray.c --- src/command/cmd_funcs.c | 2 +- src/profanity.c | 2 +- src/tray.c | 225 ------------------------------------------------ src/tray.h | 56 ------------ src/ui/tray.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++++ src/ui/tray.h | 56 ++++++++++++ 6 files changed, 283 insertions(+), 283 deletions(-) delete mode 100644 src/tray.c delete mode 100644 src/tray.h create mode 100644 src/ui/tray.c create mode 100644 src/ui/tray.h (limited to 'src') diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index fbcd944b..b65c33f1 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -81,7 +81,7 @@ #include "window_list.h" #include "event/client_events.h" #ifdef HAVE_GTK -#include "tray.h" +#include "ui/tray.h" #endif #include "tools/http_upload.h" #ifdef HAVE_PYTHON diff --git a/src/profanity.c b/src/profanity.c index 691f39d7..456cae3b 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -38,7 +38,7 @@ #endif #ifdef HAVE_GTK -#include "tray.h" +#include "ui/tray.h" #endif #include #include diff --git a/src/tray.c b/src/tray.c deleted file mode 100644 index 9011bec9..00000000 --- a/src/tray.c +++ /dev/null @@ -1,225 +0,0 @@ -/* - * tray.c - * - * Copyright (C) 2012 - 2016 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#include "config.h" - -#ifdef HAVE_GTK -#include -#include -#include - -#include "tray.h" -#include "window_list.h" -#include "log.h" -#include "config/preferences.h" - -static gboolean gtk_ready = FALSE; -static GtkStatusIcon *prof_tray = NULL; -static GString *icon_filename = NULL; -static GString *icon_msg_filename = NULL; -static gint unread_messages; -static gboolean shutting_down; -static guint timer; - -/* {{{ Privates */ - -/* - * Get icons from installation share folder or (if defined) .locale user's folder - * - * As implementation, looking through all the entries in the .locale folder is chosen. - * While useless as now, it might be useful in case an association name-icon is created. - * As now, with 2 icons only, this is pretty useless, but it is not harming ;) - * - */ -static void -_get_icons(void) -{ - GString *icons_dir = NULL; - -#ifdef ICONS_PATH - - icons_dir = g_string_new(ICONS_PATH); - icon_filename = g_string_new(icons_dir->str); - icon_msg_filename = g_string_new(icons_dir->str); - g_string_append(icon_filename, "/proIcon.png"); - g_string_append(icon_msg_filename, "/proIconMsg.png"); - g_string_free(icons_dir, TRUE); - -#endif /* ICONS_PATH */ - - gchar *xdg_config = xdg_get_config_home(); - icons_dir = g_string_new(xdg_config); - g_free(xdg_config); - g_string_append(icons_dir, "/profanity/icons"); - GError *err = NULL; - if (!g_file_test(icons_dir->str, G_FILE_TEST_IS_DIR)) { - return; - } - GDir *dir = g_dir_open(icons_dir->str, 0, &err); - if (dir) { - GString *name = g_string_new(g_dir_read_name(dir)); - while (name->len) { - if (g_strcmp0("proIcon.png", name->str) == 0) { - if (icon_filename) { - g_string_free(icon_filename, TRUE); - } - icon_filename = g_string_new(icons_dir->str); - g_string_append(icon_filename, "/proIcon.png"); - } else if (g_strcmp0("proIconMsg.png", name->str) == 0) { - if (icon_msg_filename) { - g_string_free(icon_msg_filename, TRUE); - } - icon_msg_filename = g_string_new(icons_dir->str); - g_string_append(icon_msg_filename, "/proIconMsg.png"); - } - g_string_free(name, TRUE); - name = g_string_new(g_dir_read_name(dir)); - } - g_string_free(name, TRUE); - } else { - log_error("Unable to open dir: %s", err->message); - g_error_free(err); - } - g_dir_close(dir); - g_string_free(icons_dir, TRUE); -} - -/* - * Callback for the timer - * - * This is the callback that the timer is calling in order to check if messages are there. - * - */ -gboolean -_tray_change_icon(gpointer data) -{ - if (shutting_down) { - return FALSE; - } - - unread_messages = wins_get_total_unread(); - - if (unread_messages) { - if (!prof_tray) { - prof_tray = gtk_status_icon_new_from_file(icon_msg_filename->str); - } else { - gtk_status_icon_set_from_file(prof_tray, icon_msg_filename->str); - } - } else { - if (prefs_get_boolean(PREF_TRAY_READ)) { - if (!prof_tray) { - prof_tray = gtk_status_icon_new_from_file(icon_filename->str); - } else { - gtk_status_icon_set_from_file(prof_tray, icon_filename->str); - } - } else { - g_clear_object(&prof_tray); - prof_tray = NULL; - } - } - - return TRUE; -} - -/* }}} */ -/* {{{ Public */ - -void -tray_init(void) -{ - _get_icons(); - gtk_ready = gtk_init_check(0, NULL); - log_debug("Env is GTK-ready: %s", gtk_ready ? "true" : "false"); - if (!gtk_ready) { - return; - } - - gtk_init(0, NULL); - if (prefs_get_boolean(PREF_TRAY)) { - log_debug("Building GTK icon"); - tray_enable(); - } - - gtk_main_iteration_do(FALSE); -} - -void -tray_update(void) -{ - if (gtk_ready) { - gtk_main_iteration_do(FALSE); - } -} - -void -tray_shutdown(void) -{ - if (gtk_ready && prefs_get_boolean(PREF_TRAY)) { - tray_disable(); - } - g_string_free(icon_filename, TRUE); - g_string_free(icon_msg_filename, TRUE); -} - -void -tray_set_timer(int interval) -{ - g_source_remove(timer); - _tray_change_icon(NULL); - timer = g_timeout_add(interval * 1000, _tray_change_icon, NULL); -} - -void -tray_enable(void) -{ - prof_tray = gtk_status_icon_new_from_file(icon_filename->str); - shutting_down = FALSE; - _tray_change_icon(NULL); - int interval = prefs_get_tray_timer() * 1000; - timer = g_timeout_add(interval, _tray_change_icon, NULL); -} - -void -tray_disable(void) -{ - shutting_down = TRUE; - g_source_remove(timer); - if (prof_tray) { - g_clear_object(&prof_tray); - prof_tray = NULL; - } -} - -/* }}} */ -#endif diff --git a/src/tray.h b/src/tray.h deleted file mode 100644 index 1f8f13d8..00000000 --- a/src/tray.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * tray.h - * - * Copyright (C) 2012 - 2016 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#ifndef TRAY_H -#define TRAY_H - -void tray_init(void); -void tray_update(void); -void tray_shutdown(void); - -/* - * Create tray icon - * - * This will initialize the timer that will be called in order to change the icons - * and will search the icons in the defaults paths - */ -void tray_enable(void); -/* - * Destroy tray icon - */ -void tray_disable(void); - -void tray_set_timer(int interval); - -#endif diff --git a/src/ui/tray.c b/src/ui/tray.c new file mode 100644 index 00000000..9011bec9 --- /dev/null +++ b/src/ui/tray.c @@ -0,0 +1,225 @@ +/* + * tray.c + * + * Copyright (C) 2012 - 2016 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#include "config.h" + +#ifdef HAVE_GTK +#include +#include +#include + +#include "tray.h" +#include "window_list.h" +#include "log.h" +#include "config/preferences.h" + +static gboolean gtk_ready = FALSE; +static GtkStatusIcon *prof_tray = NULL; +static GString *icon_filename = NULL; +static GString *icon_msg_filename = NULL; +static gint unread_messages; +static gboolean shutting_down; +static guint timer; + +/* {{{ Privates */ + +/* + * Get icons from installation share folder or (if defined) .locale user's folder + * + * As implementation, looking through all the entries in the .locale folder is chosen. + * While useless as now, it might be useful in case an association name-icon is created. + * As now, with 2 icons only, this is pretty useless, but it is not harming ;) + * + */ +static void +_get_icons(void) +{ + GString *icons_dir = NULL; + +#ifdef ICONS_PATH + + icons_dir = g_string_new(ICONS_PATH); + icon_filename = g_string_new(icons_dir->str); + icon_msg_filename = g_string_new(icons_dir->str); + g_string_append(icon_filename, "/proIcon.png"); + g_string_append(icon_msg_filename, "/proIconMsg.png"); + g_string_free(icons_dir, TRUE); + +#endif /* ICONS_PATH */ + + gchar *xdg_config = xdg_get_config_home(); + icons_dir = g_string_new(xdg_config); + g_free(xdg_config); + g_string_append(icons_dir, "/profanity/icons"); + GError *err = NULL; + if (!g_file_test(icons_dir->str, G_FILE_TEST_IS_DIR)) { + return; + } + GDir *dir = g_dir_open(icons_dir->str, 0, &err); + if (dir) { + GString *name = g_string_new(g_dir_read_name(dir)); + while (name->len) { + if (g_strcmp0("proIcon.png", name->str) == 0) { + if (icon_filename) { + g_string_free(icon_filename, TRUE); + } + icon_filename = g_string_new(icons_dir->str); + g_string_append(icon_filename, "/proIcon.png"); + } else if (g_strcmp0("proIconMsg.png", name->str) == 0) { + if (icon_msg_filename) { + g_string_free(icon_msg_filename, TRUE); + } + icon_msg_filename = g_string_new(icons_dir->str); + g_string_append(icon_msg_filename, "/proIconMsg.png"); + } + g_string_free(name, TRUE); + name = g_string_new(g_dir_read_name(dir)); + } + g_string_free(name, TRUE); + } else { + log_error("Unable to open dir: %s", err->message); + g_error_free(err); + } + g_dir_close(dir); + g_string_free(icons_dir, TRUE); +} + +/* + * Callback for the timer + * + * This is the callback that the timer is calling in order to check if messages are there. + * + */ +gboolean +_tray_change_icon(gpointer data) +{ + if (shutting_down) { + return FALSE; + } + + unread_messages = wins_get_total_unread(); + + if (unread_messages) { + if (!prof_tray) { + prof_tray = gtk_status_icon_new_from_file(icon_msg_filename->str); + } else { + gtk_status_icon_set_from_file(prof_tray, icon_msg_filename->str); + } + } else { + if (prefs_get_boolean(PREF_TRAY_READ)) { + if (!prof_tray) { + prof_tray = gtk_status_icon_new_from_file(icon_filename->str); + } else { + gtk_status_icon_set_from_file(prof_tray, icon_filename->str); + } + } else { + g_clear_object(&prof_tray); + prof_tray = NULL; + } + } + + return TRUE; +} + +/* }}} */ +/* {{{ Public */ + +void +tray_init(void) +{ + _get_icons(); + gtk_ready = gtk_init_check(0, NULL); + log_debug("Env is GTK-ready: %s", gtk_ready ? "true" : "false"); + if (!gtk_ready) { + return; + } + + gtk_init(0, NULL); + if (prefs_get_boolean(PREF_TRAY)) { + log_debug("Building GTK icon"); + tray_enable(); + } + + gtk_main_iteration_do(FALSE); +} + +void +tray_update(void) +{ + if (gtk_ready) { + gtk_main_iteration_do(FALSE); + } +} + +void +tray_shutdown(void) +{ + if (gtk_ready && prefs_get_boolean(PREF_TRAY)) { + tray_disable(); + } + g_string_free(icon_filename, TRUE); + g_string_free(icon_msg_filename, TRUE); +} + +void +tray_set_timer(int interval) +{ + g_source_remove(timer); + _tray_change_icon(NULL); + timer = g_timeout_add(interval * 1000, _tray_change_icon, NULL); +} + +void +tray_enable(void) +{ + prof_tray = gtk_status_icon_new_from_file(icon_filename->str); + shutting_down = FALSE; + _tray_change_icon(NULL); + int interval = prefs_get_tray_timer() * 1000; + timer = g_timeout_add(interval, _tray_change_icon, NULL); +} + +void +tray_disable(void) +{ + shutting_down = TRUE; + g_source_remove(timer); + if (prof_tray) { + g_clear_object(&prof_tray); + prof_tray = NULL; + } +} + +/* }}} */ +#endif diff --git a/src/ui/tray.h b/src/ui/tray.h new file mode 100644 index 00000000..f33176e7 --- /dev/null +++ b/src/ui/tray.h @@ -0,0 +1,56 @@ +/* + * tray.h + * + * Copyright (C) 2012 - 2016 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#ifndef UI_TRAY_H +#define UI_TRAY_H + +void tray_init(void); +void tray_update(void); +void tray_shutdown(void); + +/* + * Create tray icon + * + * This will initialize the timer that will be called in order to change the icons + * and will search the icons in the defaults paths + */ +void tray_enable(void); +/* + * Destroy tray icon + */ +void tray_disable(void); + +void tray_set_timer(int interval); + +#endif -- cgit 1.4.1-2-gfad0