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