Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
Makefile.am dock.c engage.h icon.c main.c userconfig.c
Added Files:
tray.c
Log Message:
First lump of system tray work - needs a LOT, but psi works a bit :) - change #if 0 to
#if 1 in main.c around od_tray_init()
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 8 May 2004 17:48:28 -0000 1.7
+++ Makefile.am 5 Aug 2004 17:43:06 -0000 1.8
@@ -20,6 +20,7 @@
icon.c \
wm.c \
window.c \
+tray.c \
userconfig.c
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/dock.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- dock.c 3 Aug 2004 20:41:18 -0000 1.8
+++ dock.c 5 Aug 2004 17:43:06 -0000 1.9
@@ -95,6 +95,7 @@
x += 0.5 * (__icon->scale * options.size +
options.spacing); \
__icon->x = x; \
__icon->y = y; \
+ if (__icon->type == system_icon) od_tray_move(__icon);\
x += 0.5 * (__icon->scale * options.size +
options.spacing); \
__item = __item->next; \
} \
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/engage.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- engage.h 3 Aug 2004 20:41:19 -0000 1.16
+++ engage.h 5 Aug 2004 17:43:06 -0000 1.17
@@ -45,11 +45,16 @@
void od_dock_zoom_in();
void od_dock_zoom_out();
+void od_tray_init();
+void od_tray_move(OD_Icon *icon);
+
void od_icon_mapping_add(const char *winclass, const char *name,
const char *icon_name);
OD_Icon *od_icon_new_applnk(const char *command, const char *winclass);
OD_Icon *od_icon_new_dicon(const char *command, const char *name,
const char *icon_name);
+OD_Icon *od_icon_new_sysicon(const char *name, const char *icon_path,
+ Ecore_X_Window win);
OD_Icon *od_icon_new_minwin(Ecore_X_Window win);
void od_icon_grab(OD_Icon * icon, Ecore_X_Window win);
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/icon.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- icon.c 3 Aug 2004 20:41:19 -0000 1.33
+++ icon.c 5 Aug 2004 17:43:06 -0000 1.34
@@ -62,10 +62,10 @@
}
OD_Icon *
-od_icon_new_sysicon(const char *name, const char *icon_name)
+od_icon_new_sysicon(const char *name, const char *icon_name, Ecore_X_Window win)
{
OD_Icon *ret = od_icon_new(name, name, icon_name, system_icon);
-
+ ret->data.minwin.window = win;
return ret;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- main.c 5 Jul 2004 01:10:30 -0000 1.8
+++ main.c 5 Aug 2004 17:43:06 -0000 1.9
@@ -48,6 +48,10 @@
od_window_init();
od_dock_init();
+#if 0
+ // this is not getting added until we have a LOT more work done!!!
+ od_tray_init();
+#endif
od_icon_add_path(options.icon_path);
ecore_config_evas_font_path_apply(evas);
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/userconfig.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- userconfig.c 4 Aug 2004 19:39:14 -0000 1.5
+++ userconfig.c 5 Aug 2004 17:43:06 -0000 1.6
@@ -110,7 +110,7 @@
strncpy(file_title, next->d_name, title_len);
*(file_title + title_len) = '\0';
- od_dock_add_sysicon(od_icon_new_sysicon(""/*file_title*/, file_path));
+ od_dock_add_sysicon(od_icon_new_sysicon(""/*file_title*/, file_path, NULL));
free(file_path);
free(file_title);
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
