From: <enl...@li...> - 2003-02-10 19:14:53
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: main.h notecmds.c notenum.c Log Message: RbdPngn Suggested that using . as the fontdir might be silly. So i changed it. Thanks RbdPngn. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- main.h 10 Feb 2003 18:19:33 -0000 1.8 +++ main.h 10 Feb 2003 19:14:50 -0000 1.9 @@ -162,7 +162,7 @@ void count (void); void notengui (void); -void getncmd (Ewl_Widget *ewlentry); +void getncmd (Ewl_Entry *ewlentry); void setconfig (void); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- notecmds.c 10 Feb 2003 18:19:34 -0000 1.5 +++ notecmds.c 10 Feb 2003 19:14:51 -0000 1.6 @@ -97,7 +97,7 @@ 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_Widget*)ewlentry); + ewl_callback_append(ewlbtn, EWL_CALLBACK_CLICKED, getncmd, (Ewl_Entry*)ewlentry); ewl_widget_show(ewlentry); ewl_widget_show(ewlbtn); @@ -106,12 +106,16 @@ } void -getncmd (Ewl_Widget *ewlentry) +getncmd (Ewl_Entry *ewlentry) { char *gnctmp=malloc(20); char *cmdstr=malloc(60); char *number=malloc(20); - number=ewl_entry_get_text(ewlentry); + 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; =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- notenum.c 10 Feb 2003 18:19:34 -0000 1.8 +++ notenum.c 10 Feb 2003 19:14:51 -0000 1.9 @@ -103,7 +103,6 @@ strncpy(str, tmp, (int)strlen(tmp)-1); title=evas_object_text_add (root->evas); - evas_font_path_append (root->evas, "."); evas_object_text_font_set (title, font, 16); evas_object_text_text_set (title, str); evas_object_color_set (title, r, g, b, 255); @@ -122,7 +121,6 @@ strcpy(str, tmp); str[strlen(str)-1]='\0'; txt[loop]=evas_object_text_add (root->evas); - evas_font_path_append (root->evas, "."); evas_object_text_font_set (txt[loop], font, 12); evas_object_text_text_set (txt[loop], str); evas_object_color_set (txt[loop], r, g, b, 255); |
From: <enl...@li...> - 2003-02-11 16:40:19
|
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 Log Message: Various Changes and Bug Fixes. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- main.c 10 Feb 2003 18:19:32 -0000 1.9 +++ main.c 11 Feb 2003 16:39:40 -0000 1.10 @@ -11,8 +11,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| */ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- main.h 10 Feb 2003 19:14:50 -0000 1.9 +++ main.h 11 Feb 2003 16:39:41 -0000 1.10 @@ -11,8 +11,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| */ @@ -162,11 +160,12 @@ void count (void); void notengui (void); -void getncmd (Ewl_Entry *ewlentry); + +void getncmd (Ewl_Widget *w, void *ev_data, void *user_data); void setconfig (void); -void kill_main_window (Ewl_Widget * main_win, void *ev_data, void *user_data); +void kill_main_window (Ewl_Widget *main_win, void *ev_data, void *user_data); void fadein (int fadeloop, char *tmpstr); void fadeout (int fadeloop); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- newentry.c 10 Feb 2003 18:19:33 -0000 1.3 +++ newentry.c 11 Feb 2003 16:39:41 -0000 1.4 @@ -11,8 +11,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| */ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- notecmds.c 10 Feb 2003 19:14:51 -0000 1.6 +++ notecmds.c 11 Feb 2003 16:39:42 -0000 1.7 @@ -11,13 +11,17 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| */ #include "main.h" +Ewl_Widget *ewlwin; +Ewl_Widget *ewlbox; +Ewl_Widget *ewlentry; +Ewl_Widget *ewlbtn; + + void fileopen (char *mode) { @@ -74,11 +78,6 @@ void notengui () { - Ewl_Widget *ewlwin; - Ewl_Widget *ewlbox; - Ewl_Widget *ewlentry; - Ewl_Widget *ewlbtn; - ewl_init(1, "enotes"); ewlwin=ewl_window_new(); @@ -106,9 +105,8 @@ } void -getncmd (Ewl_Entry *ewlentry) +getncmd (Ewl_Widget *w, void *ev_data, void *user_data) { - char *gnctmp=malloc(20); char *cmdstr=malloc(60); char *number=malloc(20); if(ewlentry==NULL) { @@ -120,11 +118,19 @@ printf("Why is <number> NULL ?\n"); return; } - printf("<%s>\n\n", number); - strncpy(gnctmp, number, strlen(number)-1); - sprintf(cmdstr, "enotes -n %s&", gnctmp); + + strncpy(number, number, strlen(number)-1); + strcpy(cmdstr, "enotes -n "); + strcat(cmdstr, number); + strcat(cmdstr, "&"); + system(cmdstr); + free(cmdstr); - free(gnctmp); free(number); + ev_data=NULL; + user_data=NULL; + w=NULL; + + exit(-1); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- notenum.c 10 Feb 2003 19:14:51 -0000 1.9 +++ notenum.c 11 Feb 2003 16:39:42 -0000 1.10 @@ -11,8 +11,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| */ |
From: <enl...@li...> - 2003-02-11 16:40:21
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes Modified Files: AUTHORS ChangeLog INSTALL NEWS README TODO Log Message: Various Changes and Bug Fixes. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- AUTHORS 10 Feb 2003 18:19:26 -0000 1.2 +++ AUTHORS 11 Feb 2003 16:39:36 -0000 1.3 @@ -10,8 +10,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ChangeLog 10 Feb 2003 18:19:29 -0000 1.2 +++ ChangeLog 11 Feb 2003 16:39:37 -0000 1.3 @@ -10,8 +10,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| E-Notes ChangeLog: =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- INSTALL 10 Feb 2003 18:19:30 -0000 1.2 +++ INSTALL 11 Feb 2003 16:39:37 -0000 1.3 @@ -10,8 +10,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- NEWS 10 Feb 2003 18:19:30 -0000 1.2 +++ NEWS 11 Feb 2003 16:39:38 -0000 1.3 @@ -10,8 +10,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- README 10 Feb 2003 18:19:31 -0000 1.2 +++ README 11 Feb 2003 16:39:39 -0000 1.3 @@ -10,8 +10,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| Please see INSTALL. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- TODO 10 Feb 2003 18:19:31 -0000 1.3 +++ TODO 11 Feb 2003 16:39:39 -0000 1.4 @@ -10,8 +10,6 @@ | The GNU General Public License (GPL) | | | | Owner: Thomas Fletcher | -| | -| This Software is part of the Enlightenment Project. | |_________________________________________________________| Finish The New-Note EWL Option |
From: <enl...@li...> - 2003-02-11 19:30:15
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes Added Files: COPYING Log Message: GPL License. |
From: <enl...@li...> - 2003-02-11 19:52:47
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes Modified Files: AUTHORS Log Message: Some Credits to Raster and Rephorm for their kick ass libraries. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- AUTHORS 11 Feb 2003 16:39:36 -0000 1.3 +++ AUTHORS 11 Feb 2003 19:52:45 -0000 1.4 @@ -14,3 +14,9 @@ E-Notes Owner: Thomas 'Fletch' Fletcher - sha...@ya... + + Credits: + +Evas Owner: Carsten Haitzler - Raster +Ecore Owner: Carsten Haitzler - Raster +Eprog Owner: Brian Mattern - Rephorm |
From: <enl...@li...> - 2003-02-11 20:05:41
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: main.h Log Message: License Mentioned in the Usage. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- main.h 11 Feb 2003 16:39:41 -0000 1.10 +++ main.h 11 Feb 2003 20:05:03 -0000 1.11 @@ -84,6 +84,8 @@ use enotes from there also. How you run E-Notes is\n\ up to you of course, so configure it and run it to\n\ suite your personal needs.\n\n\ +E-Notes is released under the\n\ +GNU General Public License.\n\n\ Please Enjoy E-Notes :-)\n\ Thomas Fletcher.\n\n\ Any Bugs, Please E-Mail to sha...@ya... .\n" |
From: <enl...@li...> - 2003-02-13 17:50:58
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: notenum.c Log Message: Bar fades in as well as slides in now. :-) =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- notenum.c 11 Feb 2003 16:39:42 -0000 1.10 +++ notenum.c 13 Feb 2003 17:50:51 -0000 1.11 @@ -21,6 +21,8 @@ #define slidespeed 0.05 int slidebool=0; +int fadeval=0; +int fadeval2=0; void @@ -214,16 +216,23 @@ slideout (int slideloop) { slideloop=slideloop+5; + fadeval=fadeval+20; + fadeval2=fadeval2+25.5; evas_object_resize (rectbar, slideloop, h); + evas_object_color_set (rectbar, bar_r, bar_g, bar_b, fadeval); evas_object_show (rectbar); evas_object_move (lastbtnob, slideloop-45, 10); + evas_object_image_alpha_set (lastbtnob, fadeval2); evas_object_show (lastbtnob); evas_object_move (firstbtnob, slideloop-45, 60); + evas_object_image_alpha_set (firstbtnob, fadeval2); evas_object_show (firstbtnob); evas_object_move (nubtnob, slideloop-45, 110); + evas_object_image_alpha_set (nubtnob, fadeval2); evas_object_show (nubtnob); evas_object_move (newbtnob, slideloop-45, 160); + evas_object_image_alpha_set (newbtnob, fadeval2); evas_object_show (newbtnob); @@ -241,16 +250,23 @@ slidein (int slideloop) { slideloop=slideloop-5; + fadeval=fadeval-20; + fadeval2=fadeval2-25.5; evas_object_resize (rectbar, slideloop, h); + evas_object_color_set (rectbar, bar_r, bar_g, bar_b, fadeval); evas_object_show (rectbar); evas_object_move (lastbtnob, slideloop-45, 10); + evas_object_image_alpha_set (lastbtnob, fadeval2); evas_object_show (lastbtnob); evas_object_move (firstbtnob, slideloop-45, 60); + evas_object_image_alpha_set (firstbtnob, fadeval2); evas_object_show (firstbtnob); evas_object_move (nubtnob, slideloop-45, 110); + evas_object_image_alpha_set (nubtnob, fadeval2); evas_object_show (nubtnob); evas_object_move (newbtnob, slideloop-45, 160); + evas_object_image_alpha_set (newbtnob, fadeval2); evas_object_show (newbtnob); @@ -260,6 +276,8 @@ if(slideloop==0) { ecore_del_event_timer ("slidein"); slideloop=0; + fadeval=0; + fadeval2=0; return; } } |
From: <enl...@li...> - 2003-02-13 19:01:23
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: main.h notenum.c Log Message: Going back on that until its fixed. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- main.h 11 Feb 2003 20:05:03 -0000 1.11 +++ main.h 13 Feb 2003 19:00:50 -0000 1.12 @@ -84,8 +84,6 @@ use enotes from there also. How you run E-Notes is\n\ up to you of course, so configure it and run it to\n\ suite your personal needs.\n\n\ -E-Notes is released under the\n\ -GNU General Public License.\n\n\ Please Enjoy E-Notes :-)\n\ Thomas Fletcher.\n\n\ Any Bugs, Please E-Mail to sha...@ya... .\n" =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- notenum.c 13 Feb 2003 17:50:51 -0000 1.11 +++ notenum.c 13 Feb 2003 19:00:51 -0000 1.12 @@ -21,8 +21,6 @@ #define slidespeed 0.05 int slidebool=0; -int fadeval=0; -int fadeval2=0; void @@ -216,23 +214,16 @@ slideout (int slideloop) { slideloop=slideloop+5; - fadeval=fadeval+20; - fadeval2=fadeval2+25.5; evas_object_resize (rectbar, slideloop, h); - evas_object_color_set (rectbar, bar_r, bar_g, bar_b, fadeval); evas_object_show (rectbar); evas_object_move (lastbtnob, slideloop-45, 10); - evas_object_image_alpha_set (lastbtnob, fadeval2); evas_object_show (lastbtnob); evas_object_move (firstbtnob, slideloop-45, 60); - evas_object_image_alpha_set (firstbtnob, fadeval2); evas_object_show (firstbtnob); evas_object_move (nubtnob, slideloop-45, 110); - evas_object_image_alpha_set (nubtnob, fadeval2); evas_object_show (nubtnob); evas_object_move (newbtnob, slideloop-45, 160); - evas_object_image_alpha_set (newbtnob, fadeval2); evas_object_show (newbtnob); @@ -250,23 +241,16 @@ slidein (int slideloop) { slideloop=slideloop-5; - fadeval=fadeval-20; - fadeval2=fadeval2-25.5; evas_object_resize (rectbar, slideloop, h); - evas_object_color_set (rectbar, bar_r, bar_g, bar_b, fadeval); evas_object_show (rectbar); evas_object_move (lastbtnob, slideloop-45, 10); - evas_object_image_alpha_set (lastbtnob, fadeval2); evas_object_show (lastbtnob); evas_object_move (firstbtnob, slideloop-45, 60); - evas_object_image_alpha_set (firstbtnob, fadeval2); evas_object_show (firstbtnob); evas_object_move (nubtnob, slideloop-45, 110); - evas_object_image_alpha_set (nubtnob, fadeval2); evas_object_show (nubtnob); evas_object_move (newbtnob, slideloop-45, 160); - evas_object_image_alpha_set (newbtnob, fadeval2); evas_object_show (newbtnob); @@ -276,8 +260,6 @@ if(slideloop==0) { ecore_del_event_timer ("slidein"); slideloop=0; - fadeval=0; - fadeval2=0; return; } } |
From: <enl...@li...> - 2003-02-14 08:53:32
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: notenum.c Log Message: Yay, it works again (on my machine anyway, inform me of >any< bugs.) =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- notenum.c 13 Feb 2003 19:00:51 -0000 1.12 +++ notenum.c 14 Feb 2003 08:53:00 -0000 1.13 @@ -21,11 +21,14 @@ #define slidespeed 0.05 int slidebool=0; +int fadeval=0; +int bar_b_backup = 100; void openwin () { + root=eprog_new (); eprog_title_set (root, "E-Notes"); eprog_name_class_set (root, "enotes", "Eprog"); @@ -83,6 +86,7 @@ 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, bgfile, NULL); evas_object_image_fill_set (bg, 0, 0, w, h); @@ -90,6 +94,7 @@ 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); @@ -97,6 +102,7 @@ evas_object_resize (exitbtn, 15, 15); evas_object_layer_set (exitbtn, 3); + fgets(tmp, 100, file); strncpy(str, tmp, (int)strlen(tmp)-1); @@ -106,15 +112,13 @@ evas_object_color_set (title, r, g, b, 255); evas_object_move (title, 30, 8); evas_object_layer_set (title, 2); + - makebar(); - - ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, mousemoveevent); - - evas_object_event_callback_add(exitbtn, EVAS_CALLBACK_MOUSE_DOWN, fadeout, 255); + bar_b_backup=bar_b; while(loop!=12) { + fgets(tmp, 27, file); strcpy(str, tmp); str[strlen(str)-1]='\0'; @@ -128,6 +132,15 @@ 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); + + eprog_show (root); @@ -142,7 +155,7 @@ makebar () { rectbar=evas_object_rectangle_add (root->evas); - evas_object_color_set (rectbar, bar_r, bar_g, bar_b, 200); + evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, 200); evas_object_move (rectbar, 0, 0); evas_object_resize (rectbar, 0, h); evas_object_layer_set (rectbar, 4); @@ -214,8 +227,10 @@ slideout (int slideloop) { slideloop=slideloop+5; + fadeval=fadeval+20; evas_object_resize (rectbar, slideloop, h); + evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, fadeval); evas_object_show (rectbar); evas_object_move (lastbtnob, slideloop-45, 10); evas_object_show (lastbtnob); @@ -241,8 +256,10 @@ slidein (int slideloop) { slideloop=slideloop-5; + fadeval=fadeval-20; evas_object_resize (rectbar, slideloop, h); + evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, fadeval); evas_object_show (rectbar); evas_object_move (lastbtnob, slideloop-45, 10); evas_object_show (lastbtnob); @@ -260,6 +277,7 @@ if(slideloop==0) { ecore_del_event_timer ("slidein"); slideloop=0; + fadeval=0; return; } } |
From: <enl...@li...> - 2003-02-16 11:58:13
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: main.h Added Files: evasfuncs.c Log Message: A Small Evas Layer to be implimented Later. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- main.h 13 Feb 2003 19:00:50 -0000 1.12 +++ main.h 16 Feb 2003 11:58:11 -0000 1.13 @@ -88,6 +88,8 @@ Thomas Fletcher.\n\n\ Any Bugs, Please E-Mail to sha...@ya... .\n" + + extern char *tmp; extern char *str; @@ -145,6 +147,46 @@ extern Ewl_Widget *note12; extern Ewl_Widget *okbtn; extern Ewl_Widget *cancelbtn; + +typedef struct _fadeinfo fadeinfo; + +struct _fadeinfo { + Evas_Object *ob; + int a1; + int a2; + int freq; + double speed; + int loop; +}; +//extern struct _fadeinfo; + + + +void fadein_loop (int val, fadeinfo *fi); +void fadeobin (Evas_Object *ob, int a1, int a2, int freq, double speed); +void change_alpha (Evas_Object *ob, int alpha); + +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_image (Evas *evas, char *imagefile, int layer, int fill_x, + int fill_y, int width, int height, int x, int y); +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_text (Evas *evas, char *font, int size, char *text, int r, + int g, int b, int alpha, int x, int y, int layer); +E_Prog *new_window (int width, int height); + +void move_object (Evas_Object *ob, int x, int y); +void resize_object (Evas_Object *ob, int width, int height); +void init (); +void floop (); +void onclick (Evas_Object *ob, void (*func), const void *data); +void addtimer (char *name, double interval, void (*func), + int initloopval /*Optional For Use*/, const void *data); +void mousemoveforward (Ecore_Event *event); +void onmousemove (E_Prog *eprog, void (*func)); +void movemouseimg (Ecore_Event *event); +void changemouse (E_Prog *eprog, char *img, int width, int height); void openwin (void); |
From: <enl...@li...> - 2003-02-19 09:47:16
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/docs Added Files: Configuration Log Message: New Default Theme (Nice One :-)), made the default str size bigger (100bytes), and the bar is now an image which is themable, the buttons on the bar fade with it now, so it looks better. |
From: <enl...@li...> - 2003-02-19 09:47:16
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: main.c main.h notecmds.c notenum.c Log Message: New Default Theme (Nice One :-)), made the default str size bigger (100bytes), and the bar is now an image which is themable, the buttons on the bar fade with it now, so it looks better. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- main.c 11 Feb 2003 16:39:40 -0000 1.10 +++ main.c 19 Feb 2003 09:47:15 -0000 1.11 @@ -30,6 +30,7 @@ char *firstbtn; char *nubtn; char *newbtn; +char *barimg; FILE *file; @@ -44,6 +45,9 @@ unsigned int w; unsigned int h; +unsigned int font_size; +unsigned int title_font_size; + E_Prog *root; Evas_Object *bg; Evas_Object *title; @@ -95,6 +99,7 @@ firstbtn=malloc(str_size); nubtn=malloc(str_size); newbtn=malloc(str_size); + barimg=malloc(str_size); strcat(fontdir, "."); strcpy(fn, getenv("HOME")); @@ -109,9 +114,11 @@ 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; - bar_r=100; bar_g=100; - bar_b=100; w=250; h=250; + w=250; h=250; + title_font_size=16; + font_size=12; eprog_init(); @@ -201,7 +208,28 @@ return(0); } strcpy(newbtn, argv[a+1]); - } else if (!strcmp(argv[a], "-u")||!strcmp( argv[a] , "--usage") + } 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); @@ -271,6 +299,8 @@ free(configfn); if (xbtnfn) free(xbtnfn); + if (barimg) + free (barimg); } void @@ -278,7 +308,7 @@ { char *tmp2=malloc(str_size); int sectiontype=0; - int donebool[6]; + int donebool[13]; if(file!=NULL) { fclose(file); } @@ -287,7 +317,7 @@ printf("No Configuration File Found.\nUsing Defaults.\n"); return; } - while(fgets(tmp2, 50, file)!=NULL) { + while(fgets(tmp2, str_size, file)!=NULL) { if(!strcmp(tmp2, "\n")) { goto lp1; } @@ -311,7 +341,7 @@ } else if (!strncmp(tmp2, "[xbtnimg]", 9)) { sectiontype=9; goto lp1; - } else if (!strncmp(tmp2, "[barcolour]", 11)) { + } else if (!strncmp(tmp2, "[barimg]", 8)) { sectiontype=10; goto lp1; } else if (!strncmp(tmp2, "[titleimg]", 10)) { @@ -329,6 +359,12 @@ } 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) { @@ -373,24 +409,10 @@ goto lp1; } else if (sectiontype==10) { if(donebool[4]!=1) { - bar_r=atoi(tmp2); + strncpy(barimg, tmp2, strlen(tmp2)-1); donebool[4]=1; } - sectiontype++; - goto lp1; - } else if (sectiontype==11) { - if(donebool[5]!=1) { - bar_g=atoi(tmp2); - donebool[5]=1; - } - sectiontype++; - goto lp1; - } else if (sectiontype==12) { - if(donebool[6]!=1) { - bar_b=atoi(tmp2); - donebool[6]=1; - } - sectiontype++; + sectiontype=13; goto lp1; } else if (sectiontype==13) { if(donebool[7]!=1) { @@ -424,6 +446,20 @@ 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; =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- main.h 16 Feb 2003 11:58:11 -0000 1.13 +++ main.h 19 Feb 2003 09:47:15 -0000 1.14 @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include <Ecore.h> -#define str_size 50 +#define str_size 100 #define version "pre 0.1\n" #define usage "E-Notes Usage:\n\ @@ -67,7 +67,12 @@ --nubtn <b> Use a different image for\n\ the Number Button.\n\ --newbtn <b> Use a different image for\n\ - the new entry button.\n\n\ + the new entry button.\n\ +-B <b> --barimg <b> Use a different image for\n\ + the menubar background.\n\ +-S <s> --fontsize <s> Use a different font size.\n\ +-T <s> --tsize <s> Use a different font size\n\ + for the title.\n\n\ E-Notes can be run with or without both\n\ options and commands. If you run it with\n\ neither it will simply open E-Notes at the\n\ @@ -104,6 +109,7 @@ extern char *firstbtn; extern char *nubtn; extern char *newbtn; +extern char *barimg; extern FILE *file; @@ -111,13 +117,12 @@ extern unsigned int g; extern unsigned int b; -extern unsigned int bar_r; -extern unsigned int bar_g; -extern unsigned int bar_b; - extern unsigned int w; extern unsigned int h; +extern unsigned int font_size; +extern unsigned int title_font_size; + extern E_Prog *root; extern Evas_Object *bg; extern Evas_Object *title; @@ -158,8 +163,6 @@ double speed; int loop; }; -//extern struct _fadeinfo; - void fadein_loop (int val, fadeinfo *fi); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- notecmds.c 11 Feb 2003 16:39:42 -0000 1.7 +++ notecmds.c 19 Feb 2003 09:47:15 -0000 1.8 @@ -134,3 +134,252 @@ exit(-1); } + +int keepaddin=0; + +E_Prog *tmpeprog; +void *tmpfunc; +Evas_Object *mouse; +E_Prog *tmpmouseeprog; + +void +fadein_loop (int val, fadeinfo *fi) +{ + int r, g, b, a; + 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; + } + + 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); + return; +} + +void +fadeobin (Evas_Object *ob, int a1, int a2, int freq, double speed) +{ + 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); + + ecore_add_event_timer ("quickly", 0, (void*)fadein_loop, 0, fi); + + return; +} + +void +change_alpha (Evas_Object *ob, int alpha) +{ + int r, g, b, a; + evas_object_color_get (ob, &r, &g, &b, &a); + evas_object_color_set (ob, r, g, b, alpha); + 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 *tmp; + + 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); +} + +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); + 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); +} + +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); + 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); +} + +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); + 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); +} + +E_Prog* +new_window (int width, int height) +{ + E_Prog *tmp; + tmp=eprog_new(); + eprog_resize (tmp, width, height); + + return (tmp); +} + +void +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) +{ + evas_object_resize (ob, width, height); + return; +} + +void +init () +{ + eprog_init(); + return; +} + +void +floop () +{ + eprog_event_loop(); + return; +} + +void +onclick (Evas_Object *ob, void (*func), const void *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) +{ + ecore_add_event_timer (name, interval, func, initloopval, data); + return; +} + +void +mousemoveforward (Ecore_Event *event) +{ + Ecore_Event_Mouse_Move *eemm; + + eemm=(Ecore_Event_Mouse_Move*) event->event; + + if(eemm->win==tmpeprog->win) { + return; + } + + addtimer ("tmpquick", 0, tmpfunc, &eemm->x, &eemm->y); + return; +} + +void +onmousemove (E_Prog *eprog, void (*func)) +{ + tmpfunc=func; + tmpeprog=eprog; + ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, mousemoveforward); + return; +} + +/****Template for Mousemove function to be passed to onmousemove(...)****| + * + * void funcname (int *x, int *y) + * +**/ + +void +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) + move_object (mouse, eemm->x, eemm->y); +} + +void +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); + evas_object_show (mouse); + + 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.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- notenum.c 14 Feb 2003 08:53:00 -0000 1.13 +++ notenum.c 19 Feb 2003 09:47:15 -0000 1.14 @@ -107,15 +107,13 @@ strncpy(str, tmp, (int)strlen(tmp)-1); title=evas_object_text_add (root->evas); - evas_object_text_font_set (title, font, 16); + 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); - bar_b_backup=bar_b; - while(loop!=12) { @@ -123,7 +121,7 @@ strcpy(str, tmp); str[strlen(str)-1]='\0'; txt[loop]=evas_object_text_add (root->evas); - evas_object_text_font_set (txt[loop], font, 12); + 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)); @@ -154,10 +152,11 @@ void makebar () { - rectbar=evas_object_rectangle_add (root->evas); - evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, 200); - evas_object_move (rectbar, 0, 0); - evas_object_resize (rectbar, 0, h); + 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); @@ -227,18 +226,23 @@ slideout (int slideloop) { slideloop=slideloop+5; - fadeval=fadeval+20; + fadeval=fadeval+25.5; - evas_object_resize (rectbar, slideloop, h); - evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, fadeval); + 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-45, 10); + evas_object_move (lastbtnob, slideloop-47, 10); + change_alpha (lastbtnob, fadeval); evas_object_show (lastbtnob); - evas_object_move (firstbtnob, slideloop-45, 60); + evas_object_move (firstbtnob, slideloop-47, 60); + change_alpha (firstbtnob, fadeval); evas_object_show (firstbtnob); - evas_object_move (nubtnob, slideloop-45, 110); + evas_object_move (nubtnob, slideloop-47, 110); + change_alpha (nubtnob, fadeval); evas_object_show (nubtnob); - evas_object_move (newbtnob, slideloop-45, 160); + evas_object_move (newbtnob, slideloop-47, 160); + change_alpha (newbtnob, fadeval); evas_object_show (newbtnob); @@ -256,18 +260,23 @@ slidein (int slideloop) { slideloop=slideloop-5; - fadeval=fadeval-20; + fadeval=fadeval-25.5; - evas_object_resize (rectbar, slideloop, h); - evas_object_color_set (rectbar, bar_r, bar_g, bar_b_backup, fadeval); + 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-45, 10); + evas_object_move (lastbtnob, slideloop-47, 10); + change_alpha (lastbtnob, fadeval); evas_object_show (lastbtnob); - evas_object_move (firstbtnob, slideloop-45, 60); + evas_object_move (firstbtnob, slideloop-47, 60); + change_alpha (firstbtnob, fadeval); evas_object_show (firstbtnob); - evas_object_move (nubtnob, slideloop-45, 110); + evas_object_move (nubtnob, slideloop-47, 110); + change_alpha (nubtnob, fadeval); evas_object_show (nubtnob); - evas_object_move (newbtnob, slideloop-45, 160); + evas_object_move (newbtnob, slideloop-47, 160); + change_alpha (newbtnob, fadeval); evas_object_show (newbtnob); @@ -289,14 +298,14 @@ looper=0; fadeloop=fadeloop+10; - evas_object_color_set (title, r, b, g, fadeloop); + change_alpha (title, fadeloop); evas_object_show (title); - evas_object_color_set (exitbtn, r, b, g, fadeloop); + change_alpha (exitbtn, fadeloop); evas_object_show (exitbtn); while(looper<12) { - evas_object_color_set (txt[looper], r, b, g, fadeloop); + change_alpha (txt[looper], fadeloop); evas_object_show (txt[looper]); looper++; } @@ -318,14 +327,14 @@ looper=0; fadeloop=fadeloop-10; - evas_object_color_set (title, r, b, g, fadeloop); + change_alpha (title, fadeloop); evas_object_show (title); - evas_object_color_set (exitbtn, r, b, g, fadeloop); + change_alpha (exitbtn, fadeloop); evas_object_show (exitbtn); while(looper<12) { - evas_object_color_set (txt[looper], r, b, g, fadeloop); + change_alpha (txt[looper], fadeloop); evas_object_show (txt[looper]); looper++; } |
From: <enl...@li...> - 2003-02-19 09:47:46
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/data Modified Files: bg.jpg firstbtn.png lastbtn.png newbtn.png nubtn.png titleimg.jpg x.png Added Files: 20thcent.ttf goodtime.ttf panel.png Log Message: New Default Theme (Nice One :-)), made the default str size bigger (100bytes), and the bar is now an image which is themable, the buttons on the bar fade with it now, so it looks better. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/data/bg.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsW14uBJ and /tmp/cvswzwSXk differ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/data/firstbtn.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsCTtIvK and /tmp/cvsMXuX5m differ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/data/lastbtn.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsEnl2FL and /tmp/cvsKgSrqp differ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/data/newbtn.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvseLKL3M and /tmp/cvsYxQjQp differ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/data/nubtn.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsMRNPtO and /tmp/cvsIHogGs differ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/data/titleimg.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsYCReRP and /tmp/cvsaAqecv differ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/data/x.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsYrwkWQ and /tmp/cvskjU6Bx differ |
From: <enl...@li...> - 2003-02-22 18:15:04
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: main.c main.h newentry.c Log Message: More Work on and to be done on the new-note feature (It works now, but I can't seem to change whats in the ewl_entry widget). Please somebody tell me if its me or it is a common problem. However, the buttons do things and it is recorded to the note storage file. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- main.c 19 Feb 2003 09:47:15 -0000 1.11 +++ main.c 22 Feb 2003 18:15:01 -0000 1.12 @@ -63,18 +63,7 @@ Ewl_Widget *main_win; Ewl_Widget *main_box; Ewl_Widget *ewltitle; -Ewl_Widget *note1; -Ewl_Widget *note2; -Ewl_Widget *note3; -Ewl_Widget *note4; -Ewl_Widget *note5; -Ewl_Widget *note6; -Ewl_Widget *note7; -Ewl_Widget *note8; -Ewl_Widget *note9; -Ewl_Widget *note10; -Ewl_Widget *note11; -Ewl_Widget *note12; +Ewl_Widget *note[11]; Ewl_Widget *okbtn; Ewl_Widget *cancelbtn; =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- main.h 19 Feb 2003 09:47:15 -0000 1.14 +++ main.h 22 Feb 2003 18:15:01 -0000 1.15 @@ -138,18 +138,7 @@ extern Ewl_Widget *main_win; extern Ewl_Widget *main_box; extern Ewl_Widget *ewltitle; -extern Ewl_Widget *note1; -extern Ewl_Widget *note2; -extern Ewl_Widget *note3; -extern Ewl_Widget *note4; -extern Ewl_Widget *note5; -extern Ewl_Widget *note6; -extern Ewl_Widget *note7; -extern Ewl_Widget *note8; -extern Ewl_Widget *note9; -extern Ewl_Widget *note10; -extern Ewl_Widget *note11; -extern Ewl_Widget *note12; +extern Ewl_Widget *note[11]; extern Ewl_Widget *okbtn; extern Ewl_Widget *cancelbtn; @@ -220,3 +209,5 @@ void slidein (int slideloop); void mousemoveevent (Ecore_Event *event); + +void okbtnclicked (); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- newentry.c 11 Feb 2003 16:39:41 -0000 1.4 +++ newentry.c 22 Feb 2003 18:15:01 -0000 1.5 @@ -29,6 +29,9 @@ void newnote (int argc, char *argv[]) { + int wloop=-1; + char *wtmp=malloc(str_size); + ewl_init(argc, argv); @@ -48,33 +51,22 @@ cancelbtn=ewl_button_new("Cancel"); ewltitle=ewl_entry_new("Title"); - note1=ewl_entry_new("Line 1"); - note2=ewl_entry_new("Line 2"); - note3=ewl_entry_new("Line 3"); - note4=ewl_entry_new("Line 4"); - note5=ewl_entry_new("Line 5"); - note6=ewl_entry_new("Line 6"); - note7=ewl_entry_new("Line 7"); - note8=ewl_entry_new("Line 8"); - note9=ewl_entry_new("Line 9"); - note10=ewl_entry_new("Line 10"); - note11=ewl_entry_new("Line 11"); - note12=ewl_entry_new("Line 12"); + 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); - ewl_container_append_child(EWL_CONTAINER(main_box), note1); - ewl_container_append_child(EWL_CONTAINER(main_box), note2); - ewl_container_append_child(EWL_CONTAINER(main_box), note3); - ewl_container_append_child(EWL_CONTAINER(main_box), note4); - ewl_container_append_child(EWL_CONTAINER(main_box), note5); - ewl_container_append_child(EWL_CONTAINER(main_box), note6); - ewl_container_append_child(EWL_CONTAINER(main_box), note7); - ewl_container_append_child(EWL_CONTAINER(main_box), note8); - ewl_container_append_child(EWL_CONTAINER(main_box), note9); - ewl_container_append_child(EWL_CONTAINER(main_box), note10); - ewl_container_append_child(EWL_CONTAINER(main_box), note11); - ewl_container_append_child(EWL_CONTAINER(main_box), note12); + 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); @@ -83,22 +75,46 @@ ewl_widget_show(ewltitle); - ewl_widget_show(note1); - ewl_widget_show(note2); - ewl_widget_show(note3); - ewl_widget_show(note4); - ewl_widget_show(note5); - ewl_widget_show(note6); - ewl_widget_show(note7); - ewl_widget_show(note8); - ewl_widget_show(note9); - ewl_widget_show(note10); - ewl_widget_show(note11); - ewl_widget_show(note12); + 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"); + ewl_main(); +} + +void +okbtnclicked () +{ + int d=-1; + char *dtmp=malloc(str_size); + + fileopen("a"); + + 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); + } + + fclose (file); + + exit(-1); } |
From: <enl...@li...> - 2003-02-23 10:07:18
|
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); + } } |
From: <enl...@li...> - 2003-02-26 20:38:07
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/data Added Files: bar.png barbg.png barexitbtnimg.png barfirstbtnimg.png barlastbtnimg.png barnewbtnimg.png barnubtnimg.png Log Message: New Launch Bar Feature. Which is configurable/themable from configuration and command line, i've made it extremely configurable to the point where its more than doubled my usage. |
From: <enl...@li...> - 2003-02-26 20:38:42
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: indentem main.c main.h newentry.c notecmds.c notenum.c Log Message: New Launch Bar Feature. Which is configurable/themable from configuration and command line, i've made it extremely configurable to the point where its more than doubled my usage. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/indentem,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- indentem 23 Feb 2003 10:07:17 -0000 1.1 +++ indentem 26 Feb 2003 20:38:02 -0000 1.2 @@ -1,4 +1,5 @@ #!/bin/bash indent *.c -i8 +indent *.h -i8 rm *.*~ -rf =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- main.c 23 Feb 2003 10:07:17 -0000 1.13 +++ main.c 26 Feb 2003 20:38:02 -0000 1.14 @@ -48,6 +48,53 @@ unsigned int font_size; unsigned int title_font_size; + +unsigned int win_x; +unsigned int win_y; +unsigned int win_width; +unsigned int win_height; + +unsigned int firstbtn_x; +unsigned int firstbtn_y; +unsigned int firstbtn_width; +unsigned int firstbtn_height; + +unsigned int lastbtn_x; +unsigned int lastbtn_y; +unsigned int lastbtn_width; +unsigned int lastbtn_height; + +unsigned int nubtn_x; +unsigned int nubtn_y; +unsigned int nubtn_width; +unsigned int nubtn_height; + +unsigned int newbtn_x; +unsigned int newbtn_y; +unsigned int newbtn_width; +unsigned int newbtn_height; + +unsigned int exitbtn_x; +unsigned int exitbtn_y; +unsigned int exitbtn_width; +unsigned int exitbtn_height; + +char *bgimg; +char *firstbtnimg; +char *lastbtnimg; +char *newbtnimg; +char *nubtnimg; +char *exitbtnimg; + +E_Prog *bar; +Evas_Object *bar_bg; +Evas_Object *bar_firstbtn; +Evas_Object *bar_lastbtn; +Evas_Object *bar_nubtn; +Evas_Object *bar_newbtn; +Evas_Object *bar_exitbtn; + + E_Prog *root; Evas_Object *bg; Evas_Object *title; @@ -88,7 +135,15 @@ firstbtn = malloc (str_size); nubtn = malloc (str_size); newbtn = malloc (str_size); + barimg = malloc (str_size); + bgimg = malloc (str_size); + firstbtnimg = malloc (str_size); + lastbtnimg = malloc (str_size); + firstbtnimg = malloc (str_size); + nubtnimg = malloc (str_size); + newbtnimg = malloc (str_size); + exitbtnimg = malloc (str_size); strcat (fontdir, "."); strcpy (fn, getenv ("HOME")); @@ -112,6 +167,46 @@ title_font_size = 16; font_size = 12; + + win_x = 0; + win_y = 0; + win_width = 100; + win_height = 25; + + firstbtn_x = 2; + firstbtn_y = 2; + firstbtn_width = 17; + firstbtn_height = 21; + + lastbtn_x = 21; + lastbtn_y = 2; + lastbtn_width = 17; + lastbtn_height = 21; + + nubtn_x = 40; + nubtn_y = 2; + nubtn_width = 17; + nubtn_height = 21; + + newbtn_x = 59; + newbtn_y = 2; + newbtn_width = 17; + newbtn_height = 21; + + exitbtn_x = 78; + exitbtn_y = 2; + exitbtn_width = 17; + exitbtn_height = 21; + + strcpy (bgimg, "/usr/local/share/enotes/data/barbg.png"); + strcpy (firstbtnimg, + "/usr/local/share/enotes/data/barfirstbtnimg.png"); + strcpy (lastbtnimg, "/usr/local/share/enotes/data/barlastbtnimg.png"); + strcpy (nubtnimg, "/usr/local/share/enotes/data/barnubtnimg.png"); + strcpy (newbtnimg, "/usr/local/share/enotes/data/barnewbtnimg.png"); + strcpy (exitbtnimg, "/usr/local/share/enotes/data/barexitbtnimg.png"); + + eprog_init (); setconfig (); @@ -141,7 +236,7 @@ || !strcmp (argv[a], "--titleimg")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -152,7 +247,7 @@ || !strcmp (argv[a], "--xbtnimg")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -164,7 +259,7 @@ || !strcmp (argv[a], "--config")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -200,7 +295,7 @@ else if (!strcmp (argv[a], "--lastbtn")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -210,7 +305,7 @@ else if (!strcmp (argv[a], "--firstbtn")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -220,7 +315,7 @@ else if (!strcmp (argv[a], "--nubtn")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -230,7 +325,7 @@ else if (!strcmp (argv[a], "--newbtn")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -241,7 +336,7 @@ || !strcmp (argv[a], "--barimg")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -252,7 +347,7 @@ || !strcmp (argv[a], "--fontsize")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); @@ -263,13 +358,340 @@ || !strcmp (argv[a], "--tsize")) { mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == "-") + if (mtmp == NULL || mtmp[0] == '-') { printf ("Missing Argument!\n"); return (0); } title_font_size = atoi (mtmp); } + else if (!strcmp (argv[a], "--barwin_x")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + win_x = atoi (mtmp); + } + else if (!strcmp (argv[a], "--barwin_y")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + win_y = atoi (mtmp); + } + else if (!strcmp (argv[a], "--barwin_width")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + win_width = atoi (mtmp); + } + else if (!strcmp (argv[a], "--barwin_height")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + + win_height = atoi (mtmp); + } + else if (!strcmp (argv[a], "--barwin_bg")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + + strcpy (bgimg, mtmp); + } + else if (!strcmp (argv[a], "--firstbtn_x")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + firstbtn_x = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--firstbtn_y")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + firstbtn_y = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--firstbtn_width")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + firstbtn_width = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--firstbtn_height")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + firstbtn_height = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--lastbtn_x")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + lastbtn_x = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--lastbtn_y")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + lastbtn_y = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--lastbtn_width")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + lastbtn_width = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--lastbtn_height")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + lastbtn_height = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--nubtn_x")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + nubtn_x = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--nubtn_y")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + nubtn_y = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--nubtn_width")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + nubtn_width = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--nubtn_height")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + nubtn_height = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--newbtn_x")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + newbtn_x = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--newbtn_y")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + newbtn_y = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--newbtn_width")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + newbtn_width = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--newbtn_height")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + newbtn_height = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--exitbtn_x")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + exitbtn_x = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--exitbtn_y")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + exitbtn_y = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--exitbtn_width")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + exitbtn_width = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--exitbtn_height")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + exitbtn_height = atoi (mtmp); + + } + else if (!strcmp (argv[a], "--firstbtn_img")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + strcpy (firstbtnimg, mtmp); + + } + else if (!strcmp (argv[a], "--lastbtn_img")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + strcpy (lastbtnimg, mtmp); + + } + else if (!strcmp (argv[a], "--nubtn_img")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + strcpy (nubtnimg, mtmp); + + } + else if (!strcmp (argv[a], "--newbtn_img")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + strcpy (newbtnimg, mtmp); + + } + else if (!strcmp (argv[a], "--exitbtn_img")) + { + mtmp = argv[a + 1]; + if (mtmp == NULL || mtmp[0] == '-') + { + printf ("Missing Argument!\n"); + return (0); + } + strcpy (exitbtnimg, mtmp); + + } else if (!strcmp (argv[a], "-u") || !strcmp (argv[a], "--usage") || !strcmp (argv[a], "-h") @@ -333,6 +755,11 @@ count (); actionbool = 1; } + else if (!strcmp (argv[a], "--bar")) + { + runbar (); + actionbool = 1; + } a++; } a = 0; @@ -377,7 +804,7 @@ { char *tmp2 = malloc (str_size); int sectiontype = 0; - int donebool[13]; + int donebool[43]; if (file != NULL) { fclose (file); @@ -465,6 +892,36 @@ sectiontype = 19; goto lp1; } + else if (!strncmp (tmp2, "[barwin]", 8)) + { + sectiontype = 20; + goto lp1; + } + else if (!strncmp (tmp2, "[barfirstbtn]", 13)) + { + sectiontype = 25; + goto lp1; + } + else if (!strncmp (tmp2, "[barlastbtn]", 12)) + { + sectiontype = 30; + goto lp1; + } + else if (!strncmp (tmp2, "[barnubtn]", 10)) + { + sectiontype = 35; + goto lp1; + } + else if (!strncmp (tmp2, "[barnewbtn]", 11)) + { + sectiontype = 40; + goto lp1; + } + else if (!strncmp (tmp2, "[barexitbtn]", 12)) + { + sectiontype = 45; + goto lp1; + } if (sectiontype == 1) { @@ -545,7 +1002,7 @@ { strncpy (openwinimg, tmp2, strlen (tmp2) - 1); - donebool[7] == 1; + donebool[7] = 1; } sectiontype++; goto lp1; @@ -556,7 +1013,7 @@ { strncpy (lastbtn, tmp2, strlen (tmp2) - 1); - donebool[8] == 1; + donebool[8] = 1; } sectiontype++; goto lp1; @@ -567,7 +1024,7 @@ { strncpy (firstbtn, tmp2, strlen (tmp2) - 1); - donebool[9] == 1; + donebool[9] = 1; } sectiontype++; goto lp1; @@ -578,7 +1035,7 @@ { strncpy (nubtn, tmp2, strlen (tmp2) - 1); - donebool[10] == 1; + donebool[10] = 1; } sectiontype++; goto lp1; @@ -589,7 +1046,7 @@ { strncpy (newbtn, tmp2, strlen (tmp2) - 1); - donebool[11] == 1; + donebool[11] = 1; } sectiontype++; goto lp1; @@ -599,7 +1056,7 @@ if (donebool[12] != 1) { font_size = atoi (tmp2); - donebool[12] == 1; + donebool[12] = 1; } sectiontype++; goto lp1; @@ -609,7 +1066,313 @@ if (donebool[13] != 1) { title_font_size = atoi (tmp2); - donebool[13] == 1; + donebool[13] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 20) + { + if (donebool[14] != 1) + { + win_x = atoi (tmp2); + donebool[14] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 21) + { + if (donebool[15] != 1) + { + win_y = atoi (tmp2); + donebool[15] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 22) + { + if (donebool[16] != 1) + { + win_width = atoi (tmp2); + donebool[16] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 23) + { + if (donebool[17] != 1) + { + win_height = atoi (tmp2); + donebool[17] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 24) + { + if (donebool[18] != 1) + { + strncpy (bgimg, tmp2, + strlen (tmp2) - 1); + donebool[18] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 25) + { + if (donebool[19] != 1) + { + firstbtn_x = atoi (tmp2); + donebool[19] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 26) + { + if (donebool[20] != 1) + { + firstbtn_y = atoi (tmp2); + donebool[20] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 27) + { + if (donebool[21] != 1) + { + firstbtn_width = atoi (tmp2); + donebool[21] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 28) + { + if (donebool[22] != 1) + { + firstbtn_height = atoi (tmp2); + donebool[22] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 29) + { + if (donebool[23] != 1) + { + strncpy (firstbtnimg, tmp2, + strlen (tmp2) - 1); + donebool[23] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 30) + { + if (donebool[24] != 1) + { + lastbtn_x = atoi (tmp2); + donebool[24] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 31) + { + if (donebool[25] != 1) + { + lastbtn_y = atoi (tmp2); + donebool[25] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 32) + { + if (donebool[26] != 1) + { + lastbtn_width = atoi (tmp2); + donebool[26] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 33) + { + if (donebool[27] != 1) + { + lastbtn_height = atoi (tmp2); + donebool[27] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 34) + { + if (donebool[28] != 1) + { + strncpy (lastbtnimg, tmp2, + strlen (tmp2) - 1); + donebool[28] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 35) + { + if (donebool[29] != 1) + { + nubtn_x = atoi (tmp2); + donebool[29] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 36) + { + if (donebool[30] != 1) + { + nubtn_y = atoi (tmp2); + donebool[30] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 37) + { + if (donebool[31] != 1) + { + nubtn_width = atoi (tmp2); + donebool[31] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 38) + { + if (donebool[32] != 1) + { + nubtn_height = atoi (tmp2); + donebool[32] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 39) + { + if (donebool[33] != 1) + { + strncpy (nubtnimg, tmp2, + strlen (tmp2) - 1); + donebool[33] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 40) + { + if (donebool[34] != 1) + { + newbtn_x = atoi (tmp2); + donebool[34] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 41) + { + if (donebool[35] != 1) + { + newbtn_y = atoi (tmp2); + donebool[35] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 42) + { + if (donebool[36] != 1) + { + newbtn_width = atoi (tmp2); + donebool[36] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 43) + { + if (donebool[37] != 1) + { + newbtn_height = atoi (tmp2); + donebool[37] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 44) + { + if (donebool[38] != 1) + { + strncpy (newbtnimg, tmp2, + strlen (tmp2) - 1); + donebool[38] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 45) + { + if (donebool[39] != 1) + { + exitbtn_x = atoi (tmp2); + donebool[39] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 46) + { + if (donebool[40] != 1) + { + exitbtn_y = atoi (tmp2); + donebool[40] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 47) + { + if (donebool[41] != 1) + { + exitbtn_width = atoi (tmp2); + donebool[41] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 48) + { + if (donebool[42] != 1) + { + exitbtn_height = atoi (tmp2); + donebool[42] = 1; + } + sectiontype++; + goto lp1; + } + else if (sectiontype == 49) + { + if (donebool[43] != 1) + { + strncpy (exitbtnimg, tmp2, + strlen (tmp2) - 1); + donebool[43] = 1; } sectiontype++; goto lp1; @@ -619,6 +1382,5 @@ } fclose (file); free (tmp2); - printf ("%d", strlen (bgfile)); return; } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- main.h 23 Feb 2003 10:07:17 -0000 1.16 +++ main.h 26 Feb 2003 20:38:04 -0000 1.17 @@ -45,7 +45,9 @@ -a --consolenew Use console based note\n\ creation system.\n\n\ -C --count Display Number of notes\n\ - stored.\n\n\ + stored.\n\ + --bar Display the E-Notes\n\ + Execution Bar.\n\n\ Options:\n\ POSIX GNU Description\n\ -d <d> --db <d> Use <d> as the enotes\n\ @@ -73,6 +75,68 @@ -S <s> --fontsize <s> Use a different font size.\n\ -T <s> --tsize <s> Use a different font size\n\ for the title.\n\n\ + E-Notes Execution Bar - Options:\n\ +GNU Description\n\ +--barwin_x <n> Use N as the X co-ordinate for\n\ + the E-Notes Bar window.\n\ +--barwin_y <n> Use N as the Y co-ordinate for\n\ + the E-Notes Bar window.\n\ +--barwin_width <n> Use N as the width for the\n\ + E-Notes Bar Window.\n\ +--barwin_height <n> Use N as the height for the\n\ + E-Notes Bar Window.\n\ +--barwin_bg <i> Use I as the background image\n\ + use on the E-Notes Bar Window.\n\n\ +--firstbtn_x <n> Use N for the X co-ordinate on\n\ + the \"Display First Note\" button.\n\ +--firstbtn_y <n> Use N for the Y co-ordinate on\n\ + the \"Display First Note\" button.\n\ +--lastbtn_x <n> Use N for the X co-ordinate on\n\ + the \"Display Last Note\" button.\n\ +--lastbtn_y <n> Use N for the Y co-ordinate on\n\ + the \"Display Last Note\" button.\n\ +--nubtn_x <n> Use N for the X co-ordinate on\n\ + the \"Display Note Number\" button.\n\ +--nubtn_y <n> Use N for the Y co-ordinate on\n\ + the \"Display Note Number\" button.\n\ +--newbtn_x <n> Use N for the X co-ordinate on\n\ + the \"Append New Note\" button.\n\ +--newbtn_y <n> Use N for the Y co-ordinate on\n\ + the \"Append New Note\" button.\n\ +--exitbtn_x <n> Use N for the X co-ordinate on\n\ + the \"Exit E-Notes Bar\" button.\n\ +--exitbtn_y <n> Use N for the X co-ordinate on\n\ + the \"Exit E-Notes Bar\" button.\n\n\ +--firstbtn_width <n> Use N for the width of the\n\ + \"Display First Note\" button.\n\ +--firstbtn_height <n> Use N for the height of the\n\ + \"Display First Note\" button.\n\ +--lastbtn_width <n> Use N for the width of the\n\ + \"Display Last Note\" button.\n\ +--lastbtn_height <n> Use N for the height of the\n\ + \"Display Last Note\" button.\n\ +--nubtn_width <n> Use N for the width of the\n\ + \"Display Note Number\" button.\n\ +--nubtn_height <n> Use N for the height of the\n\ + \"Display Note Number\" button.\n\ +--newbtn_width <n> Use N for the width of the\n\ + \"Append New Note\" button.\n\ +--newbtn_height <n> Use N for the height of the\n\ + \"Append New Note\" button.\n\ +--exitbtn_width <n> Use N for the width of the\n\ + \"Exit E-Notes Bar\" button.\n\ +--exitbtn_height <n> Use N for the height of the\n\ + \"Exit E-Notes Bar\" button.\n\ +--firstbtn_img <i> Use I for the image displayed as\n\ + the \"Display First Note\" button.\n\ +--lastbtn_img <i> Use I for the image displayed as\n\ + the \"Display Last Note\" button.\n\ +--nubtn_img <i> Use I for the image displayed as\n\ + the \"Display Note Number\" button.\n\ +--newbtn_img <i> Use I for the image displayed as\n\ + the \"Append New Note\" button.\n\ +--exitbtn_img <i> Use I for the image displayed as\n\ + the \"Exit E-Notes Bar\" button.\n\n\ E-Notes can be run with or without both\n\ options and commands. If you run it with\n\ neither it will simply open E-Notes at the\n\ @@ -123,6 +187,53 @@ extern unsigned int font_size; extern unsigned int title_font_size; + +extern unsigned int win_x; +extern unsigned int win_y; +extern unsigned int win_width; +extern unsigned int win_height; + +extern unsigned int firstbtn_x; +extern unsigned int firstbtn_y; +extern unsigned int firstbtn_width; +extern unsigned int firstbtn_height; + +extern unsigned int lastbtn_x; +extern unsigned int lastbtn_y; +extern unsigned int lastbtn_width; +extern unsigned int lastbtn_height; + +extern unsigned int nubtn_x; +extern unsigned int nubtn_y; +extern unsigned int nubtn_width; +extern unsigned int nubtn_height; + +extern unsigned int newbtn_x; +extern unsigned int newbtn_y; +extern unsigned int newbtn_width; +extern unsigned int newbtn_height; + +extern unsigned int exitbtn_x; +extern unsigned int exitbtn_y; +extern unsigned int exitbtn_width; +extern unsigned int exitbtn_height; + +extern char *bgimg; +extern char *firstbtnimg; +extern char *lastbtnimg; +extern char *newbtnimg; +extern char *nubtnimg; +extern char *exitbtnimg; + +extern E_Prog *bar; +extern Evas_Object *bar_bg; +extern Evas_Object *bar_firstbtn; +extern Evas_Object *bar_lastbtn; +extern Evas_Object *bar_nubtn; +extern Evas_Object *bar_newbtn; +extern Evas_Object *bar_exitbtn; + + extern E_Prog *root; extern Evas_Object *bg; extern Evas_Object *title; @@ -144,7 +255,8 @@ typedef struct _fadeinfo fadeinfo; -struct _fadeinfo { +struct _fadeinfo +{ Evas_Object *ob; int a1; int a2; @@ -154,61 +266,66 @@ }; -void fadein_loop (int val, fadeinfo *fi); -void fadeobin (Evas_Object *ob, int a1, int a2, int freq, double speed); -void change_alpha (Evas_Object *ob, int alpha); - -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_image (Evas *evas, char *imagefile, int layer, int fill_x, - int fill_y, int width, int height, int x, int y); -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_text (Evas *evas, char *font, int size, char *text, int r, - int g, int b, int alpha, int x, int y, int layer); -E_Prog *new_window (int width, int height); - -void move_object (Evas_Object *ob, int x, int y); -void resize_object (Evas_Object *ob, int width, int height); -void init (); -void floop (); -void onclick (Evas_Object *ob, void (*func), const void *data); -void addtimer (char *name, double interval, void (*func), - int initloopval /*Optional For Use*/, const void *data); -void mousemoveforward (Ecore_Event *event); -void onmousemove (E_Prog *eprog, void (*func)); -void movemouseimg (Ecore_Event *event); -void changemouse (E_Prog *eprog, char *img, int width, int height); +void fadein_loop (int val, fadeinfo * fi); +void fadeobin (Evas_Object * ob, int a1, int a2, int freq, double speed); +void change_alpha (Evas_Object * ob, int alpha); + +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_image (Evas * evas, char *imagefile, int layer, int fill_x, + int fill_y, int width, int height, int x, int y); +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_text (Evas * evas, char *font, int size, char *text, int r, + int g, int b, int alpha, int x, int y, int layer); +E_Prog *new_window (int width, int height); + +void move_object (Evas_Object * ob, int x, int y); +void resize_object (Evas_Object * ob, int width, int height); +void init (); +void floop (); +void onclick (Evas_Object * ob, void (*func), const void *data); +void addtimer (char *name, double interval, void (*func), + int initloopval /*Optional For Use */ , const void *data); +void mousemoveforward (Ecore_Event * event); +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 parseconfig (int argc, char **argv[]); +void setdefaultvalues (); + +void openwin (void); +void makebar (void); -void openwin (void); -void makebar (void); +void fnotenum (int num); +void fileopen (char *mode); -void fnotenum (int num); -void fileopen (char *mode); +void displayall (void); +void dislast (void); +void clear (void); +void newnote (int argc, char *argv[]); +void count (void); -void displayall (void); -void dislast (void); -void clear (void); -void newnote (int argc, char *argv[]); -void count (void); +void notengui (void); -void notengui (void); +void getncmd (Ewl_Widget * w, void *ev_data, void *user_data); -void getncmd (Ewl_Widget *w, void *ev_data, void *user_data); +void setconfig (void); -void setconfig (void); +void kill_main_window (Ewl_Widget * main_win, void *ev_data, void *user_data); -void kill_main_window (Ewl_Widget *main_win, void *ev_data, void *user_data); +void fadein (int fadeloop, char *tmpstr); +void fadeout (int fadeloop); +void freethem (void); -void fadein (int fadeloop, char *tmpstr); -void fadeout (int fadeloop); -void freethem (void); +void slideout (int slideloop); +void slidein (int slideloop); -void slideout (int slideloop); -void slidein (int slideloop); +void mousemoveevent (Ecore_Event * event); -void mousemoveevent (Ecore_Event *event); +void okbtnclicked (); -void okbtnclicked (); +void runbar (); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- newentry.c 23 Feb 2003 10:07:17 -0000 1.6 +++ newentry.c 26 Feb 2003 20:38:04 -0000 1.7 @@ -90,7 +90,8 @@ ewl_widget_show (okbtn); ewl_callback_append (okbtn, EWL_CALLBACK_CLICKED, okbtnclicked, NULL); - ewl_callback_append (cancelbtn, EWL_CALLBACK_CLICKED, exit, "-1"); + ewl_callback_append (cancelbtn, EWL_CALLBACK_CLICKED, (void *) exit, + "-1"); free (wtmp); @@ -105,7 +106,7 @@ fileopen ("a"); - dtmp = ewl_entry_get_text (ewltitle); + dtmp = ewl_entry_get_text ((Ewl_Entry *) ewltitle); strcat (dtmp, "\n"); fputs (dtmp, file); @@ -115,7 +116,7 @@ { break; } - dtmp = ewl_entry_get_text (note[d]); + dtmp = ewl_entry_get_text ((Ewl_Entry *) note[d]); strcat (dtmp, "\n"); fputs (dtmp, file); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- notecmds.c 23 Feb 2003 10:07:17 -0000 1.9 +++ notecmds.c 26 Feb 2003 20:38:04 -0000 1.10 @@ -81,7 +81,7 @@ void notengui () { - ewl_init (1, "enotes"); + ewl_init (1, NULL); ewlwin = ewl_window_new (); ewl_window_set_title (EWL_WINDOW (ewlwin), "View Note Number?"); @@ -335,7 +335,8 @@ addtimer (char *name, double interval, void (*func), int initloopval /*Optional For Use */ , const void *data) { - ecore_add_event_timer (name, interval, func, initloopval, data); + ecore_add_event_timer (name, interval, func, initloopval, + (void *) data); return; } @@ -351,7 +352,7 @@ return; } - addtimer ("tmpquick", 0, tmpfunc, &eemm->x, &eemm->y); + addtimer ("tmpquick", 0, tmpfunc, eemm->x, &eemm->y); return; } @@ -398,4 +399,56 @@ tmpmouseeprog = eprog; ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, movemouseimg); +} + + + +/* BAR CODE BEGINS HERE */ + + +void +runbar () +{ + bar = new_window (win_width, win_height); + eprog_borderless_set (bar, 1); + + eprog_move (bar, win_x, win_y); + + bar_bg = new_image (bar->evas, bgimg, 0, win_width, win_height, + win_width, win_height, 0, 0); + bar_firstbtn = + new_image (bar->evas, firstbtnimg, 1, firstbtn_width, + firstbtn_height, firstbtn_width, firstbtn_height, + firstbtn_x, firstbtn_y); + bar_lastbtn = + new_image (bar->evas, lastbtnimg, 1, lastbtn_width, + lastbtn_height, lastbtn_width, + lastbtn_height, lastbtn_x, lastbtn_y); + bar_nubtn = + new_image (bar->evas, nubtnimg, 1, nubtn_width, nubtn_height, + nubtn_width, nubtn_height, nubtn_x, nubtn_y); + bar_newbtn = + new_image (bar->evas, newbtnimg, 1, newbtn_width, + newbtn_height, newbtn_width, newbtn_height, + newbtn_x, newbtn_y); + bar_exitbtn = + new_image (bar->evas, exitbtnimg, 1, exitbtn_width, + exitbtn_height, exitbtn_width, exitbtn_height, + exitbtn_x, exitbtn_y); + + + onclick (bar_exitbtn, exit, "-1"); + onclick (bar_firstbtn, system, "enotes -o&"); + onclick (bar_lastbtn, system, "enotes -l&"); + onclick (bar_nubtn, system, "enotes --nu&"); + onclick (bar_newbtn, system, "enotes -N&"); + + + eprog_show (bar); + evas_object_show (bar_bg); + evas_object_show (bar_firstbtn); + evas_object_show (bar_lastbtn); + evas_object_show (bar_nubtn); + evas_object_show (bar_newbtn); + evas_object_show (bar_exitbtn); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- notenum.c 23 Feb 2003 10:07:17 -0000 1.15 +++ notenum.c 26 Feb 2003 20:38:04 -0000 1.16 @@ -46,7 +46,7 @@ ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, mousemoveevent); - onclick (exitbtn, exit, -1); + onclick (exitbtn, exit, (void *) "-1"); eprog_show (root); evas_object_show (bg); @@ -110,7 +110,7 @@ ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, mousemoveevent); - onclick (exitbtn, fadeout, 255); + onclick (exitbtn, fadeout, (void *) 255); eprog_show (root); @@ -206,8 +206,8 @@ } if (slideloop < 50) { - ecore_add_event_timer ("slideout", slidespeed, slideout, - slideloop, NULL); + ecore_add_event_timer ("slideout", slidespeed, + (void *) slideout, slideloop, NULL); } } @@ -236,8 +236,8 @@ if (slideloop > 0) { - ecore_add_event_timer ("slidein", slidespeed, slidein, - slideloop, NULL); + ecore_add_event_timer ("slidein", slidespeed, + (void *) slidein, slideloop, NULL); } if (slideloop == 0) { @@ -276,8 +276,8 @@ } if (fadeloop < 255 || fadeloop != 255) { - ecore_add_event_timer ("fadetimer", fadespeed, fadein, - fadeloop, NULL); + ecore_add_event_timer ("fadetimer", fadespeed, + (void *) fadein, fadeloop, NULL); } } @@ -310,7 +310,7 @@ if (fadeloop > 0 || fadeloop == 255) { - ecore_add_event_timer ("fadeouttimer", fadespeed, fadeout, - fadeloop, NULL); + ecore_add_event_timer ("fadeouttimer", fadespeed, + (void *) fadeout, fadeloop, NULL); } } |
From: <enl...@li...> - 2003-02-28 19:06:50
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: Makefile.am main.h Log Message: Lots of changes! But none of it to the code :-) =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 10 Feb 2003 08:17:50 -0000 1.1 +++ Makefile.am 28 Feb 2003 19:06:12 -0000 1.2 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = \ - @gtk_cflags@ @eprog_cflags@ @ewl_cflags@ + @eprog_cflags@ @ewl_cflags@ bin_PROGRAMS = enotes @@ -12,4 +12,4 @@ notecmds.c \ notenum.c -enotes_LDADD = @gtk_libs@ @ewl_libs@ @eprog_libs@ +enotes_LDADD = @ewl_libs@ @eprog_libs@ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- main.h 26 Feb 2003 20:38:04 -0000 1.17 +++ main.h 28 Feb 2003 19:06:13 -0000 1.18 @@ -22,7 +22,6 @@ #include <X11/Xlib.h> #include <Eprog.h> #include <Ewl.h> -#include <gtk/gtk.h> #include <Ecore.h> #define str_size 100 |
From: <enl...@li...> - 2003-02-28 19:06:50
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes Modified Files: AUTHORS ChangeLog INSTALL NEWS README TODO configure.in runwithoutinstall Log Message: Lots of changes! But none of it to the code :-) =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- AUTHORS 11 Feb 2003 19:52:45 -0000 1.4 +++ AUTHORS 28 Feb 2003 19:06:06 -0000 1.5 @@ -20,3 +20,12 @@ Evas Owner: Carsten Haitzler - Raster Ecore Owner: Carsten Haitzler - Raster Eprog Owner: Brian Mattern - Rephorm +Autofoo'ing: Ben Rockwood - Benr + + Various Tips and Advice from: + +Term +Azundris +Adam Till: Tillsan +Ben Rockwood: Benr (again :-) ) + =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ChangeLog 11 Feb 2003 16:39:37 -0000 1.3 +++ ChangeLog 28 Feb 2003 19:06:07 -0000 1.4 @@ -14,3 +14,4 @@ E-Notes ChangeLog: +See CVS Listings. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/INSTALL,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- INSTALL 11 Feb 2003 16:39:37 -0000 1.3 +++ INSTALL 28 Feb 2003 19:06:09 -0000 1.4 @@ -12,9 +12,23 @@ | Owner: Thomas Fletcher | |_________________________________________________________| + INSTALLATION -make; make install; +./autogen.sh +make +make install (As Root!) -or if just to try it out: + UNINSTALLATION -make; ./runwithoutinstall; +make uninstall (As Root!) + + TRYING IT OUT + +./autogen.sh +make +./runwithoutinstall (Note: If you wish to run the launch bar you must + supply more flags to the script to specify the bar + images and such, see the usage.) + +Or of course you could simply +install it, then uninstall it. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/NEWS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- NEWS 11 Feb 2003 16:39:38 -0000 1.3 +++ NEWS 28 Feb 2003 19:06:10 -0000 1.4 @@ -12,4 +12,4 @@ | Owner: Thomas Fletcher | |_________________________________________________________| - +See CVS Listings. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- README 11 Feb 2003 16:39:39 -0000 1.3 +++ README 28 Feb 2003 19:06:11 -0000 1.4 @@ -12,4 +12,26 @@ | Owner: Thomas Fletcher | |_________________________________________________________| -Please see INSTALL. + What Is It? + +E-Notes is a sticky notes system based on the enlightenment +libraries. It is aimed at being a functionable, easy to use +and nice to look at themable sticky notes system which should +prove to be helpful on many peoples unix workstations. + +It is programmed in C and requires autoconf, automake, aclocal, +make, libtool, gettext, libltdl and the standard libraries. + +Not forgetting of course the enlightenment libraries: + Evas + Eprog + Eprog + Ewl + +Please See AUTHORS for credits and people who help with or +provide resources for the development of E-Notes. + + For Installation Instructions please see INSTALL. + + For Configuration Instructions see the documents in the + directory docs. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- TODO 11 Feb 2003 16:39:39 -0000 1.4 +++ TODO 28 Feb 2003 19:06:11 -0000 1.5 @@ -12,5 +12,4 @@ | Owner: Thomas Fletcher | |_________________________________________________________| -Finish The New-Note EWL Option -Fix New Note GUI. +Add an option for timestamping. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in 10 Feb 2003 08:17:50 -0000 1.1 +++ configure.in 28 Feb 2003 19:06:11 -0000 1.2 @@ -90,19 +90,6 @@ AC_SUBST(eprog_cflags) AC_SUBST(eprog_libs) -PROG="gtk-config"; -AC_PATH_PROG(GTK_CONFIG, $PROG, "", $PATH) -if [ test -z $GTK_CONFIG ]; then - echo $PROG " is not in your \$PATH. Please ensure it is."; - echo "Read the manual page for you shell as to how to extend your path."; - echo "FATAL ERROR. ABORT."; - exit -1; -fi -gtk_cflags=`$GTK_CONFIG --cflags` -gtk_libs=`$GTK_CONFIG --libs` -AC_SUBST(gtk_cflags) -AC_SUBST(gtk_libs) - AC_OUTPUT([ Makefile =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/runwithoutinstall,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- runwithoutinstall 11 Feb 2003 16:53:00 -0000 1.5 +++ runwithoutinstall 28 Feb 2003 19:06:12 -0000 1.6 @@ -1 +1 @@ -src/enotes -b data/bg3.jpg -f data/notepad.ttf -F . -x data/x.png -d data/samplenotes -t data/titleimg.jpg --lastbtn data/lastbtn.png --firstbtn data/firstbtn.png --nubtn data/nubtn.png --newbtn data/newbtn.png $* +src/enotes -b data/bg3.jpg -f data/notepad.ttf -F . -x data/x.png -d data/samplenotes -t data/titleimg.jpg --lastbtn data/lastbtn.png --firstbtn data/firstbtn.png --nubtn data/nubtn.png --newbtn data/newbtn.png -B data/panel.png $* |
From: <enl...@li...> - 2003-02-28 20:28:21
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: Makefile.am main.c main.h newentry.c Added Files: allocmem.c argsparser.c confparse.c setdefconf.c variables.c Log Message: Modulising My code because it was getting hard to maintain (benr's advice :-) ) =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 28 Feb 2003 19:06:12 -0000 1.2 +++ Makefile.am 28 Feb 2003 20:27:39 -0000 1.3 @@ -10,6 +10,11 @@ main.h \ newentry.c \ notecmds.c \ -notenum.c +notenum.c \ +allocmem.c \ +argsparser.c \ +confparse.c \ +setdefconf.c \ +variables.c enotes_LDADD = @ewl_libs@ @eprog_libs@ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- main.c 26 Feb 2003 20:38:02 -0000 1.14 +++ main.c 28 Feb 2003 20:27:40 -0000 1.15 @@ -16,105 +16,6 @@ #include "main.h" -char *tmp; -char *str; - -char *fn; -char *fontdir; -char *bgfile; -char *font; -char *configfn; -char *xbtnfn; -char *openwinimg; -char *lastbtn; -char *firstbtn; -char *nubtn; -char *newbtn; -char *barimg; - -FILE *file; - -unsigned int r; -unsigned int g; -unsigned int b; - -unsigned int bar_r; -unsigned int bar_g; -unsigned int bar_b; - -unsigned int w; -unsigned int h; - -unsigned int font_size; -unsigned int title_font_size; - - -unsigned int win_x; -unsigned int win_y; -unsigned int win_width; -unsigned int win_height; - -unsigned int firstbtn_x; -unsigned int firstbtn_y; -unsigned int firstbtn_width; -unsigned int firstbtn_height; - -unsigned int lastbtn_x; -unsigned int lastbtn_y; -unsigned int lastbtn_width; -unsigned int lastbtn_height; - -unsigned int nubtn_x; -unsigned int nubtn_y; -unsigned int nubtn_width; -unsigned int nubtn_height; - -unsigned int newbtn_x; -unsigned int newbtn_y; -unsigned int newbtn_width; -unsigned int newbtn_height; - -unsigned int exitbtn_x; -unsigned int exitbtn_y; -unsigned int exitbtn_width; -unsigned int exitbtn_height; - -char *bgimg; -char *firstbtnimg; -char *lastbtnimg; -char *newbtnimg; -char *nubtnimg; -char *exitbtnimg; - -E_Prog *bar; -Evas_Object *bar_bg; -Evas_Object *bar_firstbtn; -Evas_Object *bar_lastbtn; -Evas_Object *bar_nubtn; -Evas_Object *bar_newbtn; -Evas_Object *bar_exitbtn; - - -E_Prog *root; -Evas_Object *bg; -Evas_Object *title; -Evas_Object *txt[11]; -Evas_Object *exitbtn; -Evas_Object *rectbar; - -Evas_Object *lastbtnob; -Evas_Object *firstbtnob; -Evas_Object *nubtnob; -Evas_Object *newbtnob; - -Ewl_Widget *main_win; -Ewl_Widget *main_box; -Ewl_Widget *ewltitle; -Ewl_Widget *note[11]; -Ewl_Widget *okbtn; -Ewl_Widget *cancelbtn; - - int main (int argc, char *argv[]) { @@ -122,1265 +23,15 @@ 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); - bgimg = malloc (str_size); - firstbtnimg = malloc (str_size); - lastbtnimg = malloc (str_size); - firstbtnimg = malloc (str_size); - nubtnimg = malloc (str_size); - newbtnimg = malloc (str_size); - exitbtnimg = 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; - - - win_x = 0; - win_y = 0; - win_width = 100; - win_height = 25; - - firstbtn_x = 2; - firstbtn_y = 2; - firstbtn_width = 17; - firstbtn_height = 21; - - lastbtn_x = 21; - lastbtn_y = 2; - lastbtn_width = 17; - lastbtn_height = 21; - - nubtn_x = 40; - nubtn_y = 2; - nubtn_width = 17; - nubtn_height = 21; - - newbtn_x = 59; - newbtn_y = 2; - newbtn_width = 17; - newbtn_height = 21; - - exitbtn_x = 78; - exitbtn_y = 2; - exitbtn_width = 17; - exitbtn_height = 21; - - strcpy (bgimg, "/usr/local/share/enotes/data/barbg.png"); - strcpy (firstbtnimg, - "/usr/local/share/enotes/data/barfirstbtnimg.png"); - strcpy (lastbtnimg, "/usr/local/share/enotes/data/barlastbtnimg.png"); - strcpy (nubtnimg, "/usr/local/share/enotes/data/barnubtnimg.png"); - strcpy (newbtnimg, "/usr/local/share/enotes/data/barnewbtnimg.png"); - strcpy (exitbtnimg, "/usr/local/share/enotes/data/barexitbtnimg.png"); - + allocatemem (); + setdefaults (); eprog_init (); setconfig (); + parseusage (argc, argv); - 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], "--barwin_x")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - win_x = atoi (mtmp); - } - else if (!strcmp (argv[a], "--barwin_y")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - win_y = atoi (mtmp); - } - else if (!strcmp (argv[a], "--barwin_width")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - win_width = atoi (mtmp); - } - else if (!strcmp (argv[a], "--barwin_height")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - - win_height = atoi (mtmp); - } - else if (!strcmp (argv[a], "--barwin_bg")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - - strcpy (bgimg, mtmp); - } - else if (!strcmp (argv[a], "--firstbtn_x")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - firstbtn_x = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--firstbtn_y")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - firstbtn_y = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--firstbtn_width")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - firstbtn_width = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--firstbtn_height")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - firstbtn_height = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--lastbtn_x")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - lastbtn_x = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--lastbtn_y")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - lastbtn_y = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--lastbtn_width")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - lastbtn_width = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--lastbtn_height")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - lastbtn_height = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--nubtn_x")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - nubtn_x = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--nubtn_y")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - nubtn_y = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--nubtn_width")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - nubtn_width = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--nubtn_height")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - nubtn_height = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--newbtn_x")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - newbtn_x = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--newbtn_y")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - newbtn_y = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--newbtn_width")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - newbtn_width = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--newbtn_height")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - newbtn_height = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--exitbtn_x")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - exitbtn_x = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--exitbtn_y")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - exitbtn_y = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--exitbtn_width")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - exitbtn_width = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--exitbtn_height")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - exitbtn_height = atoi (mtmp); - - } - else if (!strcmp (argv[a], "--firstbtn_img")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - strcpy (firstbtnimg, mtmp); - - } - else if (!strcmp (argv[a], "--lastbtn_img")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - strcpy (lastbtnimg, mtmp); - - } - else if (!strcmp (argv[a], "--nubtn_img")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - strcpy (nubtnimg, mtmp); - - } - else if (!strcmp (argv[a], "--newbtn_img")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - strcpy (newbtnimg, mtmp); - - } - else if (!strcmp (argv[a], "--exitbtn_img")) - { - mtmp = argv[a + 1]; - if (mtmp == NULL || mtmp[0] == '-') - { - printf ("Missing Argument!\n"); - return (0); - } - strcpy (exitbtnimg, 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; - } - else if (!strcmp (argv[a], "--bar")) - { - runbar (); - actionbool = 1; - } - a++; - } - a = 0; - - if (actionbool == 0) - { - openwin (); - eprog_event_loop (); - return (0); - } - - freethem (); + deallocatemem (); eprog_event_loop (); -} - -void -freethem () -{ - if (tmp) - free (tmp); - if (str) - free (str); - if (fn) - free (fn); - if (fontdir) - free (fontdir); - if (bgfile) - free (bgfile); - if (font) - free (font); - if (configfn) - free (configfn); - if (xbtnfn) - free (xbtnfn); - if (barimg) - free (barimg); -} - -void -setconfig () -{ - char *tmp2 = malloc (str_size); - int sectiontype = 0; - int donebool[43]; - 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; - } - else if (!strncmp (tmp2, "[barwin]", 8)) - { - sectiontype = 20; - goto lp1; - } - else if (!strncmp (tmp2, "[barfirstbtn]", 13)) - { - sectiontype = 25; - goto lp1; - } - else if (!strncmp (tmp2, "[barlastbtn]", 12)) - { - sectiontype = 30; - goto lp1; - } - else if (!strncmp (tmp2, "[barnubtn]", 10)) - { - sectiontype = 35; - goto lp1; - } - else if (!strncmp (tmp2, "[barnewbtn]", 11)) - { - sectiontype = 40; - goto lp1; - } - else if (!strncmp (tmp2, "[barexitbtn]", 12)) - { - sectiontype = 45; - 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; - } - else if (sectiontype == 20) - { - if (donebool[14] != 1) - { - win_x = atoi (tmp2); - donebool[14] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 21) - { - if (donebool[15] != 1) - { - win_y = atoi (tmp2); - donebool[15] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 22) - { - if (donebool[16] != 1) - { - win_width = atoi (tmp2); - donebool[16] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 23) - { - if (donebool[17] != 1) - { - win_height = atoi (tmp2); - donebool[17] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 24) - { - if (donebool[18] != 1) - { - strncpy (bgimg, tmp2, - strlen (tmp2) - 1); - donebool[18] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 25) - { - if (donebool[19] != 1) - { - firstbtn_x = atoi (tmp2); - donebool[19] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 26) - { - if (donebool[20] != 1) - { - firstbtn_y = atoi (tmp2); - donebool[20] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 27) - { - if (donebool[21] != 1) - { - firstbtn_width = atoi (tmp2); - donebool[21] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 28) - { - if (donebool[22] != 1) - { - firstbtn_height = atoi (tmp2); - donebool[22] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 29) - { - if (donebool[23] != 1) - { - strncpy (firstbtnimg, tmp2, - strlen (tmp2) - 1); - donebool[23] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 30) - { - if (donebool[24] != 1) - { - lastbtn_x = atoi (tmp2); - donebool[24] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 31) - { - if (donebool[25] != 1) - { - lastbtn_y = atoi (tmp2); - donebool[25] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 32) - { - if (donebool[26] != 1) - { - lastbtn_width = atoi (tmp2); - donebool[26] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 33) - { - if (donebool[27] != 1) - { - lastbtn_height = atoi (tmp2); - donebool[27] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 34) - { - if (donebool[28] != 1) - { - strncpy (lastbtnimg, tmp2, - strlen (tmp2) - 1); - donebool[28] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 35) - { - if (donebool[29] != 1) - { - nubtn_x = atoi (tmp2); - donebool[29] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 36) - { - if (donebool[30] != 1) - { - nubtn_y = atoi (tmp2); - donebool[30] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 37) - { - if (donebool[31] != 1) - { - nubtn_width = atoi (tmp2); - donebool[31] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 38) - { - if (donebool[32] != 1) - { - nubtn_height = atoi (tmp2); - donebool[32] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 39) - { - if (donebool[33] != 1) - { - strncpy (nubtnimg, tmp2, - strlen (tmp2) - 1); - donebool[33] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 40) - { - if (donebool[34] != 1) - { - newbtn_x = atoi (tmp2); - donebool[34] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 41) - { - if (donebool[35] != 1) - { - newbtn_y = atoi (tmp2); - donebool[35] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 42) - { - if (donebool[36] != 1) - { - newbtn_width = atoi (tmp2); - donebool[36] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 43) - { - if (donebool[37] != 1) - { - newbtn_height = atoi (tmp2); - donebool[37] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 44) - { - if (donebool[38] != 1) - { - strncpy (newbtnimg, tmp2, - strlen (tmp2) - 1); - donebool[38] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 45) - { - if (donebool[39] != 1) - { - exitbtn_x = atoi (tmp2); - donebool[39] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 46) - { - if (donebool[40] != 1) - { - exitbtn_y = atoi (tmp2); - donebool[40] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 47) - { - if (donebool[41] != 1) - { - exitbtn_width = atoi (tmp2); - donebool[41] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 48) - { - if (donebool[42] != 1) - { - exitbtn_height = atoi (tmp2); - donebool[42] = 1; - } - sectiontype++; - goto lp1; - } - else if (sectiontype == 49) - { - if (donebool[43] != 1) - { - strncpy (exitbtnimg, tmp2, - strlen (tmp2) - 1); - donebool[43] = 1; - } - sectiontype++; - goto lp1; - } - lp1: - memset (tmp2, 0, sizeof (tmp2)); - } - fclose (file); - free (tmp2); - return; } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- main.h 28 Feb 2003 19:06:13 -0000 1.18 +++ main.h 28 Feb 2003 20:27:40 -0000 1.19 @@ -282,8 +282,8 @@ void move_object (Evas_Object * ob, int x, int y); void resize_object (Evas_Object * ob, int width, int height); -void init (); -void floop (); +void init (void); +void floop (void); void onclick (Evas_Object * ob, void (*func), const void *data); void addtimer (char *name, double interval, void (*func), int initloopval /*Optional For Use */ , const void *data); @@ -294,7 +294,7 @@ /* Should I do this or not? */ void parseconfig (int argc, char **argv[]); -void setdefaultvalues (); +void setdefaultvalues (void); void openwin (void); void makebar (void); @@ -318,13 +318,19 @@ void fadein (int fadeloop, char *tmpstr); void fadeout (int fadeloop); -void freethem (void); void slideout (int slideloop); void slidein (int slideloop); void mousemoveevent (Ecore_Event * event); -void okbtnclicked (); +void okbtnclicked (void); -void runbar (); +void runbar (void); + +void parseusage (int argc, char *argv[]); +void setconfig (void); +void setdefaults (void); + +void allocatemem (void); +void deallocatemem (void); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- newentry.c 26 Feb 2003 20:38:04 -0000 1.7 +++ newentry.c 28 Feb 2003 20:27:40 -0000 1.8 @@ -89,7 +89,8 @@ ewl_widget_show (cancelbtn); ewl_widget_show (okbtn); - ewl_callback_append (okbtn, EWL_CALLBACK_CLICKED, okbtnclicked, NULL); + ewl_callback_append (okbtn, EWL_CALLBACK_CLICKED, + (void *) okbtnclicked, NULL); ewl_callback_append (cancelbtn, EWL_CALLBACK_CLICKED, (void *) exit, "-1"); |
From: <enl...@li...> - 2003-03-01 10:34:54
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: Makefile.am allocmem.c argsparser.c confparse.c main.c main.h notecmds.c notenum.c setdefconf.c variables.c Added Files: evasfuncs.c funcs_cmds.h funcs_evas.h funcs_usage_conf.h launchbar.c menubar.c notengui.c titlewin.c usage.h var_conf.h var_eprog_evas.h var_ewl.h var_structs.h Log Message: More Code Management (56k grrr) =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 28 Feb 2003 20:27:39 -0000 1.3 +++ Makefile.am 1 Mar 2003 10:34:52 -0000 1.4 @@ -6,15 +6,28 @@ bin_PROGRAMS = enotes enotes_SOURCES = \ +allocmem.c \ +funcs_cmds.h \ main.c \ -main.h \ -newentry.c \ notecmds.c \ -notenum.c \ -allocmem.c \ +titlewin.c \ +var_ewl.h \ argsparser.c \ +funcs_evas.h \ +main.h \ +notengui.c \ +usage.h \ +variables.c \ confparse.c \ +funcs_usage_conf.h \ +menubar.c \ +notenum.c \ +var_conf.h \ +var_structs.h \ +evasfuncs.c \ +launchbar.c \ +newentry.c \ setdefconf.c \ -variables.c +var_eprog_evas.h enotes_LDADD = @ewl_libs@ @eprog_libs@ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/allocmem.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- allocmem.c 28 Feb 2003 20:27:40 -0000 1.1 +++ allocmem.c 1 Mar 2003 10:34:52 -0000 1.2 @@ -1,11 +1,27 @@ +/* +----------------------------------------------------------- +| ###### # # #### ##### ###### #### | +| # ## # # # # # # | +| ##### ##### # # # # # # ##### #### | +| # # # # # # # # # | +| # # ## # # # # # # | +| ###### # # #### # ###### #### | +----------------------------------------------------------- +| E-Notes is released under: | +| The GNU General Public License (GPL) | +| | +| Owner: Thomas Fletcher | +|_________________________________________________________| +*/ + #include "main.h" void -allocatemem () +allocatemem (void) { tmp = malloc (str_size); str = malloc (str_size); - fn = malloc (100); + fn = malloc (str_size); fontdir = malloc (str_size); bgfile = malloc (str_size); font = malloc (str_size); @@ -30,7 +46,7 @@ } void -deallocatemem () +deallocatemem (void) { if (tmp) free (tmp); @@ -50,4 +66,28 @@ free (xbtnfn); if (barimg) free (barimg); + if (openwinimg) + free (openwinimg); + if (lastbtn) + free (lastbtn); + if (firstbtn) + free (firstbtn); + if (nubtn) + free (nubtn); + if (newbtn) + free (newbtn); + if (bgimg) + free (bgimg); + if (firstbtnimg) + free (firstbtnimg); + if (lastbtnimg) + free (lastbtnimg); + if (nubtnimg) + free (nubtnimg); + if (newbtnimg) + free (newbtnimg); + if (exitbtnimg) + free (exitbtnimg); + + return; } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/argsparser.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- argsparser.c 28 Feb 2003 20:27:40 -0000 1.1 +++ argsparser.c 1 Mar 2003 10:34:52 -0000 1.2 @@ -1,3 +1,19 @@ +/* +----------------------------------------------------------- +| ###### # # #### ##### ###### #### | +| # ## # # # # # # | +| ##### ##### # # # # # # ##### #### | +| # # # # # # # # # | +| # # ## # # # # # # | +| ###### # # #### # ###### #### | +----------------------------------------------------------- +| E-Notes is released under: | +| The GNU General Public License (GPL) | +| | +| Owner: Thomas Fletcher | +|_________________________________________________________| +*/ + #include "main.h" void @@ -7,7 +23,8 @@ int actionbool = 0; char *mtmp = malloc (str_size); - if (argc < 2) + if (argc < 2) /* Lets check whether there are any arguments + if not, lets just run the title screen :-) */ { openwin (); eprog_event_loop (); @@ -15,7 +32,10 @@ } - while (argv[a] != NULL) + while (argv[a] != NULL) /* Check each part of the array for an + argument match, set configuration and + continue to the command loop, now all + of the configuration arguments are set/ */ { if (!strcmp (argv[a], "-d") || !strcmp (argv[a], "--db")) { @@ -61,6 +81,7 @@ exit (-1); } strcpy (configfn, argv[a + 1]); + setconfig (); a++; } @@ -507,7 +528,8 @@ a = 1; - while (argv[a] != NULL) + while (argv[a] != NULL) /* Lets check the command arguments now and + execute the function required. */ { if (!strcmp (argv[a], "-o") || !strcmp (argv[a], "--first")) { @@ -561,14 +583,17 @@ a = 0; - if (actionbool == 0) + if (actionbool == 0) /* If no action variables have been set + and so it was just a little configuring + then run the title window now that the + options are set again :-) */ { openwin (); eprog_event_loop (); exit (-1); } - free (mtmp); + free (mtmp); /* Free the little string used */ return; } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/confparse.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- confparse.c 28 Feb 2003 20:27:40 -0000 1.1 +++ confparse.c 1 Mar 2003 10:34:52 -0000 1.2 @@ -1,3 +1,19 @@ +/* +----------------------------------------------------------- +| ###### # # #### ##### ###### #### | +| # ## # # # # # # | +| ##### ##### # # # # # # ##### #### | +| # # # # # # # # # | +| # # ## # # # # # # | +| ###### # # #### # ###### #### | +----------------------------------------------------------- +| E-Notes is released under: | +| The GNU General Public License (GPL) | +| | +| Owner: Thomas Fletcher | +|_________________________________________________________| +*/ + #include "main.h" =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- main.c 28 Feb 2003 20:27:40 -0000 1.15 +++ main.c 1 Mar 2003 10:34:52 -0000 1.16 @@ -19,19 +19,26 @@ int main (int argc, char *argv[]) { - int a = 1; - int actionbool = 0; - char *mtmp = malloc (str_size); + allocatemem (); /* Malloc the Variables. */ + setdefaults (); /* Set all of the default values + to the variables. */ - allocatemem (); - setdefaults (); + eprog_init (); /* Initialise E-Prog */ - eprog_init (); + setconfig (); /* Read the configuration file + and set the configuration. */ - setconfig (); - parseusage (argc, argv); + parseusage (argc, argv); /* Parse the command line + arguments and both set + options if needed and + execute the commands + specified. */ - deallocatemem (); + deallocatemem (); /* free the variables from memory + when all objects have been set + so the strings no longer need + to hold any data. */ - eprog_event_loop (); + eprog_event_loop (); /* Enter the event loop */ + return (0); /* Lets Get Out of Here! */ } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- main.h 28 Feb 2003 20:27:40 -0000 1.19 +++ main.h 1 Mar 2003 10:34:52 -0000 1.20 @@ -24,313 +24,22 @@ #include <Ewl.h> #include <Ecore.h> -#define str_size 100 -#define version "pre 0.1\n" - -#define usage "E-Notes Usage:\n\ - enotes [options] [command]\n\ - enotes [command] [options]\n\ - enotes [options]\n\ - enotes\n\n\ - Commands:\n\ -POSIX GNU Description\n\ --o --first Display First Note.\n\ --n <n> --num <n> Display the n'th Note.\n\ - --nu Display the GUI for the\n\ - above feature.\n\ --l --last Display the Last Note.\n\n\ --c --clear Clear all notes.\n\ --N --new Create a new note\n\ --a --consolenew Use console based note\n\ - creation system.\n\n\ --C --count Display Number of notes\n\ - stored.\n\ - --bar Display the E-Notes\n\ - Execution Bar.\n\n\ - Options:\n\ -POSIX GNU Description\n\ --d <d> --db <d> Use <d> as the enotes\n\ - data source.\n\ --s <s> --config <s> Use <s> as the configuration\n\ - file.\n\ --f <f> --font <f> Use <f> as the font.\n\ --b <b> --bg <b> Use a different\n\ - background for\n\ - note file.\n\ --x <x> --xbtnimg <x> Use a different image\n\ - for the X Button\n\ --t <i> --titleimg <i> Use a different image\n\ - for the title page\n\ - --lastbtn <b> Use a different image\n\ - for the Last Entry Button.\n\ - --firstbtn <b> Use a different image\n\ - for the First Entry Button.\n\ - --nubtn <b> Use a different image for\n\ - the Number Button.\n\ - --newbtn <b> Use a different image for\n\ - the new entry button.\n\ --B <b> --barimg <b> Use a different image for\n\ - the menubar background.\n\ --S <s> --fontsize <s> Use a different font size.\n\ --T <s> --tsize <s> Use a different font size\n\ - for the title.\n\n\ - E-Notes Execution Bar - Options:\n\ -GNU Description\n\ ---barwin_x <n> Use N as the X co-ordinate for\n\ - the E-Notes Bar window.\n\ ---barwin_y <n> Use N as the Y co-ordinate for\n\ - the E-Notes Bar window.\n\ ---barwin_width <n> Use N as the width for the\n\ - E-Notes Bar Window.\n\ ---barwin_height <n> Use N as the height for the\n\ - E-Notes Bar Window.\n\ ---barwin_bg <i> Use I as the background image\n\ - use on the E-Notes Bar Window.\n\n\ ---firstbtn_x <n> Use N for the X co-ordinate on\n\ - the \"Display First Note\" button.\n\ ---firstbtn_y <n> Use N for the Y co-ordinate on\n\ - the \"Display First Note\" button.\n\ ---lastbtn_x <n> Use N for the X co-ordinate on\n\ - the \"Display Last Note\" button.\n\ ---lastbtn_y <n> Use N for the Y co-ordinate on\n\ - the \"Display Last Note\" button.\n\ ---nubtn_x <n> Use N for the X co-ordinate on\n\ - the \"Display Note Number\" button.\n\ ---nubtn_y <n> Use N for the Y co-ordinate on\n\ - the \"Display Note Number\" button.\n\ ---newbtn_x <n> Use N for the X co-ordinate on\n\ - the \"Append New Note\" button.\n\ ---newbtn_y <n> Use N for the Y co-ordinate on\n\ - the \"Append New Note\" button.\n\ ---exitbtn_x <n> Use N for the X co-ordinate on\n\ - the \"Exit E-Notes Bar\" button.\n\ ---exitbtn_y <n> Use N for the X co-ordinate on\n\ - the \"Exit E-Notes Bar\" button.\n\n\ ---firstbtn_width <n> Use N for the width of the\n\ - \"Display First Note\" button.\n\ ---firstbtn_height <n> Use N for the height of the\n\ - \"Display First Note\" button.\n\ ---lastbtn_width <n> Use N for the width of the\n\ - \"Display Last Note\" button.\n\ ---lastbtn_height <n> Use N for the height of the\n\ - \"Display Last Note\" button.\n\ ---nubtn_width <n> Use N for the width of the\n\ - \"Display Note Number\" button.\n\ ---nubtn_height <n> Use N for the height of the\n\ - \"Display Note Number\" button.\n\ ---newbtn_width <n> Use N for the width of the\n\ - \"Append New Note\" button.\n\ ---newbtn_height <n> Use N for the height of the\n\ - \"Append New Note\" button.\n\ ---exitbtn_width <n> Use N for the width of the\n\ - \"Exit E-Notes Bar\" button.\n\ ---exitbtn_height <n> Use N for the height of the\n\ - \"Exit E-Notes Bar\" button.\n\ ---firstbtn_img <i> Use I for the image displayed as\n\ - the \"Display First Note\" button.\n\ ---lastbtn_img <i> Use I for the image displayed as\n\ - the \"Display Last Note\" button.\n\ ---nubtn_img <i> Use I for the image displayed as\n\ - the \"Display Note Number\" button.\n\ ---newbtn_img <i> Use I for the image displayed as\n\ - the \"Append New Note\" button.\n\ ---exitbtn_img <i> Use I for the image displayed as\n\ - the \"Exit E-Notes Bar\" button.\n\n\ - E-Notes can be run with or without both\n\ - options and commands. If you run it with\n\ - neither it will simply open E-Notes at the\n\ - title window, and you will be given\n\ - instructions on how to access the menu and\n\ - use it from there. Unless the theme doesn't\n\ - contain the instructions, the default themes do.\n\ - If you run it without options it will get its\n\ - settings from either the configuration file or\n\ - the default settings which are built in to E-Notes.\n\n\ - If you run it with commands however, it will\n\ - just execute that one command, but the window that\n\ - comes up, will have the menu on it, so you can easily\n\ - use enotes from there also. How you run E-Notes is\n\ - up to you of course, so configure it and run it to\n\ - suite your personal needs.\n\n\ -Please Enjoy E-Notes :-)\n\ -Thomas Fletcher.\n\n\ -Any Bugs, Please E-Mail to sha...@ya... .\n" - - - -extern char *tmp; -extern char *str; - -extern char *fn; -extern char *fontdir; -extern char *bgfile; -extern char *font; -extern char *configfn; -extern char *xbtnfn; -extern char *openwinimg; -extern char *lastbtn; -extern char *firstbtn; -extern char *nubtn; -extern char *newbtn; -extern char *barimg; - -extern FILE *file; - -extern unsigned int r; -extern unsigned int g; -extern unsigned int b; - -extern unsigned int w; -extern unsigned int h; - -extern unsigned int font_size; -extern unsigned int title_font_size; - - -extern unsigned int win_x; -extern unsigned int win_y; -extern unsigned int win_width; -extern unsigned int win_height; - -extern unsigned int firstbtn_x; -extern unsigned int firstbtn_y; -extern unsigned int firstbtn_width; -extern unsigned int firstbtn_height; - -extern unsigned int lastbtn_x; -extern unsigned int lastbtn_y; -extern unsigned int lastbtn_width; -extern unsigned int lastbtn_height; - -extern unsigned int nubtn_x; -extern unsigned int nubtn_y; -extern unsigned int nubtn_width; -extern unsigned int nubtn_height; - -extern unsigned int newbtn_x; -extern unsigned int newbtn_y; -extern unsigned int newbtn_width; -extern unsigned int newbtn_height; - -extern unsigned int exitbtn_x; -extern unsigned int exitbtn_y; -extern unsigned int exitbtn_width; -extern unsigned int exitbtn_height; - -extern char *bgimg; -extern char *firstbtnimg; -extern char *lastbtnimg; -extern char *newbtnimg; -extern char *nubtnimg; -extern char *exitbtnimg; - -extern E_Prog *bar; -extern Evas_Object *bar_bg; -extern Evas_Object *bar_firstbtn; -extern Evas_Object *bar_lastbtn; -extern Evas_Object *bar_nubtn; -extern Evas_Object *bar_newbtn; -extern Evas_Object *bar_exitbtn; - +#include "usage.h" /* Define Usage */ -extern E_Prog *root; -extern Evas_Object *bg; -extern Evas_Object *title; -extern Evas_Object *txt[11]; -extern Evas_Object *exitbtn; -extern Evas_Object *rectbar; + /* Variables */ -extern Evas_Object *lastbtnob; -extern Evas_Object *firstbtnob; -extern Evas_Object *nubtnob; -extern Evas_Object *newbtnob; +#include "var_conf.h" /* Configuration Variables */ +#include "var_eprog_evas.h" /* EProg and Evas Variables */ +#include "var_ewl.h" /* Ewl Variables */ +#include "var_structs.h" /* Structures */ -extern Ewl_Widget *main_win; -extern Ewl_Widget *main_box; -extern Ewl_Widget *ewltitle; -extern Ewl_Widget *note[11]; -extern Ewl_Widget *okbtn; -extern Ewl_Widget *cancelbtn; + /* Functions */ -typedef struct _fadeinfo fadeinfo; +#include "funcs_cmds.h" +#include "funcs_evas.h" +#include "funcs_usage_conf.h" -struct _fadeinfo -{ - Evas_Object *ob; - int a1; - int a2; - int freq; - double speed; - int loop; -}; + /* A Little Defining */ - -void fadein_loop (int val, fadeinfo * fi); -void fadeobin (Evas_Object * ob, int a1, int a2, int freq, double speed); -void change_alpha (Evas_Object * ob, int alpha); - -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_image (Evas * evas, char *imagefile, int layer, int fill_x, - int fill_y, int width, int height, int x, int y); -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_text (Evas * evas, char *font, int size, char *text, int r, - int g, int b, int alpha, int x, int y, int layer); -E_Prog *new_window (int width, int height); - -void move_object (Evas_Object * ob, int x, int y); -void resize_object (Evas_Object * ob, int width, int height); -void init (void); -void floop (void); -void onclick (Evas_Object * ob, void (*func), const void *data); -void addtimer (char *name, double interval, void (*func), - int initloopval /*Optional For Use */ , const void *data); -void mousemoveforward (Ecore_Event * event); -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 parseconfig (int argc, char **argv[]); -void setdefaultvalues (void); - -void openwin (void); -void makebar (void); - -void fnotenum (int num); -void fileopen (char *mode); - -void displayall (void); -void dislast (void); -void clear (void); -void newnote (int argc, char *argv[]); -void count (void); - -void notengui (void); - -void getncmd (Ewl_Widget * w, void *ev_data, void *user_data); - -void setconfig (void); - -void kill_main_window (Ewl_Widget * main_win, void *ev_data, void *user_data); - -void fadein (int fadeloop, char *tmpstr); -void fadeout (int fadeloop); - -void slideout (int slideloop); -void slidein (int slideloop); - -void mousemoveevent (Ecore_Event * event); - -void okbtnclicked (void); - -void runbar (void); - -void parseusage (int argc, char *argv[]); -void setconfig (void); -void setdefaults (void); - -void allocatemem (void); -void deallocatemem (void); +#define str_size 100 +#define version "pre 0.1\n" =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- notecmds.c 26 Feb 2003 20:38:04 -0000 1.10 +++ notecmds.c 1 Mar 2003 10:34:52 -0000 1.11 @@ -16,11 +16,6 @@ #include "main.h" -Ewl_Widget *ewlwin; -Ewl_Widget *ewlbox; -Ewl_Widget *ewlentry; -Ewl_Widget *ewlbtn; - void fileopen (char *mode) @@ -76,379 +71,4 @@ printf ("Count: %d\n", a / 13); free (c); exit (-1); -} - -void -notengui () -{ - ewl_init (1, NULL); - - 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; - - exit (-1); -} - -int keepaddin = 0; - -E_Prog *tmpeprog; -void *tmpfunc; -Evas_Object *mouse; -E_Prog *tmpmouseeprog; - -void -fadein_loop (int val, fadeinfo * fi) -{ - int r, g, b, a; - 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; - } - - 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); - return; -} - -void -fadeobin (Evas_Object * ob, int a1, int a2, int freq, double speed) -{ - 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); - - ecore_add_event_timer ("quickly", 0, (void *) fadein_loop, 0, fi); - - return; -} - -void -change_alpha (Evas_Object * ob, int alpha) -{ - int r, g, b, a; - evas_object_color_get (ob, &r, &g, &b, &a); - evas_object_color_set (ob, r, g, b, alpha); - 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 *tmp; - - 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); -} - -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); - 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); -} - -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); - 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); -} - -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); - 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); -} - -E_Prog * -new_window (int width, int height) -{ - E_Prog *tmp; - tmp = eprog_new (); - eprog_resize (tmp, width, height); - - return (tmp); -} - -void -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) -{ - evas_object_resize (ob, width, height); - return; -} - -void -init () -{ - eprog_init (); - return; -} - -void -floop () -{ - eprog_event_loop (); - return; -} - -void -onclick (Evas_Object * ob, void (*func), const void *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) -{ - ecore_add_event_timer (name, interval, func, initloopval, - (void *) data); - return; -} - -void -mousemoveforward (Ecore_Event * event) -{ - Ecore_Event_Mouse_Move *eemm; - - eemm = (Ecore_Event_Mouse_Move *) event->event; - - if (eemm->win == tmpeprog->win) - { - return; - } - - addtimer ("tmpquick", 0, tmpfunc, eemm->x, &eemm->y); - return; -} - -void -onmousemove (E_Prog * eprog, void (*func)) -{ - tmpfunc = func; - tmpeprog = eprog; - ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, - mousemoveforward); - return; -} - -/****Template for Mousemove function to be passed to onmousemove(...)****| - * - * void funcname (int *x, int *y) - * -**/ - -void -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) - move_object (mouse, eemm->x, eemm->y); -} - -void -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); - evas_object_show (mouse); - - tmpmouseeprog = eprog; - - ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, movemouseimg); -} - - - -/* BAR CODE BEGINS HERE */ - - -void -runbar () -{ - bar = new_window (win_width, win_height); - eprog_borderless_set (bar, 1); - - eprog_move (bar, win_x, win_y); - - bar_bg = new_image (bar->evas, bgimg, 0, win_width, win_height, - win_width, win_height, 0, 0); - bar_firstbtn = - new_image (bar->evas, firstbtnimg, 1, firstbtn_width, - firstbtn_height, firstbtn_width, firstbtn_height, - firstbtn_x, firstbtn_y); - bar_lastbtn = - new_image (bar->evas, lastbtnimg, 1, lastbtn_width, - lastbtn_height, lastbtn_width, - lastbtn_height, lastbtn_x, lastbtn_y); - bar_nubtn = - new_image (bar->evas, nubtnimg, 1, nubtn_width, nubtn_height, - nubtn_width, nubtn_height, nubtn_x, nubtn_y); - bar_newbtn = - new_image (bar->evas, newbtnimg, 1, newbtn_width, - newbtn_height, newbtn_width, newbtn_height, - newbtn_x, newbtn_y); - bar_exitbtn = - new_image (bar->evas, exitbtnimg, 1, exitbtn_width, - exitbtn_height, exitbtn_width, exitbtn_height, - exitbtn_x, exitbtn_y); - - - onclick (bar_exitbtn, exit, "-1"); - onclick (bar_firstbtn, system, "enotes -o&"); - onclick (bar_lastbtn, system, "enotes -l&"); - onclick (bar_nubtn, system, "enotes --nu&"); - onclick (bar_newbtn, system, "enotes -N&"); - - - eprog_show (bar); - evas_object_show (bar_bg); - evas_object_show (bar_firstbtn); - evas_object_show (bar_lastbtn); - evas_object_show (bar_nubtn); - evas_object_show (bar_newbtn); - evas_object_show (bar_exitbtn); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- notenum.c 26 Feb 2003 20:38:04 -0000 1.16 +++ notenum.c 1 Mar 2003 10:34:52 -0000 1.17 @@ -16,42 +16,7 @@ #include "main.h" -#define fade_interval 10 #define fadespeed 0.01 -#define slidespeed 0.05 - -int slidebool = 0; -int fadeval = 0; -int bar_b_backup = 100; - - -void -openwin () -{ - - 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); - - 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, (void *) "-1"); - - eprog_show (root); - evas_object_show (bg); - evas_object_show (exitbtn); -} void fnotenum (int num) @@ -121,132 +86,6 @@ fclose (file); } -void -makebar () -{ - 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) -{ - 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; - } - -} - -void -slideout (int slideloop) -{ - slideloop = slideloop + 5; - fadeval = fadeval + 25.5; - - evas_object_move (rectbar, slideloop - 50, 0); - change_alpha (rectbar, fadeval); - evas_object_show (rectbar); - evas_object_move (lastbtnob, slideloop - 47, 10); - change_alpha (lastbtnob, fadeval); - evas_object_show (lastbtnob); - evas_object_move (firstbtnob, slideloop - 47, 60); - change_alpha (firstbtnob, fadeval); - evas_object_show (firstbtnob); - evas_object_move (nubtnob, slideloop - 47, 110); - change_alpha (nubtnob, fadeval); - evas_object_show (nubtnob); - 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, - (void *) slideout, slideloop, NULL); - } -} - -void -slidein (int slideloop) -{ - slideloop = slideloop - 5; - fadeval = fadeval - 25.5; - - evas_object_move (rectbar, slideloop - 50, 0); - change_alpha (rectbar, fadeval); - evas_object_show (rectbar); - evas_object_move (lastbtnob, slideloop - 47, 10); - change_alpha (lastbtnob, fadeval); - evas_object_show (lastbtnob); - evas_object_move (firstbtnob, slideloop - 47, 60); - change_alpha (firstbtnob, fadeval); - evas_object_show (firstbtnob); - evas_object_move (nubtnob, slideloop - 47, 110); - change_alpha (nubtnob, fadeval); - evas_object_show (nubtnob); - evas_object_move (newbtnob, slideloop - 47, 160); - change_alpha (newbtnob, fadeval); - evas_object_show (newbtnob); - - - if (slideloop > 0) - { - ecore_add_event_timer ("slidein", slidespeed, - (void *) slidein, slideloop, NULL); - } - if (slideloop == 0) - { - ecore_del_event_timer ("slidein"); - slideloop = 0; - fadeval = 0; - return; - } -} void fadein (int fadeloop, char *tmpstr) =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/setdefconf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- setdefconf.c 28 Feb 2003 20:27:41 -0000 1.1 +++ setdefconf.c 1 Mar 2003 10:34:52 -0000 1.2 @@ -1,3 +1,19 @@ +/* +----------------------------------------------------------- +| ###### # # #### ##### ###### #### | +| # ## # # # # # # | +| ##### ##### # # # # # # ##### #### | +| # # # # # # # # # | +| # # ## # # # # # # | +| ###### # # #### # ###### #### | +----------------------------------------------------------- +| E-Notes is released under: | +| The GNU General Public License (GPL) | +| | +| Owner: Thomas Fletcher | +|_________________________________________________________| +*/ + #include "main.h" =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/variables.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- variables.c 28 Feb 2003 20:27:41 -0000 1.1 +++ variables.c 1 Mar 2003 10:34:52 -0000 1.2 @@ -1,3 +1,19 @@ +/* +----------------------------------------------------------- +| ###### # # #### ##### ###### #### | +| # ## # # # # # # | +| ##### ##### # # # # # # ##### #### | +| # # # # # # # # # | +| # # ## # # # # # # | +| ###### # # #### # ###### #### | +----------------------------------------------------------- +| E-Notes is released under: | +| The GNU General Public License (GPL) | +| | +| Owner: Thomas Fletcher | +|_________________________________________________________| +*/ + #include "main.h" @@ -92,6 +108,10 @@ Evas_Object *nubtnob; Evas_Object *newbtnob; +Ewl_Widget *ewlwin; +Ewl_Widget *ewlbox; +Ewl_Widget *ewlentry; +Ewl_Widget *ewlbtn; Ewl_Widget *main_win; Ewl_Widget *main_box; Ewl_Widget *ewltitle; |
From: <enl...@li...> - 2003-03-02 16:22:25
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: confparse.c Log Message: Configuration Fix. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/confparse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- confparse.c 1 Mar 2003 10:34:52 -0000 1.2 +++ confparse.c 2 Mar 2003 16:21:52 -0000 1.3 @@ -171,24 +171,24 @@ } else if (sectiontype == 5) { + r = atoi (tmp2); sectiontype++; goto lp1; } else if (sectiontype == 6) { - r = atoi (tmp2); + g = atoi (tmp2); sectiontype++; goto lp1; } else if (sectiontype == 7) { - g = atoi (tmp2); + b = atoi (tmp2); sectiontype++; goto lp1; } else if (sectiontype == 8) { - b = atoi (tmp2); sectiontype++; goto lp1; } |
From: <enl...@li...> - 2003-03-04 16:14:27
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: argsparser.c confparse.c funcs_cmds.h main.h newentry.c usage.h var_conf.h variables.c Log Message: Option for timestamping notes added. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/argsparser.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- argsparser.c 1 Mar 2003 10:34:52 -0000 1.2 +++ argsparser.c 4 Mar 2003 16:14:11 -0000 1.3 @@ -71,6 +71,11 @@ strcpy (xbtnfn, argv[a + 1]); a++; } + else if (!strcmp (argv[a], "--timestamp")) + { + timestampbool = 1; + a++; + } else if (!strcmp (argv[a], "-s") || !strcmp (argv[a], "--config")) { =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/confparse.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- confparse.c 2 Mar 2003 16:21:52 -0000 1.3 +++ confparse.c 4 Mar 2003 16:14:12 -0000 1.4 @@ -140,6 +140,11 @@ sectiontype = 45; goto lp1; } + else if (!strncmp (tmp2, "[+timestamp]", 12)) + { + timestampbool = 1; + goto lp1; + } if (sectiontype == 1) { =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/funcs_cmds.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- funcs_cmds.h 1 Mar 2003 10:34:52 -0000 1.1 +++ funcs_cmds.h 4 Mar 2003 16:14:12 -0000 1.2 @@ -40,3 +40,5 @@ void slideout (int slideloop); void slidein (int slideloop); + +char *fgetdate (void); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- main.h 1 Mar 2003 10:34:52 -0000 1.20 +++ main.h 4 Mar 2003 16:14:13 -0000 1.21 @@ -14,10 +14,16 @@ |_________________________________________________________| */ +/* Standard Library and + * Linux System Headers */ + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <time.h> + +/* E-Libs and X11 */ #include <X11/Xlib.h> #include <Eprog.h> =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- newentry.c 28 Feb 2003 20:27:40 -0000 1.8 +++ newentry.c 4 Mar 2003 16:14:14 -0000 1.9 @@ -51,11 +51,9 @@ 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); } @@ -63,7 +61,6 @@ wloop = -1; - printf ("Loop Two to Begin.\n"); while ((wloop++) < 12) { ewl_container_append_child (EWL_CONTAINER (main_box), @@ -78,7 +75,6 @@ ewl_widget_show (ewltitle); - printf ("Loop Three to Begin.\n"); wloop = -1; while ((wloop++) < 12) { @@ -107,8 +103,17 @@ fileopen ("a"); - dtmp = ewl_entry_get_text ((Ewl_Entry *) ewltitle); + if (timestampbool == 1) + { + strcpy (dtmp, fgetdate ()); + strcat (dtmp, ewl_entry_get_text ((Ewl_Entry *) ewltitle)); + } + else + { + strcpy (dtmp, ewl_entry_get_text ((Ewl_Entry *) ewltitle)); + } strcat (dtmp, "\n"); + printf (dtmp); fputs (dtmp, file); while ((d++) < 12) @@ -127,4 +132,20 @@ free (dtmp); exit (-1); +} + +char * +fgetdate () +{ + char *tmptimestr = malloc (str_size); + struct tm *ftm; + time_t ftimet; + + time (&ftimet); + ftm = localtime (&ftimet); + + + strftime (tmptimestr, ftimet, "%d/%m/%Y - ", ftm); + + return (tmptimestr); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- usage.h 1 Mar 2003 10:34:52 -0000 1.1 +++ usage.h 4 Mar 2003 16:14:15 -0000 1.2 @@ -60,7 +60,11 @@ the menubar background.\n\ -S <s> --fontsize <s> Use a different font size.\n\ -T <s> --tsize <s> Use a different font size\n\ - for the title.\n\n\ + for the title.\n\ + --timestamp Timestamp new entry, for use\n\ + only with -N only, advisable to\n\ + use configuration for menu/bar\n\ + based new note launch.\n\n\ E-Notes Execution Bar - Options:\n\ GNU Description\n\ --barwin_x <n> Use N as the X co-ordinate for\n\ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/var_conf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- var_conf.h 1 Mar 2003 10:34:52 -0000 1.1 +++ var_conf.h 4 Mar 2003 16:14:15 -0000 1.2 @@ -82,3 +82,5 @@ extern char *newbtnimg; extern char *nubtnimg; extern char *exitbtnimg; + +extern unsigned int timestampbool; =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/variables.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- variables.c 1 Mar 2003 10:34:52 -0000 1.2 +++ variables.c 4 Mar 2003 16:14:15 -0000 1.3 @@ -87,6 +87,8 @@ char *nubtnimg; char *exitbtnimg; +unsigned int timestampbool; + E_Prog *bar; Evas_Object *bar_bg; Evas_Object *bar_firstbtn; |
From: <enl...@li...> - 2003-03-04 19:13:23
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/docs Modified Files: Configuration Log Message: Added new configuration options into documentation. =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/docs/Configuration,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Configuration 19 Feb 2003 09:47:15 -0000 1.1 +++ Configuration 4 Mar 2003 19:13:20 -0000 1.2 @@ -85,6 +85,43 @@ titlefontsize The title font size. + FORMAT FOLLOWING SECTIONS LIKE SO: + x + y + width + height + img + +barwin + Set the geometry for the Launch Bar's window. + Note: Same format as above, without img! + +barfirstbtn + Set the geometry and image file for the 'First Note' + button on the launch bar. + +barlastbtn + Set the geometry and image file for the 'Last Note' + button on the launch bar. + +barnubtn + Set the geometry and image file for the 'Note Number' + button on the launch bar. + +barnewbtn + Set the geometry and image file for the 'New Note' + button on the launch bar. + +barexitbtn + Set the geometry and image file for the 'Exit' + button on the launch bar. + + END PREVIOUSLY MENTIONED FORMATTING + ++timestamp + This is written as a section, but contains nothing, + it just turns on TimeStamping. + NOTE:---> The following symbols don't work as of yet in |
From: <enl...@li...> - 2003-04-29 16:16:50
|
Enlightenment CVS committal Author : fletch3k Project : misc Module : enotes Dir : misc/enotes/src Modified Files: Makefile.am allocmem.c argsparser.c confparse.c evasfuncs.c funcs_cmds.h funcs_evas.h launchbar.c main.c main.h menubar.c notenum.c titlewin.c var_eprog_evas.h variables.c Log Message: Ported to Evas2 =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 29 Apr 2003 15:58:33 -0000 1.5 +++ Makefile.am 29 Apr 2003 16:16:41 -0000 1.6 @@ -1,6 +1,11 @@ ## Process this file with automake to produce Makefile.in +<<<<<<< Makefile.am +INCLUDES = \ + @ecore_cflags@ @evas_cflags@ @ewl_cflags@ +======= SUBDIRS = src +>>>>>>> 1.5 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ @@ -17,6 +22,9 @@ done \ fi +<<<<<<< Makefile.am +enotes_LDADD = @ewl_libs@ @ecore_libs@ @evas_libs@ +======= #### Uninstall DATA - probly not a great idea. ##uninstall-data-local: ## @$(NORMAL_UNINSTALL) @@ -35,3 +43,4 @@ #### Add these files to the distribution EXTRA_DIST = README AUTHORS COPYING autogen.sh +>>>>>>> 1.5 =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/allocmem.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- allocmem.c 1 Mar 2003 10:34:52 -0000 1.2 +++ allocmem.c 29 Apr 2003 16:16:42 -0000 1.3 @@ -91,3 +91,9 @@ return; } + +int +app_signal_exit (int ev_type, void *ev, void *data) +{ + exit (-1); +} =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/argsparser.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- argsparser.c 4 Mar 2003 16:14:11 -0000 1.3 +++ argsparser.c 29 Apr 2003 16:16:42 -0000 1.4 @@ -27,7 +27,12 @@ if not, lets just run the title screen :-) */ { openwin (); - eprog_event_loop (); + ecore_main_loop_begin (); + + ecore_evas_shutdown (); + ecore_shutdown (); + + deallocatemem (); exit (-1); } @@ -594,7 +599,9 @@ options are set again :-) */ { openwin (); - eprog_event_loop (); + ecore_main_loop_begin (); + ecore_evas_shutdown (); + ecore_shutdown (); exit (-1); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/confparse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- confparse.c 4 Mar 2003 16:14:12 -0000 1.4 +++ confparse.c 29 Apr 2003 16:16:42 -0000 1.5 @@ -18,6 +18,14 @@ void +userconfig () +{ + system ("mkdir ~/.e"); + system ("mkdir ~/.e/enotes"); + return; +} + +void setconfig () { char *tmp2 = malloc (str_size); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/evasfuncs.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evasfuncs.c 1 Mar 2003 10:34:52 -0000 1.3 +++ evasfuncs.c 29 Apr 2003 16:16:42 -0000 1.4 @@ -1,77 +1,5 @@ #include "main.h" -int keepaddin = 0; - -E_Prog *tmpeprog; -void *tmpfunc; -Evas_Object *mouse; -E_Prog *tmpmouseeprog; - -void -fadein_loop (int val, fadeinfo * fi) -{ - int r, g, b, a; - 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; - } - - 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); - return; -} - -void -fadeobin (Evas_Object * ob, int a1, int a2, int freq, double speed) -{ - 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); - - ecore_add_event_timer ("quickly", 0, (void *) fadein_loop, 0, fi); - - return; -} - void change_alpha (Evas_Object * ob, int alpha) { @@ -143,118 +71,10 @@ return (tmp); } -E_Prog * -new_window (int width, int height) -{ - E_Prog *tmp; - tmp = eprog_new (); - eprog_resize (tmp, width, height); - - return (tmp); -} - -void -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) -{ - evas_object_resize (ob, width, height); - return; -} - -void -init () -{ - eprog_init (); - return; -} - -void -floop () -{ - eprog_event_loop (); - return; -} - void onclick (Evas_Object * ob, void (*func), const void *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) -{ - ecore_add_event_timer (name, interval, func, initloopval, - (void *) data); - return; -} - -void -mousemoveforward (Ecore_Event * event) -{ - Ecore_Event_Mouse_Move *eemm; - - eemm = (Ecore_Event_Mouse_Move *) event->event; - - if (eemm->win == tmpeprog->win) - { - return; - } - - addtimer ("tmpquick", 0, tmpfunc, eemm->x, &eemm->y); - return; -} - -void -onmousemove (E_Prog * eprog, void (*func)) -{ - tmpfunc = func; - tmpeprog = eprog; - ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, - mousemoveforward); - return; -} - -/****Template for Mousemove function to be passed to onmousemove(...)****| - * - * void funcname (int *x, int *y) - * -**/ - -void -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) - move_object (mouse, eemm->x, eemm->y); -} - -void -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); - evas_object_show (mouse); - - tmpmouseeprog = eprog; - - ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, movemouseimg); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/funcs_cmds.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- funcs_cmds.h 4 Mar 2003 16:14:12 -0000 1.2 +++ funcs_cmds.h 29 Apr 2003 16:16:42 -0000 1.3 @@ -31,14 +31,21 @@ void getncmd (Ewl_Widget * w, void *ev_data, void *user_data); void makebar (void); -void mousemoveevent (Ecore_Event * event); +void *mousemoveevent (void *data, Evas * e, Evas_Object * obj, + void *event_info); void okbtnclicked (void); void kill_main_window (Ewl_Widget * main_win, void *ev_data, void *user_data); -void fadein (int fadeloop, char *tmpstr); -void fadeout (int fadeloop); +int fadein (void *data); +int fadeout (void); -void slideout (int slideloop); -void slidein (int slideloop); +int fadeoutrun (void *data); + +int slideout (void *data); +int slidein (void *data); char *fgetdate (void); + +void userconfig (void); + +int app_signal_exit (int ev_type, void *ev, void *data); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/funcs_evas.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- funcs_evas.h 1 Mar 2003 10:34:52 -0000 1.1 +++ funcs_evas.h 29 Apr 2003 16:16:42 -0000 1.2 @@ -17,19 +17,9 @@ /***Evas and E-Prog Simplification Functions***/ -/* Special Effects */ - -void fadein_loop (int val, fadeinfo * fi); -void fadeobin (Evas_Object * ob, int a1, int a2, int freq, double speed); - - - /* Conditioning */ void change_alpha (Evas_Object * ob, int alpha); -void move_object (Evas_Object * ob, int x, int y); -void resize_object (Evas_Object * ob, int width, int height); - /* Object Creation */ @@ -43,29 +33,10 @@ 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); -E_Prog *new_window (int width, int height); - -/* Initialisation and Event Looping */ - -void init (void); -void floop (void); - /* Events */ void onclick (Evas_Object * ob, void (*func), const void *data); -void addtimer (char *name, double interval, void (*func), - int initloopval /*Optional For Use */ , const void *data); -void mousemoveforward (Ecore_Event * event); -void onmousemove (E_Prog * eprog, void (*func)); - - - -/* Extra Options */ - -void movemouseimg (Ecore_Event * event); -void changemouse (E_Prog * eprog, char *img, int width, int height); -/* Should I do this or not? */ =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/launchbar.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- launchbar.c 1 Mar 2003 10:34:52 -0000 1.1 +++ launchbar.c 29 Apr 2003 16:16:43 -0000 1.2 @@ -20,30 +20,30 @@ void runbar () { - bar = new_window (win_width, win_height); - eprog_borderless_set (bar, 1); + bar = ecore_evas_software_x11_new (NULL, 0, win_x, win_y, win_width, + win_height); + bar_evas = ecore_evas_get (bar); + ecore_evas_borderless_set (bar, 1); - eprog_move (bar, win_x, win_y); - - bar_bg = new_image (bar->evas, bgimg, 0, win_width, win_height, + bar_bg = new_image (bar_evas, bgimg, 0, win_width, win_height, win_width, win_height, 0, 0); bar_firstbtn = - new_image (bar->evas, firstbtnimg, 1, firstbtn_width, + new_image (bar_evas, firstbtnimg, 1, firstbtn_width, firstbtn_height, firstbtn_width, firstbtn_height, firstbtn_x, firstbtn_y); bar_lastbtn = - new_image (bar->evas, lastbtnimg, 1, lastbtn_width, + new_image (bar_evas, lastbtnimg, 1, lastbtn_width, lastbtn_height, lastbtn_width, lastbtn_height, lastbtn_x, lastbtn_y); bar_nubtn = - new_image (bar->evas, nubtnimg, 1, nubtn_width, nubtn_height, + new_image (bar_evas, nubtnimg, 1, nubtn_width, nubtn_height, nubtn_width, nubtn_height, nubtn_x, nubtn_y); bar_newbtn = - new_image (bar->evas, newbtnimg, 1, newbtn_width, + new_image (bar_evas, newbtnimg, 1, newbtn_width, newbtn_height, newbtn_width, newbtn_height, newbtn_x, newbtn_y); bar_exitbtn = - new_image (bar->evas, exitbtnimg, 1, exitbtn_width, + new_image (bar_evas, exitbtnimg, 1, exitbtn_width, exitbtn_height, exitbtn_width, exitbtn_height, exitbtn_x, exitbtn_y); @@ -55,7 +55,7 @@ onclick (bar_newbtn, system, "enotes -N&"); - eprog_show (bar); + ecore_evas_show (bar); evas_object_show (bar_bg); evas_object_show (bar_firstbtn); evas_object_show (bar_lastbtn); =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- main.c 1 Mar 2003 10:34:52 -0000 1.16 +++ main.c 29 Apr 2003 16:16:43 -0000 1.17 @@ -19,26 +19,28 @@ int main (int argc, char *argv[]) { - allocatemem (); /* Malloc the Variables. */ - setdefaults (); /* Set all of the default values - to the variables. */ - - eprog_init (); /* Initialise E-Prog */ - - setconfig (); /* Read the configuration file - and set the configuration. */ - - parseusage (argc, argv); /* Parse the command line - arguments and both set - options if needed and - execute the commands - specified. */ - - deallocatemem (); /* free the variables from memory - when all objects have been set - so the strings no longer need - to hold any data. */ + allocatemem (); - eprog_event_loop (); /* Enter the event loop */ - return (0); /* Lets Get Out of Here! */ + setdefaults (); + + ecore_init (); + ecore_app_args_set (argc, (const char **) argv); + ecore_evas_init (); + + ecore_event_handler_add (ECORE_EVENT_SIGNAL_EXIT, app_signal_exit, + NULL); + + setconfig (); + + userconfig (); + + parseusage (argc, argv); + + deallocatemem (); + + ecore_main_loop_begin (); + + ecore_evas_shutdown (); + ecore_shutdown (); + return (0); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- main.h 4 Mar 2003 16:14:13 -0000 1.21 +++ main.h 29 Apr 2003 16:16:43 -0000 1.22 @@ -27,6 +27,8 @@ #include <X11/Xlib.h> #include <Eprog.h> +#include <Ecore_Evas.h> +#include <Ecore_X.h> #include <Ewl.h> #include <Ecore.h> @@ -49,3 +51,7 @@ #define str_size 100 #define version "pre 0.1\n" + +#define fade_interval 10 +#define fadespeed 0.01 +#define slidespeed 0.05 =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/menubar.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- menubar.c 1 Mar 2003 10:34:52 -0000 1.1 +++ menubar.c 29 Apr 2003 16:16:43 -0000 1.2 @@ -16,28 +16,27 @@ #include "main.h" -#define fade_interval 10 -#define fadespeed 0.01 -#define slidespeed 0.05 int slidebool = 0; +int slideloop = 0; int fadeval = 0; +int inprog1 = 0; +int inprog2 = 0; void makebar () { - rectbar = new_image (root->evas, barimg, 4, 50, h, 50, h, -50, 0); + 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); + 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); + 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); + 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); + newbtnob = new_image (root_evas, newbtn, 4, 40, 40, 40, 40, -15, 160); onclick (lastbtnob, system, "enotes -l&"); onclick (firstbtnob, system, "enotes -o&"); @@ -45,44 +44,51 @@ onclick (newbtnob, system, "enotes -N&"); } -void -mousemoveevent (Ecore_Event * event) +void * +mousemoveevent (void *data, Evas * e, Evas_Object * obj, void *event_info) { - Ecore_Event_Mouse_Move *eemm; + Evas_Event_Mouse_Move *_info; + _info = event_info; + + - eemm = (Ecore_Event_Mouse_Move *) event->event; - if (eemm->win != root->win) - { - return; - } if (slidebool == 0) { - if (eemm->x < 10 || eemm->x == 10) + if (inprog1 == 0) { - slideout (0); - slidebool = 1; + if (_info->cur.canvas.x < 10 + || _info->cur.canvas.x == 10) + { + slideloop = 0; + slideout (NULL); + } + return; } - return; } if (slidebool == 1) { - if (eemm->x > 50) + if (inprog2 == 0) { - slidein (50); - slidebool = 0; + if (_info->cur.canvas.x > 50) + { + slideloop = 50; + slidein (NULL); + } } return; } } -void -slideout (int slideloop) +int +slideout (void *data) { + inprog1 = 1; slideloop = slideloop + 5; fadeval = fadeval + 25.5; + evas_object_move (rectbar, slideloop - 50, 0); change_alpha (rectbar, fadeval); evas_object_show (rectbar); @@ -102,23 +108,28 @@ if (slideloop > 49) { - ecore_del_event_timer ("slideout"); - slideloop = 0; - return; - } - if (slideloop < 50) - { - ecore_add_event_timer ("slideout", slidespeed, - (void *) slideout, slideloop, NULL); + inprog1 = 0; + ecore_timer_del (slideouttim); + slideouttim = NULL; + slidebool = 1; + return (0); + } + if (slideouttim == NULL) + { + slideouttim = + ecore_timer_add (slidespeed, (int *) slideout, + NULL); } } -void -slidein (int slideloop) +int +slidein (void *data) { + inprog2 = 1; slideloop = slideloop - 5; fadeval = fadeval - 25.5; + evas_object_move (rectbar, slideloop - 50, 0); change_alpha (rectbar, fadeval); evas_object_show (rectbar); @@ -136,16 +147,18 @@ evas_object_show (newbtnob); - if (slideloop > 0) + if (slideintim == NULL) { - ecore_add_event_timer ("slidein", slidespeed, - (void *) slidein, slideloop, NULL); + slideintim = ecore_timer_add (slidespeed, + (int *) slidein, NULL); } - if (slideloop == 0) + if (slideloop == 0 || slideloop < 0) { - ecore_del_event_timer ("slidein"); - slideloop = 0; + inprog2 = 0; + ecore_timer_del (slideintim); + slideintim = NULL; fadeval = 0; - return; + slidebool = 0; + return (0); } } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- notenum.c 1 Mar 2003 10:34:52 -0000 1.17 +++ notenum.c 29 Apr 2003 16:16:44 -0000 1.18 @@ -16,7 +16,8 @@ #include "main.h" -#define fadespeed 0.01 +int fadeloop = 0; +int fadeloop2 = 0; void fnotenum (int num) @@ -24,33 +25,43 @@ int loop = 0; + fadeouttim == NULL; + fadeintim == NULL; fileopen ("r"); - while (loop != (13 * (num - 1))) + while (loop != (13 * /*(num - 1) */ num)) { - fgets (tmp, 100, file); + if (fgets (tmp, 100, file) == EOF) + { + printf ("ALERT: EOF!!!"); + } loop++; } loop = 0; + root = ecore_evas_software_x11_new (NULL, 0, 0, 0, w, h); + root_evas = ecore_evas_get (root); + ecore_evas_title_set (root, "E-Notes"); + ecore_evas_name_class_set (root, "enotes", "Eprog"); + ecore_evas_borderless_set (root, 1); + ecore_evas_size_min_set (root, w, h); + ecore_evas_size_max_set (root, w, h); + ecore_evas_show (root); + + mask = new_rectangle (root_evas, 255, 255, 255, 0, w - 65, h, 50, 0, + 999); + evas_object_show (mask); - 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); - - bg = new_image (root->evas, bgfile, 1, w, h, w, h, 0, 0); + bg = new_image (root_evas, bgfile, 1, w, h, w, h, 0, 0); + evas_object_show (bg); - exitbtn = - new_image (root->evas, xbtnfn, 3, 15, 15, 15, 15, w - 15, 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, + title = new_text (root_evas, font, title_font_size, str, r, g, b, 255, 30, 8, 2); while (loop != 12) @@ -60,7 +71,7 @@ str[strlen (str) - 1] = '\0'; txt[loop] = - new_text (root->evas, font, font_size, str, r, g, b, + new_text (root_evas, font, font_size, str, r, g, b, 255, 10, 50 + (loop * 15), 2); loop++; @@ -72,23 +83,26 @@ makebar (); - ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, - mousemoveevent); + evas_object_event_callback_add (bg, EVAS_CALLBACK_MOUSE_MOVE, + (void *) mousemoveevent, NULL); + evas_object_event_callback_add (mask, EVAS_CALLBACK_MOUSE_MOVE, + (void *) mousemoveevent, NULL); - onclick (exitbtn, fadeout, (void *) 255); + onclick (exitbtn, fadeoutrun, (void *) NULL); - eprog_show (root); evas_object_show (bg); - fadein (1, NULL); + fadeloop = 0; + + fadein (NULL); fclose (file); } -void -fadein (int fadeloop, char *tmpstr) +int +fadein (void *data) { int looper; looper = 0; @@ -109,47 +123,54 @@ if (fadeloop > 255 || fadeloop == 255) { - ecore_del_event_timer ("fadetimer"); + ecore_timer_del (fadeintim); + fadeintim = NULL; fadeloop = 0; - return; + return (0); } - if (fadeloop < 255 || fadeloop != 255) + if (fadeintim == NULL) { - ecore_add_event_timer ("fadetimer", fadespeed, - (void *) fadein, fadeloop, NULL); + fadeintim = + ecore_timer_add (fadespeed, (int *) fadein, NULL); } } -void -fadeout (int fadeloop) +int +fadeoutrun (void *data) +{ + fadeloop2 = 255; + fadeout (); +} + +int +fadeout () { int looper; looper = 0; - fadeloop = fadeloop - 10; + fadeloop2 = fadeloop2 - 10; - change_alpha (title, fadeloop); + change_alpha (title, fadeloop2); evas_object_show (title); - change_alpha (exitbtn, fadeloop); + change_alpha (exitbtn, fadeloop2); evas_object_show (exitbtn); while (looper < 12) { - change_alpha (txt[looper], fadeloop); + change_alpha (txt[looper], fadeloop2); evas_object_show (txt[looper]); looper++; } - if (fadeloop < 0 || fadeloop == 0) + if (fadeloop2 < 0 || fadeloop2 == 0) { - ecore_del_event_timer ("fadeouttimer"); - fadeloop = 0; + ecore_timer_del (fadeouttim); exit (-1); } - if (fadeloop > 0 || fadeloop == 255) + if (fadeouttim == NULL) { - ecore_add_event_timer ("fadeouttimer", fadespeed, - (void *) fadeout, fadeloop, NULL); + fadeouttim = ecore_timer_add (fadespeed, + (int *) fadeout, NULL); } } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/titlewin.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- titlewin.c 1 Mar 2003 10:34:52 -0000 1.1 +++ titlewin.c 29 Apr 2003 16:16:44 -0000 1.2 @@ -20,26 +20,34 @@ openwin () { - 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); + root = ecore_evas_software_x11_new (NULL, 0, 0, 0, w, h); + root_evas = ecore_evas_get (root); + ecore_evas_title_set (root, "E-Notes"); + ecore_evas_name_class_set (root, "enotes", "ecore"); + ecore_evas_borderless_set (root, 1); + ecore_evas_size_min_set (root, w, h); + ecore_evas_size_max_set (root, w, h); + + + bg = new_image (root_evas, openwinimg, 1, w, h, w, h, 0, 0); + + mask = new_rectangle (root_evas, 255, 255, 255, 0, w - 65, h, 50, 0, + 999); + evas_object_show (mask); - 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); + 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); + evas_object_event_callback_add (bg, EVAS_CALLBACK_MOUSE_MOVE, + (void *) mousemoveevent, NULL); + evas_object_event_callback_add (mask, EVAS_CALLBACK_MOUSE_MOVE, + (void *) mousemoveevent, NULL); onclick (exitbtn, exit, (void *) "-1"); - eprog_show (root); + + ecore_evas_show (root); evas_object_show (bg); evas_object_show (exitbtn); } =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/var_eprog_evas.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- var_eprog_evas.h 1 Mar 2003 10:34:52 -0000 1.1 +++ var_eprog_evas.h 29 Apr 2003 16:16:44 -0000 1.2 @@ -16,7 +16,8 @@ /* EProg and Evas Objects */ -extern E_Prog *bar; +extern Ecore_Evas *bar; +extern Evas *bar_evas; extern Evas_Object *bar_bg; extern Evas_Object *bar_firstbtn; extern Evas_Object *bar_lastbtn; @@ -25,7 +26,8 @@ extern Evas_Object *bar_exitbtn; -extern E_Prog *root; +extern Ecore_Evas *root; +extern Evas *root_evas; extern Evas_Object *bg; extern Evas_Object *title; extern Evas_Object *txt[11]; @@ -36,3 +38,12 @@ extern Evas_Object *firstbtnob; extern Evas_Object *nubtnob; extern Evas_Object *newbtnob; + +extern Evas_Object *mask; + +extern Ecore_Timer *mytimer; + +extern Ecore_Timer *fadeouttim; +extern Ecore_Timer *fadeintim; +extern Ecore_Timer *slideintim; +extern Ecore_Timer *slideouttim; =================================================================== RCS file: /cvsroot/enlightenment/misc/enotes/src/variables.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- variables.c 4 Mar 2003 16:14:15 -0000 1.3 +++ variables.c 29 Apr 2003 16:16:44 -0000 1.4 @@ -89,7 +89,8 @@ unsigned int timestampbool; -E_Prog *bar; +Ecore_Evas *bar; +Evas *bar_evas; Evas_Object *bar_bg; Evas_Object *bar_firstbtn; Evas_Object *bar_lastbtn; @@ -97,8 +98,18 @@ Evas_Object *bar_newbtn; Evas_Object *bar_exitbtn; +Evas_Object *mask; -E_Prog *root; +Ecore_Event_Handler *mousemoveevnt; + +Ecore_Timer *fadeouttim; +Ecore_Timer *fadeintim; +Ecore_Timer *slideintim; +Ecore_Timer *slideouttim; + + +Ecore_Evas *root; +Evas *root_evas; Evas_Object *bg; Evas_Object *title; Evas_Object *txt[11]; @@ -120,3 +131,5 @@ Ewl_Widget *note[11]; Ewl_Widget *okbtn; Ewl_Widget *cancelbtn; + +Ecore_Timer *mytimer; |