Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c config.c file.c globals.c groups.c iconify.c
main.c menus.c misc.c pager.c session.c settings.c setup.c
startup.c theme.c
Log Message:
Reduce the amount of __EMX__'s, random cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -3 -r1.206 -r1.207
--- E.h 12 Feb 2004 01:17:20 -0000 1.206
+++ E.h 13 Feb 2004 18:36:50 -0000 1.207
@@ -1646,11 +1646,6 @@
void FloatEwinAboveDesktops(EWin * ewin);
void DesktopAccounting(void);
-int AddEToFile(char *file);
-int CreateEFile(char *file);
-void AddE(void);
-void CreateStartupDisplay(char start);
-
/* alert.c */
void Alert(char *fmt, ...);
void InitStringList(void);
@@ -2338,10 +2333,12 @@
/* misc.c */
void BlumFlimFrub(void);
-void SetEDir(char *d);
-char *UserEDir(void);
-void SetCacheDir(char *d);
-char *UserCacheDir(void);
+const char *EDirRoot(void);
+const char *EDirBin(void);
+void EDirUserSet(const char *d);
+char *EDirUser(void);
+void EDirUserCacheSet(const char *d);
+char *EDirUserCache(void);
int EExit(void *code);
void ShowEdgeWindows(void);
void HideEdgeWindows(void);
@@ -2436,7 +2433,8 @@
void SessionGetInfo(EWin * ewin, Atom atom_change);
void SetSMID(char *smid);
void SetSMFile(char *path);
-void SetSMUserThemePath(char *path);
+void SetSMProgName(const char *name);
+void SetSMUserThemePath(const char *path);
char *GetSMFile(void);
char *GetGenericSMFile(void);
void MatchEwinToSM(EWin * ewin);
@@ -2527,6 +2525,10 @@
int SoundPlay(const char *name);
int SoundFree(const char *name);
+/* startup.c */
+void AddE(void);
+void CreateStartupDisplay(char start);
+
/* sticky.c */
void MakeWindowSticky(EWin * ewin);
void MakeWindowUnSticky(EWin * ewin);
@@ -2739,8 +2741,6 @@
#define FILEPATH_LEN_MAX 4096
extern char themepath[FILEPATH_LEN_MAX];
-extern char themename[FILEPATH_LEN_MAX];
-extern char *command;
#define DRAW_QUEUE_ENABLE 1
extern char queue_up;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- actions.c 11 Feb 2004 15:39:12 -0000 1.139
+++ actions.c 13 Feb 2004 18:36:51 -0000 1.140
@@ -3218,7 +3218,7 @@
if (!(CanZoom()))
EDBUG_RETURN(0);
- Esnprintf(s, sizeof(s), "%s/.zoom_warn", UserEDir());
+ Esnprintf(s, sizeof(s), "%s/.zoom_warn", EDirUser());
if (!exists(s))
{
FILE *f;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- config.c 12 Feb 2004 01:17:21 -0000 1.88
+++ config.c 13 Feb 2004 18:36:51 -0000 1.89
@@ -3292,19 +3292,19 @@
"-D USER_SHELL=%s " "-D ENLIGHTENMENT_VERSION_015=1 "
"%s %s/cached/cfg/%s.preparsed",
#ifndef __EMX__
- epp_path, ENLIGHTENMENT_ROOT, themepath, ENLIGHTENMENT_ROOT,
- ENLIGHTENMENT_VERSION, ENLIGHTENMENT_ROOT, ENLIGHTENMENT_BIN,
+ epp_path, EDirRoot(), themepath, EDirRoot(),
+ ENLIGHTENMENT_VERSION, EDirRoot(), EDirBin(),
#else
epp_path, x11root, ENLIGHTENMENT_ROOT, themepath, x11root,
ENLIGHTENMENT_ROOT, ENLIGHTENMENT_VERSION, x11root,
ENLIGHTENMENT_ROOT, x11root, ENLIGHTENMENT_BIN, x11root,
#endif
- themepath, UserEDir(), UserCacheDir(), root.w, root.h, root.w,
- root.h, root.depth, def_user, def_home, def_shell, path,
- UserCacheDir(), s);
+ themepath, EDirUser(), EDirUserCache(), root.w, root.h,
+ root.w, root.h, root.depth, def_user, def_home, def_shell,
+ path, EDirUserCache(), s);
system(execline);
Esnprintf(execline, sizeof(execline), "%s/cached/cfg/%s.preparsed",
- UserCacheDir(), s);
+ EDirUserCache(), s);
#ifndef __EMX__
fpin = fopen(execline, "r");
#else
@@ -3537,7 +3537,7 @@
/* look in ~/.enlightenment first */
- Esnprintf(s, sizeof(s), "%s/%s", UserEDir(), file);
+ Esnprintf(s, sizeof(s), "%s/%s", EDirUser(), file);
if (findLocalizedFile(s) || isfile(s))
EDBUG_RETURN(duplicate(s));
@@ -3547,12 +3547,7 @@
EDBUG_RETURN(duplicate(s));
/* look in system config dir */
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
-#else
- Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
- file);
-#endif
+ Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file);
if (findLocalizedFile(s) || isfile(s))
EDBUG_RETURN(duplicate(s));
@@ -3587,17 +3582,12 @@
#endif
/* look in ~/.enlightenment first */
- Esnprintf(s, sizeof(s), "%s/%s", UserEDir(), file);
+ Esnprintf(s, sizeof(s), "%s/%s", EDirUser(), file);
if (findLocalizedFile(s) || isfile(s))
EDBUG_RETURN(duplicate(s));
/* look in system config dir */
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
-#else
- Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
- file);
-#endif
+ Esnprintf(s, sizeof(s), "%s/config/%s", EDirRoot(), file);
if (findLocalizedFile(s) || isfile(s))
EDBUG_RETURN(duplicate(s));
@@ -3635,7 +3625,7 @@
i++;
}
- Esnprintf(s, sizeof(s), "%s/cached/cfg/%s.preparsed", UserCacheDir(), s2);
+ Esnprintf(s, sizeof(s), "%s/cached/cfg/%s.preparsed", EDirUserCache(), s2);
if (strstr(f, "control.cfg"))
notheme = 1;
@@ -3677,15 +3667,11 @@
EDBUG(5, "LoadEConfig");
- Esnprintf(s, sizeof(s), "%s/", UserEDir());
+ Esnprintf(s, sizeof(s), "%s/", EDirUser());
#if USE_FNLIB
Fnlib_add_dir(pFnlibData, s);
#endif
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/config/", ENLIGHTENMENT_ROOT);
-#else
- Esnprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
-#endif
+ Esnprintf(s, sizeof(s), "%s/config/", EDirRoot());
#if USE_FNLIB
Fnlib_add_dir(pFnlibData, s);
#endif
@@ -3699,7 +3685,7 @@
fprintf(f, "%s\n", themelocation);
fclose(f);
}
- Esnprintf(ss, sizeof(ss), "%s/user_theme.cfg", UserEDir());
+ Esnprintf(ss, sizeof(ss), "%s/user_theme.cfg", EDirUser());
mv(s, ss);
if (!isfile(ss))
Alert(_
@@ -3777,12 +3763,14 @@
{
if (i == 1)
CreateStartupDisplay(1);
+
if ((i > 0) && (!p) && (!init_win_ext))
{
p = CreateProgressbar(_("Enlightenment Starting..."), 400, 16);
if (p)
ShowProgressbar(p);
}
+
if (!strcmp(config_files[i], "...e_autosave.cfg"))
{
is_autosave = 1;
@@ -3799,10 +3787,10 @@
}
else
LoadConfigFile(config_files[i]);
+
if (p)
- SetProgressbar(p,
- (i * 100) / (int)(sizeof(config_files) /
- sizeof(char *)));
+ SetProgressbar(p, (i * 100) /
+ (int)(sizeof(config_files) / sizeof(char *)));
}
if (p)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/file.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- file.c 11 Feb 2004 15:39:12 -0000 1.54
+++ file.c 13 Feb 2004 18:36:51 -0000 1.55
@@ -52,7 +52,7 @@
EDBUG(9, "Etmp");
if (!n_calls)
n_calls = (unsigned long)time(NULL) + (unsigned long)getpid();
- Esnprintf(s, 1024, "%s/TMP_%lX", UserEDir(), n_calls);
+ Esnprintf(s, 1024, "%s/TMP_%lX", EDirUser(), n_calls);
n_calls++;
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- globals.c 11 Feb 2004 15:27:52 -0000 1.29
+++ globals.c 13 Feb 2004 18:36:51 -0000 1.30
@@ -53,10 +53,8 @@
Window init_win1 = 0;
Window init_win2 = 0;
Window init_win_ext = 0;
-int deskorder[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
char themepath[FILEPATH_LEN_MAX];
-char themename[FILEPATH_LEN_MAX];
-char *command;
+
char queue_up;
char no_overwrite = 0;
char clickmenu = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/groups.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- groups.c 19 Jan 2004 22:30:30 -0000 1.50
+++ groups.c 13 Feb 2004 18:36:51 -0000 1.51
@@ -386,7 +386,7 @@
FILE *f;
char s[1024];
- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", UserEDir(),
+ Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", EDirUser(),
root.scr);
f = fopen(s, "w");
if (f)
@@ -431,7 +431,7 @@
FILE *f;
char s[1024];
- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", UserEDir(),
+ Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", EDirUser(),
root.scr);
f = fopen(s, "r");
if (f)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- iconify.c 1 Feb 2004 11:28:05 -0000 1.85
+++ iconify.c 13 Feb 2004 18:36:51 -0000 1.86
@@ -1020,7 +1020,7 @@
char s[1024];
FILE *f;
- Esnprintf(s, sizeof(s), "%s/icondefs.cfg", UserEDir());
+ Esnprintf(s, sizeof(s), "%s/icondefs.cfg", EDirUser());
f = fopen(s, "w");
if (f)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- main.c 12 Feb 2004 01:17:21 -0000 1.73
+++ main.c 13 Feb 2004 18:36:51 -0000 1.74
@@ -99,7 +99,9 @@
e_machine_name = duplicate(ubuf.nodename);
if (!e_machine_name)
e_machine_name = duplicate("localhost");
- command = duplicate(argv[0]);
+
+ SetSMProgName(argv[0]);
+
themepath[0] = 0;
{
int j = 0;
@@ -117,11 +119,11 @@
}
else if ((!strcmp("-econfdir", argv[j])) && (argc - j > 1))
{
- SetEDir(argv[++j]);
+ EDirUserSet(argv[++j]);
}
else if ((!strcmp("-ecachedir", argv[j])) && (argc - j > 1))
{
- SetCacheDir(argv[++j]);
+ EDirUserCacheSet(argv[++j]);
}
else if ((!strcmp("-display", argv[j])) && (argc - j > 1))
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- menus.c 6 Feb 2004 19:56:26 -0000 1.100
+++ menus.c 13 Feb 2004 18:36:51 -0000 1.101
@@ -976,7 +976,7 @@
cc = st.st_ctime;
Esnprintf(cs, sizeof(cs),
"%s/cached/img/.%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
- UserCacheDir(), chmap[(aa >> 0) & 0x3f],
+ EDirUserCache(), chmap[(aa >> 0) & 0x3f],
chmap[(aa >> 6) & 0x3f], chmap[(aa >> 12) & 0x3f],
chmap[(aa >> 18) & 0x3f], chmap[(aa >> 24) & 0x3f],
chmap[(aa >> 28) & 0x3f], chmap[(bb >> 0) & 0x3f],
@@ -1027,7 +1027,7 @@
int justx = 512, justy = 512;
Esnprintf(s2, sizeof(s2), "%s/cached/img/%s",
- UserCacheDir(), s3);
+ EDirUserCache(), s3);
imlib_context_set_image(im);
width = imlib_image_get_width();
height = imlib_image_get_height();
@@ -1121,7 +1121,7 @@
ic->name = duplicate("`");
ic->norm.normal = CreateImageState();
Esnprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
- UserCacheDir(), s3);
+ EDirUserCache(), s3);
ic->norm.normal->im_file = duplicate(stmp);
ic->norm.normal->unloadable = 1;
IclassPopulate(ic);
@@ -1255,7 +1255,7 @@
int maxw = 48, maxh = 48;
Esnprintf(s2, sizeof(s2), "%s/cached/img/%s",
- UserCacheDir(), s3);
+ EDirUserCache(), s3);
imlib_context_set_image(im);
width = imlib_image_get_width();
height = imlib_image_get_height();
@@ -1337,7 +1337,7 @@
ic->name = duplicate("`");
ic->norm.normal = CreateImageState();
Esnprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
- UserCacheDir(), s3);
+ EDirUserCache(), s3);
ic->norm.normal->im_file = duplicate(stmp);
ic->norm.normal->unloadable = 1;
IclassPopulate(ic);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/misc.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- misc.c 11 Feb 2004 15:27:53 -0000 1.40
+++ misc.c 13 Feb 2004 18:36:52 -0000 1.41
@@ -50,12 +50,7 @@
for (i = 0; i < 3; i++)
{
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_BIN, bins[i]);
-#else
- Esnprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_BIN),
- bins[i]);
-#endif
+ Esnprintf(s, sizeof(s), "%s/%s", EDirBin(), bins[i]);
if (!exists(s))
{
Alert(_
@@ -81,16 +76,11 @@
"correctly.\n"), s);
EExit(NULL);
}
- Esnprintf(s, sizeof(s), "%s/dox", ENLIGHTENMENT_BIN);
}
+
for (i = 0; i < 3; i++)
{
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_ROOT, docs[i]);
-#else
- Esnprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
- docs[i]);
-#endif
+ Esnprintf(s, sizeof(s), "%s/%s", EDirRoot(), docs[i]);
if (!exists(s))
{
Alert(_
@@ -106,14 +96,10 @@
EExit(NULL);
}
}
+
for (i = 0; i < 1; i++)
{
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_ROOT, thms[i]);
-#else
- Esnprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
- thms[i]);
-#endif
+ Esnprintf(s, sizeof(s), "%s/%s", EDirRoot(), thms[i]);
if (!exists(s))
{
Alert(_
@@ -130,14 +116,34 @@
}
}
+const char *
+EDirBin(void)
+{
+#ifndef __EMX__
+ return ENLIGHTENMENT_BIN;
+#else
+ return __XOS2RedirRoot(ENLIGHTENMENT_BIN);
+#endif
+}
+
+const char *
+EDirRoot(void)
+{
+#ifndef __EMX__
+ return ENLIGHTENMENT_ROOT;
+#else
+ return __XOS2RedirRoot(ENLIGHTENMENT_ROOT);
+#endif
+}
+
void
-SetEDir(char *d)
+EDirUserSet(const char *d)
{
dir = duplicate(d);
}
char *
-UserEDir(void)
+EDirUser(void)
{
if (dir)
return dir;
@@ -154,16 +160,16 @@
}
void
-SetCacheDir(char *d)
+EDirUserCacheSet(const char *d)
{
cacheDir = duplicate(d);
}
char *
-UserCacheDir(void)
+EDirUserCache(void)
{
if (!cacheDir)
- cacheDir = duplicate(UserEDir());
+ cacheDir = duplicate(EDirUser());
return cacheDir;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- pager.c 6 Feb 2004 19:56:26 -0000 1.64
+++ pager.c 13 Feb 2004 18:36:52 -0000 1.65
@@ -627,7 +627,7 @@
uniq = GetUniqueBGString(desks.desk[p->desktop].bg);
Esnprintf(s, sizeof(s), "%s/cached/pager/%s.%i.%i.%s",
- UserCacheDir(),
+ EDirUserCache(),
desks.desk[p->desktop].bg->name, (p->w / ax),
(p->h / ay), uniq);
Efree(uniq);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- session.c 11 Feb 2004 15:27:53 -0000 1.51
+++ session.c 13 Feb 2004 18:36:52 -0000 1.52
@@ -38,6 +38,7 @@
#endif
+static char *command;
static int sm_fd = -1;
/* Generate a unique temporary file name from TEMPLATE.
@@ -129,7 +130,7 @@
{
char s[1024];
- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX", UserEDir());
+ Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX", EDirUser());
def_prefix = duplicate(s);
}
return def_prefix;
@@ -157,7 +158,13 @@
Match *matches = NULL;
void
-SetSMUserThemePath(char *path)
+SetSMProgName(const char *name)
+{
+ command = duplicate(name);
+}
+
+void
+SetSMUserThemePath(const char *path)
{
userthemepath = duplicate(path);
}
@@ -561,8 +568,8 @@
style = SmRestartNever;
user = username(getuid());
- e_conf_dir = UserEDir();
- e_cache_dir = UserCacheDir();
+ e_conf_dir = EDirUser();
+ e_cache_dir = EDirUserCache();
/* The SM specs state that the SmProgram should be the argument passed
* to execve. Passing argv[0] is close enough. */
program = command;
@@ -1037,14 +1044,15 @@
"exec %s -single -ext_init_win %li -theme %s "
"-econfdir %s -ecachedir %s "
"-smfile %s -smid %s", command,
- init_win_ext, themename, UserEDir(),
- UserCacheDir(), sm_file, sm_client_id);
+ init_win_ext, conf.theme.name, EDirUser(),
+ EDirUserCache(), sm_file, sm_client_id);
else
Esnprintf(s, sizeof(s),
"exec %s -single -ext_init_win %li -theme %s "
"-econfdir %s -ecachedir %s "
"-smfile %s", command, init_win_ext,
- themename, UserEDir(), UserCacheDir(), sm_file);
+ conf.theme.name, EDirUser(), EDirUserCache(),
+ sm_file);
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
else
@@ -1054,14 +1062,14 @@
"exec %s -single -ext_init_win %li "
"-econfdir %s -ecachedir %s "
"-smfile %s -smid %s", command,
- init_win_ext, UserEDir(), UserCacheDir(),
+ init_win_ext, EDirUser(), EDirUserCache(),
sm_file, sm_client_id);
else
Esnprintf(s, sizeof(s),
"exec %s -single -ext_init_win %li"
"-econfdir %s -ecachedir %s "
"-smfile %s", command, init_win_ext,
- UserEDir(), UserCacheDir(), sm_file);
+ EDirUser(), EDirUserCache(), sm_file);
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
}
@@ -1084,14 +1092,14 @@
"exec %s -single -ext_init_win %li -theme %s "
"-econfdir %s -ecachedir %s "
"-smfile %s -smid %s", command, init_win_ext,
- userthemepath, UserEDir(), UserCacheDir(), sm_file,
+ userthemepath, EDirUser(), EDirUserCache(), sm_file,
sm_client_id);
else
Esnprintf(s, sizeof(s),
"exec %s -ext_init_win %li -theme %s "
"-econfdir %s -ecachedir %s "
"-smfile %s -single", command, init_win_ext,
- userthemepath, UserEDir(), UserCacheDir(), sm_file);
+ userthemepath, EDirUser(), EDirUserCache(), sm_file);
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
else if (!strcmp((char *)s, "error"))
@@ -1147,7 +1155,7 @@
Esnprintf(sss, sizeof(sss),
"exec %s -single -ext_init_win %li -theme %s "
"-econfdir %s -ecachedir %s", command,
- w, themename, UserEDir(), UserCacheDir());
+ w, conf.theme.name, EDirUser(), EDirUserCache());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
}
else
@@ -1155,7 +1163,7 @@
Esnprintf(sss, sizeof(sss),
"exec %s -single -ext_init_win %li "
"-econfdir %s -ecachedir %s", command,
- w, UserEDir(), UserCacheDir());
+ w, EDirUser(), EDirUserCache());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
}
}
@@ -1169,7 +1177,7 @@
Esnprintf(sss, sizeof(sss),
"exec %s -single -ext_init_win %li -theme %s "
"-econfdir %s -ecachedir %s", command, w, s,
- UserEDir(), UserCacheDir());
+ EDirUser(), EDirUserCache());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
}
else if (!strcmp(s, "restart_wm"))
@@ -1182,7 +1190,7 @@
real_exec = (char *)Emalloc(strlen(s) + 6);
sprintf(real_exec,
"exec %s " "-econfdir %s -ecachedir %s", s,
- UserEDir(), UserCacheDir());
+ EDirUser(), EDirUserCache());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", "exec", real_exec,
NULL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- settings.c 12 Feb 2004 01:17:21 -0000 1.93
+++ settings.c 13 Feb 2004 18:36:52 -0000 1.94
@@ -2486,7 +2486,7 @@
Imlib_Image *im;
Pixmap p2;
- Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s", UserCacheDir(),
+ Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s", EDirUserCache(),
tmp_bg->name);
p2 = ECreatePixmap(disp, root.win, 64, 48, root.depth);
SetBackgroundTo(p2, tmp_bg, 0);
@@ -2890,12 +2890,12 @@
else
{
Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s",
- UserCacheDir(), bglist[i]->name);
+ EDirUserCache(), bglist[i]->name);
im = ELoadImage(s);
if (!im)
{
Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s",
- UserCacheDir(), bglist[i]->name);
+ EDirUserCache(), bglist[i]->name);
p2 = ECreatePixmap(disp, pmap, 64, 48, root.depth);
SetBackgroundTo(p2, bglist[i], 0);
XCopyArea(disp, p2, pmap, gc, 0, 0, 64, 48, x + 4, 4);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- setup.c 11 Feb 2004 15:39:13 -0000 1.110
+++ setup.c 13 Feb 2004 18:36:52 -0000 1.111
@@ -501,7 +501,7 @@
char s[1024], ss[1024], *home;
EDBUG(6, "SetupDirs");
- Esnprintf(s, sizeof(s), "%s", UserEDir());
+ Esnprintf(s, sizeof(s), "%s", EDirUser());
home = homedir(getuid());
if (home)
{
@@ -512,46 +512,46 @@
{
if (!isdir(s))
{
- Esnprintf(ss, sizeof(ss), "%s.old", UserEDir());
+ Esnprintf(ss, sizeof(ss), "%s.old", EDirUser());
mv(s, ss);
md(s);
}
else
- ChkDir(UserEDir());
+ ChkDir(EDirUser());
}
else
md(s);
- Esnprintf(s, sizeof(s), "%s/themes", UserEDir());
+ Esnprintf(s, sizeof(s), "%s/themes", EDirUser());
if (!exists(s))
md(s);
else
ChkDir(s);
- Esnprintf(s, sizeof(s), "%s/backgrounds", UserEDir());
+ Esnprintf(s, sizeof(s), "%s/backgrounds", EDirUser());
if (!exists(s))
md(s);
else
ChkDir(s);
- Esnprintf(s, sizeof(s), "%s/cached", UserCacheDir());
+ Esnprintf(s, sizeof(s), "%s/cached", EDirUserCache());
if (!exists(s))
md(s);
else
ChkDir(s);
- Esnprintf(s, sizeof(s), "%s/cached/img", UserCacheDir());
+ Esnprintf(s, sizeof(s), "%s/cached/img", EDirUserCache());
if (!exists(s))
md(s);
else
ChkDir(s);
- Esnprintf(s, sizeof(s), "%s/cached/cfg", UserCacheDir());
+ Esnprintf(s, sizeof(s), "%s/cached/cfg", EDirUserCache());
if (!exists(s))
md(s);
else
ChkDir(s);
- Esnprintf(s, sizeof(s), "%s/cached/bgsel", UserCacheDir());
+ Esnprintf(s, sizeof(s), "%s/cached/bgsel", EDirUserCache());
if (!exists(s))
md(s);
else
ChkDir(s);
- Esnprintf(s, sizeof(s), "%s/cached/pager", UserCacheDir());
+ Esnprintf(s, sizeof(s), "%s/cached/pager", EDirUserCache());
if (!exists(s))
md(s);
else
@@ -567,17 +567,13 @@
if (master_pid != getpid())
Esetenv("DISPLAY", DisplayString(disp), 1);
Esetenv("EVERSION", ENLIGHTENMENT_VERSION, 1);
-#ifndef __EMX__
- Esetenv("EROOT", ENLIGHTENMENT_ROOT, 1);
-#else
- Esetenv("EROOT", __XOS2RedirRoot(ENLIGHTENMENT_ROOT), 1);
-#endif
- Esetenv("EBIN", ENLIGHTENMENT_BIN, 1);
+ Esetenv("EROOT", EDirRoot(), 1);
+ Esetenv("EBIN", EDirBin(), 1);
Esnprintf(s, sizeof(s), "%i", getpid());
Esetenv("EPID", s, 1);
Esetenv("ETHEME", themepath, 1);
- Esetenv("ECONFDIR", UserEDir(), 1);
- Esetenv("ECACHEDIR", UserCacheDir(), 1);
+ Esetenv("ECONFDIR", EDirUser(), 1);
+ Esetenv("ECACHEDIR", EDirUserCache(), 1);
#ifdef __EMX__
Esetenv("EMXSHELL", "sh.exe", 1);
@@ -790,7 +786,7 @@
EDBUG(3, "SetupUserInitialization");
- Esnprintf(file, sizeof(file), "%s/.initialized", UserEDir());
+ Esnprintf(file, sizeof(file), "%s/.initialized", EDirUser());
if (isfile(file))
{
mode.firsttime = 0;
@@ -806,8 +802,7 @@
fclose(f);
if (fork())
EDBUG_RETURN_;
- Esnprintf(file, sizeof(file), "exec %s/scripts/e_gen_menu",
- ENLIGHTENMENT_ROOT);
+ Esnprintf(file, sizeof(file), "exec %s/scripts/e_gen_menu", EDirRoot());
execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file,
NULL);
exit(0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- startup.c 6 Feb 2004 19:56:26 -0000 1.33
+++ startup.c 13 Feb 2004 18:36:52 -0000 1.34
@@ -80,8 +80,7 @@
fprintf(f2, "#%s", s);
fprintf(f2,
"\n# Enlightenment inserted Execution string here\n");
- fprintf(f2, "exec %s/enlightenment\n\n",
- ENLIGHTENMENT_BIN);
+ fprintf(f2, "exec %s/enlightenment\n\n", EDirBin());
foundwm = 1;
i = wmnum + 1;
}
@@ -104,7 +103,7 @@
EDBUG_RETURN(0);
}
fprintf(f2, "\n# Enlightenment inserted Execution string here\n");
- fprintf(f2, "exec %s/enlightenment\n\n", ENLIGHTENMENT_BIN);
+ fprintf(f2, "exec %s/enlightenment\n\n", EDirBin());
while (fgets(s, 2048, f1))
fprintf(f2, "%s", s);
fclose(f1);
@@ -126,7 +125,7 @@
if (!f)
EDBUG_RETURN(0);
fprintf(f, "# Enlightenment inserted Execution string here\n");
- fprintf(f, "exec %s/enlightenment\n", ENLIGHTENMENT_BIN);
+ fprintf(f, "exec %s/enlightenment\n", EDirBin());
fclose(f);
EDBUG_RETURN(1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/theme.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- theme.c 11 Feb 2004 15:27:54 -0000 1.29
+++ theme.c 13 Feb 2004 18:36:52 -0000 1.30
@@ -229,13 +229,9 @@
NULL;
int count = 0;
- Esnprintf(s, sizeof(s), "%s/themes", UserEDir());
+ Esnprintf(s, sizeof(s), "%s/themes", EDirUser());
def = append_merge_dir(s, &list, &count);
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/themes", ENLIGHTENMENT_ROOT);
-#else
- Esnprintf(s, sizeof(s), "%s/themes", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
-#endif
+ Esnprintf(s, sizeof(s), "%s/themes", EDirRoot());
def2 = append_merge_dir(s, &list, &count);
if ((def) && (def2))
@@ -262,7 +258,7 @@
char *def = NULL;
int count;
- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", UserEDir());
+ Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", EDirUser());
#ifndef __EMX__
count = readlink(ss, s, sizeof(s));
if ((exists(ss)) && (count > 0))
@@ -272,7 +268,7 @@
def = duplicate(s);
else
{
- Esnprintf(ss, sizeof(ss), "%s/themes/%s", UserEDir(), s);
+ Esnprintf(ss, sizeof(ss), "%s/themes/%s", EDirUser(), s);
def = duplicate(ss);
}
}
@@ -282,12 +278,7 @@
#endif
if (!def)
{
-#ifndef __EMX__
- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", ENLIGHTENMENT_ROOT);
-#else
- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT",
- __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
-#endif
+ Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", EDirRoot());
#ifndef __EMX__
count = readlink(ss, s, sizeof(s));
if ((exists(ss)) && (count > 0))
@@ -297,8 +288,7 @@
def = duplicate(s);
else
{
- Esnprintf(ss, sizeof(ss), "%s/themes/%s", ENLIGHTENMENT_ROOT,
- s);
+ Esnprintf(ss, sizeof(ss), "%s/themes/%s", EDirRoot(), s);
def = duplicate(ss);
}
}
@@ -319,7 +309,7 @@
*/
char ss[FILEPATH_LEN_MAX];
- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", UserEDir());
+ Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", EDirUser());
if (exists(ss))
rm(ss);
if (theme)
@@ -360,7 +350,7 @@
/* make the temp dir */
name = fileof(theme);
- Esnprintf(th, sizeof(th), "%s/themes/%s", UserEDir(), name);
+ Esnprintf(th, sizeof(th), "%s/themes/%s", EDirUser(), name);
Efree(name);
md(th);
@@ -414,17 +404,14 @@
EDBUG(6, "FindTheme");
- strcpy(themename, theme);
+ if (conf.theme.name)
+ Efree(conf.theme.name);
+ conf.theme.name = duplicate(theme);
badreason = _("Unknown\n");
if (!theme[0])
{
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/themes/DEFAULT", ENLIGHTENMENT_ROOT);
-#else
- Esnprintf(s, sizeof(s), "%s/themes/DEFAULT",
- __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
-#endif
+ Esnprintf(s, sizeof(s), "%s/themes/DEFAULT", EDirRoot());
EDBUG_RETURN(duplicate(s));
}
@@ -436,19 +423,14 @@
ret = ThemeExtract(theme);
if (!ret)
{
- Esnprintf(s, sizeof(s), "%s/themes/%s", UserEDir(), theme);
+ Esnprintf(s, sizeof(s), "%s/themes/%s", EDirUser(), theme);
if (exists(s))
ret = ThemeExtract(s);
else
badreason = _("Theme file/directory does not exist\n");
if (!ret)
{
-#ifndef __EMX__
- Esnprintf(s, sizeof(s), "%s/themes/%s", ENLIGHTENMENT_ROOT, theme);
-#else
- Esnprintf(s, sizeof(s), "%s/themes/%s",
- __XOS2RedirRoot(ENLIGHTENMENT_ROOT), theme);
-#endif
+ Esnprintf(s, sizeof(s), "%s/themes/%s", EDirRoot(), theme);
if (exists(s))
ret = ThemeExtract(s);
else
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
