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:
Several Bug Fixes, Opening Screen and menubar added. Very nice atm.
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- main.c 3 Feb 2003 19:30:04 -0000 1.4
+++ main.c 6 Feb 2003 17:52:30 -0000 1.5
@@ -9,6 +9,11 @@
char *font;
char *configfn;
char *xbtnfn;
+char *openwinimg;
+char *lastbtn;
+char *firstbtn;
+char *nubtn;
+char *newbtn;
FILE *file;
@@ -16,6 +21,10 @@
unsigned int g;
unsigned int b;
+unsigned int bar_r;
+unsigned int bar_g;
+unsigned int bar_b;
+
unsigned int w;
unsigned int h;
@@ -24,6 +33,13 @@
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;
@@ -47,16 +63,22 @@
main (int argc, char *argv[])
{
int a=1;
- char *mtmp=malloc(50);
+ int actionbool=0;
+ char *mtmp=malloc(str_size);
- tmp=malloc(50);
- str=malloc(50);
- fn=malloc(50);
- fontdir=malloc(50);
- bgfile=malloc(50);
- font=malloc(50);
- configfn=malloc(50);
- xbtnfn=malloc(50);
+ tmp=malloc(str_size);
+ str=malloc(str_size);
+ fn=malloc(str_size);
+ 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);
strcat(fontdir, ".");
strcpy(fn, getenv("HOME"));
@@ -66,18 +88,31 @@
strcpy(configfn, getenv("HOME"));
strcat(configfn, "/.e/enotes/config");
strcat(xbtnfn, "x.png");
+ strcpy(openwinimg, getenv("HOME"));
+ strcat(openwinimg, "/.e/enotes/data/titleimg.jpg");
+ strcpy(lastbtn, getenv("HOME"));
+ strcpy(firstbtn, getenv("HOME"));
+ strcpy(nubtn, getenv("HOME"));
+ strcpy(newbtn, getenv("HOME"));
+ strcat(lastbtn, "/.e/enotes/data/lastbtn.png");
+ strcat(firstbtn, "/.e/enotes/data/firstbtn.png");
+ strcat(nubtn, "/.e/enotes/data/nubtn.png");
+ strcat(newbtn, "/.e/enotes/data/newbtn.png");
r=0; g=0; b=0;
- w=250; h=250;
+ bar_r=100; bar_g=100;
+ bar_b=100; w=250; h=250;
+
+ eprog_init();
+ setconfig();
+
if(argc<2) {
- printf(usage);
+ openwin();
+ eprog_event_loop();
return(0);
}
- eprog_init();
- setconfig();
-
while(argv[a]!=NULL) {
if(!strcmp(argv[a], "-d")||!strcmp( argv[a] , "--db")) {
mtmp=argv[a+1];
@@ -87,6 +122,13 @@
}
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]=="-") {
@@ -120,6 +162,34 @@
}
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], "-u")||!strcmp( argv[a] , "--usage")
||!strcmp(argv[a], "-h")||!strcmp(argv[a], "--help")) {
printf(usage);
@@ -135,21 +205,33 @@
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], "-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();
eprog_event_loop ();
@@ -171,9 +253,9 @@
void
setconfig ()
{
- char *tmp2=malloc(50);
+ char *tmp2=malloc(str_size);
int sectiontype=0;
- int donebool[4];
+ int donebool[6];
if(file!=NULL) {
fclose(file);
}
@@ -206,6 +288,24 @@
} else if (!strncmp(tmp2, "[xbtnimg]", 9)) {
sectiontype=9;
goto lp1;
+ } else if (!strncmp(tmp2, "[barcolour]", 11)) {
+ 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;
}
if(sectiontype==1) {
@@ -240,12 +340,70 @@
} 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) {
+ bar_r=atoi(tmp2);
+ 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++;
+ 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;
}
lp1:
memset(tmp2, 0, sizeof(tmp2));
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- main.h 2 Feb 2003 10:45:20 -0000 1.3
+++ main.h 6 Feb 2003 17:52:30 -0000 1.4
@@ -6,8 +6,10 @@
#include <X11/Xlib.h>
#include <Eprog.h>
#include <Ewl.h>
+#include <gtk/gtk.h>
#include <Ecore.h>
+#define str_size 50
#define version "pre 0.1\n"
#define usage "Usage:\n\
@@ -34,7 +36,17 @@
background for\n\
note file.\n\
-x <x> --xbtnimg <x> Use a different image\n\
- for the X Button\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"
extern char *tmp;
extern char *str;
@@ -45,6 +57,11 @@
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 FILE *file;
@@ -52,6 +69,10 @@
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;
@@ -60,6 +81,12 @@
extern Evas_Object *title;
extern Evas_Object *txt[11];
extern Evas_Object *exitbtn;
+extern Evas_Object *rectbar;
+
+extern Evas_Object *lastbtnob;
+extern Evas_Object *firstbtnob;
+extern Evas_Object *nubtnob;
+extern Evas_Object *newbtnob;
extern Ewl_Widget *main_win;
extern Ewl_Widget *main_box;
@@ -80,6 +107,9 @@
extern Ewl_Widget *cancelbtn;
+void openwin ();
+void makebar ();
+
void fnotenum (int num);
void fileopen (char *mode);
@@ -89,6 +119,9 @@
void newnote (int argc, char *argv[]);
void count ();
+void notengui ();
+void getncmd (char *number);
+
void setconfig ();
void kill_main_window (Ewl_Widget * main_win, void *ev_data, void *user_data);
@@ -96,3 +129,8 @@
void fadein (int fadeloop, char *tmpstr);
void fadeout (int fadeloop);
void freethem ();
+
+void slideout (int slideloop);
+void slidein (int slideloop);
+
+void mousemoveevent (Ecore_Event *event);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- newentry.c 1 Feb 2003 12:33:09 -0000 1.1
+++ newentry.c 6 Feb 2003 17:52:30 -0000 1.2
@@ -4,9 +4,6 @@
kill_main_window (Ewl_Widget * main_win, void *ev_data, void *user_data)
{
ewl_widget_destroy(main_win);
- ewl_main_quit();
-
- exit(-1);
main_win = NULL;
ev_data = NULL;
@@ -87,5 +84,5 @@
ewl_widget_show(okbtn);
- ewl_main();
+ ewl_main();
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- notecmds.c 1 Feb 2003 12:33:09 -0000 1.1
+++ notecmds.c 6 Feb 2003 17:52:31 -0000 1.2
@@ -52,3 +52,47 @@
free(c);
exit(-1);
}
+
+void
+notengui ()
+{
+ Ewl_Widget *ewlwin;
+ Ewl_Widget *ewlbox;
+ Ewl_Widget *ewlentry;
+ Ewl_Widget *ewlbtn;
+
+ 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_get_text
+(ewlentry));
+
+ ewl_widget_show(ewlentry);
+ ewl_widget_show(ewlbtn);
+
+ ewl_main();
+}
+
+void
+getncmd (char *number)
+{
+ char *gnctmp=malloc(20);
+ number[strlen(number)]='\0';
+ sprintf(gnctmp, "enotes -n %s&", number);
+ printf("%s\n", gnctmp);
+ system(gnctmp);
+}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- notenum.c 2 Feb 2003 10:45:20 -0000 1.3
+++ notenum.c 6 Feb 2003 17:52:31 -0000 1.4
@@ -1,6 +1,46 @@
#include "main.h"
#define fade_interval 10
#define fadespeed 0.01
+#define slidespeed 0.05
+
+int slidebool=0;
+
+void
+openwin ()
+{
+ root=eprog_new ();
+ 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);
+
+
+ eprog_show (root);
+ evas_object_show (bg);
+ evas_object_show (exitbtn);
+}
void
fnotenum (int num)
@@ -38,8 +78,6 @@
evas_object_resize (exitbtn, 15, 15);
evas_object_layer_set (exitbtn, 3);
- evas_object_event_callback_add(exitbtn, EVAS_CALLBACK_MOUSE_DOWN, fadeout,
255);
-
fgets(tmp, 100, file);
strncpy(str, tmp, (int)strlen(tmp)-1);
@@ -50,7 +88,14 @@
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);
+
+
while(loop!=12) {
fgets(tmp, 27, file);
strcpy(str, tmp);
@@ -77,6 +122,132 @@
}
void
+makebar ()
+{
+ rectbar=evas_object_rectangle_add (root->evas);
+ evas_object_color_set (rectbar, bar_r, bar_g, bar_b, 200);
+ evas_object_move (rectbar, 0, 0);
+ evas_object_resize (rectbar, 0, 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, notengui,
+NULL);
+ evas_object_event_callback_add(newbtnob, EVAS_CALLBACK_MOUSE_DOWN, 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;
+
+ evas_object_resize (rectbar, slideloop, h);
+ evas_object_show (rectbar);
+ evas_object_move (lastbtnob, slideloop-45, 10);
+ evas_object_show (lastbtnob);
+ evas_object_move (firstbtnob, slideloop-45, 60);
+ evas_object_show (firstbtnob);
+ evas_object_move (nubtnob, slideloop-45, 110);
+ evas_object_show (nubtnob);
+ evas_object_move (newbtnob, slideloop-45, 160);
+ 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);
+ }
+}
+
+void
+slidein (int slideloop)
+{
+ slideloop=slideloop-5;
+
+ evas_object_resize (rectbar, slideloop, h);
+ evas_object_show (rectbar);
+ evas_object_move (lastbtnob, slideloop-45, 10);
+ evas_object_show (lastbtnob);
+ evas_object_move (firstbtnob, slideloop-45, 60);
+ evas_object_show (firstbtnob);
+ evas_object_move (nubtnob, slideloop-45, 110);
+ evas_object_show (nubtnob);
+ evas_object_move (newbtnob, slideloop-45, 160);
+ 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;
+ return;
+ }
+}
+
+void
fadein (int fadeloop, char *tmpstr)
{
int looper;
@@ -97,7 +268,7 @@
if(fadeloop>255||fadeloop==255) {
ecore_del_event_timer ("fadetimer");
- fadeloop==0;
+ fadeloop=0;
return;
}
if(fadeloop<255||fadeloop!=255) {
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
