Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h actions.c config.c dialog.c econfig.c econfig.h
evhandlers.c ewmh.c focus.c iconify.c ipc.c main.c menus.c
mod-bg.c mod-misc.c mod-sound.c mod-tt.c settings.c setup.c
sound.c
Log Message:
Configuration defaults, this and that.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.3
retrieving revision 1.314.2.4
diff -u -3 -r1.314.2.3 -r1.314.2.4
--- E.h 31 Jul 2004 20:25:51 -0000 1.314.2.3
+++ E.h 3 Aug 2004 23:19:02 -0000 1.314.2.4
@@ -913,12 +913,12 @@
{
char iconify;
char kill;
+ char mirror;
char move;
char raise;
char set_border;
- char stick;
char shade;
- char mirror;
+ char stick;
}
GroupConfig;
@@ -1037,7 +1037,7 @@
struct
{
char enable;
- float delay;
+ int delay; /* milliseconds */
} autoraise;
struct
{
@@ -1113,6 +1113,10 @@
} snap;
struct
{
+ char enable;
+ } sound;
+ struct
+ {
char *name;
int transparency;
} theme;
@@ -1120,7 +1124,7 @@
{
char enable;
char showroottooltip;
- float delay;
+ int delay; /* milliseconds */
} tooltips;
struct
{
@@ -1158,7 +1162,6 @@
int slidespeedcleanup;
char animate_shading;
int shadespeed;
- char sound;
int button_move_resistance;
char autosave;
char memory_paranoia;
@@ -1170,11 +1173,11 @@
int edge_flip_resistance;
/* Not used */
- char primaryicondir;
#ifdef HAS_XINERAMA
char extra_head; /* Not used */
#endif
#if 0 /* Not used */
+ char primaryicondir;
TextClass *icon_textclass;
int icon_mode;
#endif
@@ -2326,7 +2329,6 @@
void EDisplayMemUse(void);
/* menus.c */
-void MenusInit(void);
void MenusHide(void);
MenuStyle *MenuStyleCreate(void);
Menu *MenuCreate(const char *name);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.174.2.1
retrieving revision 1.174.2.2
diff -u -3 -r1.174.2.1 -r1.174.2.2
--- actions.c 31 Jul 2004 20:25:51 -0000 1.174.2.1
+++ actions.c 3 Aug 2004 23:19:03 -0000 1.174.2.2
@@ -356,6 +356,8 @@
return -1;
af = &ActionFunctions[id];
+ if (!af->func)
+ return -1;
if (!af->ok_zoom && InZoom())
return 0;
@@ -386,7 +388,7 @@
return 0;
}
- return ActionFunctions[id].func(ewin, params);
+ return af->func(ewin, params);
}
static int
@@ -1825,6 +1827,7 @@
edummy = NULL;
}
+#if 0
static int
doSoundSet(EWin * edummy, const void *params)
{
@@ -1852,6 +1855,7 @@
EDBUG_RETURN(0);
edummy = NULL;
}
+#endif
static int
doButtonMoveResistSet(EWin * edummy, const void *params)
@@ -3250,7 +3254,7 @@
{0, 0, 0, 0, doSlideModeSet}, /* ACTION_SLIDEMODE_SET @@ */
{0, 0, 0, 0, doCleanupSlideSet}, /* ACTION_CLEANUPSILDE_SET @@ */
{0, 0, 0, 0, doMapSlideSet}, /* ACTION_MAPSLIDE_SET @@ */
- {0, 0, 0, 0, doSoundSet}, /* ACTION_SOUND_SET @@ */
+ {0, 0, 0, 0, NULL}, /* ACTION_SOUND_SET @@ */
{0, 0, 0, 0, doButtonMoveResistSet}, /* ACTION_BUTTONMOVE_RESIST_SET @@ */
{0, 0, 0, 0, doDesktopBgTimeoutSet}, /* ACTION_DESKTOPBG_TIMEOUT_SET @@ */
{0, 0, 0, 0, doMapSlideSpeedSet}, /* ACTION_MAPSLIDE_SPEED_SET @@ */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.111.2.3
retrieving revision 1.111.2.4
diff -u -3 -r1.111.2.3 -r1.111.2.4
--- config.c 31 Jul 2004 20:25:52 -0000 1.111.2.3
+++ config.c 3 Aug 2004 23:19:03 -0000 1.111.2.4
@@ -537,7 +537,7 @@
case CONFIG_CLOSE:
return;
case CONFIG_SOUND:
- Conf.sound = i2;
+ Conf.sound.enable = i2;
break;
case CONTROL_SAVE_UNDER:
Conf.save_under = i2;
@@ -636,14 +636,14 @@
break;
case CONTROL_TOOLTIPTIME:
sscanf(s, "%*i %f", &f1);
- Conf.tooltips.delay = f1;
+ Conf.tooltips.delay = f1 * 1000;
break;
case CONTROL_AUTORAISE:
Conf.autoraise.enable = i2;
break;
case CONTROL_AUTORAISETIME:
sscanf(s, "%*i %f", &f1);
- Conf.autoraise.delay = f1;
+ Conf.autoraise.delay = f1 * 1000;
break;
case CONTROL_GROUP_BORDER:
Conf.groups.dflt.set_border = i2;
@@ -2033,7 +2033,7 @@
ImageClass *ic = 0;
ImageState *ICToRead = 0;
ColorModifierClass *cm = 0;
- int fields;;
+ int fields;
int l, r, t, b;
while (GetLine(s, sizeof(s), ConfigFile))
@@ -3268,9 +3268,6 @@
EDBUG(5, "Dummy-LoadOpenConfigFile");
LoadOpenConfigFile(OpenConfigFileForReading
(GetGenericSMFile(), 0));
-#if ENABLE_EDB /* Override */
- ConfigurationLoad();
-#endif
SoundInit();
is_autosave = 0;
}
@@ -3312,102 +3309,9 @@
EDBUG_RETURN_;
fprintf(autosavefile, "0 999\n");
- fprintf(autosavefile, "307 %i\n", (int)Conf.focus.mode);
- fprintf(autosavefile, "311 %i\n", (int)Conf.movemode);
- fprintf(autosavefile, "312 %i\n", (int)Conf.resizemode);
- fprintf(autosavefile, "1371 %i\n", (int)Conf.geominfomode);
- fprintf(autosavefile, "9 %i\n", (int)Conf.sound);
- fprintf(autosavefile, "313 %i\n", (int)Conf.slidemode);
- fprintf(autosavefile, "314 %i\n", (int)Conf.cleanupslide);
- fprintf(autosavefile, "315 %i\n", (int)Conf.mapslide);
- fprintf(autosavefile, "316 %i\n", (int)Conf.slidespeedmap);
- fprintf(autosavefile, "317 %i\n", (int)Conf.slidespeedcleanup);
- fprintf(autosavefile, "320 %i\n", (int)Conf.backgrounds.timeout);
- fprintf(autosavefile, "321 %i\n", (int)Conf.button_move_resistance);
- fprintf(autosavefile, "400 %i\n", (int)Conf.desks.dragdir);
- fprintf(autosavefile, "401 %i\n", (int)Conf.desks.dragbar_width);
- fprintf(autosavefile, "402 %i\n", (int)Conf.desks.dragbar_ordering);
- fprintf(autosavefile, "403 %i\n", (int)Conf.desks.dragbar_length);
- fprintf(autosavefile, "404 %i\n", (int)Conf.desks.slidein);
- fprintf(autosavefile, "405 %i\n", (int)Conf.desks.slidespeed);
- fprintf(autosavefile, "406 %i\n", (int)Conf.backgrounds.hiquality);
- fprintf(autosavefile, "1370 %i\n", (int)Conf.dockapp_support);
- fprintf(autosavefile, "325 %i\n", (int)Conf.dock.dirmode);
- fprintf(autosavefile, "326 %i\n", (int)Conf.shadespeed);
- fprintf(autosavefile, "327 %i\n", (int)Conf.tooltips.enable);
- fprintf(autosavefile, "328 %f\n", (float)Conf.tooltips.delay);
- fprintf(autosavefile, "338 %i\n", (int)Conf.autoraise.enable);
- fprintf(autosavefile, "339 %f\n", (float)Conf.autoraise.delay);
- fprintf(autosavefile, "331 %i\n", (int)Conf.save_under);
- fprintf(autosavefile, "330 %i %i\n", (int)Conf.dock.startx,
- (int)Conf.dock.starty);
- fprintf(autosavefile, "334 %i\n", (int)Conf.memory_paranoia);
- fprintf(autosavefile, "332 %i\n", (int)Conf.menuslide);
- fprintf(autosavefile, "333 %i\n", (int)Conf.desks.num);
- fprintf(autosavefile, "335 %i\n", (int)Conf.focus.transientsfollowleader);
- fprintf(autosavefile, "336 %i\n", (int)Conf.focus.switchfortransientmap);
- fprintf(autosavefile, "407 %i %i\n", (int)Conf.areas.nx, (int)Conf.areas.ny);
- fprintf(autosavefile, "340 %i\n", (int)Conf.focus.all_new_windows_get_focus);
- fprintf(autosavefile, "341 %i\n", (int)Conf.focus.new_transients_get_focus);
- fprintf(autosavefile, "342 %i\n",
- (int)Conf.focus.new_transients_get_focus_if_group_focused);
- fprintf(autosavefile, "343 %i\n", (int)Conf.place.manual);
- fprintf(autosavefile, "3360 %i\n", (int)Conf.place.manual_mouse_pointer);
- fprintf(autosavefile, "3361 %i\n", (int)Conf.place.ignore_struts);
- fprintf(autosavefile, "344 %i\n", (int)Conf.focus.raise_on_next);
- fprintf(autosavefile, "345 %i\n", (int)Conf.focus.warp_on_next);
- fprintf(autosavefile, "346 %i\n", (int)Conf.edge_flip_resistance);
- fprintf(autosavefile, "347 %i\n", (int)Conf.pagers.enable);
- fprintf(autosavefile, "348 %i\n", (int)Conf.pagers.hiq);
- fprintf(autosavefile, "349 %i\n", (int)Conf.pagers.snap);
- fprintf(autosavefile, "350 %i\n", (int)Conf.animate_shading);
- fprintf(autosavefile, "351 %i\n", (int)Conf.menusonscreen);
- fprintf(autosavefile, "352 %i\n", (int)Conf.areas.wraparound);
- fprintf(autosavefile, "353 %i\n", (int)Conf.dialogs.headers);
- fprintf(autosavefile, "354 %i\n", (int)Conf.desks.wraparound);
- fprintf(autosavefile, "666 %i\n", (int)Conf.warpmenus);
- fprintf(autosavefile, "667 %i\n", (int)Conf.warplist.warpsticky);
- fprintf(autosavefile, "668 %i\n", (int)Conf.warplist.warpshaded);
- fprintf(autosavefile, "669 %i\n", (int)Conf.warplist.warpiconified);
- fprintf(autosavefile, "670 %i\n", (int)Conf.warplist.warpfocused);
- fprintf(autosavefile, "1350 %i\n", (int)Conf.backgrounds.user);
- fprintf(autosavefile, "1351 %i\n", (int)Conf.pagers.zoom);
- fprintf(autosavefile, "1352 %i\n", (int)Conf.pagers.title);
- fprintf(autosavefile, "1353 %i\n", (int)Conf.warplist.raise_on_select);
- fprintf(autosavefile, "1354 %i\n", (int)Conf.warplist.enable);
- fprintf(autosavefile, "1355 %i\n", (int)Conf.warplist.warp_on_select);
- fprintf(autosavefile, "1356 %i\n", (int)Conf.pagers.scanspeed);
- fprintf(autosavefile, "1358 %i\n", (int)Conf.groups.dflt.set_border);
- fprintf(autosavefile, "1359 %i\n", (int)Conf.groups.dflt.kill);
- fprintf(autosavefile, "1360 %i\n", (int)Conf.groups.dflt.move);
- fprintf(autosavefile, "1361 %i\n", (int)Conf.groups.dflt.raise);
- fprintf(autosavefile, "1362 %i\n", (int)Conf.groups.dflt.iconify);
- fprintf(autosavefile, "1363 %i\n", (int)Conf.groups.dflt.stick);
- fprintf(autosavefile, "1364 %i\n", (int)Conf.groups.dflt.shade);
- fprintf(autosavefile, "1365 %i\n", (int)Conf.groups.dflt.mirror);
- fprintf(autosavefile, "1372 %i\n", (int)Conf.groups.swapmove);
- fprintf(autosavefile, "1367 %i\n", (int)Conf.focus.clickraises);
- fprintf(autosavefile, "1368 %i\n", (int)Conf.tooltips.showroottooltip);
- fprintf(autosavefile, "1369 %i %i %i\n", (int)Conf.pagers.sel_button,
- (int)Conf.pagers.win_button, (int)Conf.pagers.menu_button);
-#ifdef ENABLE_THEME_TRANSPARENCY
- fprintf(autosavefile, "1373 %i\n", (int)Conf.theme.transparency);
- fprintf(autosavefile, "1375 %i\n", (int)Conf.st_trans.border);
- fprintf(autosavefile, "1376 %i\n", (int)Conf.st_trans.widget);
- fprintf(autosavefile, "1377 %i\n", (int)Conf.st_trans.iconbox);
- fprintf(autosavefile, "1378 %i\n", (int)Conf.st_trans.menu);
- fprintf(autosavefile, "1379 %i\n", (int)Conf.st_trans.menu_item);
- fprintf(autosavefile, "1380 %i\n", (int)Conf.st_trans.tooltip);
- fprintf(autosavefile, "1381 %i\n", (int)Conf.st_trans.dialog);
- fprintf(autosavefile, "1382 %i\n", (int)Conf.st_trans.hilight);
- fprintf(autosavefile, "1383 %i\n", (int)Conf.st_trans.pager);
- fprintf(autosavefile, "1384 %i\n", (int)Conf.st_trans.warplist);
-#endif
-#ifdef HAS_XINERAMA
- fprintf(autosavefile, "2013 %i\n", (int)Conf.extra_head);
-#endif
fprintf(autosavefile, "1000\n");
fprintf(autosavefile, "1001 0\n");
+
if (Mode.keybinds_changed)
{
ac = (ActionClass *) FindItem("KEYBINDINGS", 0, LIST_FINDBY_NAME,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.91.2.1
retrieving revision 1.91.2.2
diff -u -3 -r1.91.2.1 -r1.91.2.2
--- dialog.c 31 Jul 2004 20:25:52 -0000 1.91.2.1
+++ dialog.c 3 Aug 2004 23:19:03 -0000 1.91.2.2
@@ -295,7 +295,7 @@
d->keybindings[d->num_bindings - 1].data = data;
d->keybindings[d->num_bindings - 1].func = func;
d->keybindings[d->num_bindings - 1].key =
- XKeysymToKeycode(disp, XStringToKeysym(key));;
+ XKeysymToKeycode(disp, XStringToKeysym(key));
}
Dialog *
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/econfig.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- econfig.c 31 Jul 2004 20:25:53 -0000 1.1.2.1
+++ econfig.c 3 Aug 2004 23:19:03 -0000 1.1.2.2
@@ -46,16 +46,19 @@
switch (ci->type)
{
case ITEM_TYPE_BOOL:
- if (e_db_int_get(edf, name, &my_int))
- *((char *)ci->ptr) = my_int;
+ if (!e_db_int_get(edf, name, &my_int))
+ my_int = (ci->dflt) ? 1 : 0;
+ *((char *)ci->ptr) = my_int;
break;
case ITEM_TYPE_INT:
- if (e_db_int_get(edf, name, &my_int))
- *((int *)ci->ptr) = my_int;
+ if (!e_db_int_get(edf, name, &my_int))
+ my_int = ci->dflt;
+ *((int *)ci->ptr) = my_int;
break;
case ITEM_TYPE_FLOAT:
- if (e_db_float_get(edf, name, &my_float))
- *((float *)ci->ptr) = my_float;
+ if (!e_db_float_get(edf, name, &my_float))
+ my_float = ci->dflt;
+ *((float *)ci->ptr) = my_float;
break;
case ITEM_TYPE_STRING:
*((char **)ci->ptr) = e_db_str_get(edf, name);
@@ -110,6 +113,8 @@
char buf[4096];
E_DB_File *edf;
+ memset(&Conf, 0, sizeof(EConf));
+
edf = e_db_open(ConfigurationGetFile(buf, sizeof(buf)));
if (edf == NULL)
return;
@@ -278,6 +283,9 @@
sscanf(p, "%1000s %n", item, &len);
p += len;
err = ModuleConfigSet(name, item, p);
+
+ /* Save changed configuration */
+ autosave();
}
/*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/econfig.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- econfig.h 31 Jul 2004 20:25:53 -0000 1.1.2.1
+++ econfig.h 3 Aug 2004 23:19:03 -0000 1.1.2.2
@@ -29,6 +29,7 @@
const char *name;
void *ptr;
char type;
+ long dflt;
} CfgItem;
typedef enum
@@ -39,9 +40,9 @@
ITEM_TYPE_STRING
} cfg_item_type_e;
-#define CFG_ITEM_BOOL(conf, name) { #name, &conf.name, ITEM_TYPE_BOOL }
-#define CFG_ITEM_INT(conf, name) { #name, &conf.name, ITEM_TYPE_INT }
-#define CFG_ITEM_FLOAT(conf, name) { #name, &conf.name, ITEM_TYPE_FLOAT }
+#define CFG_ITEM_BOOL(conf, name, dflt) { #name, &conf.name, ITEM_TYPE_BOOL, dflt }
+#define CFG_ITEM_INT(conf, name, dflt) { #name, &conf.name, ITEM_TYPE_INT, dflt }
+#define CFG_ITEM_FLOAT(conf, name, dflt) { #name, &conf.name, ITEM_TYPE_FLOAT, dflt }
const CfgItem *CfgItemFind(const CfgItem * pcl, int ncl, const char *name);
void CfgItemToString(const CfgItem * ci, char *buf, int len);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.173.2.2
retrieving revision 1.173.2.3
diff -u -3 -r1.173.2.2 -r1.173.2.3
--- evhandlers.c 31 Jul 2004 20:25:53 -0000 1.173.2.2
+++ evhandlers.c 3 Aug 2004 23:19:03 -0000 1.173.2.3
@@ -92,7 +92,8 @@
TooltipHide(ttip);
RemoveTimerEvent("TOOLTIP_TIMEOUT");
if (Conf.tooltips.enable)
- DoIn("TOOLTIP_TIMEOUT", Conf.tooltips.delay, ToolTipTimeout, 0, NULL);
+ DoIn("TOOLTIP_TIMEOUT", 0.001 * Conf.tooltips.delay, ToolTipTimeout, 0,
+ NULL);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -u -3 -r1.55 -r1.55.2.1
--- ewmh.c 4 Jul 2004 12:28:56 -0000 1.55
+++ ewmh.c 3 Aug 2004 23:19:03 -0000 1.55.2.1
@@ -194,7 +194,7 @@
EDBUG(6, "EWMH_Init");
- E_XA_UTF8_STRING = XInternAtom(disp, "UTF8_STRING", False);;
+ E_XA_UTF8_STRING = XInternAtom(disp, "UTF8_STRING", False);
atom_count = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.81
retrieving revision 1.81.2.1
diff -u -3 -r1.81 -r1.81.2.1
--- focus.c 23 Jul 2004 20:05:50 -0000 1.81
+++ focus.c 3 Aug 2004 23:19:03 -0000 1.81.2.1
@@ -314,8 +314,8 @@
RemoveTimerEvent("AUTORAISE_TIMEOUT");
if (Conf.focus.mode != MODE_FOCUS_CLICK)
- DoIn("AUTORAISE_TIMEOUT", Conf.autoraise.delay, AutoraiseTimeout,
- ewin->client.win, NULL);
+ DoIn("AUTORAISE_TIMEOUT", 0.001 * Conf.autoraise.delay,
+ AutoraiseTimeout, ewin->client.win, NULL);
}
if (do_raise)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.116.2.2
retrieving revision 1.116.2.3
diff -u -3 -r1.116.2.2 -r1.116.2.3
--- iconify.c 31 Jul 2004 20:25:53 -0000 1.116.2.2
+++ iconify.c 3 Aug 2004 23:19:03 -0000 1.116.2.3
@@ -2267,12 +2267,16 @@
MenuAddTitle(p_menu, _("Iconbox Options"));
MenuAddStyle(p_menu, "DEFAULT");
+
Esnprintf(s, sizeof(s), "iconbox %s", ib->name);
mi = MenuItemCreate(_("This Iconbox Settings..."), NULL, ACTION_SETTINGS, s,
NULL);
MenuAddItem(p_menu, mi);
- mi = MenuItemCreate(_("Close Iconbox"), NULL, ACTION_KILL, NULL, NULL);
+
+ Esnprintf(s, sizeof(s), "%i", (unsigned)ib->win);
+ mi = MenuItemCreate(_("Close Iconbox"), NULL, ACTION_KILL, s, NULL);
MenuAddItem(p_menu, mi);
+
mi = MenuItemCreate(_("Create New Iconbox"), NULL, ACTION_CREATE_ICONBOX,
NULL, NULL);
MenuAddItem(p_menu, mi);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.1
retrieving revision 1.174.2.2
diff -u -3 -r1.174.2.1 -r1.174.2.2
--- ipc.c 31 Jul 2004 20:25:53 -0000 1.174.2.1
+++ ipc.c 3 Aug 2004 23:19:04 -0000 1.174.2.2
@@ -2264,6 +2264,7 @@
CommsSend(c, buf);
}
+#if 0
static void
IPC_FX(const char *params, Client * c)
{
@@ -2663,6 +2664,7 @@
if (buf[0])
CommsSend(c, buf);
}
+#endif
static void
IPC_ButtonShow(const char *params, Client * c)
@@ -4591,6 +4593,7 @@
Efree(bpy);
}
+#if 0
static void
IPC_ControlsSet(const char *s, Client * c __UNUSED__)
{
@@ -4953,6 +4956,7 @@
Conf.warplist.warp_on_select, Conf.edge_flip_resistance);
CommsSend(c, buf);
}
+#endif
static void
IPC_CallRaw(const char *params, Client * c __UNUSED__)
@@ -5444,6 +5448,7 @@
"(removes all buttons and the dragbar)\n\"button_show\" "
"(removes all buttons)\n \"button_show buttons CONFIG*\" "
"(removes all buttons with CONFIG in the start)"},
+#if 0
{
IPC_FX,
"fx", NULL,
@@ -5472,6 +5477,7 @@
"audio <on/off> (changes state of audio)\n"
"- seconds for tooltips and autoraise can have less than one second\n"
" (i.e. 0.5) or greater (1.3, 3.5, etc)"},
+#endif
{
IPC_DockConfig,
"dock", NULL,
@@ -5687,10 +5693,12 @@
IPC_ColormodifierGet, "get_colmod", NULL, "TBD", NULL},
{
IPC_ColormodifierSet, "set_colmod", NULL, "TBD", NULL},
+#if 0
{
IPC_ControlsSet, "set_controls", NULL, "TBD", NULL},
{
IPC_ControlsGet, "get_controls", NULL, "TBD", NULL},
+#endif
{
IPC_CallRaw, "call_raw", NULL, "TBD", NULL},
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.99.2.2
retrieving revision 1.99.2.3
diff -u -3 -r1.99.2.2 -r1.99.2.3
--- main.c 3 Aug 2004 19:43:03 -0000 1.99.2.2
+++ main.c 3 Aug 2004 23:19:05 -0000 1.99.2.3
@@ -248,13 +248,14 @@
desks.desk[0].viewable = 0;
/* now we're going to load the configuration/theme */
+ ConfigurationLoad();
LoadEConfig(themepath);
SetAreaSize(Conf.areas.nx, Conf.areas.ny);
TransparencySet(Conf.theme.transparency);
desks.desk[0].viewable = 1;
RefreshDesktop(0);
- if (Conf.sound)
+ if (Conf.sound.enable)
{
SoundPlay("SOUND_STARTUP");
SoundFree("SOUND_STARTUP");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.147.2.1
retrieving revision 1.147.2.2
diff -u -3 -r1.147.2.1 -r1.147.2.2
--- menus.c 26 Jul 2004 21:24:30 -0000 1.147.2.1
+++ menus.c 3 Aug 2004 23:19:05 -0000 1.147.2.2
@@ -968,16 +968,25 @@
Background *bg;
char ok = 1;
char s2[4096], s3[512];
+ char stmp[4096];
+ word(s, 2, s2);
+ Esnprintf(ss, sizeof(ss), "%s/%s", dir, s2);
word(s, 3, s3);
bg = (Background *) FindItem(s3, 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND);
+ Esnprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
+ EDirUserCache(), s3);
+ if (bg && (!exists(stmp) || moddate(stmp) < moddate(ss)))
+ {
+ /* The thumbnail is gone or outdated - regererate */
+ BackgroundDestroy(bg);
+ bg = NULL;
+ }
if (!bg)
{
Imlib_Image *im;
- word(s, 2, s2);
- Esnprintf(ss, sizeof(ss), "%s/%s", dir, s2);
im = imlib_load_image(ss);
if (im)
{
@@ -991,8 +1000,6 @@
int maxw = 48, maxh = 48;
int justx = 512, justy = 512;
- Esnprintf(s2, sizeof(s2), "%s/cached/img/%s",
- EDirUserCache(), s3);
imlib_context_set_image(im);
width = imlib_image_get_width();
height = imlib_image_get_height();
@@ -1016,7 +1023,7 @@
imlib_free_image_and_decache();
imlib_context_set_image(im2);
imlib_image_set_format("ppm");
- imlib_save_image(s2);
+ imlib_save_image(stmp);
imlib_free_image_and_decache();
scr_asp = (VRoot.w << 16) / VRoot.h;
@@ -1079,13 +1086,10 @@
if (ok)
{
ImageClass *ic = NULL;
- char stmp[4096];
ic = CreateIclass();
ic->name = Estrdup("`");
ic->norm.normal = CreateImageState();
- Esnprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
- EDirUserCache(), s3);
ic->norm.normal->im_file = Estrdup(stmp);
ic->norm.normal->unloadable = 1;
IclassPopulate(ic);
@@ -2045,15 +2049,15 @@
static Menu *task_menu[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
#endif
+#if 0 /* Not used */
void
MenusInit(void)
{
-#if 0 /* Not used */
int i;
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; task_menu[i++] = NULL);
-#endif
}
+#endif
static Menu *
RefreshInternalMenu(Menu * m, MenuStyle * ms,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-bg.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- mod-bg.c 31 Jul 2004 20:25:54 -0000 1.1.2.1
+++ mod-bg.c 3 Aug 2004 23:19:05 -0000 1.1.2.2
@@ -1055,7 +1055,7 @@
{
BGSettingsGoTo(bglist[i - 1]);
DesktopSetBg(desks.current, bglist[i - 1], 0);
- break;;
+ break;
}
}
if (bglist)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-misc.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- mod-misc.c 31 Jul 2004 20:25:54 -0000 1.1.2.1
+++ mod-misc.c 3 Aug 2004 23:19:05 -0000 1.1.2.2
@@ -59,83 +59,100 @@
int n_modules = sizeof(p_modules) / sizeof(EModule *);
static const CfgItem cfg_items[] = {
- CFG_ITEM_BOOL(Conf, areas.wraparound),
- CFG_ITEM_BOOL(Conf, autoraise.enable),
- CFG_ITEM_FLOAT(Conf, autoraise.delay),
- CFG_ITEM_BOOL(Conf, desks.wraparound),
- CFG_ITEM_INT(Conf, desks.num),
- CFG_ITEM_BOOL(Conf, dialogs.headers),
- CFG_ITEM_INT(Conf, dock.dirmode),
- CFG_ITEM_INT(Conf, dock.startx),
- CFG_ITEM_INT(Conf, dock.starty),
- CFG_ITEM_INT(Conf, focus.mode),
- CFG_ITEM_BOOL(Conf, focus.clickraises),
- CFG_ITEM_BOOL(Conf, focus.transientsfollowleader),
- CFG_ITEM_BOOL(Conf, focus.switchfortransientmap),
- CFG_ITEM_BOOL(Conf, focus.all_new_windows_get_focus),
- CFG_ITEM_BOOL(Conf, focus.new_transients_get_focus),
- CFG_ITEM_BOOL(Conf, focus.new_transients_get_focus_if_group_focused),
- CFG_ITEM_BOOL(Conf, focus.raise_on_next),
- CFG_ITEM_BOOL(Conf, focus.warp_on_next),
- CFG_ITEM_BOOL(Conf, hints.set_xroot_info_on_root_window),
- CFG_ITEM_BOOL(Conf, pagers.enable),
- CFG_ITEM_BOOL(Conf, pagers.zoom),
- CFG_ITEM_BOOL(Conf, pagers.title),
- CFG_ITEM_BOOL(Conf, pagers.hiq),
- CFG_ITEM_BOOL(Conf, pagers.snap),
- CFG_ITEM_INT(Conf, pagers.scanspeed),
- CFG_ITEM_INT(Conf, pagers.sel_button),
- CFG_ITEM_INT(Conf, pagers.win_button),
- CFG_ITEM_INT(Conf, pagers.menu_button),
- CFG_ITEM_BOOL(Conf, snap.enable),
- CFG_ITEM_INT(Conf, snap.edge_snap_dist),
- CFG_ITEM_INT(Conf, snap.screen_snap_dist),
-#if 0
- CFG_ITEM_BOOL(Conf, tooltips.enable),
- CFG_ITEM_BOOL(Conf, tooltips.showroottooltip),
- CFG_ITEM_FLOAT(Conf, tooltips.delay),
-#endif
- CFG_ITEM_BOOL(Conf, warplist.enable),
- CFG_ITEM_BOOL(Conf, warplist.warpsticky),
- CFG_ITEM_BOOL(Conf, warplist.warpshaded),
- CFG_ITEM_BOOL(Conf, warplist.warpiconified),
- CFG_ITEM_BOOL(Conf, warplist.warpfocused),
- CFG_ITEM_BOOL(Conf, warplist.raise_on_select),
- CFG_ITEM_BOOL(Conf, warplist.warp_on_select),
- CFG_ITEM_INT(Conf, deskmode),
- CFG_ITEM_INT(Conf, movemode),
- CFG_ITEM_INT(Conf, resizemode),
- CFG_ITEM_INT(Conf, geominfomode),
- CFG_ITEM_INT(Conf, slidemode),
- CFG_ITEM_BOOL(Conf, cleanupslide),
- CFG_ITEM_BOOL(Conf, mapslide),
- CFG_ITEM_INT(Conf, slidespeedmap),
- CFG_ITEM_INT(Conf, slidespeedcleanup),
- CFG_ITEM_BOOL(Conf, animate_shading),
- CFG_ITEM_INT(Conf, shadespeed),
- CFG_ITEM_INT(Conf, backgrounds.timeout),
- CFG_ITEM_BOOL(Conf, backgrounds.user),
- CFG_ITEM_BOOL(Conf, sound),
- CFG_ITEM_INT(Conf, button_move_resistance),
- CFG_ITEM_BOOL(Conf, autosave),
- CFG_ITEM_BOOL(Conf, memory_paranoia),
- CFG_ITEM_BOOL(Conf, dockapp_support),
- CFG_ITEM_BOOL(Conf, save_under),
- CFG_ITEM_BOOL(Conf, menuslide),
- CFG_ITEM_BOOL(Conf, menusonscreen),
- CFG_ITEM_BOOL(Conf, place.manual),
- CFG_ITEM_BOOL(Conf, place.manual_mouse_pointer),
- CFG_ITEM_BOOL(Conf, warpmenus),
- CFG_ITEM_INT(Conf, edge_flip_resistance),
- CFG_ITEM_BOOL(Conf, groups.dflt.set_border),
- CFG_ITEM_BOOL(Conf, groups.dflt.iconify),
- CFG_ITEM_BOOL(Conf, groups.dflt.kill),
- CFG_ITEM_BOOL(Conf, groups.dflt.mirror),
- CFG_ITEM_BOOL(Conf, groups.dflt.move),
- CFG_ITEM_BOOL(Conf, groups.dflt.raise),
- CFG_ITEM_BOOL(Conf, groups.dflt.shade),
- CFG_ITEM_BOOL(Conf, groups.dflt.stick),
- CFG_ITEM_BOOL(Conf, groups.swapmove),
+ CFG_ITEM_BOOL(Conf, areas.nx, 2),
+ CFG_ITEM_BOOL(Conf, areas.ny, 1),
+ CFG_ITEM_BOOL(Conf, areas.wraparound, 0),
+ CFG_ITEM_BOOL(Conf, areas.wraparound, 0),
+
+ CFG_ITEM_BOOL(Conf, autoraise.enable, 0),
+ CFG_ITEM_INT(Conf, autoraise.delay, 500),
+
+ CFG_ITEM_INT(Conf, backgrounds.hiquality, 1),
+ CFG_ITEM_INT(Conf, backgrounds.timeout, 240),
+ CFG_ITEM_BOOL(Conf, backgrounds.user, 1),
+
+ CFG_ITEM_INT(Conf, desks.num, 2),
+ CFG_ITEM_BOOL(Conf, desks.wraparound, 0),
+ CFG_ITEM_INT(Conf, desks.dragdir, 2),
+ CFG_ITEM_INT(Conf, desks.dragbar_width, 16),
+ CFG_ITEM_INT(Conf, desks.dragbar_ordering, 1),
+ CFG_ITEM_INT(Conf, desks.dragbar_length, 0),
+ CFG_ITEM_BOOL(Conf, desks.slidein, 1),
+ CFG_ITEM_INT(Conf, desks.slidespeed, 6000),
+
+ CFG_ITEM_BOOL(Conf, dialogs.headers, 0),
+
+ CFG_ITEM_INT(Conf, dock.dirmode, DOCK_DOWN),
+ CFG_ITEM_INT(Conf, dock.startx, 0),
+ CFG_ITEM_INT(Conf, dock.starty, 0),
+
+ CFG_ITEM_INT(Conf, focus.mode, MODE_FOCUS_SLOPPY),
+ CFG_ITEM_BOOL(Conf, focus.clickraises, 0),
+ CFG_ITEM_BOOL(Conf, focus.transientsfollowleader, 1),
+ CFG_ITEM_BOOL(Conf, focus.switchfortransientmap, 1),
+ CFG_ITEM_BOOL(Conf, focus.all_new_windows_get_focus, 0),
+ CFG_ITEM_BOOL(Conf, focus.new_transients_get_focus, 0),
+ CFG_ITEM_BOOL(Conf, focus.new_transients_get_focus_if_group_focused, 1),
+ CFG_ITEM_BOOL(Conf, focus.raise_on_next, 1),
+ CFG_ITEM_BOOL(Conf, focus.warp_on_next, 0),
+
+ CFG_ITEM_BOOL(Conf, groups.dflt.iconify, 1),
+ CFG_ITEM_BOOL(Conf, groups.dflt.kill, 0),
+ CFG_ITEM_BOOL(Conf, groups.dflt.mirror, 1),
+ CFG_ITEM_BOOL(Conf, groups.dflt.move, 1),
+ CFG_ITEM_BOOL(Conf, groups.dflt.raise, 0),
+ CFG_ITEM_BOOL(Conf, groups.dflt.set_border, 1),
+ CFG_ITEM_BOOL(Conf, groups.dflt.stick, 1),
+ CFG_ITEM_BOOL(Conf, groups.dflt.shade, 1),
+ CFG_ITEM_BOOL(Conf, groups.swapmove, 1),
+
+ CFG_ITEM_BOOL(Conf, hints.set_xroot_info_on_root_window, 0),
+
+ CFG_ITEM_BOOL(Conf, pagers.enable, 1),
+ CFG_ITEM_BOOL(Conf, pagers.zoom, 1),
+ CFG_ITEM_BOOL(Conf, pagers.title, 1),
+ CFG_ITEM_BOOL(Conf, pagers.hiq, 1),
+ CFG_ITEM_BOOL(Conf, pagers.snap, 1),
+ CFG_ITEM_INT(Conf, pagers.scanspeed, 10),
+ CFG_ITEM_INT(Conf, pagers.sel_button, 2),
+ CFG_ITEM_INT(Conf, pagers.win_button, 1),
+ CFG_ITEM_INT(Conf, pagers.menu_button, 3),
+
+ CFG_ITEM_BOOL(Conf, place.manual, 0),
+ CFG_ITEM_BOOL(Conf, place.manual_mouse_pointer, 0),
+
+ CFG_ITEM_BOOL(Conf, snap.enable, 1),
+ CFG_ITEM_INT(Conf, snap.edge_snap_dist, 8),
+ CFG_ITEM_INT(Conf, snap.screen_snap_dist, 32),
+
+ CFG_ITEM_BOOL(Conf, warplist.enable, 1),
+ CFG_ITEM_BOOL(Conf, warplist.warpsticky, 1),
+ CFG_ITEM_BOOL(Conf, warplist.warpshaded, 1),
+ CFG_ITEM_BOOL(Conf, warplist.warpiconified, 0),
+ CFG_ITEM_BOOL(Conf, warplist.warpfocused, 1),
+ CFG_ITEM_BOOL(Conf, warplist.raise_on_select, 1),
+ CFG_ITEM_BOOL(Conf, warplist.warp_on_select, 0),
+
+ CFG_ITEM_INT(Conf, deskmode, MODE_NONE),
+ CFG_ITEM_INT(Conf, movemode, 0),
+ CFG_ITEM_INT(Conf, resizemode, 2),
+ CFG_ITEM_INT(Conf, geominfomode, 1),
+ CFG_ITEM_INT(Conf, slidemode, 0),
+ CFG_ITEM_BOOL(Conf, cleanupslide, 1),
+ CFG_ITEM_BOOL(Conf, mapslide, 0),
+ CFG_ITEM_INT(Conf, slidespeedmap, 6000),
+ CFG_ITEM_INT(Conf, slidespeedcleanup, 8000),
+ CFG_ITEM_BOOL(Conf, animate_shading, 1),
+ CFG_ITEM_INT(Conf, shadespeed, 8000),
+ CFG_ITEM_INT(Conf, button_move_resistance, 5),
+ CFG_ITEM_BOOL(Conf, autosave, 1),
+ CFG_ITEM_BOOL(Conf, memory_paranoia, 1),
+ CFG_ITEM_BOOL(Conf, dockapp_support, 1),
+ CFG_ITEM_BOOL(Conf, save_under, 0),
+ CFG_ITEM_BOOL(Conf, menuslide, 0),
+ CFG_ITEM_BOOL(Conf, menusonscreen, 1),
+ CFG_ITEM_BOOL(Conf, warpmenus, 1),
+ CFG_ITEM_INT(Conf, edge_flip_resistance, 25),
};
#define N_CFG_ITEMS ((int)(sizeof(cfg_items)/sizeof(CfgItem)))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-sound.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- mod-sound.c 31 Jul 2004 20:25:54 -0000 1.1.2.1
+++ mod-sound.c 3 Aug 2004 23:19:06 -0000 1.1.2.2
@@ -84,8 +84,8 @@
{
if (val < 2)
{
- Conf.sound = tmp_audio;
- if (Conf.sound)
+ Conf.sound.enable = tmp_audio;
+ if (Conf.sound.enable)
SoundInit();
else
SoundExit();
@@ -108,7 +108,7 @@
}
SoundPlay("SOUND_SETTINGS_AUDIO");
- tmp_audio = Conf.sound;
+ tmp_audio = Conf.sound.enable;
d = DialogCreate("CONFIGURE_AUDIO");
DialogSetTitle(d, _("Audio Settings"));
@@ -274,6 +274,11 @@
};
#define N_IPC_FUNCS (sizeof(SoundIpcArray)/sizeof(IpcItem))
+static const CfgItem SoundCfgItems[] = {
+ CFG_ITEM_BOOL(Conf.sound, enable, 0),
+};
+#define N_CFG_ITEMS (sizeof(SoundCfgItems)/sizeof(CfgItem))
+
/*
* Module descriptor
*/
@@ -282,7 +287,6 @@
SoundSighan,
SoundConfigLoad, NULL,
SoundConfigure,
- {0, NULL}
- ,
+ {N_CFG_ITEMS, SoundCfgItems},
{N_IPC_FUNCS, SoundIpcArray}
};
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-tt.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- mod-tt.c 31 Jul 2004 20:25:54 -0000 1.1.2.1
+++ mod-tt.c 3 Aug 2004 23:19:06 -0000 1.1.2.2
@@ -151,7 +151,7 @@
if (val < 2)
{
Conf.tooltips.enable = tmp_tooltips;
- Conf.tooltips.delay = ((double)tmp_tooltiptime) / 100;
+ Conf.tooltips.delay = tmp_tooltiptime * 10;
Conf.tooltips.showroottooltip = tmp_roottip;
}
autosave();
@@ -174,7 +174,7 @@
SoundPlay("SOUND_SETTINGS_TOOLTIPS");
tmp_tooltips = Conf.tooltips.enable;
- tmp_tooltiptime = (int)(Conf.tooltips.delay * 100);
+ tmp_tooltiptime = Conf.tooltips.delay / 10;
tmp_roottip = Conf.tooltips.showroottooltip;
d = DialogCreate("CONFIGURE_TOOLTIPS");
@@ -254,12 +254,12 @@
SettingsTooltips();
}
-static const CfgItem TooltipCfgItems[] = {
- CFG_ITEM_BOOL(Conf.tooltips, enable),
- CFG_ITEM_BOOL(Conf.tooltips, showroottooltip),
- CFG_ITEM_FLOAT(Conf.tooltips, delay),
+static const CfgItem TooltipsCfgItems[] = {
+ CFG_ITEM_BOOL(Conf.tooltips, enable, 1),
+ CFG_ITEM_BOOL(Conf.tooltips, showroottooltip, 1),
+ CFG_ITEM_INT(Conf.tooltips, delay, 1500),
};
-#define N_CFG_ITEMS (sizeof(TooltipCfgItems)/sizeof(CfgItem))
+#define N_CFG_ITEMS (sizeof(TooltipsCfgItems)/sizeof(CfgItem))
/*
* Module descriptor
@@ -269,6 +269,6 @@
TooltipsSighan,
TooltipsConfigLoad, NULL,
TooltipsConfigure,
- {N_CFG_ITEMS, TooltipCfgItems},
+ {N_CFG_ITEMS, TooltipsCfgItems},
{0, NULL}
};
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.120.2.1
retrieving revision 1.120.2.2
diff -u -3 -r1.120.2.1 -r1.120.2.2
--- settings.c 31 Jul 2004 20:25:55 -0000 1.120.2.1
+++ settings.c 3 Aug 2004 23:19:06 -0000 1.120.2.2
@@ -341,7 +341,6 @@
static char tmp_raise_focus;
static char tmp_warp_focus;
-#ifdef WITH_TARTY_WARP
static char tmp_warp_after_focus;
static char tmp_raise_after_focus;
static char tmp_display_warp;
@@ -349,7 +348,7 @@
static char tmp_warpshaded;
static char tmp_warpiconified;
static char tmp_warpfocused;
-#endif
+
static char tmp_clickalways;
static void
@@ -364,7 +363,7 @@
tmp_owner_popup_focus;
Conf.focus.raise_on_next = tmp_raise_focus;
Conf.focus.warp_on_next = tmp_warp_focus;
-#ifdef WITH_TARTY_WARP
+
Conf.warplist.warp_on_select = tmp_warp_after_focus;
Conf.warplist.raise_on_select = tmp_raise_after_focus;
Conf.warplist.enable = tmp_display_warp;
@@ -372,7 +371,7 @@
Conf.warplist.warpshaded = tmp_warpshaded;
Conf.warplist.warpiconified = tmp_warpiconified;
Conf.warplist.warpfocused = tmp_warpfocused;
-#endif /* WITH_TARTY_WARP */
+
Conf.focus.clickraises = tmp_clickalways;
FocusFix();
}
@@ -400,7 +399,7 @@
tmp_owner_popup_focus = Conf.focus.new_transients_get_focus_if_group_focused;
tmp_raise_focus = Conf.focus.raise_on_next;
tmp_warp_focus = Conf.focus.warp_on_next;
-#ifdef WITH_TARTY_WARP
+
tmp_raise_after_focus = Conf.warplist.raise_on_select;
tmp_warp_after_focus = Conf.warplist.warp_on_select;
tmp_display_warp = Conf.warplist.enable;
@@ -408,7 +407,7 @@
tmp_warpshaded = Conf.warplist.warpshaded;
tmp_warpiconified = Conf.warplist.warpiconified;
tmp_warpfocused = Conf.warplist.warpfocused;
-#endif /* WITH_TARTY_WARP */
+
tmp_clickalways = Conf.focus.clickraises;
d = DialogCreate("CONFIGURE_FOCUS");
@@ -525,7 +524,6 @@
DialogItemCheckButtonSetState(di, tmp_warp_focus);
DialogItemCheckButtonSetPtr(di, &tmp_warp_focus);
-#ifdef WITH_TARTY_WARP
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
@@ -590,7 +588,6 @@
("Send mouse pointer to window after focus switch"));
DialogItemCheckButtonSetState(di, tmp_warp_after_focus);
DialogItemCheckButtonSetPtr(di, &tmp_warp_after_focus);
-#endif /* WITH_TARTY_WARP */
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@@ -1599,7 +1596,7 @@
if (val < 2)
{
Conf.autoraise.enable = tmp_autoraise;
- Conf.autoraise.delay = ((double)tmp_autoraisetime) / 100;
+ Conf.autoraise.delay = 10 * tmp_autoraisetime;
}
autosave();
data = NULL;
@@ -1621,7 +1618,7 @@
SoundPlay("SOUND_SETTINGS_AUTORAISE");
tmp_autoraise = Conf.autoraise.enable;
- tmp_autoraisetime = (int)(Conf.autoraise.delay * 100);
+ tmp_autoraisetime = Conf.autoraise.delay / 10;
d = DialogCreate("CONFIGURE_AUTORAISE");
DialogSetTitle(d, _("Autoraise Settings"));
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.139.2.1
retrieving revision 1.139.2.2
diff -u -3 -r1.139.2.1 -r1.139.2.2
--- setup.c 31 Jul 2004 20:25:55 -0000 1.139.2.1
+++ setup.c 3 Aug 2004 23:19:06 -0000 1.139.2.2
@@ -351,115 +351,8 @@
XFreeModifiermap(mod);
}
- /* Now we're going to set a bunch of default settings in E - in case we
- * don't ever get to load a config file for some odd reason. */
- memset(&Conf, 0, sizeof(EConf));
- Conf.areas.nx = 2;
- Conf.areas.ny = 1;
- Conf.areas.wraparound = 0;
- Conf.autoraise.enable = 0;
- Conf.autoraise.delay = 0.5;
- Conf.backgrounds.hiquality = 1;
- Conf.backgrounds.user = 1;
- Conf.backgrounds.timeout = 240;
- Conf.desks.num = 2;
- Conf.desks.wraparound = 0;
- Conf.desks.dragdir = 2;
- Conf.desks.dragbar_width = 16;
- Conf.desks.dragbar_ordering = 1;
- Conf.desks.dragbar_length = 0;
- Conf.desks.slidein = 1;
- Conf.desks.slidespeed = 6000;
- Conf.dialogs.headers = 0;
- Conf.dock.dirmode = DOCK_DOWN;
- Conf.dock.startx = 0;
- Conf.dock.starty = 0;
- Conf.focus.mode = MODE_FOCUS_SLOPPY;
- Conf.focus.clickraises = 0;
- Conf.focus.transientsfollowleader = 1;
- Conf.focus.switchfortransientmap = 1;
- Conf.focus.all_new_windows_get_focus = 0;
- Conf.focus.new_transients_get_focus = 0;
- Conf.focus.new_transients_get_focus_if_group_focused = 1;
- Conf.focus.raise_on_next = 1;
- Conf.focus.warp_on_next = 0;
- Conf.warplist.raise_on_select = 1;
- Conf.warplist.warp_on_select = 0;
- Conf.groups.dflt.iconify = 1;
- Conf.groups.dflt.kill = 0;
- Conf.groups.dflt.move = 1;
- Conf.groups.dflt.raise = 0;
- Conf.groups.dflt.set_border = 1;
- Conf.groups.dflt.stick = 1;
- Conf.groups.dflt.shade = 1;
- Conf.groups.dflt.mirror = 1;
- Conf.pagers.enable = 1;
- Conf.pagers.zoom = 1;
- Conf.pagers.title = 1;
- Conf.pagers.hiq = 1;
- Conf.pagers.snap = 1;
- Conf.pagers.scanspeed = 10;
- Conf.groups.swapmove = 1;
- Conf.pagers.sel_button = 2;
- Conf.pagers.win_button = 1;
- Conf.pagers.menu_button = 3;
- Conf.snap.enable = 1;
- Conf.snap.edge_snap_dist = 8;
- Conf.snap.screen_snap_dist = 32;
- Conf.tooltips.enable = 1;
- Conf.tooltips.delay = 0.5;
- Conf.tooltips.showroottooltip = 1;
-#ifdef WITH_TARTY_WARP
- Conf.warplist.enable = 1;
-#else
- Conf.warplist.enable = 0;
-#endif /* WITH_TARTY_WARP */
- Conf.warplist.warpsticky = 1;
- Conf.warplist.warpshaded = 1;
- Conf.warplist.warpiconified = 0;
- Conf.warplist.warpfocused = 1;
-
- Conf.deskmode = MODE_NONE;
- Conf.movemode = 0;
- Conf.dockapp_support = 1;
- Conf.primaryicondir = ICON_RIGHT;
- Conf.resizemode = 1;
- Conf.geominfomode = 1;
- Conf.slidemode = 0;
- Conf.cleanupslide = 1;
- Conf.mapslide = 1;
- Conf.slidespeedmap = 6000;
- Conf.slidespeedcleanup = 8000;
- Conf.shadespeed = 8000;
- Conf.animate_shading = 1;
- Conf.sound = 1;
- Conf.button_move_resistance = 5;
- Conf.autosave = 1;
- Conf.memory_paranoia = 1;
- Conf.save_under = 0;
- Conf.menuslide = 0;
- Conf.menusonscreen = 1;
- Conf.warpmenus = 1;
- Conf.place.manual = 0;
- Conf.edge_flip_resistance = 15;
-
-#ifdef ENABLE_THEME_TRANSPARENCY
- Conf.st_trans.menu = ICLASS_ATTR_BG;
- Conf.st_trans.menu_item = ICLASS_ATTR_BG;
- Conf.st_trans.tooltip = ICLASS_ATTR_GLASS;
- Conf.st_trans.widget = ICLASS_ATTR_BG;
- Conf.st_trans.hilight = ICLASS_ATTR_OPAQUE;
- Conf.st_trans.border = ICLASS_ATTR_BG;
- Conf.st_trans.iconbox = ICLASS_ATTR_BG;
- Conf.st_trans.dialog = ICLASS_ATTR_BG;
- Conf.st_trans.pager = ICLASS_ATTR_BG;
- Conf.st_trans.warplist = ICLASS_ATTR_BG;
-#endif
-
ScreenInit();
- MenusInit();
-
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/sound.c,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -3 -r1.25.2.1 -r1.25.2.2
--- sound.c 31 Jul 2004 20:25:55 -0000 1.25.2.1
+++ sound.c 3 Aug 2004 23:19:06 -0000 1.25.2.2
@@ -142,7 +142,7 @@
EDBUG(5, "SamplePlay");
#ifdef HAVE_LIBESD
- if ((sound_fd < 0) || (!Conf.sound) || (!s))
+ if ((sound_fd < 0) || (!Conf.sound.enable) || (!s))
EDBUG_RETURN_;
if (!s->id)
{
@@ -225,7 +225,7 @@
if (!sclass)
EDBUG_RETURN_;
#ifdef HAVE_LIBESD
- if ((!sclass->sample) && (Conf.sound))
+ if ((!sclass->sample) && (Conf.sound.enable))
{
f = FindFile(sclass->file);
if (f)
@@ -234,7 +234,7 @@
Efree(f);
}
}
- if ((Conf.sound) && (sclass->sample))
+ if ((Conf.sound.enable) && (sclass->sample))
SamplePlay(sclass->sample);
#endif
EDBUG_RETURN_;
@@ -292,7 +292,7 @@
EDBUG(5, "SoundInit");
#ifdef HAVE_LIBESD
- if (!Conf.sound)
+ if (!Conf.sound.enable)
EDBUG_RETURN_;
if (sound_fd != -1)
EDBUG_RETURN_;
@@ -305,7 +305,7 @@
_("Audio was enabled for Enlightenment but there was an error\n"
"communicating with the audio server (Esound). Audio will\n"
"now be disabled.\n"));
- Conf.sound = 0;
+ Conf.sound.enable = 0;
}
#else
Conf.sound = 0;
-------------------------------------------------------
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
