From c97009d44779d8a395010e22ce7d6c8643b43858 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Sun, 25 Mar 2007 16:17:19 +0000 Subject: [PATCH] Find desktop by wm_class SVN revision: 29126 --- legacy/efreet/src/bin/ef_cache.c | 5 ++++- legacy/efreet/src/lib/efreet_utils.c | 8 ++++---- legacy/efreet/src/lib/efreet_utils.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/legacy/efreet/src/bin/ef_cache.c b/legacy/efreet/src/bin/ef_cache.c index dac0d6c798..c2856e0fc4 100644 --- a/legacy/efreet/src/bin/ef_cache.c +++ b/legacy/efreet/src/bin/ef_cache.c @@ -13,6 +13,9 @@ timer(void *data) start = ecore_time_get(); desktop = efreet_util_desktop_generic_name_find("Mail/News"); printf("Mail/News: %p %.3f\n", desktop, (ecore_time_get() - start)); + start = ecore_time_get(); + desktop = efreet_util_desktop_wm_class_find("Mozilla-firefox-bin", NULL); + printf("Mozilla-firefox-bin: %p %.3f\n", desktop, (ecore_time_get() - start)); return 0; } @@ -21,7 +24,7 @@ int main(int argc, char **argv) { if (!efreet_init()) return 1; - ecore_timer_add(1.0, timer, NULL); + ecore_timer_add(2.0, timer, NULL); ecore_main_loop_begin(); efreet_shutdown(); return 0; diff --git a/legacy/efreet/src/lib/efreet_utils.c b/legacy/efreet/src/lib/efreet_utils.c index 67d337e93a..9705a5bf17 100644 --- a/legacy/efreet/src/lib/efreet_utils.c +++ b/legacy/efreet/src/lib/efreet_utils.c @@ -28,7 +28,7 @@ struct _Efreet_Cache_Search static int _efreet_util_cache_fill(void *data); static void _efreet_util_cache_dir_free(void *data); -static void _efreet_util_cache_search_wmclass(void *value, void *data); +static void _efreet_util_cache_search_wm_class(void *value, void *data); static void _efreet_util_cache_search_name(void *value, void *data); static void _efreet_util_cache_search_generic_name(void *value, void *data); @@ -162,7 +162,7 @@ efreet_util_path_to_file_id(const char *path) } Efreet_Desktop * -efreet_util_desktop_wmclass_find(const char *wmname, const char *wmclass) +efreet_util_desktop_wm_class_find(const char *wmname, const char *wmclass) { Efreet_Cache_Search search; @@ -170,7 +170,7 @@ efreet_util_desktop_wmclass_find(const char *wmname, const char *wmclass) search.desktop = NULL; search.what1 = wmname; search.what2 = wmclass; - ecore_hash_for_each_node(desktop_by_exec, _efreet_util_cache_search_wmclass, &search); + ecore_hash_for_each_node(desktop_by_exec, _efreet_util_cache_search_wm_class, &search); return search.desktop; } @@ -382,7 +382,7 @@ _efreet_util_cache_dir_free(void *data) } static void -_efreet_util_cache_search_wmclass(void *value, void *data) +_efreet_util_cache_search_wm_class(void *value, void *data) { Ecore_Hash_Node *node; Efreet_Cache_Search *search; diff --git a/legacy/efreet/src/lib/efreet_utils.h b/legacy/efreet/src/lib/efreet_utils.h index b2363e8497..616838cade 100644 --- a/legacy/efreet/src/lib/efreet_utils.h +++ b/legacy/efreet/src/lib/efreet_utils.h @@ -5,7 +5,7 @@ char *efreet_util_path_in_default(const char *section, const char *path); const char *efreet_util_path_to_file_id(const char *path); -Efreet_Desktop *efreet_util_desktop_wmclass_find(const char *wmname, const char *wmclass); +Efreet_Desktop *efreet_util_desktop_wm_class_find(const char *wmname, const char *wmclass); Efreet_Desktop *efreet_util_desktop_file_id_find(const char *file_id); Efreet_Desktop *efreet_util_desktop_exec_find(const char *exec); Efreet_Desktop *efreet_util_desktop_name_find(const char *name);