Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h aclass.c backgrounds.c buttons.c cursors.c desktops.c
ecompmgr.c econfig.c econfig.h emodule.h ewins.c focus.c fx.c
groups.c iclass.c iconify.c menus.c mod-misc.c mod-trans.c
pager.c slideout.c sound.c tclass.c theme.c tooltips.c warp.c
windowmatch.c
Log Message:
Change some stuff to const. Minor config tweaks.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -3 -r1.547 -r1.548
--- E.h 19 Apr 2006 19:13:46 -0000 1.547
+++ E.h 21 Apr 2006 22:52:58 -0000 1.548
@@ -205,6 +205,12 @@
typedef struct
{
+ int num;
+ const IpcItem *lst;
+} IpcItemList;
+
+typedef struct
+{
Window win;
Visual *vis;
int depth;
===================================================================
RCS file: /cvs/e/e16/e/src/aclass.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- aclass.c 18 Apr 2006 16:26:51 -0000 1.31
+++ aclass.c 21 Apr 2006 22:52:58 -0000 1.32
@@ -1445,7 +1445,7 @@
/*
* Module descriptor
*/
-EModule ModAclass = {
+const EModule ModAclass = {
"aclass", "ac",
AclassSighan,
{N_IPC_FUNCS, AclassIpcArray}
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- backgrounds.c 17 Apr 2006 21:55:34 -0000 1.67
+++ backgrounds.c 21 Apr 2006 22:52:58 -0000 1.68
@@ -2642,7 +2642,7 @@
/*
* Module descriptor
*/
-EModule ModBackgrounds = {
+const EModule ModBackgrounds = {
"backgrounds", "bg",
BackgroundsSighan,
{N_IPC_FUNCS, BackgroundsIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- buttons.c 18 Apr 2006 16:26:51 -0000 1.88
+++ buttons.c 21 Apr 2006 22:52:58 -0000 1.89
@@ -1192,7 +1192,7 @@
/*
* Module descriptor
*/
-EModule ModButtons = {
+const EModule ModButtons = {
"buttons", "btn",
ButtonsSighan,
{N_IPC_FUNCS, ButtonsIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/cursors.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- cursors.c 18 Feb 2006 08:30:08 -0000 1.31
+++ cursors.c 21 Apr 2006 22:52:58 -0000 1.32
@@ -372,7 +372,7 @@
/*
* Module descriptor
*/
-EModule ModCursors = {
+const EModule ModCursors = {
"cursor", "csr",
CursorSighan,
{N_IPC_FUNCS, CursorIpcArray}
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -3 -r1.239 -r1.240
--- desktops.c 20 Apr 2006 17:09:56 -0000 1.239
+++ desktops.c 21 Apr 2006 22:52:58 -0000 1.240
@@ -2945,7 +2945,7 @@
/*
* Module descriptor
*/
-EModule ModDesktops = {
+const EModule ModDesktops = {
"desktops", "desk",
DesksSighan,
{N_IPC_FUNCS, DesksIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- ecompmgr.c 18 Apr 2006 17:57:58 -0000 1.112
+++ ecompmgr.c 21 Apr 2006 22:52:58 -0000 1.113
@@ -2726,7 +2726,7 @@
CFG_ITEM_BOOL(Conf_compmgr, use_name_pixmap, 0),
CFG_ITEM_BOOL(Conf_compmgr, fading.enable, 1),
CFG_ITEM_INT(Conf_compmgr, fading.dt_us, 10000),
- CFG_ITEM_INT(Conf_compmgr, fading.step, 0x10000000),
+ CFG_ITEM_HEX(Conf_compmgr, fading.step, 0x10000000),
CFG_ITEM_INT(Conf_compmgr, override_redirect.mode, 1),
CFG_ITEM_INT(Conf_compmgr, override_redirect.opacity, 90),
};
@@ -2735,7 +2735,7 @@
/*
* Module descriptor
*/
-EModule ModCompMgr = {
+const EModule ModCompMgr = {
"compmgr", "cm",
ECompMgrSighan,
{N_IPC_FUNCS, CompMgrIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/econfig.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- econfig.c 7 Jan 2006 07:20:58 -0000 1.9
+++ econfig.c 21 Apr 2006 22:52:58 -0000 1.10
@@ -196,6 +196,12 @@
}
static void
+e16_db_hex_set(ECfgFile * ecf, const char *key, unsigned int value)
+{
+ fprintf(ecf->fs, "%s = %#x\n", key, value);
+}
+
+static void
e16_db_float_set(ECfgFile * ecf, const char *key, float value)
{
fprintf(ecf->fs, "%s = %f\n", key, value);
@@ -239,6 +245,7 @@
*((char *)ci->ptr) = my_int;
break;
case ITEM_TYPE_INT:
+ case ITEM_TYPE_HEX:
if (!edf || !e16_db_int_get(edf, name, &my_int))
my_int = ci->dflt;
*((int *)ci->ptr) = my_int;
@@ -281,6 +288,9 @@
case ITEM_TYPE_INT:
e16_db_int_set(edf, name, *((int *)ci->ptr));
break;
+ case ITEM_TYPE_HEX:
+ e16_db_hex_set(edf, name, *((unsigned int *)ci->ptr));
+ break;
case ITEM_TYPE_FLOAT:
e16_db_float_set(edf, name, *((float *)ci->ptr));
break;
@@ -412,6 +422,9 @@
break;
case ITEM_TYPE_INT:
Esnprintf(buf, len, "%d", *((int *)ci->ptr));
+ break;
+ case ITEM_TYPE_HEX:
+ Esnprintf(buf, len, "%#x", *((unsigned int *)ci->ptr));
break;
case ITEM_TYPE_FLOAT:
Esnprintf(buf, len, "%.3f", *((float *)ci->ptr));
===================================================================
RCS file: /cvs/e/e16/e/src/econfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- econfig.h 7 Jan 2006 07:20:58 -0000 1.5
+++ econfig.h 21 Apr 2006 22:52:58 -0000 1.6
@@ -32,16 +32,24 @@
void (*func) (void *item, const char *value);
} CfgItem;
+typedef struct
+{
+ int num;
+ const CfgItem *lst;
+} CfgItemList;
+
typedef enum
{
ITEM_TYPE_BOOL,
ITEM_TYPE_INT,
+ ITEM_TYPE_HEX,
ITEM_TYPE_FLOAT,
ITEM_TYPE_STRING
} cfg_item_type_e;
#define CFG_ITEM_BOOL(conf, name, dflt) { #name, &conf.name, ITEM_TYPE_BOOL,
dflt, NULL }
#define CFG_ITEM_INT(conf, name, dflt) { #name, &conf.name, ITEM_TYPE_INT,
dflt, NULL }
+#define CFG_ITEM_HEX(conf, name, dflt) { #name, &conf.name, ITEM_TYPE_HEX,
dflt, NULL }
#define CFG_ITEM_STR(conf, name) { #name, &conf.name,
ITEM_TYPE_STRING, 0, NULL }
#define CFG_FUNC_BOOL(conf, name, dflt, func) { #name, &conf.name,
ITEM_TYPE_BOOL, dflt, func }
===================================================================
RCS file: /cvs/e/e16/e/src/emodule.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- emodule.h 9 Apr 2006 10:18:33 -0000 1.9
+++ emodule.h 21 Apr 2006 22:52:58 -0000 1.10
@@ -30,16 +30,8 @@
const char *name;
const char *nick;
void (*Signal) (int sig, void *prm);
- struct
- {
- int num;
- const IpcItem *lst;
- } ipc;
- struct
- {
- int num;
- const CfgItem *lst;
- } cfg;
+ IpcItemList ipc;
+ CfgItemList cfg;
} EModule;
typedef enum
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- ewins.c 19 Apr 2006 17:23:34 -0000 1.155
+++ ewins.c 21 Apr 2006 22:52:58 -0000 1.156
@@ -2252,7 +2252,7 @@
/*
* Module descriptor
*/
-EModule ModEwins = {
+const const EModule ModEwins = {
"ewins", NULL,
EwinsSighan,
{N_IPC_FUNCS, EwinsIpcArray}
===================================================================
RCS file: /cvs/e/e16/e/src/focus.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- focus.c 16 Apr 2006 13:27:37 -0000 1.144
+++ focus.c 21 Apr 2006 22:52:58 -0000 1.145
@@ -1023,7 +1023,7 @@
/*
* Module descriptor
*/
-EModule ModFocus = {
+const EModule ModFocus = {
"focus", NULL,
FocusSighan,
{N_IPC_FUNCS, FocusIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/fx.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- fx.c 18 Apr 2006 16:26:51 -0000 1.65
+++ fx.c 21 Apr 2006 22:52:59 -0000 1.66
@@ -1083,7 +1083,7 @@
/*
* Module descriptor
*/
-EModule ModEffects = {
+const EModule ModEffects = {
"effects", "efx",
FxSighan,
{N_IPC_FUNCS, FxIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/groups.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- groups.c 19 Apr 2006 17:23:34 -0000 1.79
+++ groups.c 21 Apr 2006 22:52:59 -0000 1.80
@@ -1494,7 +1494,7 @@
};
#define N_CFG_ITEMS (sizeof(GroupsCfgItems)/sizeof(CfgItem))
-EModule ModGroups = {
+const EModule ModGroups = {
"groups", "grp",
GroupsSighan,
{N_IPC_FUNCS, GroupsIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- iclass.c 18 Apr 2006 16:26:51 -0000 1.96
+++ iclass.c 21 Apr 2006 22:52:59 -0000 1.97
@@ -1616,7 +1616,7 @@
/*
* Module descriptor
*/
-EModule ModImageclass = {
+const EModule ModImageclass = {
"imageclass", "ic",
ImageclassSighan,
{N_IPC_FUNCS, ImageclassIpcArray}
===================================================================
RCS file: /cvs/e/e16/e/src/iconify.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- iconify.c 17 Apr 2006 21:55:34 -0000 1.200
+++ iconify.c 21 Apr 2006 22:52:59 -0000 1.201
@@ -2610,7 +2610,7 @@
/*
* Module descriptor
*/
-EModule ModIconboxes = {
+const EModule ModIconboxes = {
"iconboxes", "ibox",
IconboxesSighan,
{N_IPC_FUNCS, IconboxesIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -3 -r1.237 -r1.238
--- menus.c 17 Apr 2006 21:55:34 -0000 1.237
+++ menus.c 21 Apr 2006 22:52:59 -0000 1.238
@@ -2136,19 +2136,19 @@
CFG_ITEM_BOOL(Conf.menus, warp, 1),
CFG_ITEM_BOOL(Conf.menus, show_icons, 1),
CFG_ITEM_INT(Conf.menus, icon_size, 16),
- CFG_ITEM_INT(Conf.menus, key.left, XK_Left),
- CFG_ITEM_INT(Conf.menus, key.right, XK_Right),
- CFG_ITEM_INT(Conf.menus, key.up, XK_Up),
- CFG_ITEM_INT(Conf.menus, key.down, XK_Down),
- CFG_ITEM_INT(Conf.menus, key.escape, XK_Escape),
- CFG_ITEM_INT(Conf.menus, key.ret, XK_Return),
+ CFG_ITEM_HEX(Conf.menus, key.left, XK_Left),
+ CFG_ITEM_HEX(Conf.menus, key.right, XK_Right),
+ CFG_ITEM_HEX(Conf.menus, key.up, XK_Up),
+ CFG_ITEM_HEX(Conf.menus, key.down, XK_Down),
+ CFG_ITEM_HEX(Conf.menus, key.escape, XK_Escape),
+ CFG_ITEM_HEX(Conf.menus, key.ret, XK_Return),
};
#define N_CFG_ITEMS (sizeof(MenusCfgItems)/sizeof(CfgItem))
/*
* Module descriptor
*/
-EModule ModMenus = {
+const EModule ModMenus = {
"menus", "menu",
MenusSighan,
{N_IPC_FUNCS, MenusIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/mod-misc.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- mod-misc.c 19 Apr 2006 19:13:46 -0000 1.32
+++ mod-misc.c 21 Apr 2006 22:52:59 -0000 1.33
@@ -30,35 +30,35 @@
**********************************************************************/
/* Use static module list for now */
-extern EModule ModAclass;
-extern EModule ModBackgrounds;
-extern EModule ModButtons;
+extern const EModule ModAclass;
+extern const EModule ModBackgrounds;
+extern const EModule ModButtons;
#if USE_COMPOSITE
-extern EModule ModCompMgr;
+extern const EModule ModCompMgr;
#endif
-extern EModule ModCursors;
-extern EModule ModDesktops;
-extern EModule ModEffects;
-extern EModule ModEwins;
-extern EModule ModFocus;
-extern EModule ModGroups;
-extern EModule ModImageclass;
-extern EModule ModIconboxes;
-extern EModule ModMenus;
-extern EModule ModMisc;
-extern EModule ModPagers;
-extern EModule ModSlideouts;
-extern EModule ModSound;
-extern EModule ModTextclass;
-extern EModule ModTheme;
-extern EModule ModTooltips;
+extern const EModule ModCursors;
+extern const EModule ModDesktops;
+extern const EModule ModEffects;
+extern const EModule ModEwins;
+extern const EModule ModFocus;
+extern const EModule ModGroups;
+extern const EModule ModImageclass;
+extern const EModule ModIconboxes;
+extern const EModule ModMenus;
+extern const EModule ModMisc;
+extern const EModule ModPagers;
+extern const EModule ModSlideouts;
+extern const EModule ModSound;
+extern const EModule ModTextclass;
+extern const EModule ModTheme;
+extern const EModule ModTooltips;
#ifdef ENABLE_THEME_TRANSPARENCY
-extern EModule ModTransparency;
+extern const EModule ModTransparency;
#endif
-extern EModule ModWarplist;
-extern EModule ModWindowMatch;
+extern const EModule ModWarplist;
+extern const EModule ModWindowMatch;
const EModule *p_modules[] = {
&ModAclass,
@@ -227,7 +227,7 @@
#define N_IPC_FUNCS (sizeof(MiscIpcArray)/sizeof(IpcItem))
/* Stuff not elsewhere */
-EModule ModMisc = {
+const const EModule ModMisc = {
"misc", NULL,
NULL,
{N_IPC_FUNCS, MiscIpcArray}
===================================================================
RCS file: /cvs/e/e16/e/src/mod-trans.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- mod-trans.c 16 Apr 2006 13:27:38 -0000 1.17
+++ mod-trans.c 21 Apr 2006 22:52:59 -0000 1.18
@@ -333,7 +333,7 @@
/*
* Module descriptor
*/
-EModule ModTransparency = {
+const EModule ModTransparency = {
"transparency", "tr",
TransparencySighan,
{N_IPC_FUNCS, TransIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -3 -r1.206 -r1.207
--- pager.c 18 Apr 2006 16:26:51 -0000 1.206
+++ pager.c 21 Apr 2006 22:52:59 -0000 1.207
@@ -2068,7 +2068,7 @@
/*
* Module descriptor
*/
-EModule ModPagers = {
+const EModule ModPagers = {
"pagers", "pg",
PagersSighan,
{N_IPC_FUNCS, PagersIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/slideout.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- slideout.c 18 Feb 2006 08:30:09 -0000 1.52
+++ slideout.c 21 Apr 2006 22:52:59 -0000 1.53
@@ -523,7 +523,7 @@
/*
* Module descriptor
*/
-EModule ModSlideouts = {
+const EModule ModSlideouts = {
"slideouts", "slideout",
SlideoutsSighan,
{N_IPC_FUNCS, SlideoutsIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/sound.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- sound.c 19 Mar 2006 14:59:48 -0000 1.41
+++ sound.c 21 Apr 2006 22:52:59 -0000 1.42
@@ -559,7 +559,7 @@
/*
* Module descriptor
*/
-EModule ModSound = {
+const EModule ModSound = {
"sound", "audio",
SoundSighan,
{N_IPC_FUNCS, SoundIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/tclass.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- tclass.c 16 Apr 2006 22:27:06 -0000 1.42
+++ tclass.c 21 Apr 2006 22:52:59 -0000 1.43
@@ -642,7 +642,7 @@
/*
* Module descriptor
*/
-EModule ModTextclass = {
+const EModule ModTextclass = {
"textclass", "tc",
TextclassSighan,
{N_IPC_FUNCS, TextclassIpcArray}
===================================================================
RCS file: /cvs/e/e16/e/src/theme.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- theme.c 19 Apr 2006 19:13:46 -0000 1.56
+++ theme.c 21 Apr 2006 22:52:59 -0000 1.57
@@ -507,7 +507,7 @@
/*
* Module descriptor
*/
-EModule ModTheme = {
+const EModule ModTheme = {
"theme", "th",
ThemesSighan,
{N_IPC_FUNCS, ThemeIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/tooltips.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- tooltips.c 16 Apr 2006 22:27:06 -0000 1.98
+++ tooltips.c 21 Apr 2006 22:52:59 -0000 1.99
@@ -919,7 +919,7 @@
/*
* Module descriptor
*/
-EModule ModTooltips = {
+const EModule ModTooltips = {
"tooltips", "tt",
TooltipsSighan,
{N_IPC_FUNCS, TooltipsIpcArray},
===================================================================
RCS file: /cvs/e/e16/e/src/warp.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- warp.c 16 Apr 2006 22:27:06 -0000 1.87
+++ warp.c 21 Apr 2006 22:52:59 -0000 1.88
@@ -484,7 +484,7 @@
};
#define N_CFG_ITEMS (sizeof(WarplistCfgItems)/sizeof(CfgItem))
-EModule ModWarplist = {
+const EModule ModWarplist = {
"warplist", "warp",
WarplistSighan,
{0, NULL},
===================================================================
RCS file: /cvs/e/e16/e/src/windowmatch.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- windowmatch.c 2 Apr 2006 09:45:40 -0000 1.47
+++ windowmatch.c 21 Apr 2006 22:52:59 -0000 1.48
@@ -920,7 +920,7 @@
/*
* Module descriptor
*/
-EModule ModWindowMatch = {
+const EModule ModWindowMatch = {
"winmatch", NULL,
WindowMatchSighan,
{N_IPC_FUNCS, WindowMatchIpcArray}
-------------------------------------------------------
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
