Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_dnd.c e_stolen.c e_utils.c e_utils.h
Log Message:
No need to duplicate this function.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.589
retrieving revision 1.590
diff -u -3 -r1.589 -r1.590
--- e_border.c 29 Apr 2007 03:24:16 -0000 1.589
+++ e_border.c 7 May 2007 18:01:42 -0000 1.590
@@ -96,8 +96,6 @@
static int _e_border_cb_ping_timer(void *data);
static int _e_border_cb_kill_timer(void *data);
-static char *_e_border_winid_str_get(Ecore_X_Window win);
-
static void _e_border_pointer_resize_begin(E_Border *bd);
static void _e_border_pointer_resize_end(E_Border *bd);
static void _e_border_pointer_move_begin(E_Border *bd);
@@ -466,9 +464,9 @@
bd->desk = e_desk_current_get(bd->zone);
e_container_border_add(bd);
borders = evas_list_append(borders, bd);
- borders_hash = evas_hash_add(borders_hash,
_e_border_winid_str_get(bd->client.win), bd);
- borders_hash = evas_hash_add(borders_hash,
_e_border_winid_str_get(bd->bg_win), bd);
- borders_hash = evas_hash_add(borders_hash,
_e_border_winid_str_get(bd->win), bd);
+ borders_hash = evas_hash_add(borders_hash,
e_util_winid_str_get(bd->client.win), bd);
+ borders_hash = evas_hash_add(borders_hash,
e_util_winid_str_get(bd->bg_win), bd);
+ borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->win),
bd);
managed = 1;
ecore_x_window_prop_card32_set(win, E_ATOM_MANAGED, &managed, 1);
ecore_x_window_prop_card32_set(win, E_ATOM_CONTAINER,
&bd->zone->container->num, 1);
@@ -2278,7 +2276,7 @@
{
E_Border *bd;
- bd = evas_hash_find(borders_hash, _e_border_winid_str_get(win));
+ bd = evas_hash_find(borders_hash, e_util_winid_str_get(win));
if ((bd) && (!e_object_is_del(E_OBJECT(bd))) &&
(bd->client.win == win))
return bd;
@@ -2290,7 +2288,7 @@
{
E_Border *bd;
- bd = evas_hash_find(borders_hash, _e_border_winid_str_get(win));
+ bd = evas_hash_find(borders_hash, e_util_winid_str_get(win));
if ((bd) && (!e_object_is_del(E_OBJECT(bd))) &&
(bd->bg_win == win))
return bd;
@@ -2302,7 +2300,7 @@
{
E_Border *bd;
- bd = evas_hash_find(borders_hash, _e_border_winid_str_get(win));
+ bd = evas_hash_find(borders_hash, e_util_winid_str_get(win));
if ((bd) && (!e_object_is_del(E_OBJECT(bd))) &&
(bd->win == win))
return bd;
@@ -3170,9 +3168,9 @@
e_bindings_wheel_ungrab(E_BINDING_CONTEXT_BORDER, bd->win);
ecore_x_window_del(bd->win);
- borders_hash = evas_hash_del(borders_hash,
_e_border_winid_str_get(bd->client.win), bd);
- borders_hash = evas_hash_del(borders_hash,
_e_border_winid_str_get(bd->bg_win), bd);
- borders_hash = evas_hash_del(borders_hash,
_e_border_winid_str_get(bd->win), bd);
+ borders_hash = evas_hash_del(borders_hash,
e_util_winid_str_get(bd->client.win), bd);
+ borders_hash = evas_hash_del(borders_hash,
e_util_winid_str_get(bd->bg_win), bd);
+ borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->win),
bd);
borders = evas_list_remove(borders, bd);
focus_stack = evas_list_remove(focus_stack, bd);
@@ -7253,26 +7251,6 @@
}
bd->kill_timer = NULL;
return 0;
-}
-
-static char *
-_e_border_winid_str_get(Ecore_X_Window win)
-{
- const char *vals = "qWeRtYuIoP5-$&<~";
- static char id[9];
- unsigned int val;
-
- val = (unsigned int)win;
- id[0] = vals[(val >> 28) & 0xf];
- id[1] = vals[(val >> 24) & 0xf];
- id[2] = vals[(val >> 20) & 0xf];
- id[3] = vals[(val >> 16) & 0xf];
- id[4] = vals[(val >> 12) & 0xf];
- id[5] = vals[(val >> 8) & 0xf];
- id[6] = vals[(val >> 4) & 0xf];
- id[7] = vals[(val ) & 0xf];
- id[8] = 0;
- return id;
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- e_dnd.c 5 Apr 2007 06:59:02 -0000 1.58
+++ e_dnd.c 7 May 2007 18:01:43 -0000 1.59
@@ -37,8 +37,6 @@
static int _e_dnd_cb_event_dnd_drop(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_selection(void *data, int type, void *event);
-static char *_e_dnd_winid_str_get(Ecore_X_Window win);
-
/* local subsystem globals */
typedef struct _XDnd XDnd;
@@ -391,7 +389,7 @@
{
const char *id;
- id = _e_dnd_winid_str_get(win);
+ id = e_util_winid_str_get(win);
if (reg)
{
if (!evas_hash_find(_drop_win_hash, id))
@@ -945,7 +943,7 @@
ev = event;
if (ev->source == _drag_win) return 1;
- id = _e_dnd_winid_str_get(ev->win);
+ id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1;
for (l = _drop_handlers; l; l = l->next)
{
@@ -1018,7 +1016,7 @@
ev = event;
if (ev->source == _drag_win) return 1;
- id = _e_dnd_winid_str_get(ev->win);
+ id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1;
printf("Xdnd leave\n");
@@ -1066,7 +1064,7 @@
ev = event;
if (ev->source == _drag_win) return 1;
- id = _e_dnd_winid_str_get(ev->win);
+ id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1;
rect.x = 0;
@@ -1137,7 +1135,7 @@
ev = event;
if (ev->source == _drag_win) return 1;
- id = _e_dnd_winid_str_get(ev->win);
+ id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1;
printf("Xdnd drop\n");
@@ -1156,7 +1154,7 @@
int i;
ev = event;
- id = _e_dnd_winid_str_get(ev->win);
+ id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1;
if (ev->selection != ECORE_X_SELECTION_XDND) return 1;
printf("Xdnd selection\n");
@@ -1223,24 +1221,4 @@
free(_xdnd);
_xdnd = NULL;
return 1;
-}
-
-static char *
-_e_dnd_winid_str_get(Ecore_X_Window win)
-{
- const char *vals = "qWeRtYuIoP5-$&<~";
- static char id[9];
- unsigned int val;
-
- val = (unsigned int)win;
- id[0] = vals[(val >> 28) & 0xf];
- id[1] = vals[(val >> 24) & 0xf];
- id[2] = vals[(val >> 20) & 0xf];
- id[3] = vals[(val >> 16) & 0xf];
- id[4] = vals[(val >> 12) & 0xf];
- id[5] = vals[(val >> 8) & 0xf];
- id[6] = vals[(val >> 4) & 0xf];
- id[7] = vals[(val ) & 0xf];
- id[8] = 0;
- return id;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_stolen.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_stolen.c 31 Jan 2006 12:06:47 -0000 1.1
+++ e_stolen.c 7 May 2007 18:01:43 -0000 1.2
@@ -3,8 +3,6 @@
*/
#include "e.h"
-static char *_e_stolen_winid_str_get(Ecore_X_Window win);
-
typedef struct _E_Stolen_Window E_Stolen_Window;
struct _E_Stolen_Window
@@ -21,7 +19,7 @@
{
E_Stolen_Window *esw;
- esw = evas_hash_find(_e_stolen_windows, _e_stolen_winid_str_get(win));
+ esw = evas_hash_find(_e_stolen_windows, e_util_winid_str_get(win));
if (esw) return 1;
return 0;
}
@@ -31,7 +29,7 @@
{
E_Stolen_Window *esw;
- esw = evas_hash_find(_e_stolen_windows, _e_stolen_winid_str_get(win));
+ esw = evas_hash_find(_e_stolen_windows, e_util_winid_str_get(win));
if (esw)
{
esw->refcount++;
@@ -41,7 +39,7 @@
esw = E_NEW(E_Stolen_Window, 1);
esw->win = win;
esw->refcount = 1;
- _e_stolen_windows = evas_hash_add(_e_stolen_windows,
_e_stolen_winid_str_get(win), esw);
+ _e_stolen_windows = evas_hash_add(_e_stolen_windows,
e_util_winid_str_get(win), esw);
}
return;
}
@@ -51,36 +49,15 @@
{
E_Stolen_Window *esw;
- esw = evas_hash_find(_e_stolen_windows, _e_stolen_winid_str_get(win));
+ esw = evas_hash_find(_e_stolen_windows, e_util_winid_str_get(win));
if (esw)
{
esw->refcount--;
if (esw->refcount == 0)
{
- _e_stolen_windows = evas_hash_del(_e_stolen_windows,
_e_stolen_winid_str_get(win), esw);
+ _e_stolen_windows = evas_hash_del(_e_stolen_windows,
e_util_winid_str_get(win), esw);
free(esw);
}
}
return;
-}
-
-/* local subsystem functions */
-static char *
-_e_stolen_winid_str_get(Ecore_X_Window win)
-{
- const char *vals = "qWeRtYuIoP5-$&<~";
- static char id[9];
- unsigned int val;
-
- val = (unsigned int)win;
- id[0] = vals[(val >> 28) & 0xf];
- id[1] = vals[(val >> 24) & 0xf];
- id[2] = vals[(val >> 20) & 0xf];
- id[3] = vals[(val >> 16) & 0xf];
- id[4] = vals[(val >> 12) & 0xf];
- id[5] = vals[(val >> 8) & 0xf];
- id[6] = vals[(val >> 4) & 0xf];
- id[7] = vals[(val ) & 0xf];
- id[8] = 0;
- return id;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_utils.c 4 May 2007 15:55:24 -0000 1.69
+++ e_utils.c 7 May 2007 18:01:43 -0000 1.70
@@ -913,6 +913,26 @@
ecore_idle_enterer_add(_e_util_cb_delayed_del, obj);
}
+EAPI const char *
+e_util_winid_str_get(Ecore_X_Window win)
+{
+ const char *vals = "qWeRtYuIoP5-$&<~";
+ static char id[9];
+ unsigned int val;
+
+ val = (unsigned int)win;
+ id[0] = vals[(val >> 28) & 0xf];
+ id[1] = vals[(val >> 24) & 0xf];
+ id[2] = vals[(val >> 20) & 0xf];
+ id[3] = vals[(val >> 16) & 0xf];
+ id[4] = vals[(val >> 12) & 0xf];
+ id[5] = vals[(val >> 8) & 0xf];
+ id[6] = vals[(val >> 4) & 0xf];
+ id[7] = vals[(val ) & 0xf];
+ id[8] = 0;
+ return id;
+}
+
/* local subsystem functions */
static int
_e_util_cb_delayed_del(void *data)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- e_utils.h 4 May 2007 15:55:24 -0000 1.39
+++ e_utils.h 7 May 2007 18:01:43 -0000 1.40
@@ -53,6 +53,7 @@
EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop,
const char *size, E_Menu_Item *mi);
EAPI int e_util_dir_check(const char *dir);
EAPI void e_util_defer_object_del(E_Object *obj);
+EAPI const char *e_util_winid_str_get(Ecore_X_Window win);
#endif
#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
