E CVS: libs/embryo tsauerbeck
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/embryo
Dir : e17/libs/embryo/src/bin
Modified Files:
embryo_cc_sc.h embryo_cc_sc1.c
Log Message:
remove no longer needed (crappy) code
===
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- embryo_cc_sc.h 26 Mar 2005 16:44:12 - 1.9
+++ embryo_cc_sc.h 1 Apr 2005 15:11:30 - 1.10
@@ -9,7 +9,7 @@
* Copyright J.E. Hendrix, 1982, 1983
* Copyright T. Riemersma, 1997-2003
*
- * Version: $Id: embryo_cc_sc.h,v 1.9 2005/03/26 16:44:12 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc.h,v 1.10 2005/04/01 15:11:30 tsauerbeck Exp $
*
* This software is provided as-is, without any express or implied warranty.
* In no event will the authors be held liable for any damages arising from
@@ -438,7 +438,6 @@
#endif
/* function prototypes in SC1.C */
-voidset_extension(char *filename, char *extension, int force);
symbol *fetchfunc(char *name, int tag);
char *operator_symname(char *symname, char *opername, int tag1,
int tag2, int numtags, int resulttag);
===
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc1.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- embryo_cc_sc1.c 26 Mar 2005 16:44:12 - 1.24
+++ embryo_cc_sc1.c 1 Apr 2005 15:11:31 - 1.25
@@ -21,7 +21,7 @@
* must not be misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source
* distribution.
- * Version: $Id: embryo_cc_sc1.c,v 1.24 2005/03/26 16:44:12 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc1.c,v 1.25 2005/04/01 15:11:31 tsauerbeck Exp $
*/
#include assert.h
#include ctype.h
@@ -592,40 +592,6 @@
}
-/* set_extension
- * Set the default extension, or force an extension. To erase the
- * extension of a filename, set extension to an empty string.
- */
-SC_FUNC void
-set_extension(char *filename, char *extension, int force)
-{
- char *ptr;
-
- ptr = strrchr(filename, '.');
-#if 0
- if (ptr != NULL)
- {
- /* ignore extension on a directory or at the start of the filename */
- if (strchr(ptr, DIRSEP_CHAR) != NULL || ptr == filename
- || *(ptr - 1) == DIRSEP_CHAR)
- ptr = NULL;
- } /* if */
- if (force ptr != NULL)
- *ptr = '\0'; /* set zero terminator at the position of the
period */
- if (force || ptr == NULL)
- strcat(filename, extension);
-#else
- if (!ptr)
- {
- strcat(filename, extension);
- }
- else
- {
- strncpy(ptr, extension, strlen(extension));
- }
-#endif
-}
-
static void
parseoptions(int argc, char **argv, char *iname, char *oname,
char *pname, char *rname)
---
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/info/Sentarus/hamr30
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/embryo tsauerbeck
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/embryo
Dir : e17/libs/embryo/src/bin
Modified Files:
embryo_cc_sc.h embryo_cc_sc2.c
Log Message:
replace ishex() by isxdigits() calls
===
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- embryo_cc_sc.h 1 Apr 2005 15:11:30 - 1.10
+++ embryo_cc_sc.h 1 Apr 2005 15:15:38 - 1.11
@@ -9,7 +9,7 @@
* Copyright J.E. Hendrix, 1982, 1983
* Copyright T. Riemersma, 1997-2003
*
- * Version: $Id: embryo_cc_sc.h,v 1.10 2005/04/01 15:11:30 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc.h,v 1.11 2005/04/01 15:15:38 tsauerbeck Exp $
*
* This software is provided as-is, without any express or implied warranty.
* In no event will the authors be held liable for any damages arising from
@@ -465,7 +465,6 @@
int needtoken(int token);
voidstowlit(cell value);
int alphanum(char c);
-int ishex(char c);
voiddelete_symbol(symbol * root, symbol * sym);
voiddelete_symbols(symbol * root, int level, int del_labels,
int delete_functions);
===
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc2.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- embryo_cc_sc2.c 26 Mar 2005 15:21:02 - 1.16
+++ embryo_cc_sc2.c 1 Apr 2005 15:15:38 - 1.17
@@ -21,7 +21,7 @@
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*
- * Version: $Id: embryo_cc_sc2.c,v 1.16 2005/03/26 15:21:02 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc2.c,v 1.17 2005/04/01 15:15:38 tsauerbeck Exp $
*/
#include assert.h
#include stdio.h
@@ -477,11 +477,11 @@
if (*ptr == '0' *(ptr + 1) == 'x')
{ /* C style hexadecimal notation */
ptr += 2;
- while (ishex(*ptr) || *ptr == '_')
+ while (isxdigit(*ptr) || *ptr == '_')
{
if (*ptr != '_')
{
- assert(ishex(*ptr));
+ assert(isxdigit(*ptr));
*val = *val 4;
if (isdigit(*ptr))
*val += (*ptr - '0');
@@ -2337,17 +2337,6 @@
return (alpha(c) || isdigit(c));
}
-/* ishex
- *
- * Test if character c is a hexadecimal digit (0..9 or a..f).
- */
-SC_FUNC int
-ishex(char c)
-{
- return (c = '0' c = '9') || (c = 'a' c = 'f') || (c = 'A'
- c = 'F');
-}
-
/* The local variable table must be searched backwards, so that the deepest
* nesting of local variables is searched first. The simplest way to do
* this is to insert all new items at the head of the list.
---
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/info/Sentarus/hamr30
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_modules codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e_modules Dir : e17/apps/e_modules/src/modules/notes Modified Files: e_mod_main.c e_mod_main.h Log Message: moved menus to note face, added functionality and started face conf. trans setting doesnt work yet === RCS file: /cvsroot/enlightenment/e17/apps/e_modules/src/modules/notes/e_mod_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_main.c31 Mar 2005 09:31:56 - 1.12 +++ e_mod_main.c1 Apr 2005 12:26:47 - 1.13 @@ -21,14 +21,17 @@ static void _note_menu_bgcolor_yellow (void *data, E_Menu *m, E_Menu_Item *mi); static void _note_menu_bgcolor_green (void *data, E_Menu *m, E_Menu_Item *mi); static void _note_menu_face_add (void *data, E_Menu *m, E_Menu_Item *mi); - +static void _note_face_trans_set(void *data, E_Menu *m, E_Menu_Item *mi); static int _note_face_init (Note_Face *nf); static void _note_face_free (Note_Face *nf); +static void _note_face_menu_del (void *data, E_Menu *m, E_Menu_Item *mi); static int _note_face_add(Note *n); static void _note_face_focus (void *data, Evas *e, Evas_Object *obj, void *event_info); static void _note_face_unfocus(void *data, Evas *e, Evas_Object *obj, void *event_info); - +static void _note_face_menu_new (Note_Face *nf); +static void _note_face_cb_mouse_down (void *data, Evas *e, Evas_Object *obj, void *event_info); + char *_note_module_dir; static int _note_count; @@ -55,7 +58,6 @@ /* actually init ibar */ n = _note_init (m); m-config_menu = _note_config_menu_new (n); - return n; } @@ -200,86 +202,6 @@ /* FIXME: hook callbacks to each menu item */ mn = e_menu_new (); // main configuration menu - mnbg = e_menu_new (); // options submenu - mnt = e_menu_new (); // trans submenu - - - n-config_menu_bg = mnbg; - n-config_menu = mn; - n-config_menu_trans = mnt; - - - mi = e_menu_item_new (mnbg); - e_menu_item_label_set (mi, White Bg); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (n-conf-bgcolor == BGCOLOR_WHITE) e_menu_item_toggle_set (mi, 1); - e_menu_item_callback_set (mi, _note_menu_bgcolor_white, n); - - mi = e_menu_item_new (mnbg); - e_menu_item_label_set (mi, Yellow Bg); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (n-conf-bgcolor == BGCOLOR_YELLOW) e_menu_item_toggle_set (mi, 1); - e_menu_item_callback_set (mi, _note_menu_bgcolor_yellow, n); - - mi = e_menu_item_new (mnbg); - e_menu_item_label_set (mi, Blue Bg); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (n-conf-bgcolor == BGCOLOR_BLUE) e_menu_item_toggle_set (mi, 1); - e_menu_item_callback_set (mi, _note_menu_bgcolor_blue, n); - - mi = e_menu_item_new(mnbg); - e_menu_item_label_set(mi, Green Bg); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (n-conf-bgcolor == BGCOLOR_GREEN) e_menu_item_toggle_set (mi, 1); - e_menu_item_callback_set (mi, _note_menu_bgcolor_blue, n); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, Backgrounds); - e_menu_item_submenu_set(mi, n-config_menu_bg); - - mi = e_menu_item_new (mnt); - e_menu_item_label_set (mi, 0%); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - //if (n-conf-bgcolor == BGCOLOR_WHITE) e_menu_item_toggle_set (mi, 1); - //e_menu_item_callback_set (mi, _note_menu_bgcolor_white, n); - - mi = e_menu_item_new (mnt); - e_menu_item_label_set (mi, 25%); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - //if (n-conf-bgcolor == BGCOLOR_WHITE) e_menu_item_toggle_set (mi, 1); - //e_menu_item_callback_set (mi, _note_menu_bgcolor_white, n); - - mi = e_menu_item_new (mnt); - e_menu_item_label_set (mi, 50%); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - //if (n-conf-bgcolor == BGCOLOR_WHITE) e_menu_item_toggle_set (mi, 1); - //e_menu_item_callback_set (mi, _note_menu_bgcolor_white, n); - - mi = e_menu_item_new (mnt); - e_menu_item_label_set (mi, 75%); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - //if (n-conf-bgcolor == BGCOLOR_WHITE) e_menu_item_toggle_set (mi, 1); - //e_menu_item_callback_set (mi, _note_menu_bgcolor_white, n); - - mi = e_menu_item_new (mnt); - e_menu_item_label_set (mi, 100%); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - //if (n-conf-bgcolor == BGCOLOR_WHITE) e_menu_item_toggle_set (mi, 1); - //e_menu_item_callback_set (mi, _note_menu_bgcolor_white, n); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, Transparency); - e_menu_item_submenu_set(mi,
E CVS: libs/esmart codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_textarea
Modified Files:
esmart_textarea_cursor.c
Log Message:
fixes to up/down arrow movement when we have spaces on the destination positions
===
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/esmart_textarea_cursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- esmart_textarea_cursor.c31 Mar 2005 09:23:21 - 1.2
+++ esmart_textarea_cursor.c2 Apr 2005 12:58:13 - 1.3
@@ -53,62 +53,68 @@
}
/* move cursor one position down: go one line down, reach current x coord */
-void _esmart_textarea_cursor_move_down(Esmart_Text_Area *ta) {
+void _esmart_textarea_cursor_move_down(Esmart_Text_Area *t) {
int cur_line, line, pos, len;
Evas_Coord cx,cy,cw,ch,i;
i = 0;
- pos = evas_object_textblock_cursor_pos_get(ta-text);
+ pos = evas_object_textblock_cursor_pos_get(t-text);
- len = evas_object_textblock_length_get(ta-text);
+ len = evas_object_textblock_length_get(t-text);
/* get coords of current cursor position */
- evas_object_textblock_char_pos_get(ta-text,pos,cx,cy,cw,ch);
+ evas_object_textblock_char_pos_get(t-text,pos,cx,cy,cw,ch);
+
+ /* if we're on the bottom line, dont do anything */
+ line = cur_line = evas_object_textblock_cursor_line_get(t-text);
+ if(evas_object_textblock_lines_get(t-text) - 1 == line) return;
/* go down one line */
- line = cur_line = evas_object_textblock_cursor_line_get(ta-text);
while(line == cur_line pos = len ) {
pos++;
- evas_object_textblock_cursor_pos_set(ta-text, pos);
- cur_line = evas_object_textblock_cursor_line_get(ta-text);
+ evas_object_textblock_cursor_pos_set(t-text, pos);
+ cur_line = evas_object_textblock_cursor_line_get(t-text);
}
/* keep moving until we hit the required x coord */
- evas_object_textblock_char_pos_get(ta-text,pos,i,cy,cw,ch);
- while(cx != i pos = len) {
+ evas_object_textblock_char_pos_get(t-text,pos,i,cy,cw,ch);
+ while(cx i pos = len) {
pos++;
- evas_object_textblock_cursor_pos_set(ta-text, pos);
- evas_object_textblock_char_pos_get(ta-text,pos,i,cy,cw,ch);
+ evas_object_textblock_cursor_pos_set(t-text, pos);
+ evas_object_textblock_char_pos_get(t-text,pos,i,cy,cw,ch);
}
}
/* move cursor one position up: go one line up, reach current x coord */
-void _esmart_textarea_cursor_move_up(Esmart_Text_Area *ta) {
+void _esmart_textarea_cursor_move_up(Esmart_Text_Area *t) {
int cur_line, line, pos;
Evas_Coord cx,cy,cw,ch,i;
-
+
i = 0;
- pos = evas_object_textblock_cursor_pos_get(ta-text);
+ pos = evas_object_textblock_cursor_pos_get(t-text);
/* get coords of current cursor position */
- evas_object_textblock_char_pos_get(ta-text,pos,cx,cy,cw,ch);
+ evas_object_textblock_char_pos_get(t-text,pos,cx,cy,cw,ch);
- /* go up one line */
- line = cur_line = evas_object_textblock_cursor_line_get(ta-text);
+ /* if we're on the top line, dont do anything */
+ line = cur_line = evas_object_textblock_cursor_line_get(t-text);
+ if(line == 0) return;
+
+ /* go up one line */
while(line == cur_line pos = 0) {
pos--;
- evas_object_textblock_cursor_pos_set(ta-text, pos);
- cur_line = evas_object_textblock_cursor_line_get(ta-text);
+ evas_object_textblock_cursor_pos_set(t-text, pos);
+ cur_line = evas_object_textblock_cursor_line_get(t-text);
}
/* keep moving until we hit the required x coord */
- evas_object_textblock_char_pos_get(ta-text,pos,i,cy,cw,ch);
- while(cx != i pos = 0) {
+ evas_object_textblock_char_pos_get(t-text,pos,i,cy,cw,ch);
+ while(cx i pos = 0) {
pos--;
- evas_object_textblock_cursor_pos_set(ta-text, pos);
- evas_object_textblock_char_pos_get(ta-text,pos,i,cy,cw,ch);
+ evas_object_textblock_cursor_pos_set(t-text, pos);
+ evas_object_textblock_char_pos_get(t-text,pos,i,cy,cw,ch);
}
}
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_modules doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : apps/e_modules Dir : e17/apps/e_modules Modified Files: configure.in README NEWS Log Message: flame module === RCS file: /cvsroot/enlightenment/e17/apps/e_modules/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.in30 Mar 2005 14:21:45 - 1.3 +++ configure.in1 Apr 2005 16:26:32 - 1.4 @@ -185,6 +185,7 @@ src/modules/Makefile src/modules/snow/Makefile src/modules/notes/Makefile +src/modules/flame/Makefile ],[ ]) === RCS file: /cvsroot/enlightenment/e17/apps/e_modules/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- README 30 Mar 2005 09:58:25 - 1.1 +++ README 1 Apr 2005 16:26:32 - 1.2 @@ -1 +1,6 @@ e_modules - a collection of modules for enlightenment 0.17 + +Flame: A module that displays flame at the bottom of the screen. +Notes: A module that displays sticky notes. +Snow.: A module that displays christmas trees and falling snow on + your desktop. \ No newline at end of file === RCS file: /cvsroot/enlightenment/e17/apps/e_modules/NEWS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- NEWS30 Mar 2005 09:58:25 - 1.1 +++ NEWS1 Apr 2005 16:26:32 - 1.2 @@ -1,2 +1,5 @@ +01/03/05 + Vincent Torri: Addition of the flame module + 30/03/05 HandyAndE: Started new tree for enlightenment modules --- This SF.net email is sponsored by Demarc: A global provider of Threat Management Solutions. Download our HomeAdmin security software for free today! http://www.demarc.com/info/Sentarus/hamr30 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_modules doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : apps/e_modules Dir : e17/apps/e_modules/src/modules Modified Files: Makefile.am Log Message: flame module === RCS file: /cvsroot/enlightenment/e17/apps/e_modules/src/modules/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 30 Mar 2005 10:21:04 - 1.2 +++ Makefile.am 1 Apr 2005 16:23:58 - 1.3 @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = snow notes +SUBDIRS = flame notes snow --- This SF.net email is sponsored by Demarc: A global provider of Threat Management Solutions. Download our HomeAdmin security software for free today! http://www.demarc.com/info/Sentarus/hamr30 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c Log Message: nuke valgrind badness! :) === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_mod_main.c22 Mar 2005 19:30:32 - 1.22 +++ e_mod_main.c1 Apr 2005 16:12:30 - 1.23 @@ -180,7 +180,7 @@ #undef D #define T Config_Bar #define D conf_bar_edd - E_CONFIG_VAL(D, T, enabled, INT); + E_CONFIG_VAL(D, T, enabled, UCHAR); conf_edd = E_CONFIG_DD_NEW(IBar_Config, Config); #undef T --- This SF.net email is sponsored by Demarc: A global provider of Threat Management Solutions. Download our HomeAdmin security software for free today! http://www.demarc.com/info/Sentarus/hamr30 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_modules codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e_modules
Dir : e17/apps/e_modules/src/modules/notes
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
fixed transparency settings
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_modules/src/modules/notes/e_mod_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.c1 Apr 2005 12:26:47 - 1.13
+++ e_mod_main.c1 Apr 2005 23:58:56 - 1.14
@@ -265,11 +265,11 @@
Evas_Object *bg;
int r,g,b,a;
- return; /* not working */
+ printf(Trans is %d\n,face-conf-trans);
bg = esmart_textarea_bg_get(face-note_object);
evas_object_color_get(bg, r,g,b,a);
- switch(face-conf-trans)
+ switch(e_menu_item_num_get(mi))
{
case TRANS_0:
a = 255;
@@ -390,43 +390,38 @@
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
if (face-conf-trans == TRANS_0) e_menu_item_toggle_set (mi, 1);
- face-conf-trans = TRANS_0;
e_menu_item_callback_set (mi, _note_face_trans_set, face);
mi = e_menu_item_new (mnt);
e_menu_item_label_set (mi, 25%);
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
- if (face-conf-bgcolor == TRANS_25) e_menu_item_toggle_set (mi, 1);
- face-conf-trans = TRANS_25;
+ if (face-conf-trans == TRANS_25) e_menu_item_toggle_set (mi, 1);
e_menu_item_callback_set (mi, _note_face_trans_set, face);
mi = e_menu_item_new (mnt);
e_menu_item_label_set (mi, 50%);
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
- if (face-conf-bgcolor == TRANS_50) e_menu_item_toggle_set (mi, 1);
- face-conf-trans = TRANS_50;
+ if (face-conf-trans == TRANS_50) e_menu_item_toggle_set (mi, 1);
e_menu_item_callback_set (mi, _note_face_trans_set, face);
mi = e_menu_item_new (mnt);
e_menu_item_label_set (mi, 75%);
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
- if (face-conf-bgcolor == TRANS_75) e_menu_item_toggle_set (mi, 1);
- face-conf-trans = TRANS_75;
+ if (face-conf-trans == TRANS_75) e_menu_item_toggle_set (mi, 1);
e_menu_item_callback_set (mi, _note_face_trans_set, face);
mi = e_menu_item_new (mnt);
e_menu_item_label_set (mi, 100%);
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
- if (face-conf-bgcolor == TRANS_100) e_menu_item_toggle_set (mi, 1);
- face-conf-trans = TRANS_100;
+ if (face-conf-trans == TRANS_100) e_menu_item_toggle_set (mi, 1);
e_menu_item_callback_set (mi, _note_face_trans_set, face);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, Transparency (doesnt work));
+ e_menu_item_label_set(mi, Transparency);
e_menu_item_submenu_set(mi, face-menu_trans);
mi = e_menu_item_new(mn);
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_modules/src/modules/notes/e_mod_main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.h1 Apr 2005 12:26:47 - 1.5
+++ e_mod_main.h1 Apr 2005 23:58:56 - 1.6
@@ -6,11 +6,11 @@
#define BGCOLOR_GREEN 3
#define BGCOLOR_YELLOW 4
-#define TRANS_01
-#define TRANS_25 2
-#define TRANS_50 3
-#define TRANS_75 4
-#define TRANS_100 5
+#define TRANS_00
+#define TRANS_25 1
+#define TRANS_50 2
+#define TRANS_75 3
+#define TRANS_100 4
typedef struct _Note Note;
typedef struct _Note_Face Note_Face;
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_container.c Log Message: Fix for calling the child_hide callback at appropriate times. Holler if you notice this cause issues. It fixes the problem with collapsing tree nodes not resizing correctly. === RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_container.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ewl_container.c 28 Mar 2005 07:04:27 - 1.4 +++ ewl_container.c 2 Apr 2005 07:20:20 - 1.5 @@ -800,7 +800,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); - if (c-child_hide VISIBLE(w) REALIZED(w)) + if (c-child_hide !VISIBLE(w) REALIZED(w)) c-child_hide(c, w); ecore_list_goto_first(c-children); --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_main.c Log Message: nuke valgrind badness! :) === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- e_main.c22 Mar 2005 09:09:12 - 1.57 +++ e_main.c1 Apr 2005 16:12:29 - 1.58 @@ -59,12 +59,15 @@ int after_restart = 0; char buf[1024]; char *s; +#if 0 /* install the signal handlers. */ struct sigaction sigsegv_action; - sigsegv_action.sa_sigaction=e_sigseg_act; - sigsegv_action.sa_flags=0; + + sigsegv_action.sa_sigaction = e_sigseg_act; + sigsegv_action.sa_flags = 0; + sigemptyset(sigsegv_action.sa_mask); sigaction(SIGSEGV, sigsegv_action, NULL); - +#endif /* for debugging by redirecting stdout of e to a log file to tail */ setvbuf(stdout, NULL, _IONBF, 0); --- This SF.net email is sponsored by Demarc: A global provider of Threat Management Solutions. Download our HomeAdmin security software for free today! http://www.demarc.com/info/Sentarus/hamr30 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_main.c Log Message: nuke valgrind badness! :) === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_mod_main.c22 Mar 2005 19:31:01 - 1.16 +++ e_mod_main.c1 Apr 2005 16:12:31 - 1.17 @@ -117,7 +117,7 @@ #undef D #define T Config_Face #define D conf_face_edd - E_CONFIG_VAL(D, T, enabled, INT); + E_CONFIG_VAL(D, T, enabled, UCHAR); conf_edd = E_CONFIG_DD_NEW(Temperature_Config, Config); #undef T --- This SF.net email is sponsored by Demarc: A global provider of Threat Management Solutions. Download our HomeAdmin security software for free today! http://www.demarc.com/info/Sentarus/hamr30 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_modules codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e_modules Dir : e17/apps/e_modules/src/modules/notes Modified Files: TODO Log Message: TODO changes === RCS file: /cvsroot/enlightenment/e17/apps/e_modules/src/modules/notes/TODO,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- TODO31 Mar 2005 08:50:16 - 1.5 +++ TODO1 Apr 2005 23:59:52 - 1.6 @@ -1,5 +1,2 @@ -* add Contiguration - Options - Background (color changes?) (done, refine) -* add Contiguration - Options - Transparency (0% 25% 50% 75% 100%) (add cb) -* allow for multiple note creation * add various default settings * save notes, their content, colors, locations etc... --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c emotion_xine.h
Log Message:
moom's patches
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- emotion_xine.c 24 Jul 2004 09:53:00 - 1.13
+++ emotion_xine.c 2 Apr 2005 15:40:35 - 1.14
@@ -304,6 +304,7 @@
v = xine_get_stream_info(ev-stream, XINE_STREAM_INFO_VIDEO_RATIO);
ev-ratio = (double)v / 1.0;
ev-just_loaded = 1;
+ ev-get_poslen = 0;
{
pthread_attr_t thattr;
@@ -320,6 +321,8 @@
pthread_attr_init(thattr);
pthread_create(ev-get_pos_len_th, NULL, _em_get_pos_len_th, ev);
pthread_attr_destroy(thattr);
+
+ ev-get_pos_thread_deleted = 0;
}
// em_debug(ev);
return ev;
@@ -334,10 +337,15 @@
ev-delete_me = 1;
// pthread_mutex_lock((ev-seek_mutex));
pthread_cond_broadcast((ev-seek_cond));
-// pthread_mutex_lock((ev-get_pos_len_mutex));
- pthread_cond_broadcast((ev-get_pos_len_cond));
while (ev-seek_to);
- while (ev-get_poslen);
+
+// pthread_mutex_lock((ev-get_pos_len_mutex));
+ if (!ev-get_pos_thread_deleted)
+ {
+ pthread_cond_broadcast((ev-get_pos_len_cond));
+ while (ev-get_poslen);
+ }
+
printf(EX pause end...\n);
if (!emotion_object_play_get(ev-obj))
// if (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
@@ -1269,7 +1277,7 @@
for (;;)
{
pthread_cond_wait((ev-get_pos_len_cond), (ev-get_pos_len_mutex));
- while (ev-get_poslen 0)
+ while (ev-get_poslen 0 || ev-delete_me)
{
int pos_stream = 0;
int pos_time = 0;
@@ -1296,6 +1304,7 @@
if (ev-delete_me)
{
ev-get_poslen = 0;
+ev-get_pos_thread_deleted = 1;
return NULL;
}
ev-get_poslen = 0;
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emotion_xine.h 23 Jul 2004 03:15:30 - 1.6
+++ emotion_xine.h 2 Apr 2005 15:40:35 - 1.7
@@ -49,6 +49,7 @@
pthread_cond_tget_pos_len_cond;
pthread_mutex_t seek_mutex;
pthread_mutex_t get_pos_len_mutex;
+ unsigned char get_pos_thread_deleted : 1;
};
struct _Emotion_Xine_Video_Frame
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_config
Modified Files:
ecore_config_private.h
Log Message:
sgi build patches
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ecore_config_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_config_private.h 4 Mar 2005 19:29:39 - 1.5
+++ ecore_config_private.h 2 Apr 2005 15:59:55 - 1.6
@@ -3,8 +3,13 @@
/* debug */
extern int DEBUG;
+#ifdef __sgi
+# define D
+# define E
+#else
# define D(fmt,args...) do { if(DEBUG=0) fprintf(stderr,fmt,## args); }
while(0);
# define E(lvl,args...) do { if(DEBUG=(lvl)) fprintf(stderr,## args); }
while(0)
+#endif
typedef struct _Ecore_Config_DB_File Ecore_Config_DB_File;
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_ipc
Modified Files:
ecore_ipc_private.h
Log Message:
sgi build patches
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/ecore_ipc_private.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_ipc_private.h 22 Oct 2004 03:41:48 - 1.4
+++ ecore_ipc_private.h 2 Apr 2005 15:59:55 - 1.5
@@ -12,6 +12,10 @@
typedef struct _Ecore_Ipc_Server Ecore_Ipc_Server;
typedef struct _Ecore_Ipc_Msg_Head Ecore_Ipc_Msg_Head;
+
+#ifdef __sgi
+#pragma pack 4
+#endif
struct _Ecore_Ipc_Msg_Head
{
int head;
@@ -21,7 +25,14 @@
int ref_to;
int response;
int size;
-} __attribute__ ((packed));
+}
+#ifdef _GNU_C_
+__attribute__ ((packed));
+#endif
+;
+#ifdef __sgi
+#pragma pack 0
+#endif
struct _Ecore_Ipc_Client
{
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
Ecore_Data.h
Log Message:
sgi build patches
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Ecore_Data.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Ecore_Data.h26 Mar 2005 23:40:30 - 1.13
+++ Ecore_Data.h2 Apr 2005 15:59:55 - 1.14
@@ -9,6 +9,13 @@
# ifdef __cplusplus
extern C {
# endif
+
+#ifdef __sgi
+#define __FUNCTION__ unknown
+#ifndef __cplusplus
+#define inline
+#endif
+#endif
# define PRIME_TABLE_MAX 21
# define PRIME_MIN 17
@@ -102,7 +109,7 @@
# else /* No pthreads available */
-# define ECORE_DECLARE_LOCKS struct { } locks
+# define ECORE_DECLARE_LOCKS
# define ECORE_INIT_LOCKS(structure)
# define ECORE_READ_LOCK(structure)
# define ECORE_READ_UNLOCK(structure)
@@ -325,10 +332,17 @@
* of the message and checks that it is to be printed at the current
debugging
* level */
# ifndef DPRINTF
-# define DPRINTF(debug, format, args...) \
+# ifdef __sgi
+# define DPRINTF(debug, format, args) \
if (debug = DEBUG_LEVEL) \
fprintf(stderr, format, args);
+# else
+# define DPRINTF(debug, format, args...) \
+ if (debug = DEBUG_LEVEL) \
+fprintf(stderr, format, args);
+# endif
# endif
+
/* convenience macros for checking pointer parameters for non-NULL */
# ifndef CHECK_PARAM_POINTER_RETURN
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: signal fix... and TODO for timers === RCS file: /cvsroot/enlightenment/e17/apps/e/TODO,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- TODO1 Apr 2005 16:12:29 - 1.85 +++ TODO2 Apr 2005 16:11:04 - 1.86 @@ -32,6 +32,7 @@ * virtual desktops need an overhaul. hacked in waay too quickly. * virtual desktops need fixing to work with zones properly * gadman gadget menu needs icons :) +* general ecore/edje/efl bug - if u change system clock - especially BACKWARDS timers in ecore and edje get fucked add more issues as they are found --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_signals.c
Log Message:
signal fix... and TODO for timers
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_signals.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_signals.c 31 Mar 2005 03:21:58 - 1.4
+++ e_signals.c 2 Apr 2005 16:11:04 - 1.5
@@ -26,6 +26,7 @@
void e_sigseg_act(int x, siginfo_t *info, void *data){
write(2, SEGMENTATION FAULT \n, 29);
write(2, Backtrace disabled... *\n\n, 34);
+ exit(-11);
}
#endif
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_config.c e_config.h e_includes.h e_ipc.c e_ipc.h
e_main.c e_remote_main.c
Log Message:
shorns' font fixme work.. so we can all work on it :)
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Makefile.am 15 Mar 2005 10:25:47 - 1.19
+++ Makefile.am 2 Apr 2005 16:40:30 - 1.20
@@ -43,8 +43,8 @@
e_xinerama.h \
e_table.h \
e_layout.h \
-e_test.h
-
+e_test.h \
+e_font.h
enlightenment_SOURCES = \
e_main.c \
@@ -81,6 +81,7 @@
e_table.c \
e_layout.c \
e_test.c \
+e_font.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_config.c 24 Mar 2005 08:30:44 - 1.26
+++ e_config.c 2 Apr 2005 16:40:30 - 1.27
@@ -26,6 +26,8 @@
static E_Config_DD *_e_config_edd = NULL;
static E_Config_DD *_e_config_module_edd = NULL;
static E_Config_DD *_e_config_binding_edd = NULL;
+static E_Config_DD *_e_config_font_fallback_edd = NULL;
+static E_Config_DD *_e_config_font_default_edd = NULL;
/* externally accessible functions */
int
@@ -49,6 +51,24 @@
E_CONFIG_VAL(D, T, modifiers, INT);
E_CONFIG_VAL(D, T, action, INT);
+ _e_config_font_default_edd = E_CONFIG_DD_NEW(E_Font_Default,
+E_Font_Default);
+#undef T
+#undef D
+#define T E_Font_Default
+#define D _e_config_font_default_edd
+ E_CONFIG_VAL(D, T, text_class, STR);
+ E_CONFIG_VAL(D, T, font, STR);
+ E_CONFIG_VAL(D, T, size, INT);
+
+ _e_config_font_fallback_edd = E_CONFIG_DD_NEW(E_Font_Fallback,
+ E_Font_Fallback);
+#undef T
+#undef D
+#define T E_Font_Fallback
+#define D _e_config_font_fallback_edd
+ E_CONFIG_VAL(D, T, name, STR);
+
_e_config_edd = E_CONFIG_DD_NEW(E_Config, E_Config);
#undef T
#undef D
@@ -68,6 +88,8 @@
E_CONFIG_VAL(D, T, zone_desks_y_count, INT);
E_CONFIG_LIST(D, T, modules, _e_config_module_edd);
E_CONFIG_LIST(D, T, bindings, _e_config_binding_edd);
+ E_CONFIG_LIST(D, T, font_fallbacks, _e_config_font_fallback_edd);
+ E_CONFIG_LIST(D, T, font_defaults, _e_config_font_default_edd);
e_config = e_config_domain_load(e, _e_config_edd);
if (!e_config)
@@ -143,6 +165,30 @@
eb-action = E_BINDING_ACTION_MENU;
e_config-bindings = evas_list_append(e_config-bindings, eb);
}
+ {
+E_Font_Fallback* eff;
+
+eff = E_NEW(E_Font_Fallback, 1);
+eff-name = strdup(Kochi-Gothic);
+e_config-font_fallbacks =
evas_list_append(e_config-font_fallbacks,
+eff);
+
+eff = E_NEW(E_Font_Fallback, 1);
+eff-name = strdup(Baekmuk-Dotum);
+e_config-font_fallbacks =
evas_list_append(e_config-font_fallbacks,
+eff);
+
+ }
+ {
+E_Font_Default* efd;
+
+ efd = E_NEW(E_Font_Fallback, 1);
+efd-text_class = strdup(title_bar);
+efd-font = strdup(Vera);
+efd-size = 10;
+ e_config-font_defaults =
evas_list_append(e_config-font_defaults, efd);
+
+ }
e_config_save_queue();
}
@@ -180,12 +226,34 @@
e_config-bindings = evas_list_remove_list(e_config-bindings,
e_config-bindings);
E_FREE(eb);
}
+ while (e_config-font_fallbacks)
+ {
+E_Font_Fallback *eff;
+
+eff = e_config-font_fallbacks-data;
+e_config-font_fallbacks =
evas_list_remove_list(e_config-font_fallbacks, e_config-font_fallbacks);
+E_FREE(eff-name);
+E_FREE(eff);
+ }
+ while (e_config-font_defaults)
+ {
+E_Font_Default *efd;
+
+efd = e_config-font_defaults-data;
+e_config-font_defaults =
evas_list_remove_list(e_config-font_defaults, e_config-font_defaults);
+E_FREE(efd-text_class);
+E_FREE(efd-font);
+E_FREE(efd);
+ }
+
E_FREE(e_config-desktop_default_background);
E_FREE(e_config);
}
E_CONFIG_DD_FREE(_e_config_edd);
E_CONFIG_DD_FREE(_e_config_module_edd);
E_CONFIG_DD_FREE(_e_config_binding_edd);
+ E_CONFIG_DD_FREE(_e_config_font_default_edd);
+ E_CONFIG_DD_FREE(_e_config_font_fallback_edd);
return 1;
}
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Added Files: e_font.c e_font.h Log Message: the rest of shorne's font stuff --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_font.c
Log Message:
dont die if u dont rm your cfg
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_font.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_font.c2 Apr 2005 17:11:04 - 1.1
+++ e_font.c3 Apr 2005 01:52:16 - 1.2
@@ -9,8 +9,8 @@
* - use e_path to search for available fonts
*/
-static Evas_List *_e_font_defaults;/* MRU E_Font_Default */
-static Evas_List *_e_font_fallbacks; /* E_Font_Fallback */
+static Evas_List *_e_font_defaults = NULL; /* MRU E_Font_Default */
+static Evas_List *_e_font_fallbacks = NULL;/* E_Font_Fallback */
static Evas_List *_e_font_font_dir_available_get (Evas_List * available_fonts,
const char *font_dir);
@@ -50,7 +50,8 @@
{
edje_fontset_append_set(NULL);
}
-
+
+ buf[0] = 0;
while (next)
{
eff = evas_list_data(next);
@@ -58,7 +59,8 @@
strcat(buf, eff-name);
next = evas_list_next(next);
}
- edje_fontset_append_set(buf);
+ if (buf[0] != 0)
+ edje_fontset_append_set(buf);
/* setup edje text classes */
next = _e_font_defaults;
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_modules codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e_modules
Dir : e17/apps/e_modules/src/modules/notes
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
added font inc / dec menu to face
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_modules/src/modules/notes/e_mod_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_mod_main.c2 Apr 2005 00:04:01 - 1.15
+++ e_mod_main.c3 Apr 2005 01:57:54 - 1.16
@@ -22,6 +22,7 @@
static void _note_menu_bgcolor_green (void *data, E_Menu *m, E_Menu_Item *mi);
static void _note_menu_face_add (void *data, E_Menu *m, E_Menu_Item *mi);
static void _note_face_trans_set(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _note_face_font_change(void *data, E_Menu *m, E_Menu_Item *mi);
static int _note_face_init (Note_Face *nf);
static void _note_face_free (Note_Face *nf);
@@ -258,6 +259,34 @@
}
static void
+_note_face_font_change(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+
+ Note_Face *face = data;
+ Evas_Object *bg;
+ Esmart_Text_Area_Format *format;
+ char f[10];
+ int pos;
+
+ pos = esmart_textarea_cursor_pos_get(face-note_object);
+ esmart_textarea_cursor_pos_set(face-note_object, 0);
+ format = esmart_textarea_format_get(face-note_object);
+
+ switch(e_menu_item_num_get(mi))
+ {
+ case 0:
+ sprintf(f, font=%s size=%d,format-font, atoi(format-size)+1);
+ esmart_textarea_format_insert(face-note_object, f);
+ break;
+ case 1:
+ sprintf(f, font=%s size=%d,format-font, atoi(format-size)-1);
+ esmart_textarea_format_insert(face-note_object, f);
+ break;
+ }
+ esmart_textarea_cursor_pos_set(face-note_object, pos);
+}
+
+static void
_note_face_trans_set(void *data, E_Menu *m, E_Menu_Item *mi)
{
@@ -341,15 +370,17 @@
static void
_note_face_menu_new(Note_Face *face)
{
- E_Menu *mn, *mnbg, *mnt;
+ E_Menu *mn, *mnbg, *mnt, *mnf;
E_Menu_Item *mi;
- mn = e_menu_new();
- mnbg = e_menu_new (); // options submenu
- mnt = e_menu_new (); // trans submenu
+ mn = e_menu_new();// main menu
+ mnbg = e_menu_new (); // bg submenu
+ mnt = e_menu_new (); // trans submenu
+ mnf = e_menu_new (); // fonts submenu
face-menu = mn;
face-menu_bg = mnbg;
face-menu_trans = mnt;
+ face-menu_font = mnf;
mi = e_menu_item_new (mnbg);
e_menu_item_label_set (mi, White Bg);
@@ -422,6 +453,19 @@
e_menu_item_label_set(mi, Transparency);
e_menu_item_submenu_set(mi, face-menu_trans);
+ mi = e_menu_item_new (mnf);
+ e_menu_item_label_set (mi, Larger);
+ e_menu_item_callback_set (mi, _note_face_font_change, face);
+
+ mi = e_menu_item_new (mnf);
+ e_menu_item_label_set (mi, Smaller);
+ e_menu_item_callback_set (mi, _note_face_font_change, face);
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, Font);
+ e_menu_item_submenu_set(mi, face-menu_font);
+
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, Delete Note);
e_menu_item_callback_set(mi, _note_face_menu_del, face);
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_modules/src/modules/notes/e_mod_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_main.h1 Apr 2005 23:58:56 - 1.6
+++ e_mod_main.h3 Apr 2005 01:57:54 - 1.7
@@ -48,6 +48,7 @@
E_Menu *menu;
E_Menu *menu_bg;
E_Menu *menu_trans;
+ E_Menu *menu_font;
E_Config_DD *conf_edd;
Config *conf;
};
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_textarea
Modified Files:
Esmart_Textarea.h esmart_textarea_callbacks.c
esmart_textarea_private.c esmart_textarea_private.h
esmart_textarea_public.c
Log Message:
added format structure so we can return formatting info without having to parse
them
===
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/Esmart_Textarea.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Esmart_Textarea.h 2 Apr 2005 00:01:10 - 1.5
+++ Esmart_Textarea.h 3 Apr 2005 01:57:54 - 1.6
@@ -30,6 +30,30 @@
int pos;
};
+struct _Esmart_Text_Area_Format { /* formatting information */
+ char *font;
+ char *size;
+ char *color;
+ char *underline;
+ char *underline_color;
+ char *double_underline;
+ char *double_underline_color;
+ char *outline;
+ char *outline_color;
+ char *shadow;
+ char *shadow_color;
+ char *glow;
+ char *glow_color;
+ char *outer_glow;
+ char *outer_glow_color;
+ char *backing;
+ char *backing_color;
+ char *strikethrough;
+ char *strikethrough_color;
+};
+
+typedef struct _Esmart_Text_Area_Format Esmart_Text_Area_Format;
+
typedef struct _Esmart_Text_Area_Coord Esmart_Text_Area_Coord;
struct _Esmart_Text_Area { /* our typical text area */
@@ -89,4 +113,6 @@
voidesmart_textarea_native_size_get(Evas_Object *o, Evas_Coord *w,
Evas_Coord *h);
int esmart_textarea_native_lines_get(Evas_Object *o);
+Esmart_Text_Area_Format *esmart_textarea_format_get(Evas_Object *o);
+
#endif
===
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/esmart_textarea_callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- esmart_textarea_callbacks.c 2 Apr 2005 00:01:11 - 1.2
+++ esmart_textarea_callbacks.c 3 Apr 2005 01:57:54 - 1.3
@@ -114,7 +114,7 @@
break;
case 3:
- t-mouse_modifiers |= ESMART_TEXTAREA_MOUSE_MODIFIER_RIGHT;
+ t-mouse_modifiers |= ESMART_TEXTAREA_MOUSE_MODIFIER_RIGHT;
break;
}
}
===
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/esmart_textarea_private.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- esmart_textarea_private.c 2 Apr 2005 00:01:11 - 1.6
+++ esmart_textarea_private.c 3 Apr 2005 01:57:54 - 1.7
@@ -257,3 +257,48 @@
{
return evas_object_textblock_native_lines_get(t-text);
}
+
+/* this is an experimental function that gets formatting at a current
+ * location and uses the Esmart_Text_Area_Format struct as a placeholder
+ */
+Esmart_Text_Area_Format *
+_esmart_textarea_format_get(Esmart_Text_Area *t)
+{
+ Esmart_Text_Area_Format *format;
+ char *s, *tok;
+
+ format = malloc(sizeof(Esmart_Text_Area_Format));
+ s = strdup(evas_object_textblock_format_current_get(t-text));
+
+#define FORMAT_FILL(op) \
+ if(!strcmp(tok,#op)) \
+ { \
+ if((tok = strtok(NULL, =))) \
+ format-op = strdup(tok); \
+ }
+
+ tok = strtok(s, =);
+ if(!tok) return NULL;
+ do {
+ FORMAT_FILL(font);
+ FORMAT_FILL(size);
+ FORMAT_FILL(color);
+ FORMAT_FILL(underline);
+ FORMAT_FILL(underline_color);
+ FORMAT_FILL(double_underline);
+ FORMAT_FILL(double_underline_color);
+ FORMAT_FILL(outline);
+ FORMAT_FILL(outline_color);
+ FORMAT_FILL(shadow);
+ FORMAT_FILL(shadow_color);
+ FORMAT_FILL(glow);
+ FORMAT_FILL(glow_color);
+ FORMAT_FILL(outer_glow);
+ FORMAT_FILL(outer_glow_color);
+ FORMAT_FILL(backing);
+ FORMAT_FILL(backing_color);
+ FORMAT_FILL(strikethrough);
+ FORMAT_FILL(strikethrough_color);
+ } while((tok = strtok(NULL, =)));
+ return format;
+}
===
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/esmart_textarea_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- esmart_textarea_private.h 2 Apr 2005 00:01:11 - 1.5
+++ esmart_textarea_private.h 3 Apr 2005 01:57:54 - 1.6
@@ -37,6 +37,8 @@
void _esmart_textarea_native_size_get(Esmart_Text_Area *t,
Evas_Coord *w, Evas_Coord *h);
int _esmart_textarea_native_lines_get(Esmart_Text_Area *t);
+Esmart_Text_Area_Format *_esmart_textarea_format_get(Esmart_Text_Area *t);
+
/* textarea cursor movement and cursor related functions */
void _esmart_textarea_cursor_goto_cursor(Esmart_Text_Area
