Enlightenment CVS committal

Author  : fletch3k
Project : misc
Module  : enotes

Dir     : misc/enotes/src


Modified Files:
        main.c main.h newentry.c notecmds.c notenum.c 
Added Files:
        indentem 
Removed Files:
        evasfuncs.c 


Log Message:
E-Notes now uses my small Evas simplification layer for some objects and event driven 
functions, I've added a script for use of the indent command to tidy my code up, so i 
just run the script before updates and commits. :-)

===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- main.c      22 Feb 2003 18:15:01 -0000      1.12
+++ main.c      23 Feb 2003 10:07:17 -0000      1.13
@@ -71,200 +71,280 @@
 int
 main (int argc, char *argv[])
 {
-       int a=1;
-       int actionbool=0;
-       char *mtmp=malloc(str_size);
-
-       tmp=malloc(str_size);
-       str=malloc(str_size);
-       fn=malloc(100);
-       fontdir=malloc(str_size);
-       bgfile=malloc(str_size);
-       font=malloc(str_size);
-       configfn=malloc(str_size);
-       xbtnfn=malloc(str_size);
-       openwinimg=malloc(str_size);
-       lastbtn=malloc(str_size);
-       firstbtn=malloc(str_size);
-       nubtn=malloc(str_size);
-       newbtn=malloc(str_size);
-       barimg=malloc(str_size);
-
-       strcat(fontdir, ".");
-       strcpy(fn, getenv("HOME"));
-       strcat(fn, "/.e/enotes/notes");
-       strcpy(bgfile, "/usr/local/share/enotes/data/bg.jpg");
-       strcpy(font, "/usr/local/share/enotes/data/arial.ttf");
-       strcpy(configfn, getenv("HOME"));
-       strcat(configfn, "/.e/enotes/config");
-       strcpy(xbtnfn, "/usr/local/share/enotes/data/x.png");
-       strcpy(openwinimg, "/usr/local/share/enotes/data/titleimg.jpg");
-       strcpy(lastbtn, "/usr/local/share/enotes/data/lastbtn.png");
-       strcpy(firstbtn, "/usr/local/share/enotes/data/firstbtn.png");
-       strcpy(nubtn, "/usr/local/share/enotes/data/nubtn.png");
-       strcpy(newbtn, "/usr/local/share/enotes/data/newbtn.png");
-       strcpy(barimg, "/usr/local/share/enotes/data/panel.png");
-       r=0;    g=0;    b=0;
-       w=250;     h=250;
-       title_font_size=16;
-       font_size=12;
-
-       eprog_init();
-
-       setconfig();
-       
-       if(argc<2) {
-               openwin();
-               eprog_event_loop();
-               return(0);
-       }
-
-
-       while(argv[a]!=NULL) {
-               if(!strcmp(argv[a], "-d")||!strcmp( argv[a] , "--db")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=='-') {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(fn, argv[a+1]);
-                       a++;
-               } else if (!strcmp(argv[a], "-t")||!strcmp(argv[a], "--titleimg")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(openwinimg, argv[a+1]);
-               } else if (!strcmp(argv[a], "-x")||!strcmp(argv[a], "--xbtnimg")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(xbtnfn, argv[a+1]);
-                       a++;
-               } else if (!strcmp(argv[a], "-s")||!strcmp(argv[a], "--config")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(configfn, argv[a+1]);
-                       a++;
-                       
-               } else if (!strcmp(argv[a], "-f")||!strcmp( argv[a] , "--font")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=='-') {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(font, argv[a+1]);
-                       a++;
-               } else if (!strcmp(argv[a], "-b")||!strcmp( argv[a] , "--bg")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=='-') {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(bgfile, argv[a+1]);
-                       a++;
-               } else if (!strcmp(argv[a], "--lastbtn")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(lastbtn, argv[a+1]);
-               } else if (!strcmp(argv[a], "--firstbtn")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(firstbtn, argv[a+1]);
-               } else if (!strcmp(argv[a], "--nubtn")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(nubtn, argv[a+1]);
-               } else if (!strcmp(argv[a], "--newbtn")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy(newbtn, argv[a+1]);
-               } else if (!strcmp(argv[a], "-B")||!strcmp( argv[a], "--barimg")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       strcpy (barimg, argv[a+1]);
-               } else if (!strcmp(argv[a], "-S")||!strcmp( argv[a], "--fontsize")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       font_size=atoi (mtmp);
-               } else if (!strcmp(argv[a], "-T")||!strcmp( argv[a], "--tsize")) {
-                       mtmp=argv[a+1];
-                       if(mtmp==NULL||mtmp[0]=="-") {
-                               printf("Missing Argument!\n");
-                               return(0);
-                       }
-                       title_font_size=atoi (mtmp);
-               } else if (!strcmp(argv[a], "-u")||!strcmp( argv[a], "--usage")
-                               ||!strcmp(argv[a], "-h")||!strcmp(argv[a], "--help")) {
-                       printf(usage);
-                       return(0);
-               } else if (!strcmp(argv[a], "-v")||!strcmp(argv[a], "--version")) {
-                       printf(version);
-                       return(0);
-               }
-               a++;
-       } a=1;
-
-
-       while(argv[a]!=NULL) {
-               if (!strcmp(argv[a], "-o")||!strcmp(argv[a], "--first")) {
-                       fnotenum(1);
-                       actionbool=1;
-               } else if (!strcmp(argv[a], "-l")||!strcmp(argv[a], "--last")) {
-                       dislast();
-                       actionbool=1;
-               } else if (!strcmp(argv[a], "--nu")) {
-                       notengui();
-                       a++;
-                       actionbool=1;
-               } else if (!strcmp(argv[a], "-n")||!strcmp(argv[a], "--num")) {
-                       fnotenum(atoi(argv[a+1]));
-                       a++;
-                       actionbool=1;
-               } else if (!strcmp(argv[a], "-c")||!strcmp(argv[a], "--clear")) {
-                       clear();
-                       actionbool=1;
-               } else if (!strcmp(argv[a], "-N")||!strcmp(argv[a], "--new")) {
-                       newnote(argc, argv);
-                       actionbool=1;
-               } else if (!strcmp(argv[a], "-C")||!strcmp(argv[a], "--count")) {
-                       count();
-                       actionbool=1;
-               }
-               a++;
-       } a=0;
-
-       if(actionbool==0) {
-               openwin();
-               eprog_event_loop();
-               return(0);
-       }
+       int a = 1;
+       int actionbool = 0;
+       char *mtmp = malloc (str_size);
+
+       tmp = malloc (str_size);
+       str = malloc (str_size);
+       fn = malloc (100);
+       fontdir = malloc (str_size);
+       bgfile = malloc (str_size);
+       font = malloc (str_size);
+       configfn = malloc (str_size);
+       xbtnfn = malloc (str_size);
+       openwinimg = malloc (str_size);
+       lastbtn = malloc (str_size);
+       firstbtn = malloc (str_size);
+       nubtn = malloc (str_size);
+       newbtn = malloc (str_size);
+       barimg = malloc (str_size);
+
+       strcat (fontdir, ".");
+       strcpy (fn, getenv ("HOME"));
+       strcat (fn, "/.e/enotes/notes");
+       strcpy (bgfile, "/usr/local/share/enotes/data/bg.jpg");
+       strcpy (font, "/usr/local/share/enotes/data/arial.ttf");
+       strcpy (configfn, getenv ("HOME"));
+       strcat (configfn, "/.e/enotes/config");
+       strcpy (xbtnfn, "/usr/local/share/enotes/data/x.png");
+       strcpy (openwinimg, "/usr/local/share/enotes/data/titleimg.jpg");
+       strcpy (lastbtn, "/usr/local/share/enotes/data/lastbtn.png");
+       strcpy (firstbtn, "/usr/local/share/enotes/data/firstbtn.png");
+       strcpy (nubtn, "/usr/local/share/enotes/data/nubtn.png");
+       strcpy (newbtn, "/usr/local/share/enotes/data/newbtn.png");
+       strcpy (barimg, "/usr/local/share/enotes/data/panel.png");
+       r = 0;
+       g = 0;
+       b = 0;
+       w = 250;
+       h = 250;
+       title_font_size = 16;
+       font_size = 12;
+
+       eprog_init ();
+
+       setconfig ();
+
+       if (argc < 2)
+         {
+                 openwin ();
+                 eprog_event_loop ();
+                 return (0);
+         }
+
+
+       while (argv[a] != NULL)
+         {
+                 if (!strcmp (argv[a], "-d") || !strcmp (argv[a], "--db"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == '-')
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (fn, argv[a + 1]);
+                           a++;
+                   }
+                 else if (!strcmp (argv[a], "-t")
+                          || !strcmp (argv[a], "--titleimg"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (openwinimg, argv[a + 1]);
+                   }
+                 else if (!strcmp (argv[a], "-x")
+                          || !strcmp (argv[a], "--xbtnimg"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (xbtnfn, argv[a + 1]);
+                           a++;
+                   }
+                 else if (!strcmp (argv[a], "-s")
+                          || !strcmp (argv[a], "--config"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (configfn, argv[a + 1]);
+                           a++;
+
+                   }
+                 else if (!strcmp (argv[a], "-f")
+                          || !strcmp (argv[a], "--font"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == '-')
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (font, argv[a + 1]);
+                           a++;
+                   }
+                 else if (!strcmp (argv[a], "-b")
+                          || !strcmp (argv[a], "--bg"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == '-')
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (bgfile, argv[a + 1]);
+                           a++;
+                   }
+                 else if (!strcmp (argv[a], "--lastbtn"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (lastbtn, argv[a + 1]);
+                   }
+                 else if (!strcmp (argv[a], "--firstbtn"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (firstbtn, argv[a + 1]);
+                   }
+                 else if (!strcmp (argv[a], "--nubtn"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (nubtn, argv[a + 1]);
+                   }
+                 else if (!strcmp (argv[a], "--newbtn"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (newbtn, argv[a + 1]);
+                   }
+                 else if (!strcmp (argv[a], "-B")
+                          || !strcmp (argv[a], "--barimg"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           strcpy (barimg, argv[a + 1]);
+                   }
+                 else if (!strcmp (argv[a], "-S")
+                          || !strcmp (argv[a], "--fontsize"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           font_size = atoi (mtmp);
+                   }
+                 else if (!strcmp (argv[a], "-T")
+                          || !strcmp (argv[a], "--tsize"))
+                   {
+                           mtmp = argv[a + 1];
+                           if (mtmp == NULL || mtmp[0] == "-")
+                             {
+                                     printf ("Missing Argument!\n");
+                                     return (0);
+                             }
+                           title_font_size = atoi (mtmp);
+                   }
+                 else if (!strcmp (argv[a], "-u")
+                          || !strcmp (argv[a], "--usage")
+                          || !strcmp (argv[a], "-h")
+                          || !strcmp (argv[a], "--help"))
+                   {
+                           printf (usage);
+                           return (0);
+                   }
+                 else if (!strcmp (argv[a], "-v")
+                          || !strcmp (argv[a], "--version"))
+                   {
+                           printf (version);
+                           return (0);
+                   }
+                 a++;
+         }
+       a = 1;
+
+
+       while (argv[a] != NULL)
+         {
+                 if (!strcmp (argv[a], "-o") || !strcmp (argv[a], "--first"))
+                   {
+                           fnotenum (1);
+                           actionbool = 1;
+                   }
+                 else if (!strcmp (argv[a], "-l")
+                          || !strcmp (argv[a], "--last"))
+                   {
+                           dislast ();
+                           actionbool = 1;
+                   }
+                 else if (!strcmp (argv[a], "--nu"))
+                   {
+                           notengui ();
+                           a++;
+                           actionbool = 1;
+                   }
+                 else if (!strcmp (argv[a], "-n")
+                          || !strcmp (argv[a], "--num"))
+                   {
+                           fnotenum (atoi (argv[a + 1]));
+                           a++;
+                           actionbool = 1;
+                   }
+                 else if (!strcmp (argv[a], "-c")
+                          || !strcmp (argv[a], "--clear"))
+                   {
+                           clear ();
+                           actionbool = 1;
+                   }
+                 else if (!strcmp (argv[a], "-N")
+                          || !strcmp (argv[a], "--new"))
+                   {
+                           newnote (argc, argv);
+                           actionbool = 1;
+                   }
+                 else if (!strcmp (argv[a], "-C")
+                          || !strcmp (argv[a], "--count"))
+                   {
+                           count ();
+                           actionbool = 1;
+                   }
+                 a++;
+         }
+       a = 0;
+
+       if (actionbool == 0)
+         {
+                 openwin ();
+                 eprog_event_loop ();
+                 return (0);
+         }
 
-       freethem();
+       freethem ();
 
        eprog_event_loop ();
 }
@@ -273,21 +353,21 @@
 freethem ()
 {
        if (tmp)
-               free(tmp);
+               free (tmp);
        if (str)
-               free(str);
+               free (str);
        if (fn)
-               free(fn);
+               free (fn);
        if (fontdir)
-               free(fontdir);
+               free (fontdir);
        if (bgfile)
-               free(bgfile);
+               free (bgfile);
        if (font)
-               free(font);
+               free (font);
        if (configfn)
-               free(configfn);
+               free (configfn);
        if (xbtnfn)
-               free(xbtnfn);
+               free (xbtnfn);
        if (barimg)
                free (barimg);
 }
@@ -295,169 +375,250 @@
 void
 setconfig ()
 {
-       char *tmp2=malloc(str_size);
-       int sectiontype=0;
+       char *tmp2 = malloc (str_size);
+       int sectiontype = 0;
        int donebool[13];
-       if(file!=NULL) {
-               fclose(file);
-       }
-       file=fopen(configfn, "r");
-       if(file==NULL) {
-               printf("No Configuration File Found.\nUsing Defaults.\n");
-               return;
-       }
-       while(fgets(tmp2, str_size, file)!=NULL) {
-               if(!strcmp(tmp2, "\n")) {
-                       goto lp1;
-               }
-               
-               if(tmp2[0]=='#') {
-                       goto lp1;
-               }
-               
-               if(!strncmp(tmp2, "[storage]", (size_t)9)) {
-                       sectiontype=1;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[font]", 6)) {
-                       sectiontype=3;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[bg]", 4)) {
-                       sectiontype=4;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[txtcolour]", 11)) {
-                       sectiontype=5;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[xbtnimg]", 9)) {
-                       sectiontype=9;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[barimg]", 8)) {
-                       sectiontype=10;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[titleimg]", 10)) {
-                       sectiontype=13;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[lastbtnimg]", 12)) {
-                       sectiontype=14;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[firstbtnimg]", 13)) {
-                       sectiontype=15;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[nubtnimg]", 10)) {
-                       sectiontype=16;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[newbtnimg]", 11)) {
-                       sectiontype=17;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[fontsize]", 10)) {
-                       sectiontype=18;
-                       goto lp1;
-               } else if (!strncmp(tmp2, "[titlefontsize]", 15)) {
-                       sectiontype=19;
-                       goto lp1;
-               }
-
-               if(sectiontype==1) {
-                       if(donebool[0]!=1) {
-                               strncpy(fn, tmp2, strlen(tmp2)-1);
-                               donebool[0]=1;
-                       }
-                       sectiontype==0;
-               } else if (sectiontype==3) {
-                       if(donebool[1]!=1) {
-                               strncpy(font, tmp2, strlen(tmp2)-1);
-                               donebool[1]=1;
-                       }
-                       sectiontype==0;
-               } else if (sectiontype==4) {
-                       if(donebool[2]!=1) {
-                               strncpy(bgfile, tmp2, strlen(tmp2)-1);
-                               donebool[2]==1;
-                       }
-                       sectiontype==0;
-               } else if (sectiontype==5) {
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==6) {
-                       r=atoi(tmp2);
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==7) {
-                       g=atoi(tmp2);
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==8) {
-                       b=atoi(tmp2);
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==9) {
-                       if(donebool[3]!=1) {
-                               strncpy(xbtnfn, tmp2, strlen(tmp2)-1);
-                               donebool[3]=1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==10) {
-                       if(donebool[4]!=1) {
-                               strncpy(barimg, tmp2, strlen(tmp2)-1);
-                               donebool[4]=1;
-                       }
-                       sectiontype=13;
-                       goto lp1;
-               } else if (sectiontype==13) {
-                       if(donebool[7]!=1) {
-                               strncpy(openwinimg, tmp2, strlen(tmp2)-1);
-                               donebool[7]==1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==14) {
-                       if(donebool[8]!=1) {
-                               strncpy(lastbtn, tmp2, strlen(tmp2)-1);
-                               donebool[8]==1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==15) {
-                       if(donebool[9]!=1) {
-                               strncpy(firstbtn, tmp2, strlen(tmp2)-1);
-                               donebool[9]==1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==16) {
-                       if(donebool[10]!=1) {
-                               strncpy(nubtn, tmp2, strlen(tmp2)-1);
-                               donebool[10]==1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==17) {
-                       if(donebool[11]!=1) {
-                               strncpy(newbtn, tmp2, strlen(tmp2)-1);
-                               donebool[11]==1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==18) {
-                       if(donebool[12]!=1) {
-                               font_size=atoi(tmp2);
-                               donebool[12]==1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               } else if (sectiontype==19) {
-                       if(donebool[13]!=1) {
-                               title_font_size=atoi(tmp2);
-                               donebool[13]==1;
-                       }
-                       sectiontype++;
-                       goto lp1;
-               }
-lp1:
-               memset(tmp2, 0, sizeof(tmp2));
-       }
-       fclose(file);
-       free(tmp2);
-       printf("%d", strlen(bgfile));
+       if (file != NULL)
+         {
+                 fclose (file);
+         }
+       file = fopen (configfn, "r");
+       if (file == NULL)
+         {
+                 printf ("No Configuration File Found.\nUsing Defaults.\n");
+                 return;
+         }
+       while (fgets (tmp2, str_size, file) != NULL)
+         {
+                 if (!strcmp (tmp2, "\n"))
+                   {
+                           goto lp1;
+                   }
+
+                 if (tmp2[0] == '#')
+                   {
+                           goto lp1;
+                   }
+
+                 if (!strncmp (tmp2, "[storage]", (size_t) 9))
+                   {
+                           sectiontype = 1;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[font]", 6))
+                   {
+                           sectiontype = 3;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[bg]", 4))
+                   {
+                           sectiontype = 4;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[txtcolour]", 11))
+                   {
+                           sectiontype = 5;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[xbtnimg]", 9))
+                   {
+                           sectiontype = 9;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[barimg]", 8))
+                   {
+                           sectiontype = 10;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[titleimg]", 10))
+                   {
+                           sectiontype = 13;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[lastbtnimg]", 12))
+                   {
+                           sectiontype = 14;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[firstbtnimg]", 13))
+                   {
+                           sectiontype = 15;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[nubtnimg]", 10))
+                   {
+                           sectiontype = 16;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[newbtnimg]", 11))
+                   {
+                           sectiontype = 17;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[fontsize]", 10))
+                   {
+                           sectiontype = 18;
+                           goto lp1;
+                   }
+                 else if (!strncmp (tmp2, "[titlefontsize]", 15))
+                   {
+                           sectiontype = 19;
+                           goto lp1;
+                   }
+
+                 if (sectiontype == 1)
+                   {
+                           if (donebool[0] != 1)
+                             {
+                                     strncpy (fn, tmp2, strlen (tmp2) - 1);
+                                     donebool[0] = 1;
+                             }
+                           sectiontype == 0;
+                   }
+                 else if (sectiontype == 3)
+                   {
+                           if (donebool[1] != 1)
+                             {
+                                     strncpy (font, tmp2, strlen (tmp2) - 1);
+                                     donebool[1] = 1;
+                             }
+                           sectiontype == 0;
+                   }
+                 else if (sectiontype == 4)
+                   {
+                           if (donebool[2] != 1)
+                             {
+                                     strncpy (bgfile, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[2] == 1;
+                             }
+                           sectiontype == 0;
+                   }
+                 else if (sectiontype == 5)
+                   {
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 6)
+                   {
+                           r = atoi (tmp2);
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 7)
+                   {
+                           g = atoi (tmp2);
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 8)
+                   {
+                           b = atoi (tmp2);
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 9)
+                   {
+                           if (donebool[3] != 1)
+                             {
+                                     strncpy (xbtnfn, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[3] = 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 10)
+                   {
+                           if (donebool[4] != 1)
+                             {
+                                     strncpy (barimg, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[4] = 1;
+                             }
+                           sectiontype = 13;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 13)
+                   {
+                           if (donebool[7] != 1)
+                             {
+                                     strncpy (openwinimg, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[7] == 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 14)
+                   {
+                           if (donebool[8] != 1)
+                             {
+                                     strncpy (lastbtn, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[8] == 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 15)
+                   {
+                           if (donebool[9] != 1)
+                             {
+                                     strncpy (firstbtn, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[9] == 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 16)
+                   {
+                           if (donebool[10] != 1)
+                             {
+                                     strncpy (nubtn, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[10] == 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 17)
+                   {
+                           if (donebool[11] != 1)
+                             {
+                                     strncpy (newbtn, tmp2,
+                                              strlen (tmp2) - 1);
+                                     donebool[11] == 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 18)
+                   {
+                           if (donebool[12] != 1)
+                             {
+                                     font_size = atoi (tmp2);
+                                     donebool[12] == 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+                 else if (sectiontype == 19)
+                   {
+                           if (donebool[13] != 1)
+                             {
+                                     title_font_size = atoi (tmp2);
+                                     donebool[13] == 1;
+                             }
+                           sectiontype++;
+                           goto lp1;
+                   }
+               lp1:
+                 memset (tmp2, 0, sizeof (tmp2));
+         }
+       fclose (file);
+       free (tmp2);
+       printf ("%d", strlen (bgfile));
        return;
 }
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- main.h      22 Feb 2003 18:15:01 -0000      1.15
+++ main.h      23 Feb 2003 10:07:17 -0000      1.16
@@ -179,6 +179,7 @@
 void onmousemove           (E_Prog *eprog, void (*func));
 void movemouseimg          (Ecore_Event *event);
 void changemouse           (E_Prog *eprog, char *img, int width, int height);
+/* Should I do this or not? */
 
 
 void openwin               (void);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- newentry.c  22 Feb 2003 18:15:01 -0000      1.5
+++ newentry.c  23 Feb 2003 10:07:17 -0000      1.6
@@ -19,7 +19,7 @@
 void
 kill_main_window (Ewl_Widget * main_win, void *ev_data, void *user_data)
 {
-       ewl_widget_destroy(main_win);
+       ewl_widget_destroy (main_win);
 
        main_win = NULL;
        ev_data = NULL;
@@ -29,92 +29,100 @@
 void
 newnote (int argc, char *argv[])
 {
-       int wloop=-1;
-       char *wtmp=malloc(str_size);
-       
-       ewl_init(argc, argv);
-
-
-       main_win = ewl_window_new();
-       ewl_window_set_title(EWL_WINDOW(main_win), "Add Note");
-       ewl_callback_append(main_win, EWL_CALLBACK_DELETE_WINDOW,
-               kill_main_window, NULL);
-       ewl_window_set_min_size(EWL_WINDOW(main_win), 100, 100);
-       ewl_window_set_auto_size(EWL_WINDOW(main_win), TRUE);
-        ewl_widget_show(main_win);
-
-       main_box = ewl_vbox_new();
-       ewl_container_append_child(EWL_CONTAINER(main_win), main_box);
-        ewl_widget_show(main_box);
-
-       okbtn=ewl_button_new("Ok");
-       cancelbtn=ewl_button_new("Cancel");
-
-       ewltitle=ewl_entry_new("Title");
-       printf("Loop One to Begin.\n");
-       while((wloop++)<12) {
-               sprintf(wtmp, "Line %d", wloop);
-               printf("::   %s\n", wtmp);
-               note[wloop-1]=ewl_entry_new(wtmp);
-//             printf("Loop: %d", wloop);
-       }
-
-       ewl_container_append_child(EWL_CONTAINER(main_box), ewltitle);
-       
-       wloop=-1;
-       
-       printf("Loop Two to Begin.\n");
-       while((wloop++)<12) {
-               ewl_container_append_child(EWL_CONTAINER(main_box), note[wloop-1]);
-       } wloop=0;
-       
-       ewl_container_append_child(EWL_CONTAINER(main_box), cancelbtn);
-       ewl_container_append_child(EWL_CONTAINER(main_box), okbtn);
-
-       
-
-       ewl_widget_show(ewltitle);
-       
-       printf("Loop Three to Begin.\n");
-       wloop=-1;
-       while((wloop++)<12) {
-               ewl_widget_show(note[wloop-1]);
-       } wloop=0;
-
-       ewl_widget_show(cancelbtn);
-       ewl_widget_show(okbtn);
-
-       ewl_callback_append (okbtn, EWL_CALLBACK_CLICKED,
-                       okbtnclicked, NULL);
-       ewl_callback_append (cancelbtn, EWL_CALLBACK_CLICKED,
-                       exit, "-1");
+       int wloop = -1;
+       char *wtmp = malloc (str_size);
 
+       ewl_init (argc, argv);
 
-       ewl_main(); 
+
+       main_win = ewl_window_new ();
+       ewl_window_set_title (EWL_WINDOW (main_win), "Add Note");
+       ewl_callback_append (main_win, EWL_CALLBACK_DELETE_WINDOW,
+                            kill_main_window, NULL);
+       ewl_window_set_min_size (EWL_WINDOW (main_win), 100, 100);
+       ewl_window_set_auto_size (EWL_WINDOW (main_win), TRUE);
+       ewl_widget_show (main_win);
+
+       main_box = ewl_vbox_new ();
+       ewl_container_append_child (EWL_CONTAINER (main_win), main_box);
+       ewl_widget_show (main_box);
+
+       okbtn = ewl_button_new ("Ok");
+       cancelbtn = ewl_button_new ("Cancel");
+
+       ewltitle = ewl_entry_new ("Title");
+       printf ("Loop One to Begin.\n");
+       while ((wloop++) < 12)
+         {
+                 sprintf (wtmp, "Line %d", wloop);
+                 printf ("::   %s\n", wtmp);
+                 note[wloop - 1] = ewl_entry_new (wtmp);
+         }
+
+       ewl_container_append_child (EWL_CONTAINER (main_box), ewltitle);
+
+       wloop = -1;
+
+       printf ("Loop Two to Begin.\n");
+       while ((wloop++) < 12)
+         {
+                 ewl_container_append_child (EWL_CONTAINER (main_box),
+                                             note[wloop - 1]);
+         }
+       wloop = 0;
+
+       ewl_container_append_child (EWL_CONTAINER (main_box), cancelbtn);
+       ewl_container_append_child (EWL_CONTAINER (main_box), okbtn);
+
+
+
+       ewl_widget_show (ewltitle);
+
+       printf ("Loop Three to Begin.\n");
+       wloop = -1;
+       while ((wloop++) < 12)
+         {
+                 ewl_widget_show (note[wloop - 1]);
+         }
+       wloop = 0;
+
+       ewl_widget_show (cancelbtn);
+       ewl_widget_show (okbtn);
+
+       ewl_callback_append (okbtn, EWL_CALLBACK_CLICKED, okbtnclicked, NULL);
+       ewl_callback_append (cancelbtn, EWL_CALLBACK_CLICKED, exit, "-1");
+
+       free (wtmp);
+
+       ewl_main ();
 }
 
 void
 okbtnclicked ()
 {
-       int d=-1;
-       char *dtmp=malloc(str_size);
-       
-       fileopen("a");
+       int d = -1;
+       char *dtmp = malloc (str_size);
+
+       fileopen ("a");
 
-       dtmp=ewl_entry_get_text (ewltitle);
+       dtmp = ewl_entry_get_text (ewltitle);
        strcat (dtmp, "\n");
        fputs (dtmp, file);
-       
-       while((d++)<12) {
-               if(d==12) {
-                       break;
-               }
-               dtmp=ewl_entry_get_text (note[d]);
-               strcat (dtmp, "\n");
-               fputs (dtmp, file);
-       }
+
+       while ((d++) < 12)
+         {
+                 if (d == 12)
+                   {
+                           break;
+                   }
+                 dtmp = ewl_entry_get_text (note[d]);
+                 strcat (dtmp, "\n");
+                 fputs (dtmp, file);
+         }
 
        fclose (file);
 
-       exit(-1);
+       free (dtmp);
+
+       exit (-1);
 }
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- notecmds.c  19 Feb 2003 09:47:15 -0000      1.8
+++ notecmds.c  23 Feb 2003 10:07:17 -0000      1.9
@@ -25,117 +25,124 @@
 void
 fileopen (char *mode)
 {
-       file=fopen(fn, mode);
-       if(file==NULL) {
-               printf("No File: %s\n", fn);
-               exit(-1);
-       }
+       file = fopen (fn, mode);
+       if (file == NULL)
+         {
+                 printf ("No File: %s\n", fn);
+                 exit (-1);
+         }
 }
 
 void
 displayall ()
 {
-       fnotenum(1);
-       fnotenum(2);
+       fnotenum (1);
+       fnotenum (2);
 }
 
 void
 dislast ()
 {
-       char *c=malloc(50);
-       int a=0;
-       fileopen("r");
-       while((c=fgets(c, 50, file))!=NULL) {
-               a++;
-       }
-       fclose(file);
-       fnotenum(a/13);
-       free(c);
+       char *c = malloc (50);
+       int a = 0;
+       fileopen ("r");
+       while ((c = fgets (c, 50, file)) != NULL)
+         {
+                 a++;
+         }
+       fclose (file);
+       fnotenum (a / 13);
+       free (c);
 }
 
 void
 clear ()
 {
-       unlink(fn);
+       unlink (fn);
 }
 
 void
 count ()
 {
-       char *c=malloc(50);
-       int a=0;
-       fileopen("r");
-       while((c=fgets(c, 50, file))!=NULL) {
-               a++;
-       }
-
-       fclose(file);
-       printf("Count: %d\n", a/13);
-       free(c);
-       exit(-1);
+       char *c = malloc (50);
+       int a = 0;
+       fileopen ("r");
+       while ((c = fgets (c, 50, file)) != NULL)
+         {
+                 a++;
+         }
+
+       fclose (file);
+       printf ("Count: %d\n", a / 13);
+       free (c);
+       exit (-1);
 }
 
 void
 notengui ()
 {
-       ewl_init(1, "enotes");
-       
-       ewlwin=ewl_window_new();
-       ewl_window_set_title(EWL_WINDOW(ewlwin), "View Note Number?");
-       ewl_callback_append(ewlwin, EWL_CALLBACK_DELETE_WINDOW, kill_main_window, 
NULL);
-       ewl_window_set_auto_size(EWL_WINDOW (ewlwin), TRUE);
-       ewl_widget_show(ewlwin);
-
-       ewlbox=ewl_vbox_new();
-       ewl_container_append_child(EWL_CONTAINER(ewlwin), ewlbox);
-       ewl_widget_show(ewlbox);
-
-       ewlbtn=ewl_button_new("View It!");
-       ewlentry=ewl_entry_new("");
-
-       ewl_container_append_child(EWL_CONTAINER(ewlbox), ewlentry);
-       ewl_container_append_child(EWL_CONTAINER(ewlbox), ewlbtn);
-       
-       ewl_callback_append(ewlbtn, EWL_CALLBACK_CLICKED, getncmd, 
(Ewl_Entry*)ewlentry);
-       
-       ewl_widget_show(ewlentry);
-       ewl_widget_show(ewlbtn);
-       
-       ewl_main();
+       ewl_init (1, "enotes");
+
+       ewlwin = ewl_window_new ();
+       ewl_window_set_title (EWL_WINDOW (ewlwin), "View Note Number?");
+       ewl_callback_append (ewlwin, EWL_CALLBACK_DELETE_WINDOW,
+                            kill_main_window, NULL);
+       ewl_window_set_auto_size (EWL_WINDOW (ewlwin), TRUE);
+       ewl_widget_show (ewlwin);
+
+       ewlbox = ewl_vbox_new ();
+       ewl_container_append_child (EWL_CONTAINER (ewlwin), ewlbox);
+       ewl_widget_show (ewlbox);
+
+       ewlbtn = ewl_button_new ("View It!");
+       ewlentry = ewl_entry_new ("");
+
+       ewl_container_append_child (EWL_CONTAINER (ewlbox), ewlentry);
+       ewl_container_append_child (EWL_CONTAINER (ewlbox), ewlbtn);
+
+       ewl_callback_append (ewlbtn, EWL_CALLBACK_CLICKED, getncmd,
+                            (Ewl_Entry *) ewlentry);
+
+       ewl_widget_show (ewlentry);
+       ewl_widget_show (ewlbtn);
+
+       ewl_main ();
 }
 
 void
-getncmd (Ewl_Widget *w, void *ev_data, void *user_data)
-{
-       char *cmdstr=malloc(60);
-       char *number=malloc(20);
-       if(ewlentry==NULL) {
-               printf("WHAT?!?!    The EWL Entry is NULL!");
-               return;
-       }
-       number=ewl_entry_get_text(EWL_ENTRY(ewlentry));
-       if(number==NULL) {
-               printf("Why is <number> NULL ?\n");
-               return;
-       }
-       
-       strncpy(number, number, strlen(number)-1);
-       strcpy(cmdstr, "enotes -n ");
-       strcat(cmdstr, number);
-       strcat(cmdstr, "&");
-       
-       system(cmdstr);
-       
-       free(cmdstr);
-       free(number);
-       ev_data=NULL;
-       user_data=NULL;
-       w=NULL;
+getncmd (Ewl_Widget * w, void *ev_data, void *user_data)
+{
+       char *cmdstr = malloc (60);
+       char *number = malloc (20);
+       if (ewlentry == NULL)
+         {
+                 printf ("WHAT?!?!    The EWL Entry is NULL!");
+                 return;
+         }
+       number = ewl_entry_get_text (EWL_ENTRY (ewlentry));
+       if (number == NULL)
+         {
+                 printf ("Why is <number> NULL ?\n");
+                 return;
+         }
+
+       strncpy (number, number, strlen (number) - 1);
+       strcpy (cmdstr, "enotes -n ");
+       strcat (cmdstr, number);
+       strcat (cmdstr, "&");
+
+       system (cmdstr);
 
-       exit(-1);
+       free (cmdstr);
+       free (number);
+       ev_data = NULL;
+       user_data = NULL;
+       w = NULL;
+
+       exit (-1);
 }
 
-int keepaddin=0;
+int keepaddin = 0;
 
 E_Prog *tmpeprog;
 void *tmpfunc;
@@ -143,70 +150,72 @@
 E_Prog *tmpmouseeprog;
 
 void
-fadein_loop (int val, fadeinfo *fi)
+fadein_loop (int val, fadeinfo * fi)
 {
        int r, g, b, a;
-       char *tmp=malloc(50);
+       char *tmp = malloc (50);
        Evas_Object *ob;
        int a1, a2, loop;
        double speed;
        int freq;
 
-       if(fi->ob==NULL) {
-               printf("Object is NULL.\n");
-               exit(-1);
-       }
-
-       ob=fi->ob;
-       a1=fi->a1;
-       a2=fi->a2;
-       speed=fi->speed;
-       loop=fi->loop;
-       freq=fi->freq;
-       
-       loop=loop+freq;
-       fi->loop=fi->loop+freq;
-
-       if(loop==a2||loop>a2) {
-               printf("Ending.\n");
-               return;
-       }
-       
+       if (fi->ob == NULL)
+         {
+                 printf ("Object is NULL.\n");
+                 exit (-1);
+         }
+
+       ob = fi->ob;
+       a1 = fi->a1;
+       a2 = fi->a2;
+       speed = fi->speed;
+       loop = fi->loop;
+       freq = fi->freq;
+
+       loop = loop + freq;
+       fi->loop = fi->loop + freq;
+
+       if (loop == a2 || loop > a2)
+         {
+                 printf ("Ending.\n");
+                 return;
+         }
+
        evas_object_color_get (ob, &r, &g, &b, &a);
        evas_object_color_set (ob, r, g, b, loop);
 
        evas_object_show (ob);
 
        keepaddin++;
-       
-       sprintf(tmp, "%dloop", keepaddin);
 
-       ecore_add_event_timer (tmp, speed, (void*)fadein_loop, 0, fi);
-       free(tmp);
+       sprintf (tmp, "%dloop", keepaddin);
+
+       ecore_add_event_timer (tmp, speed, (void *) fadein_loop, 0, fi);
+       free (tmp);
        return;
 }
 
 void
-fadeobin (Evas_Object *ob, int a1, int a2, int freq, double speed)
+fadeobin (Evas_Object * ob, int a1, int a2, int freq, double speed)
 {
-       fadeinfo *fi=malloc(20);
+       fadeinfo *fi = malloc (20);
 
-       fi->ob=ob;
-       fi->a1=a1;
-       fi->a2=a2;
-       fi->speed=speed;
-       fi->freq=freq;
-       fi->loop=a1;
-       
-       printf("a1 first passed: %d\na2 first passed: %d\n", a1, a2);
+       fi->ob = ob;
+       fi->a1 = a1;
+       fi->a2 = a2;
+       fi->speed = speed;
+       fi->freq = freq;
+       fi->loop = a1;
+
+       printf ("a1 first passed: %d\na2 first passed: %d\n", a1, a2);
+
+       ecore_add_event_timer ("quickly", 0, (void *) fadein_loop, 0, fi);
 
-       ecore_add_event_timer ("quickly", 0, (void*)fadein_loop, 0, fi);
-       
        return;
 }
 
 void
-change_alpha (Evas_Object *ob, int alpha)
+change_alpha (Evas_Object * ob, int alpha)
 {
        int r, g, b, a;
        evas_object_color_get (ob, &r, &g, &b, &a);
@@ -214,86 +223,87 @@
        return;
 }
 
-Evas_Object*
-new_line (Evas *evas, int x1, int y1, int x2, int y2, int r, int g,
-               int b, int alpha, int layer)
+Evas_Object *
+new_line (Evas * evas, int x1, int y1, int x2, int y2, int r, int g,
+         int b, int alpha, int layer)
 {
        Evas_Object *tmp;
 
-       tmp=evas_object_line_add (evas);
-       evas_object_line_xy_set (tmp, (double)x1, (double)y1, (double)x2, (double)x2);
+       tmp = evas_object_line_add (evas);
+       evas_object_line_xy_set (tmp, (double) x1, (double) y1, (double) x2,
+                                (double) x2);
        evas_object_color_set (tmp, r, g, b, alpha);
        evas_object_layer_set (tmp, layer);
 
-       return(tmp);
+       return (tmp);
 }
 
-Evas_Object*
-new_image (Evas *evas, char *imagefile, int layer, int fill_x,
-               int fill_y, int width, int height, int x, int y)
+Evas_Object *
+new_image (Evas * evas, char *imagefile, int layer, int fill_x,
+          int fill_y, int width, int height, int x, int y)
 {
        Evas_Object *tmp;
-       
-       tmp=evas_object_image_add (evas);
+
+       tmp = evas_object_image_add (evas);
        evas_object_image_file_set (tmp, imagefile, NULL);
        evas_object_image_fill_set (tmp, 0, 0, fill_x, fill_y);
        evas_object_layer_set (tmp, layer);
        evas_object_resize (tmp, width, height);
        evas_object_move (tmp, x, y);
-       
-       return(tmp);
+
+       return (tmp);
 }
 
-Evas_Object*
-new_rectangle (Evas *evas, int r, int g, int b, int alpha,
-               int width_x, int width_y, int x, int y, int layer)
+Evas_Object *
+new_rectangle (Evas * evas, int r, int g, int b, int alpha,
+              int width_x, int width_y, int x, int y, int layer)
 {
        Evas_Object *tmp;
 
-       tmp=evas_object_rectangle_add (evas);
+       tmp = evas_object_rectangle_add (evas);
        evas_object_color_set (tmp, r, g, b, alpha);
        evas_object_move (tmp, x, y);
        evas_object_resize (tmp, width_x, width_y);
        evas_object_layer_set (tmp, layer);
 
-       return(tmp);
+       return (tmp);
 }
 
-Evas_Object*
-new_text (Evas *evas, char *font, int size, char *text, int r,
-               int g, int b, int alpha, int x, int y, int layer)
+Evas_Object *
+new_text (Evas * evas, char *font, int size, char *text, int r,
+         int g, int b, int alpha, int x, int y, int layer)
 {
        Evas_Object *tmp;
 
-       tmp=evas_object_text_add (evas);
+       tmp = evas_object_text_add (evas);
        evas_object_text_font_set (tmp, font, size);
        evas_object_text_text_set (tmp, text);
        evas_object_color_set (tmp, r, g, b, alpha);
        evas_object_layer_set (tmp, layer);
        evas_object_move (tmp, x, y);
 
-       return(tmp);
+       return (tmp);
 }
 
-E_Prog*
+E_Prog *
 new_window (int width, int height)
 {
        E_Prog *tmp;
-       tmp=eprog_new();
+       tmp = eprog_new ();
        eprog_resize (tmp, width, height);
 
        return (tmp);
 }
 
 void
-move_object (Evas_Object *ob, int x, int y)
+move_object (Evas_Object * ob, int x, int y)
 {
        evas_object_move (ob, x, y);
        return;
 }
 
 void
-resize_object (Evas_Object *ob, int width, int height)
+resize_object (Evas_Object * ob, int width, int height)
 {
        evas_object_resize (ob, width, height);
        return;
@@ -302,52 +312,56 @@
 void
 init ()
 {
-       eprog_init();
+       eprog_init ();
        return;
 }
 
 void
 floop ()
 {
-       eprog_event_loop();
+       eprog_event_loop ();
        return;
 }
 
 void
-onclick (Evas_Object *ob, void (*func), const void *data)
+onclick (Evas_Object * ob, void (*func), const void *data)
 {
-       evas_object_event_callback_add (ob, EVAS_CALLBACK_MOUSE_DOWN, func, data);
+       evas_object_event_callback_add (ob, EVAS_CALLBACK_MOUSE_DOWN, func,
+                                       data);
        return;
 }
 
 void
-addtimer (char *name, double interval, void (*func), int initloopval /*Optional For 
Use*/, const void *data)
+addtimer (char *name, double interval, void (*func),
+         int initloopval /*Optional For Use */ , const void *data)
 {
        ecore_add_event_timer (name, interval, func, initloopval, data);
        return;
 }
 
 void
-mousemoveforward (Ecore_Event *event)
+mousemoveforward (Ecore_Event * event)
 {
        Ecore_Event_Mouse_Move *eemm;
 
-       eemm=(Ecore_Event_Mouse_Move*) event->event;
+       eemm = (Ecore_Event_Mouse_Move *) event->event;
+
+       if (eemm->win == tmpeprog->win)
+         {
+                 return;
+         }
 
-       if(eemm->win==tmpeprog->win) {
-               return;
-       }
-       
        addtimer ("tmpquick", 0, tmpfunc, &eemm->x, &eemm->y);
        return;
 }
 
 void
-onmousemove (E_Prog *eprog, void (*func))
+onmousemove (E_Prog * eprog, void (*func))
 {
-       tmpfunc=func;
-       tmpeprog=eprog;
-       ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, mousemoveforward);
+       tmpfunc = func;
+       tmpeprog = eprog;
+       ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE,
+                                       mousemoveforward);
        return;
 }
 
@@ -358,28 +372,30 @@
 **/
 
 void
-movemouseimg (Ecore_Event *event)
+movemouseimg (Ecore_Event * event)
 {
        Ecore_Event_Mouse_Move *eemm;
-               
-        eemm=(Ecore_Event_Mouse_Move*) event->event;
 
-       if(eemm->win!=tmpmouseeprog->win) {
-               return;
-       }
-       
-       if(eemm->x<501&&eemm->y<501)
+       eemm = (Ecore_Event_Mouse_Move *) event->event;
+
+       if (eemm->win != tmpmouseeprog->win)
+         {
+                 return;
+         }
+
+       if (eemm->x < 501 && eemm->y < 501)
                move_object (mouse, eemm->x, eemm->y);
 }
 
 void
-changemouse (E_Prog *eprog, char *img, int width, int height)
+changemouse (E_Prog * eprog, char *img, int width, int height)
 {
        ecore_set_blank_pointer (eprog->win);
-       mouse=new_image (eprog->evas, img, 4, width, height, width, height, 0, 0);
+       mouse = new_image (eprog->evas, img, 4, width, height, width, height,
+                          0, 0);
        evas_object_show (mouse);
 
-       tmpmouseeprog=eprog;
-       
+       tmpmouseeprog = eprog;
+
        ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, movemouseimg);
 }
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- notenum.c   19 Feb 2003 09:47:15 -0000      1.14
+++ notenum.c   23 Feb 2003 10:07:17 -0000      1.15
@@ -20,44 +20,34 @@
 #define fadespeed 0.01
 #define slidespeed 0.05
 
-int slidebool=0;
-int fadeval=0;
+int slidebool = 0;
+int fadeval = 0;
 int bar_b_backup = 100;
 
 
 void
-openwin  ()
+openwin ()
 {
 
-       root=eprog_new ();
+       root = new_window (w, h);
        eprog_title_set (root, "E-Notes");
        eprog_name_class_set (root, "enotes", "Eprog");
        eprog_borderless_set (root, 1);
        eprog_min_size_set (root, w, h);
        eprog_max_size_set (root, w, h);
-       eprog_resize (root, h, w);
 
-       bg=evas_object_image_add (root->evas);
-       evas_object_image_file_set (bg, openwinimg, NULL);
-       evas_object_image_fill_set (bg, 0, 0, w, h);
-        evas_object_move (bg, 0, 0);
-        evas_object_resize (bg, w, h);
-        evas_object_layer_set (bg, 1);
-
-       exitbtn=evas_object_image_add (root->evas);
-       evas_object_image_file_set (exitbtn, xbtnfn, NULL);
-       evas_object_image_fill_set (exitbtn, 0, 0, 15, 15);
-       evas_object_move (exitbtn, w-15, 0);
-       evas_object_resize (exitbtn, 15, 15);
-       evas_object_layer_set (exitbtn, 3);
-
-       makebar();
-       
-       ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, mousemoveevent);
-       
-       evas_object_event_callback_add(exitbtn, EVAS_CALLBACK_MOUSE_DOWN, exit, -1);
-       
-       
+       bg = new_image (root->evas, openwinimg, 1, w, h, w, h, 0, 0);
+
+       exitbtn =
+               new_image (root->evas, xbtnfn, 3, 15, 15, 15, 15, w - 15, 0);
+
+       makebar ();
+
+       ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE,
+                                       mousemoveevent);
+
+       onclick (exitbtn, exit, -1);
+
        eprog_show (root);
        evas_object_show (bg);
        evas_object_show (exitbtn);
@@ -67,265 +57,236 @@
 fnotenum (int num)
 {
 
-       int loop=0;
+       int loop = 0;
+
+
+       fileopen ("r");
 
+       while (loop != (13 * (num - 1)))
+         {
+                 fgets (tmp, 100, file);
+                 loop++;
+         }
+       loop = 0;
 
-       fileopen("r");
 
-       while(loop!=(13*(num-1))) {
-               fgets(tmp, 100, file);
-               loop++;
-       } loop=0;
-       
-       
-       root=eprog_new ();
+       root = new_window (w, h);
        eprog_title_set (root, "E-Notes");
        eprog_name_class_set (root, "enotes", "Eprog");
        eprog_borderless_set (root, 1);
        eprog_min_size_set (root, w, h);
        eprog_max_size_set (root, w, h);
-       eprog_resize (root, h, w);
 
+       bg = new_image (root->evas, bgfile, 1, w, h, w, h, 0, 0);
+
+       exitbtn =
+               new_image (root->evas, xbtnfn, 3, 15, 15, 15, 15, w - 15, 0);
+
+       fgets (tmp, 100, file);
+       strncpy (str, tmp, (int) strlen (tmp) - 1);
+
+       title = new_text (root->evas, font, title_font_size, str, r, g, b,
+                         255, 30, 8, 2);
+
+       while (loop != 12)
+         {
+                 fgets (tmp, 27, file);
+                 strcpy (str, tmp);
+                 str[strlen (str) - 1] = '\0';
+
+                 txt[loop] =
+                         new_text (root->evas, font, font_size, str, r, g, b,
+                                   255, 10, 50 + (loop * 15), 2);
+
+                 loop++;
+                 memset (str, 0, sizeof (str));
+                 memset (tmp, 0, sizeof (tmp));
+         }
+       loop = 0;
 
-       bg=evas_object_image_add (root->evas);
-       evas_object_image_file_set (bg, bgfile, NULL);
-       evas_object_image_fill_set (bg, 0, 0, w, h);
-        evas_object_move (bg, 0, 0);
-        evas_object_resize (bg, w, h);
-        evas_object_layer_set (bg, 1);
-
-
-       exitbtn=evas_object_image_add (root->evas);
-       evas_object_image_file_set (exitbtn, xbtnfn, NULL);
-       evas_object_image_fill_set (exitbtn, 0, 0, 15, 15);
-       evas_object_move (exitbtn, w-15, 0);
-       evas_object_resize (exitbtn, 15, 15);
-       evas_object_layer_set (exitbtn, 3);
-
-
-       fgets(tmp, 100, file);
-       strncpy(str, tmp, (int)strlen(tmp)-1);
-
-       title=evas_object_text_add (root->evas);
-        evas_object_text_font_set (title, font, title_font_size);
-       evas_object_text_text_set (title, str);
-       evas_object_color_set (title, r, g, b, 255);
-        evas_object_move (title, 30, 8);
-        evas_object_layer_set (title, 2);
-
-       
-       
-       while(loop!=12) {
-
-               fgets(tmp, 27, file);
-               strcpy(str, tmp);
-               str[strlen(str)-1]='\0';
-               txt[loop]=evas_object_text_add (root->evas);
-               evas_object_text_font_set (txt[loop], font, font_size);
-               evas_object_text_text_set (txt[loop], str);
-               evas_object_color_set (txt[loop], r, g, b, 255);
-               evas_object_move (txt[loop], 10, 50+(loop*15));
-               evas_object_layer_set (txt[loop], 2);
-               loop++;
-               memset(str, 0, sizeof(str));
-               memset(tmp, 0, sizeof(tmp));
-       } loop=0;
-       
-
-       makebar();
-       
-       ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, mousemoveevent);
-       
-       evas_object_event_callback_add(exitbtn, EVAS_CALLBACK_MOUSE_DOWN, fadeout, 
255);
 
+       makebar ();
 
+       ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE,
+                                       mousemoveevent);
+
+       onclick (exitbtn, fadeout, 255);
 
        eprog_show (root);
-       
+
        evas_object_show (bg);
 
-       fadein(1, NULL);
-       
-       fclose(file);
+       fadein (1, NULL);
+
+       fclose (file);
 }
 
 void
 makebar ()
 {
-       rectbar=evas_object_image_add (root->evas);
-       evas_object_image_file_set (rectbar, barimg, NULL);
-       evas_object_image_fill_set (rectbar, 0, 0, /*128*/50, /*128*/h);
-       evas_object_move (rectbar, -50, 0);
-       evas_object_resize (rectbar, 50, h);
-       evas_object_layer_set (rectbar, 4);
-       evas_object_show (rectbar);
-       
-       lastbtnob=evas_object_image_add (root->evas);
-       evas_object_image_file_set (lastbtnob, lastbtn, NULL);
-       evas_object_image_fill_set (lastbtnob, 0, 0, 40, 40);
-       evas_object_move (lastbtnob, -15, 10);
-       evas_object_resize (lastbtnob, 40, 40);
-       evas_object_layer_set (lastbtnob, 4);
-
-       firstbtnob=evas_object_image_add (root->evas);
-       evas_object_image_file_set (firstbtnob, firstbtn, NULL);
-       evas_object_image_fill_set (firstbtnob, 0, 0, 40, 40);
-       evas_object_move (firstbtnob, -15, 60);
-       evas_object_resize (firstbtnob, 40, 40);
-       evas_object_layer_set (firstbtnob, 4);
-       
-       nubtnob=evas_object_image_add (root->evas);
-       evas_object_image_file_set (nubtnob, nubtn, NULL);
-       evas_object_image_fill_set (nubtnob, 0, 0, 40, 40);
-       evas_object_move (nubtnob, -15, 110);
-       evas_object_resize (nubtnob, 40, 40);
-       evas_object_layer_set (nubtnob, 4);
-       
-       newbtnob=evas_object_image_add (root->evas);
-       evas_object_image_file_set (newbtnob, newbtn, NULL);
-       evas_object_image_fill_set (newbtnob, 0, 0, 40, 40);
-       evas_object_move (newbtnob, -15, 160);
-       evas_object_resize (newbtnob, 40, 40);
-       evas_object_layer_set (newbtnob, 4);
-
-       evas_object_event_callback_add(lastbtnob, EVAS_CALLBACK_MOUSE_DOWN, system, 
"enotes -l&");
-       evas_object_event_callback_add(firstbtnob, EVAS_CALLBACK_MOUSE_DOWN, system, 
"enotes -o&");
-       evas_object_event_callback_add(nubtnob, EVAS_CALLBACK_MOUSE_DOWN, system, 
"enotes --nu&");
-       evas_object_event_callback_add(newbtnob, EVAS_CALLBACK_MOUSE_DOWN, system, 
"enotes -N&");
-       
+       rectbar = new_image (root->evas, barimg, 4, 50, h, 50, h, -50, 0);
+
+       lastbtnob =
+               new_image (root->evas, lastbtn, 4, 40, 40, 40, 40, -15, 10);
+
+       firstbtnob =
+               new_image (root->evas, firstbtn, 4, 40, 40, 40, 40, -15, 60);
+
+       nubtnob = new_image (root->evas, nubtn, 4, 40, 40, 40, 40, -15, 110);
+
+       newbtnob =
+               new_image (root->evas, newbtn, 4, 40, 40, 40, 40, -15, 160);
+
+       onclick (lastbtnob, system, "enotes -l&");
+       onclick (firstbtnob, system, "enotes -o&");
+       onclick (nubtnob, system, "enotes --nu&");
+       onclick (newbtnob, system, "enotes -N&");
 }
 
 void
-mousemoveevent (Ecore_Event *event)
+mousemoveevent (Ecore_Event * event)
 {
        Ecore_Event_Mouse_Move *eemm;
-       
-       eemm=(Ecore_Event_Mouse_Move*) event->event;
 
-       if(eemm->win!=root->win) {
-               return;
-       }
-       if(slidebool==0) {
-               if(eemm->x<10||eemm->x==10) {
-                       slideout(0);
-                       slidebool=1;
-               }
-               return;
-       }
-       if(slidebool==1) {
-               if(eemm->x>50) {
-                       slidein(50);
-                       slidebool=0;
-               }
-               return;
-       }
+       eemm = (Ecore_Event_Mouse_Move *) event->event;
+
+       if (eemm->win != root->win)
+         {
+                 return;
+         }
+       if (slidebool == 0)
+         {
+                 if (eemm->x < 10 || eemm->x == 10)
+                   {
+                           slideout (0);
+                           slidebool = 1;
+                   }
+                 return;
+         }
+       if (slidebool == 1)
+         {
+                 if (eemm->x > 50)
+                   {
+                           slidein (50);
+                           slidebool = 0;
+                   }
+                 return;
+         }
 
 }
 
 void
 slideout (int slideloop)
 {
-       slideloop=slideloop+5;
-       fadeval=fadeval+25.5;
+       slideloop = slideloop + 5;
+       fadeval = fadeval + 25.5;
 
-       evas_object_move (rectbar, slideloop-50, 0);
+       evas_object_move (rectbar, slideloop - 50, 0);
        change_alpha (rectbar, fadeval);
-//     evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, fadeval);
        evas_object_show (rectbar);
-       evas_object_move (lastbtnob, slideloop-47, 10);
+       evas_object_move (lastbtnob, slideloop - 47, 10);
        change_alpha (lastbtnob, fadeval);
        evas_object_show (lastbtnob);
-       evas_object_move (firstbtnob, slideloop-47, 60);
+       evas_object_move (firstbtnob, slideloop - 47, 60);
        change_alpha (firstbtnob, fadeval);
        evas_object_show (firstbtnob);
-       evas_object_move (nubtnob, slideloop-47, 110);
+       evas_object_move (nubtnob, slideloop - 47, 110);
        change_alpha (nubtnob, fadeval);
        evas_object_show (nubtnob);
-       evas_object_move (newbtnob, slideloop-47, 160);
+       evas_object_move (newbtnob, slideloop - 47, 160);
        change_alpha (newbtnob, fadeval);
        evas_object_show (newbtnob);
 
 
-       if(slideloop>49) {
-               ecore_del_event_timer ("slideout");
-               slideloop=0;
-               return;
-       }
-       if(slideloop<50) {
-               ecore_add_event_timer ("slideout", slidespeed, slideout, slideloop, 
NULL);
-       }
+       if (slideloop > 49)
+         {
+                 ecore_del_event_timer ("slideout");
+                 slideloop = 0;
+                 return;
+         }
+       if (slideloop < 50)
+         {
+                 ecore_add_event_timer ("slideout", slidespeed, slideout,
+                                        slideloop, NULL);
+         }
 }
 
 void
 slidein (int slideloop)
 {
-       slideloop=slideloop-5;
-       fadeval=fadeval-25.5;
+       slideloop = slideloop - 5;
+       fadeval = fadeval - 25.5;
 
-       evas_object_move (rectbar, slideloop-50, 0);
+       evas_object_move (rectbar, slideloop - 50, 0);
        change_alpha (rectbar, fadeval);
-//     evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, fadeval);
        evas_object_show (rectbar);
-       evas_object_move (lastbtnob, slideloop-47, 10);
+       evas_object_move (lastbtnob, slideloop - 47, 10);
        change_alpha (lastbtnob, fadeval);
        evas_object_show (lastbtnob);
-       evas_object_move (firstbtnob, slideloop-47, 60);
+       evas_object_move (firstbtnob, slideloop - 47, 60);
        change_alpha (firstbtnob, fadeval);
        evas_object_show (firstbtnob);
-       evas_object_move (nubtnob, slideloop-47, 110);
+       evas_object_move (nubtnob, slideloop - 47, 110);
        change_alpha (nubtnob, fadeval);
        evas_object_show (nubtnob);
-       evas_object_move (newbtnob, slideloop-47, 160);
+       evas_object_move (newbtnob, slideloop - 47, 160);
        change_alpha (newbtnob, fadeval);
        evas_object_show (newbtnob);
-       
 
-       if(slideloop>0) {
-               ecore_add_event_timer ("slidein", slidespeed, slidein, slideloop, 
NULL);
-       }
-       if(slideloop==0) {
-               ecore_del_event_timer ("slidein");
-               slideloop=0;
-               fadeval=0;
-               return;
-       }
+
+       if (slideloop > 0)
+         {
+                 ecore_add_event_timer ("slidein", slidespeed, slidein,
+                                        slideloop, NULL);
+         }
+       if (slideloop == 0)
+         {
+                 ecore_del_event_timer ("slidein");
+                 slideloop = 0;
+                 fadeval = 0;
+                 return;
+         }
 }
 
 void
 fadein (int fadeloop, char *tmpstr)
 {
        int looper;
-       looper=0;
-       fadeloop=fadeloop+10;
-       
+       looper = 0;
+       fadeloop = fadeloop + 10;
+
        change_alpha (title, fadeloop);
        evas_object_show (title);
 
        change_alpha (exitbtn, fadeloop);
        evas_object_show (exitbtn);
 
-       while(looper<12) {
-               change_alpha (txt[looper], fadeloop);
-               evas_object_show (txt[looper]);
-               looper++;
-       }
-       
-       if(fadeloop>255||fadeloop==255) {
-               ecore_del_event_timer ("fadetimer");
-               fadeloop=0;
-               return;
-       }
-       if(fadeloop<255||fadeloop!=255) {
-               ecore_add_event_timer ("fadetimer", fadespeed, fadein, fadeloop, NULL);
-       }
+       while (looper < 12)
+         {
+                 change_alpha (txt[looper], fadeloop);
+                 evas_object_show (txt[looper]);
+                 looper++;
+         }
+
+       if (fadeloop > 255 || fadeloop == 255)
+         {
+                 ecore_del_event_timer ("fadetimer");
+                 fadeloop = 0;
+                 return;
+         }
+       if (fadeloop < 255 || fadeloop != 255)
+         {
+                 ecore_add_event_timer ("fadetimer", fadespeed, fadein,
+                                        fadeloop, NULL);
+         }
 }
 
 void
 fadeout (int fadeloop)
 {
        int looper;
-       looper=0;
-       fadeloop=fadeloop-10;
+       looper = 0;
+       fadeloop = fadeloop - 10;
 
        change_alpha (title, fadeloop);
        evas_object_show (title);
@@ -333,19 +294,23 @@
        change_alpha (exitbtn, fadeloop);
        evas_object_show (exitbtn);
 
-       while(looper<12) {
-               change_alpha (txt[looper], fadeloop);
-               evas_object_show (txt[looper]);
-               looper++;
-       }
-       
-       if(fadeloop<0||fadeloop==0) {
-               ecore_del_event_timer ("fadeouttimer");
-               fadeloop=0;
-               exit(-1);
-       }
-
-       if(fadeloop>0||fadeloop==255) {
-               ecore_add_event_timer ("fadeouttimer", fadespeed, fadeout, fadeloop, 
NULL);
-       }
+       while (looper < 12)
+         {
+                 change_alpha (txt[looper], fadeloop);
+                 evas_object_show (txt[looper]);
+                 looper++;
+         }
+
+       if (fadeloop < 0 || fadeloop == 0)
+         {
+                 ecore_del_event_timer ("fadeouttimer");
+                 fadeloop = 0;
+                 exit (-1);
+         }
+
+       if (fadeloop > 0 || fadeloop == 255)
+         {
+                 ecore_add_event_timer ("fadeouttimer", fadespeed, fadeout,
+                                        fadeloop, NULL);
+         }
 }




-------------------------------------------------------
This SF.net email is sponsored by: SlickEdit Inc. Develop an edge.
The most comprehensive and flexible code editor you can use.
Code faster. C/C++, C#, Java, HTML, XML, many more. FREE 30-Day Trial.
www.slickedit.com/sourceforge
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to