Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h arrange.c buttons.c buttons.h
Log Message:
Eliminate some obsolete code.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -3 -r1.552 -r1.553
--- E.h 29 Apr 2006 19:39:20 -0000 1.552
+++ E.h 30 Apr 2006 13:23:01 -0000 1.553
@@ -517,14 +517,6 @@
}
EMode;
-typedef struct _rectbox
-{
- void *data;
- int x, y, w, h;
- int p;
-}
-RectBox;
-
/*
* Function prototypes
*/
===================================================================
RCS file: /cvs/e/e16/e/src/arrange.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- arrange.c 30 Apr 2006 13:15:52 -0000 1.92
+++ arrange.c 30 Apr 2006 13:23:01 -0000 1.93
@@ -27,6 +27,13 @@
#include "groups.h"
#include "screen.h"
+typedef struct
+{
+ void *data;
+ int x, y, w, h;
+ int p;
+} RectBox;
+
static int
ArrangeAddToList(int *array, int current_size, int value)
{
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- buttons.c 29 Apr 2006 19:39:20 -0000 1.91
+++ buttons.c 30 Apr 2006 13:23:01 -0000 1.92
@@ -393,24 +393,6 @@
}
int
-ButtonGetInfo(const Button * b, RectBox * r, Desk * desk)
-{
- if (!EoIsShown(b) || ButtonIsInternal(b))
- return -1;
- if (!EoIsSticky(b) && EoGetDesk(b) != desk)
- return -1;
-
- r->data = NULL;
- r->x = EoGetX(b);
- r->y = EoGetY(b);
- r->w = EoGetW(b);
- r->h = EoGetH(b);
- r->p = EoIsSticky(b);
-
- return 0;
-}
-
-int
ButtonDoShowDefault(const Button * b)
{
return !b->internal && b->default_show;
@@ -474,12 +456,6 @@
autosave();
}
-Button **
-ButtonsGetList(int *pnum)
-{
- return (Button **) ecore_list_items_get(button_list, pnum);
-}
-
void
ButtonsForeach(int id, Desk * dsk, void (*func) (Button * b))
{
@@ -944,12 +920,10 @@
{
char s[FILEPATH_LEN_MAX], st[FILEPATH_LEN_MAX];
FILE *fs;
- int i, num;
- Button **blst;
+ Button *b;
int flags;
- blst = ButtonsGetList(&num);
- if (!blst)
+ if (ecore_list_nodes(button_list) <= 0)
return;
Etmp(st);
@@ -957,64 +931,61 @@
if (!fs)
return;
- for (i = 0; i < num; i++)
- {
- if (blst[i]->id != 0 || blst[i]->internal)
- continue;
-
- fprintf(fs, "4 999\n");
- fprintf(fs, "100 %s\n", EoGetName(blst[i]));
- if (blst[i]->iclass)
- fprintf(fs, "12 %s\n", ImageclassGetName(blst[i]->iclass));
- if (blst[i]->aclass)
- fprintf(fs, "11 %s\n", ActionclassGetName(blst[i]->aclass));
- if (EoGetLayer(blst[i]) >= 0)
- fprintf(fs, "453 %i\n", EoGetLayer(blst[i]));
- fprintf(fs, "456 %i\n", blst[i]->geom.width.min);
- fprintf(fs, "457 %i\n", blst[i]->geom.width.max);
- fprintf(fs, "468 %i\n", blst[i]->geom.height.min);
- fprintf(fs, "469 %i\n", blst[i]->geom.height.max);
- fprintf(fs, "528 %i\n", blst[i]->geom.xorigin);
- fprintf(fs, "529 %i\n", blst[i]->geom.yorigin);
- fprintf(fs, "530 %i\n", blst[i]->geom.xabs);
- fprintf(fs, "531 %i\n", blst[i]->geom.xrel);
- fprintf(fs, "532 %i\n", blst[i]->geom.yabs);
- fprintf(fs, "533 %i\n", blst[i]->geom.yrel);
- fprintf(fs, "534 %i\n", blst[i]->geom.xsizerel);
- fprintf(fs, "535 %i\n", blst[i]->geom.xsizeabs);
- fprintf(fs, "536 %i\n", blst[i]->geom.ysizerel);
- fprintf(fs, "537 %i\n", blst[i]->geom.ysizeabs);
- fprintf(fs, "538 %i\n", blst[i]->geom.size_from_image);
- fprintf(fs, "539 %i\n", EoGetDeskNum(blst[i]));
- fprintf(fs, "540 %i\n", EoIsSticky(blst[i]));
- fprintf(fs, "542 %i\n", EoIsShown(blst[i]));
+ ECORE_LIST_FOR_EACH(button_list, b)
+ {
+ if (b->id != 0 || b->internal)
+ continue;
- if (blst[i]->flags)
- {
- flags = 0;
- if (((blst[i]->flags & FLAG_FIXED_HORIZ)
- && (blst[i]->flags & FLAG_FIXED_VERT))
- || (blst[i]->flags & FLAG_FIXED))
- flags = 2;
- else if (blst[i]->flags & FLAG_FIXED_HORIZ)
- flags = 3;
- else if (blst[i]->flags & FLAG_FIXED_VERT)
- flags = 4;
- else if (blst[i]->flags & FLAG_TITLE)
- flags = 0;
- else if (blst[i]->flags & FLAG_MINIICON)
- flags = 1;
- fprintf(fs, "454 %i\n", flags);
- }
- fprintf(fs, "1000\n");
- }
+ fprintf(fs, "4 999\n");
+ fprintf(fs, "100 %s\n", EoGetName(b));
+ if (b->iclass)
+ fprintf(fs, "12 %s\n", ImageclassGetName(b->iclass));
+ if (b->aclass)
+ fprintf(fs, "11 %s\n", ActionclassGetName(b->aclass));
+ if (EoGetLayer(b) >= 0)
+ fprintf(fs, "453 %i\n", EoGetLayer(b));
+ fprintf(fs, "456 %i\n", b->geom.width.min);
+ fprintf(fs, "457 %i\n", b->geom.width.max);
+ fprintf(fs, "468 %i\n", b->geom.height.min);
+ fprintf(fs, "469 %i\n", b->geom.height.max);
+ fprintf(fs, "528 %i\n", b->geom.xorigin);
+ fprintf(fs, "529 %i\n", b->geom.yorigin);
+ fprintf(fs, "530 %i\n", b->geom.xabs);
+ fprintf(fs, "531 %i\n", b->geom.xrel);
+ fprintf(fs, "532 %i\n", b->geom.yabs);
+ fprintf(fs, "533 %i\n", b->geom.yrel);
+ fprintf(fs, "534 %i\n", b->geom.xsizerel);
+ fprintf(fs, "535 %i\n", b->geom.xsizeabs);
+ fprintf(fs, "536 %i\n", b->geom.ysizerel);
+ fprintf(fs, "537 %i\n", b->geom.ysizeabs);
+ fprintf(fs, "538 %i\n", b->geom.size_from_image);
+ fprintf(fs, "539 %i\n", EoGetDeskNum(b));
+ fprintf(fs, "540 %i\n", EoIsSticky(b));
+ fprintf(fs, "542 %i\n", EoIsShown(b));
+
+ if (b->flags)
+ {
+ flags = 0;
+ if (((b->flags & FLAG_FIXED_HORIZ) &&
+ (b->flags & FLAG_FIXED_VERT)) || (b->flags & FLAG_FIXED))
+ flags = 2;
+ else if (b->flags & FLAG_FIXED_HORIZ)
+ flags = 3;
+ else if (b->flags & FLAG_FIXED_VERT)
+ flags = 4;
+ else if (b->flags & FLAG_TITLE)
+ flags = 0;
+ else if (b->flags & FLAG_MINIICON)
+ flags = 1;
+ fprintf(fs, "454 %i\n", flags);
+ }
+ fprintf(fs, "1000\n");
+ }
fclose(fs);
Esnprintf(s, sizeof(s), "%s.buttons", EGetSavePrefix());
E_mv(st, s);
-
- Efree(blst);
}
/*
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- buttons.h 6 Apr 2006 21:20:16 -0000 1.9
+++ buttons.h 30 Apr 2006 13:23:01 -0000 1.10
@@ -49,12 +49,10 @@
void ButtonSwallowInto(Button * b, EObj * eo);
void ButtonSetCallback(Button * b, ButtonCbFunc * func,
EObj * eo);
-int ButtonGetInfo(const Button * b, RectBox * r, Desk * d);
int ButtonDoShowDefault(const Button * b);
int ButtonEmbedWindow(Button * ButtonToUse,
Window WindowToEmbed);
-Button **ButtonsGetList(int *pnum);
void ButtonsForeach(int id, Desk * dsk,
void (*func) (Button * b));
void ButtonsMoveStickyToDesk(Desk * d);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
