forked from e16/e16
1
0
Fork 0

added soem docs, added optiosn to dox to make it mroe versatilex

SVN revision: 183
This commit is contained in:
Carsten Haitzler 1999-09-05 20:34:52 +00:00
parent 0cc7bc3978
commit 50e6810bcc
6 changed files with 148 additions and 12 deletions

16
dox/E-docs/FIRST_0.16 Normal file
View File

@ -0,0 +1,16 @@
<page columns=1 padding=16 name=front background=Edoc_bg.png linkcolor=#88dddd>
<img src=E_logo.png x=32 y=64>
<font face=aircut3/12 color=#ffffff>
<p align=50%>
Welcome to Enlightenment Development Release 0.16. I will now help you set up
and install Enlightenment for your use.
<p align=50%>
If you have been using Enlightenment before and
have any important information in your ~/.enlightenment/ directory you wish
to keep please move it out of that directory now. Once you are done, click on
Contiune below.
<p align=50%>
If you are new to Enlightenment click on Contiue below now.
<br>
<br>
_Continue(INPUT.first16.sh)<br>

48
dox/E-docs/first16-2.sh Executable file
View File

@ -0,0 +1,48 @@
#!/bin/sh
cat << __EOF__
<page columns=1 padding=16 name=front background=Edoc_bg.png linkcolor=#88dddd>
<font face=aircut3/12 color=#ffffff>
__EOF__
# find the users .xinitrc, .xsession, .Xclients
EXISTS="0"
if [ -e ~/.xsession ]; then
EXISTS="1"
fi
if [ -e ~/.xinitrc ]; then
EXISTS="1"
fi
if [ -e ~/.Xclients ]; then
EXISTS="1"
fi
E_BIN=$E_BINDIR/enlightenment
E_EESH=$E_BINDIR/eesh
E_DOX=$E_BINDIR/dox
E_DATA=$E_BINDIR/enlightenment
if [ $EXISTS = "1" ]; then
cat << __EOF__
<p align=50%>
It appears you already have some of your own X Login startup scripts (such as
.xsession, .xinitrc and .Xclients). If you have no idea what this is all
about just click Contiue below and everything will be taken care of for you.
<p align=50%>
If you have customised these files and wish to keep your modifications, it is
suggested that you review each or all of them and manually ensure they run
$E_BIN as the window manager on the last line of your script(s).
<p align=50%>
If you wish to abort just close this window.
<p align=50%>
_Contiune(INPUT.first16-2.sh)
__EOF__
else
cat << __EOF__
<p align=50%>
You appear to have no custom X Login setup for your user. If you click on
Contiue below Enlightenment will set everything up for you
<p align=50%>
If you wish to abort just close this window.
<p align=50%>
_Contiune(INPUT.first16-2.sh)
__EOF__
fi

48
dox/E-docs/first16.sh Executable file
View File

@ -0,0 +1,48 @@
#!/bin/sh
cat << __EOF__
<page columns=1 padding=16 name=front background=Edoc_bg.png linkcolor=#88dddd>
<font face=aircut3/12 color=#ffffff>
__EOF__
# find the users .xinitrc, .xsession, .Xclients
EXISTS="0"
if [ -e ~/.xsession ]; then
EXISTS="1"
fi
if [ -e ~/.xinitrc ]; then
EXISTS="1"
fi
if [ -e ~/.Xclients ]; then
EXISTS="1"
fi
E_BIN=$E_BINDIR/enlightenment
E_EESH=$E_BINDIR/eesh
E_DOX=$E_BINDIR/dox
E_DATA=$E_DATADIR
if [ $EXISTS = "1" ]; then
cat << __EOF__
<p align=50%>
It appears you already have some of your own X Login startup scripts (such as
.xsession, .xinitrc and .Xclients). If you have no idea what this is all
about just click Contiue below and everything will be taken care of for you.
<p align=50%>
If you have customised these files and wish to keep your modifications, it is
suggested that you review each or all of them and manually ensure they run
$E_BIN $0 as the window manager on the last line of your script(s).
<p align=50%>
If you wish to abort just close this window.
<p align=50%>
_Contiune(INPUT.first16-2.sh)
__EOF__
else
cat << __EOF__
<p align=50%>
You appear to have no custom X Login setup for your user. If you click on
Contiue below Enlightenment will set everything up for you
<p align=50%>
If you wish to abort just close this window.
<p align=50%>
_Contiune(INPUT.first16-2.sh)
__EOF__
fi

View File

@ -33,7 +33,7 @@ LDADD = $(TTF_LIBS) $(FNLIB_LIBS) $(IMLIB_LIBS) -lm
INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\"
#install-exec-local:
# if [ x@USE_FSSTD@ = "xno" ]; then \

View File

@ -162,10 +162,10 @@ int
main(int argc, char **argv)
{
int pagenum;
int x, y;
int i, w, h, x, y;
int wx, wy;
FILE *f;
char *s;
char *s, *docfile = NULL;
Pixmap draw = 0;
Link *l = NULL, *ll = NULL;
ImlibBorder ibd;
@ -203,25 +203,42 @@ main(int argc, char **argv)
if (argc < 2)
{
printf("usage:\n%s [-page num] Edoc_dir\n", argv[0]);
printf("usage:\n"
"%s [-page page_number] [-file Edoc_fname] [-size width height] Edoc_dir\n",
argv[0]);
exit(1);
}
if (!strcmp(argv[1], "-page"))
docdir=".";
docfile="MAIN";
for (i = 1; i < argc; i++)
{
pagenum = atoi(argv[2]);
docdir = strdup(argv[3]);
if ((!strcmp(argv[i], "-page")) && (i < (argc - 1)))
pagenum = atoi(argv[++i]);
else if ((!strcmp(argv[i], "-file")) && (i < (argc - 1)))
docfile = argv[++i];
else if ((!strcmp(argv[i], "-size")) && (i < (argc - 2)))
{
w = atoi(argv[++i]);
h = atoi(argv[++i]);
}
else
docdir = strdup(argv[i]);
}
else
docdir = strdup(argv[1]);
s = malloc(strlen(docdir) + 1 + 5);
s = malloc(strlen(docdir) + strlen(docfile) + 2);
strcpy(s, docdir);
strcat(s, "/MAIN");
strcat(s, "/");
strcat(s, docfile);
f = fopen(s, "r");
if (!f)
{
printf("Edoc_dir does not contain a MAIN file\n");
printf("Edoc_dir %s does not contain a %s file\n", docdir, docfile);
exit(1);
}
Esetenv("DISPLAY", DisplayString(disp), 1);
Esetenv("E_DATADIR", ENLIGHTENMENT_ROOT, 1);
Esetenv("E_BINDIR", ENLIGHTENMENT_BIN, 1);
t = 16;
GetObjects(f);
fclose(f);

View File

@ -61,6 +61,13 @@
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
#define Esetenv(var, val, overwrite) \
{ \
static char envvar[1024]; \
sprintf(envvar, "%500s=%500s", var, val);\
putenv(envvar);\
}
typedef struct _efont
{
TT_Engine engine;