2009-04-20 16:20:40 -07:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
2010-01-04 18:15:41 -08:00
|
|
|
#include <limits.h>
|
2010-03-03 04:28:21 -08:00
|
|
|
#include <libgen.h>
|
2010-06-06 12:45:16 -07:00
|
|
|
#include <sys/types.h>
|
2010-03-03 04:28:21 -08:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/mman.h>
|
2010-06-06 12:45:16 -07:00
|
|
|
#include <fcntl.h>
|
2010-04-15 12:21:23 -07:00
|
|
|
#include <dirent.h>
|
2009-04-20 16:20:40 -07:00
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
# include <winsock2.h>
|
|
|
|
#endif
|
|
|
|
|
2009-04-27 22:39:22 -07:00
|
|
|
#include <Ecore.h>
|
2009-04-20 16:20:40 -07:00
|
|
|
#include <Ecore_File.h>
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
#include "Efreet.h"
|
|
|
|
#include "efreet_private.h"
|
|
|
|
|
2010-01-24 13:21:27 -08:00
|
|
|
#define DESKTOP_VERSION "1.0"
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-04-15 12:19:59 -07:00
|
|
|
typedef struct _Efreet_Old_Cache Efreet_Old_Cache;
|
2010-03-25 22:33:12 -07:00
|
|
|
|
2010-04-15 12:19:59 -07:00
|
|
|
struct _Efreet_Old_Cache
|
2010-03-25 22:33:12 -07:00
|
|
|
{
|
|
|
|
Eina_Hash *desktop_cache;
|
|
|
|
Eet_File *cache;
|
|
|
|
};
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* The current desktop environment (e.g. "Enlightenment" or "Gnome")
|
|
|
|
*/
|
|
|
|
static const char *desktop_environment = NULL;
|
|
|
|
|
|
|
|
/**
|
2007-09-06 09:15:10 -07:00
|
|
|
* A cache of all loaded desktops, hashed by file name.
|
2007-02-03 05:05:30 -08:00
|
|
|
* Values are Efreet_Desktop structures
|
|
|
|
*/
|
2008-12-17 07:33:43 -08:00
|
|
|
static Eina_Hash *efreet_desktop_cache = NULL;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2007-02-04 18:06:05 -08:00
|
|
|
/**
|
|
|
|
* A list of the desktop types available
|
|
|
|
*/
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
static Eina_List *efreet_desktop_types = NULL;
|
2007-02-04 18:06:05 -08:00
|
|
|
|
2010-03-03 04:28:21 -08:00
|
|
|
/**
|
|
|
|
* A cache of all unknown desktop dirs
|
|
|
|
*/
|
|
|
|
static Eina_List *efreet_desktop_dirs = NULL;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A job pointer for cache updates
|
|
|
|
*/
|
2010-04-15 12:19:48 -07:00
|
|
|
static Ecore_Job *efreet_desktop_job = NULL;
|
|
|
|
static Ecore_Exe *efreet_desktop_exe = NULL;
|
|
|
|
static int efreet_desktop_exe_lock = -1;
|
2010-04-03 11:45:57 -07:00
|
|
|
static Ecore_Event_Handler *efreet_desktop_exe_handler = NULL;
|
2010-03-03 04:28:21 -08:00
|
|
|
|
2010-04-15 12:19:48 -07:00
|
|
|
/**
|
|
|
|
* Data for cache files
|
|
|
|
*/
|
|
|
|
static const char *cache_dirs = NULL;
|
|
|
|
static const char *cache_file = NULL;
|
|
|
|
static Eet_File *cache = NULL;
|
2010-03-01 13:43:59 -08:00
|
|
|
static Eet_Data_Descriptor *desktop_edd = NULL;
|
2010-04-15 12:19:48 -07:00
|
|
|
static Ecore_File_Monitor *cache_monitor = NULL;
|
2010-04-15 12:19:59 -07:00
|
|
|
|
|
|
|
static Eina_List *old_caches = NULL;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-04-15 12:19:48 -07:00
|
|
|
static Eina_Hash *change_monitors = NULL;
|
2010-04-06 11:35:45 -07:00
|
|
|
|
2010-08-29 01:47:37 -07:00
|
|
|
#ifdef EFREET_MODULE_LOG_DOM
|
2009-09-21 09:36:29 -07:00
|
|
|
#undef EFREET_MODULE_LOG_DOM
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define EFREET_MODULE_LOG_DOM _efreet_desktop_log_dom
|
2010-04-15 11:23:42 -07:00
|
|
|
int _efreet_desktop_log_dom = -1;
|
2009-09-21 09:36:29 -07:00
|
|
|
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI int EFREET_DESKTOP_TYPE_APPLICATION = 0;
|
|
|
|
EAPI int EFREET_DESKTOP_TYPE_LINK = 0;
|
|
|
|
EAPI int EFREET_DESKTOP_TYPE_DIRECTORY = 0;
|
2007-02-05 13:16:55 -08:00
|
|
|
|
2010-04-15 12:21:03 -07:00
|
|
|
EAPI int EFREET_EVENT_DESKTOP_CACHE_UPDATE = 0;
|
2010-04-15 12:20:18 -07:00
|
|
|
|
2007-02-05 12:23:31 -08:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* Information about custom types
|
|
|
|
*/
|
|
|
|
typedef struct Efreet_Desktop_Type_Info Efreet_Desktop_Type_Info;
|
|
|
|
struct Efreet_Desktop_Type_Info
|
|
|
|
{
|
2007-02-05 13:16:55 -08:00
|
|
|
int id;
|
2010-04-01 12:31:49 -07:00
|
|
|
const char *type;
|
2007-02-05 12:23:31 -08:00
|
|
|
Efreet_Desktop_Type_Parse_Cb parse_func;
|
2007-02-05 13:16:55 -08:00
|
|
|
Efreet_Desktop_Type_Save_Cb save_func;
|
2007-02-05 12:23:31 -08:00
|
|
|
Efreet_Desktop_Type_Free_Cb free_func;
|
|
|
|
};
|
|
|
|
|
2010-04-15 12:20:31 -07:00
|
|
|
static int efreet_desktop_cache_check(Efreet_Desktop *desktop);
|
2007-03-27 12:41:23 -07:00
|
|
|
static int efreet_desktop_read(Efreet_Desktop *desktop);
|
2007-02-05 13:16:55 -08:00
|
|
|
static Efreet_Desktop_Type_Info *efreet_desktop_type_parse(const char *type_str);
|
2010-04-15 12:20:31 -07:00
|
|
|
static void efreet_desktop_type_info_free(Efreet_Desktop_Type_Info *info);
|
2007-09-06 09:15:10 -07:00
|
|
|
static void *efreet_desktop_application_fields_parse(Efreet_Desktop *desktop,
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Ini *ini);
|
2007-09-06 09:15:10 -07:00
|
|
|
static void efreet_desktop_application_fields_save(Efreet_Desktop *desktop,
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Ini *ini);
|
2007-02-05 13:16:55 -08:00
|
|
|
static void *efreet_desktop_link_fields_parse(Efreet_Desktop *desktop,
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Ini *ini);
|
2007-09-06 09:15:10 -07:00
|
|
|
static void efreet_desktop_link_fields_save(Efreet_Desktop *desktop,
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Ini *ini);
|
2007-09-06 09:15:10 -07:00
|
|
|
static int efreet_desktop_generic_fields_parse(Efreet_Desktop *desktop,
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Ini *ini);
|
2007-09-06 09:15:10 -07:00
|
|
|
static void efreet_desktop_generic_fields_save(Efreet_Desktop *desktop,
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Ini *ini);
|
2008-12-17 07:33:43 -08:00
|
|
|
static Eina_Bool efreet_desktop_x_fields_parse(const Eina_Hash *hash,
|
2010-02-04 01:12:35 -08:00
|
|
|
const void *key,
|
|
|
|
void *data,
|
|
|
|
void *fdata);
|
2008-12-17 07:33:43 -08:00
|
|
|
static Eina_Bool efreet_desktop_x_fields_save(const Eina_Hash *hash,
|
2010-02-04 01:12:35 -08:00
|
|
|
const void *key,
|
|
|
|
void *value,
|
|
|
|
void *fdata);
|
2007-02-03 05:05:30 -08:00
|
|
|
static int efreet_desktop_environment_check(Efreet_Ini *ini);
|
2010-04-15 12:20:31 -07:00
|
|
|
|
2010-05-13 11:31:41 -07:00
|
|
|
static int efreet_desktop_write_cache_dirs_file(void);
|
2010-04-15 12:20:51 -07:00
|
|
|
|
|
|
|
static void efreet_desktop_cache_update_cb(void *data, Ecore_File_Monitor *em,
|
|
|
|
Ecore_File_Event event, const char *path);
|
2010-03-25 22:33:12 -07:00
|
|
|
static void efreet_desktop_cache_update_free(void *data, void *ev);
|
2010-04-15 12:20:51 -07:00
|
|
|
|
2010-04-03 11:45:57 -07:00
|
|
|
static void efreet_desktop_update_cache(void);
|
|
|
|
static void efreet_desktop_update_cache_job(void *data);
|
2010-06-24 09:17:45 -07:00
|
|
|
static Eina_Bool efreet_desktop_exe_cb(void *data, int type, void *event);
|
2010-03-03 04:28:21 -08:00
|
|
|
|
2010-04-15 12:21:13 -07:00
|
|
|
static void efreet_desktop_changes_listen(void);
|
2010-04-15 12:21:23 -07:00
|
|
|
static void efreet_desktop_changes_listen_recursive(const char *path);
|
2010-04-15 12:38:01 -07:00
|
|
|
static void efreet_desktop_changes_monitor_add(const char *path);
|
2010-04-15 12:21:13 -07:00
|
|
|
static void efreet_desktop_changes_cb(void *data, Ecore_File_Monitor *em,
|
2010-04-06 11:35:45 -07:00
|
|
|
Ecore_File_Event event, const char *path);
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @return Returns > 0 on success or 0 on failure
|
|
|
|
* @brief Initialize the Desktop parser subsystem
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
efreet_desktop_init(void)
|
|
|
|
{
|
2010-04-03 11:46:07 -07:00
|
|
|
char buf[PATH_MAX];
|
|
|
|
|
2009-10-09 23:19:13 -07:00
|
|
|
_efreet_desktop_log_dom = eina_log_domain_register("Efreet_desktop", EFREET_DEFAULT_LOG_COLOR);
|
|
|
|
if (_efreet_desktop_log_dom < 0)
|
|
|
|
{
|
2010-02-04 01:12:35 -08:00
|
|
|
ERROR("Efreet: Could not create a log domain for Efreet_desktop");
|
|
|
|
return 0;
|
2009-10-09 23:19:13 -07:00
|
|
|
}
|
|
|
|
if (!ecore_file_init())
|
2010-03-01 10:16:32 -08:00
|
|
|
goto ecore_error;
|
2010-03-01 13:43:59 -08:00
|
|
|
desktop_edd = efreet_desktop_edd_init();
|
|
|
|
if (!desktop_edd)
|
2010-03-01 10:16:32 -08:00
|
|
|
goto edd_error;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2008-12-17 07:33:43 -08:00
|
|
|
efreet_desktop_cache = eina_hash_string_superfast_new(NULL);
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
efreet_desktop_types = NULL;
|
2007-02-05 13:16:55 -08:00
|
|
|
|
2007-09-06 09:15:10 -07:00
|
|
|
EFREET_DESKTOP_TYPE_APPLICATION = efreet_desktop_type_add("Application",
|
|
|
|
efreet_desktop_application_fields_parse,
|
|
|
|
efreet_desktop_application_fields_save,
|
2007-02-05 13:16:55 -08:00
|
|
|
NULL);
|
2007-09-06 09:15:10 -07:00
|
|
|
EFREET_DESKTOP_TYPE_LINK = efreet_desktop_type_add("Link",
|
|
|
|
efreet_desktop_link_fields_parse,
|
2007-02-05 13:16:55 -08:00
|
|
|
efreet_desktop_link_fields_save, NULL);
|
2007-09-06 09:15:10 -07:00
|
|
|
EFREET_DESKTOP_TYPE_DIRECTORY = efreet_desktop_type_add("Directory", NULL,
|
2007-02-05 13:16:55 -08:00
|
|
|
NULL, NULL);
|
2007-02-04 18:06:05 -08:00
|
|
|
|
2010-04-15 12:21:03 -07:00
|
|
|
EFREET_EVENT_DESKTOP_CACHE_UPDATE = ecore_event_type_new();
|
2010-03-25 22:33:12 -07:00
|
|
|
|
2010-04-03 11:46:07 -07:00
|
|
|
snprintf(buf, sizeof(buf), "%s/.efreet", efreet_home_dir_get());
|
2010-04-06 11:36:25 -07:00
|
|
|
if (!ecore_file_mkpath(buf)) goto cache_error;
|
2010-04-03 11:46:07 -07:00
|
|
|
|
2010-03-28 11:54:25 -07:00
|
|
|
if (efreet_cache_update)
|
|
|
|
{
|
2010-04-06 11:36:25 -07:00
|
|
|
efreet_desktop_exe_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
|
|
|
|
efreet_desktop_exe_cb, NULL);
|
|
|
|
if (!efreet_desktop_exe_handler) goto cache_error;
|
|
|
|
|
2010-03-28 11:54:25 -07:00
|
|
|
cache_monitor = ecore_file_monitor_add(buf,
|
2010-04-15 12:20:51 -07:00
|
|
|
efreet_desktop_cache_update_cb,
|
2010-03-28 11:54:25 -07:00
|
|
|
NULL);
|
2010-04-06 11:36:25 -07:00
|
|
|
if (!cache_monitor) goto handler_error;
|
|
|
|
|
2010-04-15 12:21:13 -07:00
|
|
|
efreet_desktop_changes_listen();
|
2010-03-25 22:33:12 -07:00
|
|
|
|
2010-04-17 13:19:35 -07:00
|
|
|
ecore_exe_run(PACKAGE_LIB_DIR "/efreet/efreet_desktop_cache_create", NULL);
|
2010-04-03 11:45:57 -07:00
|
|
|
|
2010-03-28 12:31:14 -07:00
|
|
|
}
|
2010-03-25 22:33:12 -07:00
|
|
|
|
2010-04-29 11:16:15 -07:00
|
|
|
/* TODO: Defer eet open until we actually need it open. */
|
2010-03-01 10:16:32 -08:00
|
|
|
cache = eet_open(efreet_desktop_cache_file(), EET_FILE_MODE_READ);
|
2010-03-25 22:33:12 -07:00
|
|
|
|
2009-10-09 23:19:13 -07:00
|
|
|
return 1;
|
2010-03-01 10:16:32 -08:00
|
|
|
|
2010-04-06 11:36:25 -07:00
|
|
|
handler_error:
|
|
|
|
if (efreet_desktop_exe_handler) ecore_event_handler_del(efreet_desktop_exe_handler);
|
2010-04-03 11:45:57 -07:00
|
|
|
cache_error:
|
|
|
|
if (efreet_desktop_cache) eina_hash_free(efreet_desktop_cache);
|
2010-03-01 10:16:32 -08:00
|
|
|
edd_error:
|
|
|
|
ecore_file_shutdown();
|
|
|
|
ecore_error:
|
|
|
|
eina_log_domain_unregister(_efreet_desktop_log_dom);
|
|
|
|
return 0;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @returns the number of initializations left for this system
|
|
|
|
* @brief Attempts to shut down the subsystem if nothing else is using it
|
|
|
|
*/
|
2009-10-09 23:19:13 -07:00
|
|
|
void
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_shutdown(void)
|
|
|
|
{
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
Efreet_Desktop_Type_Info *info;
|
2010-03-03 04:28:21 -08:00
|
|
|
char *dir;
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
|
2010-04-03 11:45:57 -07:00
|
|
|
if (efreet_desktop_exe_handler) ecore_event_handler_del(efreet_desktop_exe_handler);
|
2007-02-04 18:06:05 -08:00
|
|
|
IF_RELEASE(desktop_environment);
|
2007-02-03 05:05:30 -08:00
|
|
|
IF_FREE_HASH(efreet_desktop_cache);
|
2010-08-03 13:46:25 -07:00
|
|
|
EINA_LIST_FREE(efreet_desktop_types, info)
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
efreet_desktop_type_info_free(info);
|
2010-03-03 04:28:21 -08:00
|
|
|
EINA_LIST_FREE(efreet_desktop_dirs, dir)
|
2010-04-01 12:31:49 -07:00
|
|
|
eina_stringshare_del(dir);
|
2010-03-25 22:33:12 -07:00
|
|
|
if (cache_monitor) ecore_file_monitor_del(cache_monitor);
|
2010-04-06 11:35:45 -07:00
|
|
|
if (change_monitors) eina_hash_free(change_monitors);
|
2010-03-01 10:16:32 -08:00
|
|
|
if (cache) eet_close(cache);
|
2010-03-01 13:43:59 -08:00
|
|
|
efreet_desktop_edd_shutdown(desktop_edd);
|
2009-10-09 23:19:13 -07:00
|
|
|
ecore_file_shutdown();
|
|
|
|
eina_log_domain_unregister(_efreet_desktop_log_dom);
|
2010-04-01 12:31:49 -07:00
|
|
|
IF_RELEASE(cache_file);
|
|
|
|
IF_RELEASE(cache_dirs);
|
2010-08-13 21:02:31 -07:00
|
|
|
if (efreet_desktop_job)
|
|
|
|
{
|
|
|
|
ecore_job_del(efreet_desktop_job);
|
|
|
|
efreet_desktop_job = NULL;
|
|
|
|
}
|
2010-03-01 10:16:32 -08:00
|
|
|
}
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* @param file: The file to get the Efreet_Desktop from
|
2007-09-06 09:15:10 -07:00
|
|
|
* @return Returns a reference to a cached Efreet_Desktop on success, NULL
|
2007-02-03 05:05:30 -08:00
|
|
|
* on failure. This reference should not be freed.
|
|
|
|
* @brief Gets a reference to an Efreet_Desktop structure representing the
|
|
|
|
* contents of @a file or NULL if @a file is not a valid .desktop file.
|
2010-03-03 11:42:38 -08:00
|
|
|
*
|
|
|
|
* By using efreet_desktop_get the Efreet_Desktop will be saved in an internal
|
|
|
|
* cache, and changes will be signalled by events.
|
2010-04-03 11:48:57 -07:00
|
|
|
*
|
|
|
|
* Efreet will also try to save all files fetched by efreet_desktop_get in a
|
|
|
|
* cache to speed up further requests.
|
2007-02-03 05:05:30 -08:00
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI Efreet_Desktop *
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_get(const char *file)
|
|
|
|
{
|
2010-03-03 14:11:06 -08:00
|
|
|
/* TODO: Check if we need to differentiate between desktop_new and desktop_get */
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Desktop *desktop;
|
|
|
|
|
2010-03-15 12:08:22 -07:00
|
|
|
if (!file) return NULL;
|
2007-09-06 09:15:10 -07:00
|
|
|
if (efreet_desktop_cache)
|
2007-02-03 05:05:30 -08:00
|
|
|
{
|
2010-03-15 12:08:22 -07:00
|
|
|
char rp[PATH_MAX];
|
|
|
|
|
|
|
|
if (!realpath(file, rp)) return NULL;
|
|
|
|
desktop = eina_hash_find(efreet_desktop_cache, rp);
|
2007-02-03 05:05:30 -08:00
|
|
|
if (desktop)
|
|
|
|
{
|
|
|
|
if (efreet_desktop_cache_check(desktop))
|
2007-06-14 11:37:31 -07:00
|
|
|
{
|
|
|
|
desktop->ref++;
|
2007-02-03 05:05:30 -08:00
|
|
|
return desktop;
|
2007-06-14 11:37:31 -07:00
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2007-06-14 11:37:31 -07:00
|
|
|
desktop->cached = 0;
|
2010-03-25 22:33:12 -07:00
|
|
|
eina_hash_del_by_key(efreet_desktop_cache, rp);
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
desktop = efreet_desktop_new(file);
|
|
|
|
if (!desktop) return NULL;
|
|
|
|
|
2010-03-03 11:42:38 -08:00
|
|
|
if (!desktop->eet)
|
|
|
|
{
|
|
|
|
char buf[PATH_MAX];
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read file from disk, save path in cache so it will be included in next
|
|
|
|
* cache update
|
|
|
|
*/
|
|
|
|
strncpy(buf, desktop->orig_path, PATH_MAX);
|
|
|
|
buf[PATH_MAX - 1] = '\0';
|
|
|
|
p = dirname(buf);
|
|
|
|
if (!eina_list_search_unsorted(efreet_desktop_dirs, EINA_COMPARE_CB(strcmp), p))
|
2010-04-01 12:31:49 -07:00
|
|
|
efreet_desktop_dirs = eina_list_append(efreet_desktop_dirs, eina_stringshare_add(p));
|
2010-04-03 11:46:37 -07:00
|
|
|
efreet_desktop_update_cache();
|
2010-03-03 11:42:38 -08:00
|
|
|
}
|
|
|
|
|
2010-03-15 06:46:45 -07:00
|
|
|
if (efreet_desktop_cache) eina_hash_add(efreet_desktop_cache, desktop->orig_path, desktop);
|
2007-06-14 08:53:02 -07:00
|
|
|
desktop->cached = 1;
|
2007-02-03 05:05:30 -08:00
|
|
|
return desktop;
|
|
|
|
}
|
|
|
|
|
2007-06-22 02:39:58 -07:00
|
|
|
/**
|
|
|
|
* @param desktop: The Efreet_Desktop to ref
|
|
|
|
* @return Returns the new reference count
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI int
|
2007-06-22 02:39:58 -07:00
|
|
|
efreet_desktop_ref(Efreet_Desktop *desktop)
|
|
|
|
{
|
|
|
|
if (!desktop) return 0;
|
|
|
|
desktop->ref++;
|
|
|
|
return desktop->ref;
|
|
|
|
}
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* @param file: The file to create the Efreet_Desktop from
|
|
|
|
* @return Returns a new empty_Efreet_Desktop on success, NULL on failure
|
|
|
|
* @brief Creates a new empty Efreet_Desktop structure or NULL on failure
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI Efreet_Desktop *
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_empty_new(const char *file)
|
|
|
|
{
|
|
|
|
Efreet_Desktop *desktop;
|
|
|
|
|
|
|
|
desktop = NEW(Efreet_Desktop, 1);
|
|
|
|
if (!desktop) return NULL;
|
|
|
|
|
|
|
|
desktop->orig_path = strdup(file);
|
2007-06-16 17:33:39 -07:00
|
|
|
desktop->load_time = ecore_file_mod_time(file);
|
2007-06-14 11:37:31 -07:00
|
|
|
|
2007-06-14 08:53:02 -07:00
|
|
|
desktop->ref = 1;
|
2007-06-14 11:37:31 -07:00
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
return desktop;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param file: The file to create the Efreet_Desktop from
|
|
|
|
* @return Returns a new Efreet_Desktop on success, NULL on failure
|
|
|
|
* @brief Creates a new Efreet_Desktop structure initialized from the
|
|
|
|
* contents of @a file or NULL on failure
|
2010-03-03 11:42:38 -08:00
|
|
|
*
|
|
|
|
* By using efreet_desktop_new the caller will get a unique copy of a
|
|
|
|
* Efreet_Desktop. The Efreet_Desktop should immidiatly after use be free'd,
|
|
|
|
* as there is no guarantee how long the pointers will be valid.
|
2007-02-03 05:05:30 -08:00
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI Efreet_Desktop *
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_new(const char *file)
|
|
|
|
{
|
2010-03-01 10:16:32 -08:00
|
|
|
Efreet_Desktop *desktop = NULL;
|
|
|
|
|
2010-03-07 12:34:41 -08:00
|
|
|
if (!file) return NULL;
|
2010-03-01 10:16:32 -08:00
|
|
|
if (cache)
|
|
|
|
{
|
2010-03-15 12:57:57 -07:00
|
|
|
char rp[PATH_MAX];
|
|
|
|
if (!realpath(file, rp)) return NULL;
|
|
|
|
|
2010-03-02 12:07:41 -08:00
|
|
|
desktop = eet_data_read(cache, desktop_edd, rp);
|
2010-04-03 11:46:47 -07:00
|
|
|
if (desktop && desktop->load_time == ecore_file_mod_time(desktop->orig_path))
|
2010-03-01 10:16:32 -08:00
|
|
|
{
|
|
|
|
desktop->ref = 1;
|
|
|
|
desktop->eet = 1;
|
|
|
|
return desktop;
|
|
|
|
}
|
|
|
|
}
|
2010-03-15 12:57:57 -07:00
|
|
|
return efreet_desktop_uncached_new(file);
|
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-03-15 12:57:57 -07:00
|
|
|
/**
|
|
|
|
* @param file: The file to create the Efreet_Desktop from
|
|
|
|
* @return Returns a new Efreet_Desktop on success, NULL on failure
|
|
|
|
* @brief Creates a new Efreet_Desktop structure initialized from the
|
|
|
|
* contents of @a file or NULL on failure
|
|
|
|
*
|
|
|
|
* By using efreet_desktop_uncached_new the Efreet_Desktop structure will be
|
|
|
|
* read from disk, and not from any cache.
|
|
|
|
*/
|
|
|
|
EAPI Efreet_Desktop *
|
|
|
|
efreet_desktop_uncached_new(const char *file)
|
|
|
|
{
|
|
|
|
Efreet_Desktop *desktop = NULL;
|
|
|
|
char rp[PATH_MAX];
|
|
|
|
|
|
|
|
if (!file) return NULL;
|
|
|
|
if (!realpath(file, rp)) return NULL;
|
|
|
|
if (!ecore_file_exists(rp)) return NULL;
|
2007-07-26 04:37:23 -07:00
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
desktop = NEW(Efreet_Desktop, 1);
|
2010-03-15 12:57:57 -07:00
|
|
|
if (!desktop) return NULL;
|
2010-03-15 12:08:22 -07:00
|
|
|
desktop->orig_path = strdup(rp);
|
2010-03-27 13:53:52 -07:00
|
|
|
desktop->ref = 1;
|
2010-03-15 12:57:57 -07:00
|
|
|
if (!efreet_desktop_read(desktop))
|
|
|
|
{
|
|
|
|
efreet_desktop_free(desktop);
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-06-14 11:37:31 -07:00
|
|
|
|
2007-03-27 12:41:23 -07:00
|
|
|
return desktop;
|
|
|
|
}
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* @param desktop: The desktop file to save
|
|
|
|
* @return Returns 1 on success or 0 on failure
|
|
|
|
* @brief Saves any changes made to @a desktop back to the file on the
|
|
|
|
* filesystem
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI int
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_save(Efreet_Desktop *desktop)
|
|
|
|
{
|
2007-02-05 13:16:55 -08:00
|
|
|
Efreet_Desktop_Type_Info *info;
|
2007-02-03 05:05:30 -08:00
|
|
|
Efreet_Ini *ini;
|
|
|
|
int ok = 1;
|
|
|
|
|
2009-05-15 04:47:39 -07:00
|
|
|
ini = efreet_ini_new(NULL);
|
2010-08-04 12:15:38 -07:00
|
|
|
if (!ini) return 0;
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_ini_section_add(ini, "Desktop Entry");
|
|
|
|
efreet_ini_section_set(ini, "Desktop Entry");
|
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
info = eina_list_nth(efreet_desktop_types, desktop->type);
|
2007-09-06 09:15:10 -07:00
|
|
|
if (info)
|
2007-02-04 18:06:05 -08:00
|
|
|
{
|
2007-02-05 13:16:55 -08:00
|
|
|
efreet_ini_string_set(ini, "Type", info->type);
|
|
|
|
if (info->save_func) info->save_func(desktop, ini);
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
2007-02-04 18:06:05 -08:00
|
|
|
else
|
|
|
|
ok = 0;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
|
|
|
if (ok)
|
|
|
|
{
|
|
|
|
char *val;
|
|
|
|
|
|
|
|
if (desktop->only_show_in)
|
|
|
|
{
|
|
|
|
val = efreet_desktop_string_list_join(desktop->only_show_in);
|
2010-08-04 12:15:53 -07:00
|
|
|
if (val)
|
|
|
|
{
|
|
|
|
efreet_ini_string_set(ini, "OnlyShowIn", val);
|
|
|
|
FREE(val);
|
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
if (desktop->not_show_in)
|
|
|
|
{
|
|
|
|
val = efreet_desktop_string_list_join(desktop->not_show_in);
|
2010-08-04 12:15:53 -07:00
|
|
|
if (val)
|
|
|
|
{
|
|
|
|
efreet_ini_string_set(ini, "NotShowIn", val);
|
|
|
|
FREE(val);
|
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
efreet_desktop_generic_fields_save(desktop, ini);
|
|
|
|
/* When we save the file, it should be updated to the
|
|
|
|
* latest version that we support! */
|
2010-01-24 13:21:27 -08:00
|
|
|
efreet_ini_string_set(ini, "Version", DESKTOP_VERSION);
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-03-15 12:10:51 -07:00
|
|
|
if (!efreet_ini_save(ini, desktop->orig_path)) ok = 0;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
efreet_ini_free(ini);
|
|
|
|
return ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param desktop: The desktop file to save
|
|
|
|
* @param file: The filename to save as
|
|
|
|
* @return Returns 1 on success or 0 on failure
|
|
|
|
* @brief Saves @a desktop to @a file
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI int
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_save_as(Efreet_Desktop *desktop, const char *file)
|
|
|
|
{
|
2010-03-01 10:16:32 -08:00
|
|
|
if (desktop->cached && efreet_desktop_cache &&
|
|
|
|
desktop == eina_hash_find(efreet_desktop_cache, desktop->orig_path))
|
2007-06-14 11:37:31 -07:00
|
|
|
{
|
|
|
|
desktop->cached = 0;
|
2010-03-25 22:33:12 -07:00
|
|
|
eina_hash_del_by_key(efreet_desktop_cache, desktop->orig_path);
|
2007-06-14 11:37:31 -07:00
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
FREE(desktop->orig_path);
|
|
|
|
desktop->orig_path = strdup(file);
|
|
|
|
return efreet_desktop_save(desktop);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: The Efreet_Desktop to work with
|
|
|
|
* @return Returns no value
|
|
|
|
* @brief Frees the Efreet_Desktop structure and all of it's data
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI void
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_free(Efreet_Desktop *desktop)
|
|
|
|
{
|
|
|
|
if (!desktop) return;
|
|
|
|
|
2007-06-14 08:53:02 -07:00
|
|
|
desktop->ref--;
|
|
|
|
if (desktop->ref > 0) return;
|
2007-06-14 11:37:31 -07:00
|
|
|
|
2010-03-27 13:53:52 -07:00
|
|
|
if (desktop->cached)
|
2010-03-25 22:33:12 -07:00
|
|
|
{
|
2010-03-27 13:53:52 -07:00
|
|
|
if (efreet_desktop_cache &&
|
|
|
|
desktop == eina_hash_find(efreet_desktop_cache, desktop->orig_path))
|
|
|
|
{
|
|
|
|
eina_hash_del_by_key(efreet_desktop_cache, desktop->orig_path);
|
|
|
|
}
|
2010-04-15 12:19:59 -07:00
|
|
|
else if (old_caches)
|
2010-03-27 13:53:52 -07:00
|
|
|
{
|
2010-04-15 12:19:59 -07:00
|
|
|
Efreet_Old_Cache *d;
|
2010-03-27 13:53:52 -07:00
|
|
|
Efreet_Desktop *curr;
|
|
|
|
Eina_List *l;
|
|
|
|
|
2010-04-15 12:19:59 -07:00
|
|
|
EINA_LIST_FOREACH(old_caches, l, d)
|
2010-03-27 13:53:52 -07:00
|
|
|
{
|
|
|
|
curr = eina_hash_find(d->desktop_cache, desktop->orig_path);
|
|
|
|
if (curr && curr == desktop)
|
|
|
|
{
|
|
|
|
eina_hash_del_by_key(d->desktop_cache, desktop->orig_path);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-03-25 22:33:12 -07:00
|
|
|
}
|
2007-06-14 11:37:31 -07:00
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
if (desktop->eet)
|
|
|
|
{
|
2010-03-14 13:48:52 -07:00
|
|
|
eina_list_free(desktop->only_show_in);
|
|
|
|
eina_list_free(desktop->not_show_in);
|
|
|
|
eina_list_free(desktop->categories);
|
|
|
|
eina_list_free(desktop->mime_types);
|
2010-03-13 11:14:35 -08:00
|
|
|
IF_FREE_HASH(desktop->x);
|
2010-03-01 10:16:32 -08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *str;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
IF_FREE(desktop->orig_path);
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
IF_FREE(desktop->version);
|
|
|
|
IF_FREE(desktop->name);
|
|
|
|
IF_FREE(desktop->generic_name);
|
|
|
|
IF_FREE(desktop->comment);
|
|
|
|
IF_FREE(desktop->icon);
|
|
|
|
IF_FREE(desktop->url);
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
IF_FREE(desktop->try_exec);
|
|
|
|
IF_FREE(desktop->exec);
|
|
|
|
IF_FREE(desktop->path);
|
|
|
|
IF_FREE(desktop->startup_wm_class);
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
IF_FREE_LIST(desktop->only_show_in, free);
|
|
|
|
IF_FREE_LIST(desktop->not_show_in, free);
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
EINA_LIST_FREE(desktop->categories, str)
|
|
|
|
eina_stringshare_del(str);
|
|
|
|
EINA_LIST_FREE(desktop->mime_types, str)
|
|
|
|
eina_stringshare_del(str);
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
IF_FREE_HASH(desktop->x);
|
|
|
|
|
|
|
|
if (desktop->type_data)
|
|
|
|
{
|
|
|
|
Efreet_Desktop_Type_Info *info;
|
|
|
|
info = eina_list_nth(efreet_desktop_types, desktop->type);
|
|
|
|
if (info->free_func)
|
|
|
|
info->free_func(desktop->type_data);
|
|
|
|
}
|
2007-02-05 12:23:31 -08:00
|
|
|
}
|
2010-03-13 11:14:35 -08:00
|
|
|
FREE(desktop);
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param environment: the environment name
|
|
|
|
* @brief sets the global desktop environment name
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI void
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_environment_set(const char *environment)
|
|
|
|
{
|
2008-10-15 07:48:03 -07:00
|
|
|
if (desktop_environment) eina_stringshare_del(desktop_environment);
|
|
|
|
if (environment) desktop_environment = eina_stringshare_add(environment);
|
2007-02-03 05:05:30 -08:00
|
|
|
else desktop_environment = NULL;
|
|
|
|
}
|
|
|
|
|
2007-07-17 08:07:59 -07:00
|
|
|
/**
|
|
|
|
* @return environment: the environment name
|
|
|
|
* @brief sets the global desktop environment name
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI const char *
|
2007-07-17 08:07:59 -07:00
|
|
|
efreet_desktop_environment_get(void)
|
|
|
|
{
|
|
|
|
return desktop_environment;
|
|
|
|
}
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* @param desktop: The desktop to work with
|
|
|
|
* @return Returns the number of categories assigned to this desktop
|
|
|
|
* @brief Retrieves the number of categories the given @a desktop belongs
|
|
|
|
* too
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI unsigned int
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_category_count_get(Efreet_Desktop *desktop)
|
|
|
|
{
|
|
|
|
if (!desktop || !desktop->categories) return 0;
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
return eina_list_count(desktop->categories);
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param desktop: the desktop
|
|
|
|
* @param category: the category name
|
|
|
|
* @brief add a category to a desktop
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI void
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_category_add(Efreet_Desktop *desktop, const char *category)
|
|
|
|
{
|
|
|
|
if (!desktop) return;
|
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
if (eina_list_search_unsorted(desktop->categories,
|
2009-03-26 10:56:51 -07:00
|
|
|
EINA_COMPARE_CB(strcmp), category)) return;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
desktop->categories = eina_list_append(desktop->categories,
|
2008-10-15 07:48:03 -07:00
|
|
|
(void *)eina_stringshare_add(category));
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param desktop: the desktop
|
|
|
|
* @param category: the category name
|
|
|
|
* @brief removes a category from a desktop
|
|
|
|
* @return 1 if the desktop had his category listed, 0 otherwise
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI int
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_category_del(Efreet_Desktop *desktop, const char *category)
|
|
|
|
{
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
char *found = NULL;
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
if (!desktop || !desktop->categories) return 0;
|
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
if ((found = eina_list_search_unsorted(desktop->categories,
|
2009-03-26 10:56:51 -07:00
|
|
|
EINA_COMPARE_CB(strcmp), category)))
|
2007-02-03 05:05:30 -08:00
|
|
|
{
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
eina_stringshare_del(found);
|
|
|
|
desktop->categories = eina_list_remove(desktop->categories, found);
|
|
|
|
|
|
|
|
return 1;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
return 0;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
2007-02-04 18:06:05 -08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @param type: The type to add to the list of matching types
|
2007-02-05 12:23:31 -08:00
|
|
|
* @param parse_func: a function to parse out custom fields
|
2007-02-05 13:16:55 -08:00
|
|
|
* @param save_func: a function to save data returned from @a parse_func
|
2007-02-05 12:23:31 -08:00
|
|
|
* @param free_func: a function to free data returned from @a parse_func
|
2007-09-06 09:15:10 -07:00
|
|
|
* @return Returns the id of the new type
|
2007-02-04 18:06:05 -08:00
|
|
|
* @brief Adds the given type to the list of types in the system
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI int
|
2007-02-05 12:23:31 -08:00
|
|
|
efreet_desktop_type_add(const char *type, Efreet_Desktop_Type_Parse_Cb parse_func,
|
2007-02-05 13:16:55 -08:00
|
|
|
Efreet_Desktop_Type_Save_Cb save_func,
|
2007-02-05 12:23:31 -08:00
|
|
|
Efreet_Desktop_Type_Free_Cb free_func)
|
2007-02-04 18:06:05 -08:00
|
|
|
{
|
|
|
|
int id;
|
2007-02-05 12:23:31 -08:00
|
|
|
Efreet_Desktop_Type_Info *info;
|
|
|
|
|
|
|
|
info = NEW(Efreet_Desktop_Type_Info, 1);
|
|
|
|
if (!info) return 0;
|
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
id = eina_list_count(efreet_desktop_types);
|
2007-02-05 13:16:55 -08:00
|
|
|
|
|
|
|
info->id = id;
|
2010-04-01 12:31:49 -07:00
|
|
|
info->type = eina_stringshare_add(type);
|
2007-02-05 12:23:31 -08:00
|
|
|
info->parse_func = parse_func;
|
2007-02-05 13:16:55 -08:00
|
|
|
info->save_func = save_func;
|
2007-02-05 12:23:31 -08:00
|
|
|
info->free_func = free_func;
|
2007-02-04 18:06:05 -08:00
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
efreet_desktop_types = eina_list_append(efreet_desktop_types, info);
|
2007-02-04 18:06:05 -08:00
|
|
|
|
2007-02-05 13:16:55 -08:00
|
|
|
return id;
|
2007-02-04 18:06:05 -08:00
|
|
|
}
|
|
|
|
|
2007-06-20 11:04:26 -07:00
|
|
|
/**
|
|
|
|
* @brief Add an alias for an existing desktop type.
|
|
|
|
* @param from_type the type to alias (e.g. EFREE_DESKTOP_TYPE_APPLICATION)
|
|
|
|
* @param alias the alias
|
|
|
|
* @return the new type id, or -1 if @p from_type was not valid
|
|
|
|
*
|
2007-09-06 09:15:10 -07:00
|
|
|
* This allows applications to add non-standard types that behave exactly as standard types.
|
2007-06-20 11:04:26 -07:00
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI int
|
|
|
|
efreet_desktop_type_alias(int from_type, const char *alias)
|
2007-06-20 11:04:26 -07:00
|
|
|
{
|
|
|
|
Efreet_Desktop_Type_Info *info;
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
info = eina_list_nth(efreet_desktop_types, from_type);
|
2007-06-20 11:04:26 -07:00
|
|
|
if (!info) return -1;
|
|
|
|
|
|
|
|
return efreet_desktop_type_add(alias, info->parse_func, info->save_func, info->free_func);
|
|
|
|
}
|
|
|
|
|
2010-04-15 12:20:31 -07:00
|
|
|
EAPI Eina_Bool
|
|
|
|
efreet_desktop_x_field_set(Efreet_Desktop *desktop, const char *key, const char *data)
|
2007-02-05 12:23:31 -08:00
|
|
|
{
|
2010-04-15 12:20:31 -07:00
|
|
|
if (!desktop || strncmp(key, "X-", 2))
|
|
|
|
return EINA_FALSE;
|
|
|
|
|
|
|
|
if (!desktop->x)
|
|
|
|
desktop->x = eina_hash_string_superfast_new(EINA_FREE_CB(eina_stringshare_del));
|
|
|
|
|
|
|
|
eina_hash_del_by_key(desktop->x, key);
|
|
|
|
eina_hash_add(desktop->x, key, eina_stringshare_add(data));
|
|
|
|
|
|
|
|
return EINA_TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
EAPI const char *
|
|
|
|
efreet_desktop_x_field_get(Efreet_Desktop *desktop, const char *key)
|
|
|
|
{
|
|
|
|
const char *ret;
|
|
|
|
|
|
|
|
if (!desktop || strncmp(key, "X-", 2))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!desktop->x)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
ret = eina_hash_find(desktop->x, key);
|
|
|
|
if (!ret)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return eina_stringshare_add(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
EAPI Eina_Bool
|
|
|
|
efreet_desktop_x_field_del(Efreet_Desktop *desktop, const char *key)
|
|
|
|
{
|
|
|
|
if (!desktop || strncmp(key, "X-", 2))
|
|
|
|
return EINA_FALSE;
|
|
|
|
|
|
|
|
if (!desktop->x)
|
|
|
|
return EINA_FALSE;
|
|
|
|
|
|
|
|
return eina_hash_del_by_key(desktop->x, key);
|
2007-02-05 12:23:31 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief get type specific data for custom desktop types
|
|
|
|
* @param desktop the desktop
|
|
|
|
* @return type specific data, or NULL if there is none
|
|
|
|
*/
|
2007-11-04 01:32:35 -08:00
|
|
|
EAPI void *
|
2007-02-05 12:23:31 -08:00
|
|
|
efreet_desktop_type_data_get(Efreet_Desktop *desktop)
|
|
|
|
{
|
|
|
|
return desktop->type_data;
|
|
|
|
}
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* @param string: the raw string list
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
* @return an Eina_List of ecore string's
|
2007-02-03 05:05:30 -08:00
|
|
|
* @brief Parse ';' separate list of strings according to the desktop spec
|
|
|
|
*/
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
EAPI Eina_List *
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_string_list_parse(const char *string)
|
|
|
|
{
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
Eina_List *list = NULL;
|
2007-02-03 05:05:30 -08:00
|
|
|
char *tmp;
|
|
|
|
char *s, *p;
|
2010-04-01 12:32:10 -07:00
|
|
|
size_t len;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
|
|
|
if (!string) return NULL;
|
|
|
|
|
2010-04-01 12:32:10 -07:00
|
|
|
len = strlen(string) + 1;
|
|
|
|
tmp = alloca(len);
|
|
|
|
memcpy(tmp, string, len);
|
2007-02-03 05:05:30 -08:00
|
|
|
s = tmp;
|
|
|
|
|
|
|
|
while ((p = strchr(s, ';')))
|
|
|
|
{
|
|
|
|
if (p > tmp && *(p-1) == '\\') continue;
|
|
|
|
*p = '\0';
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
list = eina_list_append(list, (void *)eina_stringshare_add(s));
|
2007-02-03 05:05:30 -08:00
|
|
|
s = p + 1;
|
|
|
|
}
|
|
|
|
/* If this is true, the .desktop file does not follow the standard */
|
|
|
|
if (*s)
|
|
|
|
{
|
2007-04-04 03:41:53 -07:00
|
|
|
#ifdef STRICT_SPEC
|
2009-09-21 09:36:29 -07:00
|
|
|
WRN("[Efreet]: Found a string list without ';' "
|
|
|
|
"at the end: %s", string);
|
2007-02-03 05:05:30 -08:00
|
|
|
#endif
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
list = eina_list_append(list, (void *)eina_stringshare_add(s));
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
* @param list: Eina_List with strings
|
2007-02-03 05:05:30 -08:00
|
|
|
* @return a raw string list
|
|
|
|
* @brief Create a ';' separate list of strings according to the desktop spec
|
|
|
|
*/
|
2007-11-04 04:29:36 -08:00
|
|
|
EAPI char *
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
efreet_desktop_string_list_join(Eina_List *list)
|
2007-02-03 05:05:30 -08:00
|
|
|
{
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
Eina_List *l;
|
2010-08-03 12:30:53 -07:00
|
|
|
const char *elem;
|
2007-02-03 05:05:30 -08:00
|
|
|
char *string;
|
|
|
|
size_t size, pos, len;
|
|
|
|
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
if (!list) return strdup("");
|
2007-02-03 05:05:30 -08:00
|
|
|
|
|
|
|
size = 1024;
|
|
|
|
string = malloc(size);
|
2010-08-03 12:31:04 -07:00
|
|
|
if (!string) return NULL;
|
2007-02-03 05:05:30 -08:00
|
|
|
pos = 0;
|
|
|
|
|
2010-08-03 12:30:53 -07:00
|
|
|
EINA_LIST_FOREACH(list, l, elem)
|
2007-02-03 05:05:30 -08:00
|
|
|
{
|
2010-08-03 12:30:53 -07:00
|
|
|
len = strlen(elem);
|
2007-02-03 05:05:30 -08:00
|
|
|
/* +1 for ';' */
|
|
|
|
if ((len + pos + 1) >= size)
|
|
|
|
{
|
2010-08-03 12:30:53 -07:00
|
|
|
char *tmp;
|
2007-05-04 08:02:55 -07:00
|
|
|
size = len + pos + 1024;
|
2010-08-03 12:30:53 -07:00
|
|
|
tmp = realloc(string, size);
|
|
|
|
if (!tmp)
|
|
|
|
{
|
|
|
|
free(string);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
string = tmp;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
2010-08-03 12:30:53 -07:00
|
|
|
strcpy(string + pos, elem);
|
2007-02-03 05:05:30 -08:00
|
|
|
pos += len;
|
|
|
|
strcpy(string + pos, ";");
|
|
|
|
pos += 1;
|
|
|
|
}
|
|
|
|
return string;
|
|
|
|
}
|
|
|
|
|
2010-04-15 12:20:31 -07:00
|
|
|
/*
|
|
|
|
* Needs EAPI because of helper binaries
|
|
|
|
*/
|
|
|
|
EAPI const char *
|
|
|
|
efreet_desktop_cache_file(void)
|
|
|
|
{
|
|
|
|
char tmp[PATH_MAX] = { '\0' };
|
|
|
|
const char *home, *lang, *country, *modifier;
|
|
|
|
|
|
|
|
if (cache_file) return cache_file;
|
|
|
|
|
|
|
|
home = efreet_home_dir_get();
|
|
|
|
lang = efreet_lang_get();
|
|
|
|
country = efreet_lang_country_get();
|
|
|
|
modifier = efreet_lang_modifier_get();
|
|
|
|
|
|
|
|
if (lang && country && modifier)
|
|
|
|
snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop_%s_%s@%s.cache", home, lang, country, modifier);
|
|
|
|
else if (lang && country)
|
|
|
|
snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop_%s_%s.cache", home, lang, country);
|
|
|
|
else if (lang)
|
|
|
|
snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop_%s.cache", home, lang);
|
|
|
|
else
|
|
|
|
snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop.cache", home);
|
|
|
|
|
|
|
|
cache_file = eina_stringshare_add(tmp);
|
|
|
|
return cache_file;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Needs EAPI because of helper binaries
|
|
|
|
*/
|
|
|
|
EAPI const char *
|
|
|
|
efreet_desktop_cache_dirs(void)
|
|
|
|
{
|
|
|
|
char tmp[PATH_MAX] = { '\0' };
|
|
|
|
|
|
|
|
if (cache_dirs) return cache_dirs;
|
|
|
|
|
|
|
|
snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop_dirs.cache", efreet_home_dir_get());
|
|
|
|
|
|
|
|
cache_dirs = eina_stringshare_add(tmp);
|
|
|
|
return cache_dirs;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: The desktop to check
|
|
|
|
* @return Returns 1 if the cache is still valid, 0 otherwise
|
|
|
|
* @brief This will check if the desktop cache is still valid.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
efreet_desktop_cache_check(Efreet_Desktop *desktop)
|
|
|
|
{
|
|
|
|
if (!desktop) return 0;
|
|
|
|
|
|
|
|
/* have we modified this file since we last read it in? */
|
|
|
|
if (ecore_file_mod_time(desktop->orig_path) != desktop->load_time)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: The desktop to fill
|
|
|
|
* @return Returns 1 on success, 0 on failure
|
|
|
|
* @brief initialize an Efreet_Desktop from the contents of @a file
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
efreet_desktop_read(Efreet_Desktop *desktop)
|
|
|
|
{
|
|
|
|
Efreet_Ini *ini;
|
|
|
|
int error = 0;
|
|
|
|
int ok;
|
|
|
|
|
|
|
|
ini = efreet_ini_new(desktop->orig_path);
|
2010-08-04 12:15:38 -07:00
|
|
|
if (!ini) return 0;
|
2010-04-15 12:20:31 -07:00
|
|
|
if (!ini->data)
|
|
|
|
{
|
|
|
|
efreet_ini_free(ini);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
ok = efreet_ini_section_set(ini, "Desktop Entry");
|
|
|
|
if (!ok) ok = efreet_ini_section_set(ini, "KDE Desktop Entry");
|
|
|
|
if (!ok)
|
|
|
|
{
|
|
|
|
ERR("efreet_desktop_new error: no Desktop Entry section");
|
|
|
|
error = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!error)
|
|
|
|
{
|
|
|
|
Efreet_Desktop_Type_Info *info;
|
|
|
|
|
|
|
|
info = efreet_desktop_type_parse(efreet_ini_string_get(ini, "Type"));
|
|
|
|
if (info)
|
|
|
|
{
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
desktop->type = info->id;
|
|
|
|
val = efreet_ini_string_get(ini, "Version");
|
|
|
|
if (val) desktop->version = strdup(val);
|
|
|
|
|
|
|
|
if (info->parse_func)
|
|
|
|
desktop->type_data = info->parse_func(desktop, ini);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
error = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!error && !efreet_desktop_environment_check(ini)) error = 1;
|
|
|
|
if (!error && !efreet_desktop_generic_fields_parse(desktop, ini)) error = 1;
|
|
|
|
if (!error)
|
|
|
|
eina_hash_foreach(ini->section, efreet_desktop_x_fields_parse, desktop);
|
|
|
|
|
|
|
|
efreet_ini_free(ini);
|
|
|
|
|
|
|
|
desktop->load_time = ecore_file_mod_time(desktop->orig_path);
|
|
|
|
|
|
|
|
if (error) return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param type_str: the type as a string
|
|
|
|
* @return the parsed type
|
|
|
|
* @brief parse the type string into an Efreet_Desktop_Type
|
|
|
|
*/
|
|
|
|
static Efreet_Desktop_Type_Info *
|
|
|
|
efreet_desktop_type_parse(const char *type_str)
|
|
|
|
{
|
|
|
|
Efreet_Desktop_Type_Info *info;
|
|
|
|
Eina_List *l;
|
|
|
|
|
|
|
|
if (!type_str) return NULL;
|
|
|
|
|
|
|
|
EINA_LIST_FOREACH(efreet_desktop_types, l, info)
|
|
|
|
{
|
|
|
|
if (!strcmp(info->type, type_str))
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @brief Free an Efreet Desktop_Type_Info struct
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
efreet_desktop_type_info_free(Efreet_Desktop_Type_Info *info)
|
|
|
|
{
|
|
|
|
if (!info) return;
|
|
|
|
IF_RELEASE(info->type);
|
|
|
|
free(info);
|
|
|
|
}
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: the Efreet_Desktop to store parsed fields in
|
|
|
|
* @param ini: the Efreet_Ini to parse fields from
|
2007-02-05 13:16:55 -08:00
|
|
|
* @return No value
|
2007-02-03 05:05:30 -08:00
|
|
|
* @brief Parse application specific desktop fields
|
|
|
|
*/
|
2007-02-05 13:16:55 -08:00
|
|
|
static void *
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_application_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini)
|
|
|
|
{
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
val = efreet_ini_string_get(ini, "TryExec");
|
|
|
|
if (val) desktop->try_exec = strdup(val);
|
|
|
|
|
|
|
|
val = efreet_ini_string_get(ini, "Exec");
|
|
|
|
if (val) desktop->exec = strdup(val);
|
|
|
|
|
|
|
|
val = efreet_ini_string_get(ini, "Path");
|
|
|
|
if (val) desktop->path = strdup(val);
|
|
|
|
|
|
|
|
val = efreet_ini_string_get(ini, "StartupWMClass");
|
|
|
|
if (val) desktop->startup_wm_class = strdup(val);
|
|
|
|
|
|
|
|
desktop->categories = efreet_desktop_string_list_parse(
|
|
|
|
efreet_ini_string_get(ini, "Categories"));
|
|
|
|
desktop->mime_types = efreet_desktop_string_list_parse(
|
|
|
|
efreet_ini_string_get(ini, "MimeType"));
|
|
|
|
|
|
|
|
desktop->terminal = efreet_ini_boolean_get(ini, "Terminal");
|
|
|
|
desktop->startup_notify = efreet_ini_boolean_get(ini, "StartupNotify");
|
|
|
|
|
2007-02-05 13:16:55 -08:00
|
|
|
return NULL;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: the Efreet_Desktop to save fields from
|
|
|
|
* @param ini: the Efreet_Ini to save fields to
|
|
|
|
* @return Returns no value
|
|
|
|
* @brief Save application specific desktop fields
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
efreet_desktop_application_fields_save(Efreet_Desktop *desktop, Efreet_Ini *ini)
|
|
|
|
{
|
|
|
|
char *val;
|
|
|
|
|
2007-09-06 09:15:10 -07:00
|
|
|
if (desktop->try_exec)
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_ini_string_set(ini, "TryExec", desktop->try_exec);
|
|
|
|
|
2007-09-06 09:15:10 -07:00
|
|
|
if (desktop->exec)
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_ini_string_set(ini, "Exec", desktop->exec);
|
|
|
|
|
2007-09-06 09:15:10 -07:00
|
|
|
if (desktop->path)
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_ini_string_set(ini, "Path", desktop->path);
|
|
|
|
|
|
|
|
if (desktop->startup_wm_class)
|
|
|
|
efreet_ini_string_set(ini, "StartupWMClass", desktop->startup_wm_class);
|
|
|
|
|
|
|
|
if (desktop->categories)
|
|
|
|
{
|
|
|
|
val = efreet_desktop_string_list_join(desktop->categories);
|
2010-08-04 12:15:53 -07:00
|
|
|
if (val)
|
|
|
|
{
|
|
|
|
efreet_ini_string_set(ini, "Categories", val);
|
|
|
|
FREE(val);
|
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (desktop->mime_types)
|
|
|
|
{
|
|
|
|
val = efreet_desktop_string_list_join(desktop->mime_types);
|
2010-08-04 12:15:53 -07:00
|
|
|
if (val)
|
|
|
|
{
|
|
|
|
efreet_ini_string_set(ini, "MimeType", val);
|
|
|
|
FREE(val);
|
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
efreet_ini_boolean_set(ini, "Terminal", desktop->terminal);
|
|
|
|
efreet_ini_boolean_set(ini, "StartupNotify", desktop->startup_notify);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: the Efreet_Desktop to store parsed fields in
|
|
|
|
* @param ini: the Efreet_Ini to parse fields from
|
2007-02-05 13:16:55 -08:00
|
|
|
* @return Returns no value
|
2007-02-03 05:05:30 -08:00
|
|
|
* @brief Parse link specific desktop fields
|
|
|
|
*/
|
2007-02-05 13:16:55 -08:00
|
|
|
static void *
|
2007-02-03 05:05:30 -08:00
|
|
|
efreet_desktop_link_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini)
|
|
|
|
{
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
val = efreet_ini_string_get(ini, "URL");
|
|
|
|
if (val) desktop->url = strdup(val);
|
2007-02-05 13:16:55 -08:00
|
|
|
return NULL;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: the Efreet_Desktop to save fields from
|
|
|
|
* @param ini: the Efreet_Ini to save fields in
|
|
|
|
* @return Returns no value
|
|
|
|
* @brief Save link specific desktop fields
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
efreet_desktop_link_fields_save(Efreet_Desktop *desktop, Efreet_Ini *ini)
|
|
|
|
{
|
|
|
|
if (desktop->url) efreet_ini_string_set(ini, "URL", desktop->url);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: the Efreet_Desktop to store parsed fields in
|
|
|
|
* @param ini: the Efreet_Ini to parse fields from
|
2010-09-08 04:27:59 -07:00
|
|
|
* @return 1 if parsed successfully, 0 otherwise
|
2007-02-03 05:05:30 -08:00
|
|
|
* @brief Parse desktop fields that all types can include
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
efreet_desktop_generic_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini)
|
|
|
|
{
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
val = efreet_ini_localestring_get(ini, "Name");
|
|
|
|
if (val) desktop->name = strdup(val);
|
2007-09-06 09:15:10 -07:00
|
|
|
else
|
2007-02-03 05:05:30 -08:00
|
|
|
{
|
2009-09-21 09:36:29 -07:00
|
|
|
ERR("efreet_desktop_generic_fields_parse error: no Name");
|
2007-02-03 05:05:30 -08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = efreet_ini_localestring_get(ini, "GenericName");
|
|
|
|
if (val) desktop->generic_name = strdup(val);
|
|
|
|
|
|
|
|
val = efreet_ini_localestring_get(ini, "Comment");
|
|
|
|
if (val) desktop->comment = strdup(val);
|
|
|
|
|
|
|
|
val = efreet_ini_localestring_get(ini, "Icon");
|
|
|
|
if (val) desktop->icon = strdup(val);
|
|
|
|
|
|
|
|
desktop->no_display = efreet_ini_boolean_get(ini, "NoDisplay");
|
|
|
|
desktop->hidden = efreet_ini_boolean_get(ini, "Hidden");
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param desktop: the Efreet_Desktop to save fields from
|
|
|
|
* @param ini: the Efreet_Ini to save fields to
|
|
|
|
* @return Returns nothing
|
|
|
|
* @brief Save desktop fields that all types can include
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
efreet_desktop_generic_fields_save(Efreet_Desktop *desktop, Efreet_Ini *ini)
|
|
|
|
{
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
if (desktop->name)
|
|
|
|
{
|
|
|
|
efreet_ini_localestring_set(ini, "Name", desktop->name);
|
|
|
|
val = efreet_ini_string_get(ini, "Name");
|
|
|
|
if (!val)
|
|
|
|
efreet_ini_string_set(ini, "Name", desktop->name);
|
|
|
|
}
|
|
|
|
if (desktop->generic_name)
|
|
|
|
{
|
|
|
|
efreet_ini_localestring_set(ini, "GenericName", desktop->generic_name);
|
|
|
|
val = efreet_ini_string_get(ini, "GenericName");
|
|
|
|
if (!val)
|
|
|
|
efreet_ini_string_set(ini, "GenericName", desktop->generic_name);
|
|
|
|
}
|
|
|
|
if (desktop->comment)
|
|
|
|
{
|
|
|
|
efreet_ini_localestring_set(ini, "Comment", desktop->comment);
|
|
|
|
val = efreet_ini_string_get(ini, "Comment");
|
|
|
|
if (!val)
|
|
|
|
efreet_ini_string_set(ini, "Comment", desktop->comment);
|
|
|
|
}
|
|
|
|
if (desktop->icon)
|
|
|
|
{
|
|
|
|
efreet_ini_localestring_set(ini, "Icon", desktop->icon);
|
|
|
|
val = efreet_ini_string_get(ini, "Icon");
|
|
|
|
if (!val)
|
|
|
|
efreet_ini_string_set(ini, "Icon", desktop->icon);
|
|
|
|
}
|
|
|
|
|
|
|
|
efreet_ini_boolean_set(ini, "NoDisplay", desktop->no_display);
|
|
|
|
efreet_ini_boolean_set(ini, "Hidden", desktop->hidden);
|
2007-11-22 22:57:39 -08:00
|
|
|
|
2008-12-17 07:33:43 -08:00
|
|
|
if (desktop->x) eina_hash_foreach(desktop->x, efreet_desktop_x_fields_save,
|
2010-02-04 01:12:35 -08:00
|
|
|
ini);
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param node: The node to work with
|
|
|
|
* @param desktop: The desktop file to work with
|
2009-02-26 14:35:38 -08:00
|
|
|
* @return Returns always true, to be used in eina_hash_foreach()
|
2007-11-22 22:57:39 -08:00
|
|
|
* @brief Parses out an X- key from @a node and stores in @a desktop
|
2007-02-03 05:05:30 -08:00
|
|
|
*/
|
2008-12-17 07:33:43 -08:00
|
|
|
static Eina_Bool
|
2009-02-26 14:35:38 -08:00
|
|
|
efreet_desktop_x_fields_parse(const Eina_Hash *hash __UNUSED__, const void *key, void *value, void *fdata)
|
2007-02-03 05:05:30 -08:00
|
|
|
{
|
2008-12-17 07:33:43 -08:00
|
|
|
Efreet_Desktop * desktop = fdata;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2009-02-26 14:35:38 -08:00
|
|
|
if (!desktop) return EINA_TRUE;
|
2008-12-17 07:33:43 -08:00
|
|
|
if (strncmp(key, "X-", 2)) return EINA_TRUE;
|
|
|
|
|
2009-02-26 14:35:38 -08:00
|
|
|
if (!desktop->x)
|
2010-02-04 01:12:35 -08:00
|
|
|
desktop->x = eina_hash_string_superfast_new(EINA_FREE_CB(eina_stringshare_del));
|
2010-03-25 22:33:12 -07:00
|
|
|
eina_hash_del_by_key(desktop->x, key);
|
2008-12-17 07:33:43 -08:00
|
|
|
eina_hash_add(desktop->x, key, (void *)eina_stringshare_add(value));
|
|
|
|
|
|
|
|
return EINA_TRUE;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
2007-11-22 22:57:39 -08:00
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param node: The node to work with
|
|
|
|
* @param ini: The ini file to work with
|
|
|
|
* @return Returns no value
|
|
|
|
* @brief Stores an X- key from @a node and stores in @a ini
|
|
|
|
*/
|
2008-12-17 07:33:43 -08:00
|
|
|
static Eina_Bool
|
2009-02-26 14:35:38 -08:00
|
|
|
efreet_desktop_x_fields_save(const Eina_Hash *hash __UNUSED__, const void *key, void *value, void *fdata)
|
2007-11-22 22:57:39 -08:00
|
|
|
{
|
2008-12-17 07:33:43 -08:00
|
|
|
Efreet_Ini *ini = fdata;
|
|
|
|
efreet_ini_string_set(ini, key, value);
|
|
|
|
|
|
|
|
return EINA_TRUE;
|
2007-11-22 22:57:39 -08:00
|
|
|
}
|
|
|
|
|
2007-02-03 05:05:30 -08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @internal
|
|
|
|
* @param ini: The Efreet_Ini to parse values from
|
|
|
|
* @return 1 if desktop should be included in current environement, 0 otherwise
|
2007-09-06 09:15:10 -07:00
|
|
|
* @brief Determines if a desktop should be included in the current environment,
|
2007-02-03 05:05:30 -08:00
|
|
|
* based on the values of the OnlyShowIn and NotShowIn fields
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
efreet_desktop_environment_check(Efreet_Ini *ini)
|
|
|
|
{
|
2009-02-25 08:46:51 -08:00
|
|
|
Eina_List *list;
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
int found = 0;
|
|
|
|
char *val;
|
|
|
|
|
|
|
|
if (!desktop_environment)
|
2010-02-04 01:12:35 -08:00
|
|
|
return 1;
|
2007-02-03 05:05:30 -08:00
|
|
|
|
|
|
|
list = efreet_desktop_string_list_parse(efreet_ini_string_get(ini, "OnlyShowIn"));
|
|
|
|
if (list)
|
|
|
|
{
|
2010-02-04 01:12:35 -08:00
|
|
|
EINA_LIST_FREE(list, val)
|
|
|
|
{
|
|
|
|
if (!strcmp(val, desktop_environment))
|
|
|
|
found = 1;
|
|
|
|
eina_stringshare_del(val);
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
return found;
|
|
|
|
}
|
|
|
|
|
2010-02-04 01:12:35 -08:00
|
|
|
list = efreet_desktop_string_list_parse(efreet_ini_string_get(ini, "NotShowIn"));
|
* estickies,
* etk,
* PROTO/exalt,
* E-MODULES-EXTRA/diskio,
* E-MODULES-EXTRA/drawer,
* E-MODULES-EXTRA/penguins,
* E-MODULES-EXTRA/slideshow,
* E-MODULES-EXTRA/mail,
* E-MODULES-EXTRA/forecasts,
* E-MODULES-EXTRA/iiirk,
* E-MODULES-EXTRA/places,
* e,
* ewl,
* ecore,
* elitaire,
* entrance,
* e_dbus,
* efreet: Here we go, move from Ecore_List to Eina_List.
NOTE: This patch is huge, I did test it a lot, and I hope nothing is
broken. But if you think something change after this commit, please
contact me ASAP.
SVN revision: 39200
2009-02-25 03:03:47 -08:00
|
|
|
EINA_LIST_FREE(list, val)
|
2010-02-04 01:12:35 -08:00
|
|
|
{
|
|
|
|
if (!strcmp(val, desktop_environment))
|
|
|
|
found = 1;
|
|
|
|
eina_stringshare_del(val);
|
|
|
|
}
|
2007-02-03 05:05:30 -08:00
|
|
|
|
2010-02-04 01:12:35 -08:00
|
|
|
return !found;
|
2007-02-03 05:05:30 -08:00
|
|
|
}
|
|
|
|
|
2010-03-01 10:16:32 -08:00
|
|
|
/*
|
|
|
|
* Needs EAPI because of helper binaries
|
|
|
|
*/
|
|
|
|
EAPI Eet_Data_Descriptor *
|
|
|
|
efreet_desktop_edd_init(void)
|
|
|
|
{
|
|
|
|
Eet_Data_Descriptor *edd;
|
|
|
|
|
|
|
|
Eet_Data_Descriptor_Class eddc;
|
2010-08-13 08:53:59 -07:00
|
|
|
if (!eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), "cache", sizeof(Efreet_Desktop))) return NULL;
|
2010-03-01 10:16:32 -08:00
|
|
|
edd = eet_data_descriptor_file_new(&eddc);
|
|
|
|
if (!edd) return NULL;
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "type", type, EET_T_INT);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "version", version, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "orig_path", orig_path, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "load_time", load_time, EET_T_LONG_LONG);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "name", name, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "generic_name", generic_name, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "comment", comment, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "icon", icon, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "try_exec", try_exec, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "exec", exec, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "path", path, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "startup_wm_class", startup_wm_class, EET_T_STRING);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "url", url, EET_T_STRING);
|
|
|
|
eet_data_descriptor_element_add(edd, "only_show_in", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Desktop, only_show_in), 0, NULL, NULL);
|
|
|
|
eet_data_descriptor_element_add(edd, "not_show_in", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Desktop, not_show_in), 0, NULL, NULL);
|
|
|
|
eet_data_descriptor_element_add(edd, "categories", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Desktop, categories), 0, NULL, NULL);
|
|
|
|
eet_data_descriptor_element_add(edd, "mime_types", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Desktop, mime_types), 0, NULL, NULL);
|
|
|
|
eet_data_descriptor_element_add(edd, "x", EET_T_STRING, EET_G_HASH, offsetof(Efreet_Desktop, x), 0, NULL, NULL);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "no_display", no_display, EET_T_UCHAR);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "hidden", hidden, EET_T_UCHAR);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "terminal", terminal, EET_T_UCHAR);
|
|
|
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Efreet_Desktop, "startup_notify", startup_notify, EET_T_UCHAR);
|
|
|
|
return edd;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Needs EAPI because of helper binaries
|
|
|
|
*/
|
|
|
|
EAPI void
|
|
|
|
efreet_desktop_edd_shutdown(Eet_Data_Descriptor *edd)
|
|
|
|
{
|
|
|
|
eet_data_descriptor_free(edd);
|
|
|
|
}
|
|
|
|
|
2010-05-13 11:31:41 -07:00
|
|
|
static int
|
2010-04-15 12:20:41 -07:00
|
|
|
efreet_desktop_write_cache_dirs_file(void)
|
2010-03-03 04:28:21 -08:00
|
|
|
{
|
|
|
|
char file[PATH_MAX];
|
|
|
|
int fd = -1;
|
|
|
|
int cachefd = -1;
|
|
|
|
char *dir;
|
|
|
|
struct stat st;
|
2010-06-11 14:48:33 -07:00
|
|
|
struct flock fl;
|
2010-03-03 04:28:21 -08:00
|
|
|
|
2010-05-13 11:31:41 -07:00
|
|
|
if (!efreet_desktop_dirs) return 1;
|
|
|
|
|
2010-04-03 11:45:46 -07:00
|
|
|
snprintf(file, sizeof(file), "%s/.efreet/desktop_data.lock", efreet_home_dir_get());
|
2010-06-11 14:48:33 -07:00
|
|
|
fd = open(file, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
|
2010-05-13 11:31:41 -07:00
|
|
|
if (fd < 0) return 0;
|
2010-03-03 04:28:21 -08:00
|
|
|
/* TODO: Retry update cache later */
|
2010-06-11 14:48:33 -07:00
|
|
|
memset(&fl, 0, sizeof(struct flock));
|
|
|
|
fl.l_type = F_WRLCK;
|
|
|
|
fl.l_whence = SEEK_SET;
|
|
|
|
if (fcntl(fd, F_SETLK, &fl) < 0) goto error;
|
2010-03-03 04:28:21 -08:00
|
|
|
|
2010-03-03 04:29:09 -08:00
|
|
|
cachefd = open(efreet_desktop_cache_dirs(), O_CREAT | O_APPEND | O_RDWR, S_IRUSR | S_IWUSR);
|
2010-03-03 04:28:21 -08:00
|
|
|
if (cachefd < 0) goto error;
|
|
|
|
if (fstat(cachefd, &st) < 0) goto error;
|
|
|
|
if (st.st_size > 0)
|
|
|
|
{
|
|
|
|
Eina_List *l, *ln;
|
|
|
|
char *p;
|
2010-08-29 01:47:37 -07:00
|
|
|
char *map;
|
2010-03-03 04:28:21 -08:00
|
|
|
|
|
|
|
map = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, cachefd, 0);
|
|
|
|
if (map == MAP_FAILED) goto error;
|
|
|
|
p = map;
|
|
|
|
while (p < map + st.st_size)
|
|
|
|
{
|
|
|
|
unsigned int size = *(unsigned int *)p;
|
|
|
|
p += sizeof(unsigned int);
|
|
|
|
EINA_LIST_FOREACH_SAFE(efreet_desktop_dirs, l, ln, dir)
|
|
|
|
{
|
|
|
|
if (!strcmp(dir, p))
|
|
|
|
{
|
|
|
|
efreet_desktop_dirs = eina_list_remove_list(efreet_desktop_dirs, l);
|
2010-04-01 12:31:49 -07:00
|
|
|
eina_stringshare_del(dir);
|
2010-03-03 04:28:21 -08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
p += size;
|
|
|
|
}
|
2010-08-29 01:47:37 -07:00
|
|
|
munmap(map, st.st_size);
|
2010-03-03 04:28:21 -08:00
|
|
|
}
|
|
|
|
EINA_LIST_FREE(efreet_desktop_dirs, dir)
|
|
|
|
{
|
|
|
|
unsigned int size = strlen(dir) + 1;
|
2010-06-24 18:38:50 -07:00
|
|
|
size_t count;
|
2010-06-24 09:17:45 -07:00
|
|
|
|
|
|
|
count = write(cachefd, &size, sizeof(int));
|
2010-06-24 18:38:50 -07:00
|
|
|
count += write(cachefd, dir, size);
|
2010-06-24 09:17:45 -07:00
|
|
|
|
2010-06-24 18:38:50 -07:00
|
|
|
if (count != sizeof(int) + size)
|
|
|
|
DBG("Didn't write all data on cachefd");
|
2010-04-15 12:38:01 -07:00
|
|
|
|
|
|
|
efreet_desktop_changes_monitor_add(dir);
|
2010-04-01 12:31:49 -07:00
|
|
|
eina_stringshare_del(dir);
|
2010-03-03 04:28:21 -08:00
|
|
|
}
|
|
|
|
efreet_desktop_dirs = NULL;
|
2010-08-28 08:11:20 -07:00
|
|
|
if (fd >= 0) close(fd);
|
|
|
|
if (cachefd >= 0) close(cachefd);
|
2010-05-13 11:31:41 -07:00
|
|
|
return 1;
|
2010-03-03 04:28:21 -08:00
|
|
|
|
|
|
|
error:
|
2010-08-28 08:11:20 -07:00
|
|
|
if (fd >= 0) close(fd);
|
|
|
|
if (cachefd >= 0) close(cachefd);
|
2010-05-13 11:31:41 -07:00
|
|
|
return 0;
|
2010-03-03 04:28:21 -08:00
|
|
|
}
|
2010-03-25 22:33:12 -07:00
|
|
|
|
|
|
|
static void
|
2010-04-15 12:20:51 -07:00
|
|
|
efreet_desktop_cache_update_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__,
|
|
|
|
Ecore_File_Event event, const char *path)
|
2010-03-25 22:33:12 -07:00
|
|
|
{
|
|
|
|
Eet_File *tmp;
|
2010-07-25 13:25:51 -07:00
|
|
|
Efreet_Event_Cache_Update *ev = NULL;
|
|
|
|
Efreet_Old_Cache *d = NULL;
|
2010-03-25 22:33:12 -07:00
|
|
|
|
|
|
|
if (strcmp(path, efreet_desktop_cache_file())) return;
|
|
|
|
if (event != ECORE_FILE_EVENT_CREATED_FILE &&
|
|
|
|
event != ECORE_FILE_EVENT_MODIFIED) return;
|
|
|
|
|
|
|
|
tmp = eet_open(efreet_desktop_cache_file(), EET_FILE_MODE_READ);
|
|
|
|
if (!tmp) return;
|
|
|
|
ev = NEW(Efreet_Event_Cache_Update, 1);
|
|
|
|
if (!ev) goto error;
|
2010-04-15 12:19:59 -07:00
|
|
|
d = NEW(Efreet_Old_Cache, 1);
|
2010-03-25 22:33:12 -07:00
|
|
|
if (!d) goto error;
|
|
|
|
|
|
|
|
d->desktop_cache = efreet_desktop_cache;
|
|
|
|
d->cache = cache;
|
2010-04-15 12:19:59 -07:00
|
|
|
old_caches = eina_list_append(old_caches, d);
|
2010-03-25 22:33:12 -07:00
|
|
|
|
|
|
|
efreet_desktop_cache = eina_hash_string_superfast_new(NULL);
|
|
|
|
cache = tmp;
|
|
|
|
|
2010-03-27 12:58:33 -07:00
|
|
|
efreet_util_desktop_cache_reload();
|
2010-04-15 12:21:03 -07:00
|
|
|
ecore_event_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE, ev, efreet_desktop_cache_update_free, d);
|
2010-03-25 22:33:12 -07:00
|
|
|
return;
|
|
|
|
error:
|
2010-07-25 13:25:51 -07:00
|
|
|
IF_FREE(ev);
|
|
|
|
IF_FREE(d);
|
2010-07-13 19:05:47 -07:00
|
|
|
eet_close(tmp);
|
2010-03-25 22:33:12 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
efreet_desktop_cache_update_free(void *data, void *ev)
|
|
|
|
{
|
2010-04-15 12:19:59 -07:00
|
|
|
Efreet_Old_Cache *d;
|
2010-03-29 22:29:49 -07:00
|
|
|
int dangling = 0;
|
2010-08-29 01:47:37 -07:00
|
|
|
|
2010-03-29 22:29:49 -07:00
|
|
|
d = data;
|
|
|
|
/*
|
|
|
|
* All users should now had the chance to update their pointers, so we can now
|
|
|
|
* free the old cache
|
|
|
|
*/
|
|
|
|
if (d->desktop_cache)
|
|
|
|
{
|
2010-03-27 12:57:33 -07:00
|
|
|
Eina_Iterator *it;
|
2010-03-27 13:53:52 -07:00
|
|
|
Eina_Hash_Tuple *tuple;
|
2010-08-29 01:47:37 -07:00
|
|
|
|
2010-03-27 13:53:52 -07:00
|
|
|
it = eina_hash_iterator_tuple_new(d->desktop_cache);
|
|
|
|
EINA_ITERATOR_FOREACH(it, tuple)
|
2010-03-29 22:29:49 -07:00
|
|
|
{
|
2010-08-29 01:47:37 -07:00
|
|
|
printf("Efreet: %d:%s still in cache on cache close!\n",
|
2010-04-01 12:32:00 -07:00
|
|
|
((Efreet_Desktop *)tuple->data)->ref, (char *)tuple->key);
|
2010-03-29 22:29:49 -07:00
|
|
|
dangling++;
|
|
|
|
}
|
2010-03-27 12:57:33 -07:00
|
|
|
eina_iterator_free(it);
|
2010-08-29 01:47:37 -07:00
|
|
|
|
2010-03-27 12:57:33 -07:00
|
|
|
eina_hash_free(d->desktop_cache);
|
2010-03-29 22:29:49 -07:00
|
|
|
}
|
2010-08-29 01:47:37 -07:00
|
|
|
/*
|
2010-03-29 22:29:49 -07:00
|
|
|
* If there are dangling references the eet file won't be closed - to
|
|
|
|
* avoid crashes, but this will leak instead.
|
|
|
|
*/
|
|
|
|
if (dangling == 0)
|
|
|
|
{
|
|
|
|
if (d->cache) eet_close(d->cache);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
printf("Efreet: ERROR. There are still %i desktop files with old\n"
|
|
|
|
"dangling references to desktop files. This application\n"
|
2010-04-15 12:21:03 -07:00
|
|
|
"has not handled the EFREET_EVENT_DESKTOP_CACHE_UPDATE\n"
|
|
|
|
"fully and released its references. Please fix the application\n"
|
|
|
|
"so it does this.\n",
|
2010-03-29 22:29:49 -07:00
|
|
|
dangling);
|
|
|
|
}
|
2010-04-15 12:19:59 -07:00
|
|
|
old_caches = eina_list_remove(old_caches, d);
|
2010-03-29 22:29:49 -07:00
|
|
|
free(d);
|
|
|
|
free(ev);
|
2010-03-25 22:33:12 -07:00
|
|
|
}
|
2010-04-03 11:45:57 -07:00
|
|
|
|
|
|
|
static void
|
|
|
|
efreet_desktop_update_cache(void)
|
|
|
|
{
|
2010-04-03 11:46:27 -07:00
|
|
|
if (!efreet_cache_update) return;
|
|
|
|
|
2010-04-06 11:36:25 -07:00
|
|
|
/* TODO: Make sure we don't create a lot of execs, maybe use a timer? */
|
2010-04-03 11:45:57 -07:00
|
|
|
if (efreet_desktop_job) ecore_job_del(efreet_desktop_job);
|
|
|
|
efreet_desktop_job = ecore_job_add(efreet_desktop_update_cache_job, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
efreet_desktop_update_cache_job(void *data __UNUSED__)
|
|
|
|
{
|
|
|
|
char file[PATH_MAX];
|
2010-06-11 14:48:33 -07:00
|
|
|
struct flock fl;
|
2010-04-03 11:45:57 -07:00
|
|
|
|
2010-08-13 21:02:31 -07:00
|
|
|
efreet_desktop_job = NULL;
|
2010-08-29 01:47:37 -07:00
|
|
|
|
2010-04-15 12:20:51 -07:00
|
|
|
/* TODO: Retry update cache later */
|
|
|
|
if (efreet_desktop_exe_lock > 0) return;
|
|
|
|
|
2010-05-13 11:31:41 -07:00
|
|
|
if (!efreet_desktop_write_cache_dirs_file()) return;
|
2010-04-03 11:45:57 -07:00
|
|
|
|
|
|
|
snprintf(file, sizeof(file), "%s/.efreet/desktop_exec.lock", efreet_home_dir_get());
|
|
|
|
|
2010-06-11 14:48:33 -07:00
|
|
|
efreet_desktop_exe_lock = open(file, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
|
2010-04-03 11:46:17 -07:00
|
|
|
if (efreet_desktop_exe_lock < 0) return;
|
2010-06-11 14:48:33 -07:00
|
|
|
memset(&fl, 0, sizeof(struct flock));
|
|
|
|
fl.l_type = F_WRLCK;
|
|
|
|
fl.l_whence = SEEK_SET;
|
|
|
|
if (fcntl(efreet_desktop_exe_lock, F_SETLK, &fl) < 0) goto error;
|
2010-04-17 13:19:35 -07:00
|
|
|
efreet_desktop_exe = ecore_exe_run(PACKAGE_LIB_DIR "/efreet/efreet_desktop_cache_create", NULL);
|
2010-04-03 11:45:57 -07:00
|
|
|
if (!efreet_desktop_exe) goto error;
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
error:
|
2010-04-03 11:46:17 -07:00
|
|
|
if (efreet_desktop_exe_lock > 0)
|
2010-04-03 11:45:57 -07:00
|
|
|
{
|
2010-04-03 11:46:17 -07:00
|
|
|
close(efreet_desktop_exe_lock);
|
|
|
|
efreet_desktop_exe_lock = -1;
|
2010-04-03 11:45:57 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-24 09:17:45 -07:00
|
|
|
static Eina_Bool
|
2010-04-03 11:45:57 -07:00
|
|
|
efreet_desktop_exe_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|
|
|
{
|
|
|
|
Ecore_Exe_Event_Del *ev;
|
|
|
|
|
|
|
|
ev = event;
|
2010-06-24 09:17:45 -07:00
|
|
|
if (ev->exe != efreet_desktop_exe) return ECORE_CALLBACK_RENEW;
|
2010-04-03 11:46:17 -07:00
|
|
|
if (efreet_desktop_exe_lock > 0)
|
2010-04-03 11:45:57 -07:00
|
|
|
{
|
2010-04-03 11:46:17 -07:00
|
|
|
close(efreet_desktop_exe_lock);
|
|
|
|
efreet_desktop_exe_lock = -1;
|
2010-04-03 11:45:57 -07:00
|
|
|
}
|
2010-06-24 09:17:45 -07:00
|
|
|
return ECORE_CALLBACK_RENEW;
|
2010-04-03 11:45:57 -07:00
|
|
|
}
|
2010-04-06 11:35:45 -07:00
|
|
|
|
|
|
|
static void
|
2010-04-15 12:21:13 -07:00
|
|
|
efreet_desktop_changes_listen(void)
|
2010-04-06 11:35:45 -07:00
|
|
|
{
|
|
|
|
int dirsfd = -1;
|
|
|
|
Eina_List *dirs;
|
|
|
|
char *path;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
change_monitors = eina_hash_string_superfast_new(EINA_FREE_CB(ecore_file_monitor_del));
|
|
|
|
if (!change_monitors) return;
|
|
|
|
|
|
|
|
dirs = efreet_default_dirs_get(efreet_data_home_get(),
|
|
|
|
efreet_data_dirs_get(), "applications");
|
|
|
|
|
|
|
|
EINA_LIST_FREE(dirs, path)
|
|
|
|
{
|
2010-04-15 12:21:23 -07:00
|
|
|
efreet_desktop_changes_listen_recursive(path);
|
2010-04-06 11:35:45 -07:00
|
|
|
eina_stringshare_del(path);
|
|
|
|
}
|
|
|
|
|
|
|
|
dirsfd = open(efreet_desktop_cache_dirs(), O_RDONLY, S_IRUSR | S_IWUSR);
|
2010-08-29 01:47:37 -07:00
|
|
|
if (dirsfd >= 0)
|
2010-04-06 11:35:45 -07:00
|
|
|
{
|
2010-08-29 01:47:37 -07:00
|
|
|
if ((fstat(dirsfd, &st) == 0) && (st.st_size > 0))
|
2010-04-06 11:35:45 -07:00
|
|
|
{
|
2010-08-29 01:47:37 -07:00
|
|
|
char *p;
|
|
|
|
char *map;
|
|
|
|
|
|
|
|
map = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, dirsfd, 0);
|
|
|
|
if (map == MAP_FAILED) goto error;
|
|
|
|
p = map;
|
|
|
|
while (p < map + st.st_size)
|
|
|
|
{
|
|
|
|
unsigned int size = *(unsigned int *)p;
|
|
|
|
p += sizeof(unsigned int);
|
|
|
|
efreet_desktop_changes_monitor_add(p);
|
|
|
|
p += size;
|
|
|
|
}
|
|
|
|
munmap(map, st.st_size);
|
2010-04-06 11:35:45 -07:00
|
|
|
}
|
2010-08-29 01:47:37 -07:00
|
|
|
close(dirsfd);
|
2010-04-06 11:35:45 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
error:
|
2010-08-29 01:47:37 -07:00
|
|
|
if (dirsfd >= 0) close(dirsfd);
|
2010-04-06 11:35:45 -07:00
|
|
|
}
|
|
|
|
|
2010-04-15 12:21:23 -07:00
|
|
|
static void
|
|
|
|
efreet_desktop_changes_listen_recursive(const char *path)
|
|
|
|
{
|
|
|
|
char buf[PATH_MAX];
|
|
|
|
DIR *files;
|
|
|
|
struct dirent *file;
|
|
|
|
|
2010-04-15 12:38:01 -07:00
|
|
|
efreet_desktop_changes_monitor_add(path);
|
2010-04-15 12:21:23 -07:00
|
|
|
|
|
|
|
files = opendir(path);
|
2010-04-15 19:20:56 -07:00
|
|
|
if (!files) return;
|
2010-04-15 12:21:23 -07:00
|
|
|
while ((file = readdir(files)))
|
|
|
|
{
|
|
|
|
if (!file) break;
|
|
|
|
if (!strcmp(file->d_name, ".") || !strcmp(file->d_name, "..")) continue;
|
|
|
|
|
|
|
|
snprintf(buf, sizeof(buf), "%s/%s", path, file->d_name);
|
|
|
|
if (ecore_file_is_dir(buf)) efreet_desktop_changes_listen_recursive(buf);
|
|
|
|
}
|
|
|
|
closedir(files);
|
|
|
|
}
|
|
|
|
|
2010-04-15 12:38:01 -07:00
|
|
|
static void
|
|
|
|
efreet_desktop_changes_monitor_add(const char *path)
|
|
|
|
{
|
|
|
|
char rp[PATH_MAX];
|
|
|
|
|
|
|
|
if (!realpath(path, rp)) return;
|
|
|
|
if (eina_hash_find(change_monitors, rp)) return;
|
|
|
|
eina_hash_add(change_monitors, rp,
|
|
|
|
ecore_file_monitor_add(rp,
|
|
|
|
efreet_desktop_changes_cb,
|
|
|
|
NULL));
|
|
|
|
}
|
|
|
|
|
2010-04-06 11:35:45 -07:00
|
|
|
static void
|
2010-04-15 12:21:13 -07:00
|
|
|
efreet_desktop_changes_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__,
|
2010-04-06 11:35:45 -07:00
|
|
|
Ecore_File_Event event, const char *path)
|
|
|
|
{
|
|
|
|
switch (event)
|
|
|
|
{
|
|
|
|
case ECORE_FILE_EVENT_NONE:
|
|
|
|
/* noop */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ECORE_FILE_EVENT_CREATED_FILE:
|
|
|
|
case ECORE_FILE_EVENT_DELETED_FILE:
|
|
|
|
case ECORE_FILE_EVENT_MODIFIED:
|
|
|
|
efreet_desktop_update_cache();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ECORE_FILE_EVENT_DELETED_SELF:
|
|
|
|
case ECORE_FILE_EVENT_DELETED_DIRECTORY:
|
|
|
|
eina_hash_del_by_key(change_monitors, path);
|
|
|
|
efreet_desktop_update_cache();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ECORE_FILE_EVENT_CREATED_DIRECTORY:
|
2010-04-15 12:38:01 -07:00
|
|
|
efreet_desktop_changes_monitor_add(path);
|
2010-04-06 11:35:45 -07:00
|
|
|
efreet_desktop_update_cache();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|