Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/iconbar
Dir : e17/apps/iconbar/src
Modified Files:
iconbar.c iconbar.h main.c
Added Files:
Makefile.am
Removed Files:
Makefile bg.c bg.h container.c container.h
Log Message:
Updating to use auto* tools
removed files that are in esmart now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- iconbar.c 20 Aug 2003 23:37:03 -0000 1.6
+++ iconbar.c 12 Dec 2003 20:21:34 -0000 1.7
@@ -1,6 +1,5 @@
#include "iconbar.h"
#include "util.h"
-#include "container.h"
#include <math.h>
#include <time.h>
/* smart object handlers */
@@ -22,7 +21,7 @@
void iconbar_icon_move(Icon *icon);
void iconbar_icons_fix(Iconbar *ib);
void iconbar_icons_load(Iconbar *ib);
-void write_out_order(Iconbar *ib);
+void write_out_order(void *data);
static int clock_timer(void *data);
@@ -396,7 +395,7 @@
DIR *dirp;
struct dirent *dp;
char dir[PATH_MAX];
- Evas_List *icons, *new = NULL;
+ Evas_List *icons = NULL, *new = NULL;
snprintf(dir, sizeof(dir), "%s/icons", ib->path);
dirp = opendir(dir);
@@ -485,37 +484,37 @@
}
void
-write_out_order(Iconbar *ib)
+write_out_order(void *data)
{
FILE *f;
char buf[PATH_MAX];
Evas_List *l, *ll;
-
- snprintf(buf, sizeof(buf), "%s/order.txt", ib->path);
-
-
- f = fopen(buf, "w");
-
- if (f)
+ Iconbar *ib = NULL;
+
+ if((ib = (Iconbar*)data))
{
- printf("file opened ok\n");
- for (l = e_container_elements_get(ib->cont); l; l = l->next)
+ snprintf(buf, sizeof(buf), "%s/order.txt", ib->path);
+ if ((f = fopen(buf, "w")))
{
- Evas_Object *obj = l->data;
- Icon *ic = evas_object_data_get(obj, "Icon");
- char *p;
-
- p = strrchr(ic->file, '/');
- if (p)
- {
- p++;
- fputs(p, f);
- fputs("\n", f);
- printf("write: %s\n", p);
- }
+ printf("file opened ok\n");
+ for (l = e_container_elements_get(ib->cont); l; l = l->next)
+ {
+ Evas_Object *obj = l->data;
+ Icon *ic = evas_object_data_get(obj, "Icon");
+ char *p;
+
+ p = strrchr(ic->file, '/');
+ if (p)
+ {
+ p++;
+ fputs(p, f);
+ fputs("\n", f);
+ printf("write: %s\n", p);
+ }
+ }
+ fclose(f);
}
}
- fclose(f);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- iconbar.h 27 Jul 2003 19:36:54 -0000 1.1
+++ iconbar.h 12 Dec 2003 20:21:34 -0000 1.2
@@ -4,6 +4,7 @@
#include <Evas.h>
#include <Ecore.h>
#include <Edje.h>
+#include <Esmart/container.h>
#include <stdlib.h>
#include <stdio.h>
#include <dirent.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- main.c 23 Aug 2003 02:35:57 -0000 1.2
+++ main.c 12 Dec 2003 20:21:34 -0000 1.3
@@ -2,12 +2,12 @@
#include <Ecore_X.h>
#include <Ecore_Evas.h>
#include <Evas.h>
+#include <Esmart/Esmart_Trans.h>
+
#include "iconbar.h"
-#include "bg.h"
#include "util.h"
-#include "../config.h"
+#include "config.h"
-#define PACKAGE_DATA_DIR PKGDIR"/share/iconbar/data/"
static void resize(Ecore_Evas *ee);
static void window_leave(Ecore_Evas *ee);
static int cb_exit(Ecore_Evas *ee);
@@ -48,14 +48,17 @@
evas_font_path_append(ecore_evas_get(ee), "/usr/local/share/elicit/data/font/");
-#ifdef TRANS_BG
+#ifdef HAVE_TRANS_BG
{
int x, y, w, h;
ecore_evas_geometry_get(ee, &x, &y, &w, &h);
- bg = transparency_get_pixmap(ecore_evas_get(ee), NULL, x, y, w, h);
+ bg = esmart_trans_x11_new(ecore_evas_get(ee));
evas_object_layer_set(bg, 0);
evas_object_move(bg, 0, 0);
evas_object_resize(bg, w, h);
+ evas_object_name_set(bg, "trans");
+
+ esmart_trans_x11_freshen(bg, x, y, w, h);
evas_object_show(bg);
}
#endif
@@ -92,11 +95,12 @@
resize(Ecore_Evas *ee)
{
int x, y, w, h;
+ Evas_Object *o = NULL;
ecore_evas_geometry_get(ee, &x, &y, &w, &h);
-#ifdef TRANS_BG
- bg = transparency_get_pixmap(ecore_evas_get(ee), bg, x, y, w, h);
- evas_object_resize(bg, w, h);
+#ifdef HAVE_TRANS_BG
+ if((o = evas_object_name_find(ecore_evas_get(ee), "trans")))
+ esmart_trans_x11_freshen(o, x, y, w, h);
#endif
evas_object_resize(iconbar, w, h);
}
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
