E CVS: apps/engycad glassy
Enlightenment CVS committal
Author : glassy
Project : e17
Module : apps/engycad
Dir : e17/apps/engycad/src
Modified Files:
cl.c misc.c serv.c shell.c misc.h
Log Message:
aliases backported, deadlock fixed
===
RCS file: /cvs/e/e17/apps/engycad/src/cl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- cl.c16 Jul 2007 15:54:04 - 1.4
+++ cl.c22 Jul 2007 10:42:28 - 1.5
@@ -482,6 +482,41 @@
cl_refresh(oparent);
}*/
+int check_alias(const char *keyname, Evas_Modifier *mods)
+{
+ int mask = 0;
+ char *s;
+ char buf[4096];
+
+ if(evas_key_modifier_is_set(mods, Shift))
+ mask |= 1;
+ if(evas_key_modifier_is_set(mods, Control))
+ mask |= 2;
+ if(evas_key_modifier_is_set(mods, Alt))
+ mask |= 4;
+
+ switch(mask)
+ {
+ case 0: return 0; break;
+ case 1: s = shift; break;
+ case 2: s = ctrl; break;
+ case 3: s = ctrl+shift; break;
+ case 4: s = alt; break;
+ case 5: s = alt+shift; break;
+ case 6: s = ctrl+alt; break;
+ case 7: s = ctrl+alt+shift; break;
+ }
+ sprintf(buf, %s+%s, s, keyname);
+ s = _alias(buf);
+ if(s)
+ {
+ gui_put_string(s);
+ return 1;
+ }
+
+ return 0;
+}
+
void cl_handle_key(Evas_Object *o, void *event_info)
{
Evas_Object *oparent;
@@ -547,7 +582,7 @@
cl_text_set(oparent, );
}
- else
+ else if(!check_alias(ee-keyname, ee-modifiers))
{ // insert input
char * nt;
===
RCS file: /cvs/e/e17/apps/engycad/src/misc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- misc.c 8 Jul 2007 14:56:23 - 1.2
+++ misc.c 22 Jul 2007 10:42:28 - 1.3
@@ -511,42 +511,58 @@
/** aliases **/
+Evas_Hash *aliases;
+
+Evas_Bool my_pair_free(Evas_Hash *hash,
+ const char *key, void *data, void *fdata)
+{
+ FREE(data);
+}
+
+void alias_init()
+{
+ char buf[4096];
+ char *al;
+ FILE *f;
+
+ sprintf(buf,%s/%s, shell-home, shell-aliases);
+ f = fopen(buf, r);
+
+ if(!f)
+ return;
+ while(!feof(f))
+ {
+ fgets(buf, 4095, f);
+ if(!buf[0])
+ continue;
+ buf[strlen(buf)-1] = '\0';
+ al = strchr(buf, '=');
+ if(!al)
+ continue;
+ al[0] = '\0';
+ al++;
+ aliases = evas_hash_add(aliases, buf, DUP(al));
+ }
+
+ fclose(f);
+}
+
+void alias_shutdown()
+{
+ evas_hash_foreach(aliases, my_pair_free, NULL);
+ evas_hash_free(aliases);
+}
+
char *
_alias(char *s)
{
-charbuf[4096];
-char *al;
-char *res;
-FILE *in;
-int fl = 1;
-
-sprintf(buf, %s/%s, shell-home, shell-aliases);
-in = fopen(buf, r);
-ENGY_ASSERT(in);
-
-if (!in)
-return NULL;
-
-while ((!feof(in)) fl)
- {
- fgets(buf, 4095, in);
- if (!buf)
- continue;
- buf[strlen(buf) - 1] = 0;
- al = (char *)strchr(buf, '=');
- if (!al)
- continue;
- al[0] = 0;
- al++;
- if (!strcmp(buf, s))
- fl = 0;
- }
-fclose(in);
+ char *res;
+ res = (char*) evas_hash_find(aliases, s);
-if (fl)
-return NULL;
+ if(res)
+ return DUP(res);
-return DUP(al);
+ return NULL;
}
/* screen-to-world */
===
RCS file: /cvs/e/e17/apps/engycad/src/serv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- serv.c 16 Jul 2007 15:54:04 - 1.5
+++ serv.c 22 Jul 2007 10:42:28 - 1.6
@@ -32,6 +32,7 @@
/* vars */
+pthread_mutex_t queuemutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t datamutex = PTHREAD_MUTEX_INITIALIZER;
pthread_t thserv;
@@ -142,7 +143,7 @@
if (strlen(s) 4000)
s[4000] = 0;
-pthread_mutex_lock(datamutex);
+pthread_mutex_lock(queuemutex);
for (i = 0, j = 0; s[i]; i++)
{
if ((s[i] == '|') || (j == 4095))
@@ -160,7 +161,7 @@
buf[j] = 0;
_serv_put_string(DUP(_(buf)));
FREE(s);
-pthread_mutex_unlock(datamutex);
+pthread_mutex_unlock(queuemutex);
}
char *
@@ -170,16 +171,16 @@
do
{
- pthread_mutex_lock(datamutex);
+ pthread_mutex_lock(queuemutex);
if(!serv_queue)
{
-
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/src Modified Files: Makefile.am Log Message: patch from ekrunch === RCS file: /cvs/e/e17/apps/engycad/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 8 Jul 2007 15:19:56 - 1.2 +++ Makefile.am 22 Jul 2007 14:09:03 - 1.3 @@ -75,4 +75,4 @@ undo.c \ undo.h -engycad_LDADD = @ENGY_LIBS@ -lm +engycad_LDADD = @ENGY_LIBS@ @pthread_libs@ -lm - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal
Author : glassy
Project : e17
Module : apps/engycad
Dir : e17/apps/engycad/src
Modified Files:
arc.c circle.c cl.c drawing.c earc.c ellipse.c image.c layer.c
line.c point.c serv.c shell.c text.c arc.h circle.h earc.h
ellipse.h image.h line.h point.h text.h
Log Message:
command-line history backported
===
RCS file: /cvs/e/e17/apps/engycad/src/arc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- arc.c 9 Jul 2007 17:19:54 - 1.3
+++ arc.c 16 Jul 2007 15:54:04 - 1.4
@@ -299,13 +299,27 @@
arc_redraw(arc);
}
-void
+void
arc_destroy(Arc * arc)
{
-Evas *e;
Evas_List *l;
-e = shell-evas;
+for (l = drawing-layers; l; l = l-next)
+ {
+ Layer *layer;
+
+ layer = (Layer *) l-data;
+ layer-objects = evas_list_remove(layer-objects, arc);
+ }
+
+arc_free(arc);
+}
+
+void
+arc_free(Arc * arc)
+{
+Evas_List *l;
+
if (!arc)
return;
@@ -320,13 +334,6 @@
evas_object_del(l-data);
arc-list = evas_list_free(arc-list);
-for (l = drawing-layers; l; l = l-next)
- {
- Layer *layer;
-
- layer = (Layer *) l-data;
- layer-objects = evas_list_remove(layer-objects, arc);
- }
FREE(arc);
}
===
RCS file: /cvs/e/e17/apps/engycad/src/circle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- circle.c9 Jul 2007 17:19:54 - 1.3
+++ circle.c16 Jul 2007 15:54:04 - 1.4
@@ -253,13 +253,25 @@
ci_redraw(ci);
}
-void
+void
ci_destroy(Circle * ci)
{
-Evas *e;
+ Evas_List *l;
+ for (l = drawing-layers; l; l = l-next)
+ {
+ Layer *layer;
+
+ layer = (Layer *) l-data;
+ layer-objects = evas_list_remove(layer-objects, ci);
+ }
+ ci_free(ci);
+}
+
+void
+ci_free(Circle * ci)
+{
Evas_List *l;
-e = shell-evas;
if (!ci)
return;
@@ -274,13 +286,6 @@
evas_object_del(l-data);
ci-list = evas_list_free(ci-list);
-for (l = drawing-layers; l; l = l-next)
- {
- Layer *layer;
-
- layer = (Layer *) l-data;
- layer-objects = evas_list_remove(layer-objects, ci);
- }
FREE(ci);
}
===
RCS file: /cvs/e/e17/apps/engycad/src/cl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- cl.c9 Jul 2007 17:19:54 - 1.3
+++ cl.c16 Jul 2007 15:54:04 - 1.4
@@ -32,6 +32,8 @@
Evas_Object * o_cl;
iconv_t dcd;
Evas_Object * current_editbox;
+Evas_List * history = NULL;
+Evas_List * curr_h = NULL;
Evas_Smart *smart;
@@ -56,6 +58,10 @@
void cl_clip_set(Evas_Object *o, Evas_Object *clip);
void cl_clip_unset(Evas_Object *o);
+void cl_history_up(Evas_Object *o);
+void cl_history_down(Evas_Object *o);
+void cl_autocomplete(Evas_Object *o);
+
void bg_key_down_cb(void * data,
Evas *e,
Evas_Object *obj,
@@ -501,12 +507,32 @@
cl_cursor_pos_set(oparent, 0);
else if (!strcmp(ee-keyname, End))
cl_cursor_pos_set(oparent, 0x);
-// else if (!strcmp(ee-keyname, Tab)) engy_panel_feed(ee);
- else if (!strcmp(ee-keyname, Return))
+ else if (!strcmp(ee-keyname, Tab))
+ cl_autocomplete(oparent);
+ else if (!strcmp(ee-keyname, Up))
+ cl_history_up(oparent);
+ else if (!strcmp(ee-keyname, Down))
+ cl_history_down(oparent);
+ else if (!strcmp(ee-keyname, Return) ||
+ !strcmp(ee-keyname, KP_Enter))
{
char *p, *s, *al;
cl_text_get(oparent, p);
+ if(!curr_h)
+ {
+ s = DUP(p);
+ history = evas_list_prepend(history, s);
+ }
+ else
+ {
+ curr_h = history;
+ IF_FREE(curr_h-data);
+ curr_h-data = DUP(p);
+ }
+
+ curr_h = NULL;
+
s = DUP(p);
al = _alias(s);
if(!al)
@@ -521,10 +547,6 @@
cl_text_set(oparent, );
}
-// else if (!strcmp(ee-keyname, KP_Enter)) engy_panel_feed(ee);
-// else if (!strcmp(ee-keyname, Up)) engy_panel_feed(ee);
-// else if (!strcmp(ee-keyname, Down)) engy_panel_feed(ee);
-// else if (! ee-key_compose) engy_panel_feed(ee);
else
{ // insert input
char * nt;
@@ -597,6 +619,75 @@
cl-bcpos = evas_string_char_prev_get(cl-text, pos, d);
}
+void cl_history_up(Evas_Object *_o)
+{
+ char *s, *p;
+ cl_text_get(_o, p);
+
+ if(!curr_h)
+ {
+ s = DUP(p);
+ history
E CVS: apps/engycad glassy
Enlightenment CVS committal
Author : glassy
Project : e17
Module : apps/engycad
Dir : e17/apps/engycad/src
Modified Files:
guiserv.c panel.c serv.c shell.c
Log Message:
crash on dualcores fixed
===
RCS file: /cvs/e/e17/apps/engycad/src/guiserv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- guiserv.c 10 Jul 2007 15:16:10 - 1.2
+++ guiserv.c 13 Jul 2007 06:20:28 - 1.3
@@ -291,7 +291,7 @@
FREE(s);
}
if (!fl2)
- cl_hint_set(o_cl, DUP(_(cmd: )));
+ cl_hint_set(o_cl, _(cmd: ));
}
}
===
RCS file: /cvs/e/e17/apps/engycad/src/panel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- panel.c 9 Jul 2007 17:19:54 - 1.3
+++ panel.c 13 Jul 2007 06:20:28 - 1.4
@@ -295,6 +295,7 @@
Evas_List *l;
double w;
int_x, _y;
+char *s;
Evas_Event_Mouse_In *em = (Evas_Event_Mouse_In*)event_info;
e = shell-evas;
@@ -317,7 +318,9 @@
evas_object_hide(oa);
evas_object_show(oh);
-evas_object_text_text_set(o_hte, my_iconv(shell-dcd, DUP(_(ic-hint;
+s = my_iconv(shell-dcd, _(ic-hint));
+evas_object_text_text_set(o_hte, s);
+FREE(s);
w = evas_object_text_horiz_advance_get(o_hte);
evas_object_move(o_hbg, _x + w * ((ic-x = 0) ? 0 : -1),
_y + 20 * ((ic-y = 0) ? 1 : -1));
===
RCS file: /cvs/e/e17/apps/engycad/src/serv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- serv.c 10 Jul 2007 15:16:10 - 1.3
+++ serv.c 13 Jul 2007 06:20:28 - 1.4
@@ -32,9 +32,8 @@
/* vars */
-pthread_mutex_t servmutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t datamutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t quemutex = PTHREAD_MUTEX_INITIALIZER;
+
pthread_t thserv;
char *ipc_script_name;
charfile[4096];
@@ -119,22 +118,17 @@
void
serv_init(void)
{
-pthread_mutex_lock(servmutex);
+ // pthread_mutex_lock(servmutex);
pthread_create(thserv, NULL, (void *)serv_loop, NULL);
};
void
_serv_put_string(char *s)
{
-int need_to_unlock = 0;
-
if (!s)
return;
-if (!serv_queue)
-need_to_unlock = 1;
+
serv_queue = evas_list_append(serv_queue, s);
-if (need_to_unlock)
-pthread_mutex_unlock(servmutex);
}
void
@@ -148,7 +142,7 @@
if (strlen(s) 4000)
s[4000] = 0;
-pthread_mutex_lock(quemutex);
+pthread_mutex_lock(datamutex);
for (i = 0, j = 0; s[i]; i++)
{
if ((s[i] == '|') || (j == 4095))
@@ -166,22 +160,29 @@
buf[j] = 0;
_serv_put_string(DUP(_(buf)));
FREE(s);
-pthread_mutex_unlock(quemutex);
+pthread_mutex_unlock(datamutex);
}
char *
_serv_get_string(void)
{
-char *s;
+char *s = NULL;
+
+do
+{
+ pthread_mutex_lock(datamutex);
+ if(!serv_queue)
+ {
+ pthread_mutex_unlock(datamutex);
+ usleep(10*1000);
+ continue;
+ }
+ s = serv_queue-data;
+ serv_queue = evas_list_remove(serv_queue, s);
+ pthread_mutex_unlock(datamutex);
+}
+while(!s);
-pthread_mutex_lock(servmutex);
-pthread_mutex_lock(quemutex);
-ENGY_ASSERTS(serv_queue, am i an idiot?);
-s = serv_queue-data; /* fifo */
-serv_queue = evas_list_remove(serv_queue, s);
-pthread_mutex_unlock(quemutex);
-if (serv_queue)
-pthread_mutex_unlock(servmutex);
return s;
}
@@ -223,8 +224,9 @@
serv_parser(s);
}
-printf(I quit!!!\n);
+pthread_mutex_destroy(datamutex);
fl_shutdown = 2;
+
}
#define IFCMD(a) if(!strcmp(_(s),_(a)))set_flag(); if(!strcmp(_(s),_(a)))
@@ -309,6 +311,10 @@
IFCMD(save_ps) serv_save_ps();
IFCMD(help) serv_help();
IFCMD(__exit) fl_shutdown = 1;
+{
+ static long death_count = 0;
+ IFCMD(dummy) printf(%d\n, death_count++);
+}
FREE(s);
}
===
RCS file: /cvs/e/e17/apps/engycad/src/shell.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- shell.c 10 Jul 2007 15:16:10 - 1.4
+++ shell.c 13 Jul 2007 06:20:28 - 1.5
@@ -405,6 +405,8 @@
shell_init();
ecore_main_loop_begin();
shell_shutdown();
+ecore_evas_free(shell-ee);
+ecore_evas_shutdown();
return 0;
}
-
This SF.net email is sponsored by DB2
E CVS: apps/engycad glassy
Enlightenment CVS committal
Author : glassy
Project : e17
Module : apps/engycad
Dir : e17/apps/engycad/src
Modified Files:
drawing.c guiserv.c layer.c main.c menu.c serv.c shell.c
Log Message:
more work on leaks
===
RCS file: /cvs/e/e17/apps/engycad/src/drawing.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- drawing.c 9 Jul 2007 17:19:54 - 1.3
+++ drawing.c 10 Jul 2007 15:16:10 - 1.4
@@ -61,7 +61,7 @@
if (fn)
fn++;
if (!fn)
-fn = DUP(shell-drawingfile);
+fn = shell-drawingfile;
f = fopen(full, rb);
if (!f)
new_file = 1;
===
RCS file: /cvs/e/e17/apps/engycad/src/guiserv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- guiserv.c 8 Jul 2007 04:15:49 - 1.1
+++ guiserv.c 10 Jul 2007 15:16:10 - 1.2
@@ -135,7 +135,7 @@
s = _gui_get_string();
IFCMD(logo) logo_init();
- IFCMD(_exit) exit(0);
+ IFCMD(_exit) ecore_main_loop_quit();
// GLS
// IFCMD(cl_toggle) cl_toggle();
IFCMD(log_toggle) log_toggle();
@@ -182,7 +182,9 @@
IFCMD(cl_set_hint)
{
- cl_hint_set(o_cl, _gui_get_string());
+ char * hint = _gui_get_string();
+ cl_hint_set(o_cl, hint);
+ FREE(hint);
fl2 = 1;
}
IFCMD(_clean) evas_damage_rectangle_add(shell-evas, 0, 0,
shell-w,
@@ -284,6 +286,10 @@
log_add_string(DUP(s));
if (!fl)
serv_put_string(s);
+ else
+ {
+ FREE(s);
+ }
if (!fl2)
cl_hint_set(o_cl, DUP(_(cmd: )));
}
===
RCS file: /cvs/e/e17/apps/engycad/src/layer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- layer.c 9 Jul 2007 17:19:54 - 1.3
+++ layer.c 10 Jul 2007 15:16:10 - 1.4
@@ -343,6 +343,7 @@
ENGY_ASSERT(res);
sprintf(buf, /layer/%d/label, layer-id);
+IF_FREE(layer-label);
E_DB_STR_GET(f, buf, layer-label, res);
ENGY_ASSERT(res);
if(layer-label (strlen(layer-label)4000))
===
RCS file: /cvs/e/e17/apps/engycad/src/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- main.c 8 Jul 2007 04:15:49 - 1.1
+++ main.c 10 Jul 2007 15:16:10 - 1.2
@@ -1,48 +1,4 @@
-#include engy.h
-
-#define R(a) engy_utils_report((a),1)
-
-int
-handler_signal_exit(void *data, int ev_type, void *ev)
-{
- Ecore_Event_Signal_Exit *e;
-
- e = ev;
- if (e-interrupt) printf(exit: interrupt\n);
- if (e-quit) printf(exit: quit\n);
- if (e-terminate) printf(exit: terminate\n);
-
- ecore_main_loop_quit();
- return 1;
-}
-
-
-int main1(int argc, char *argv[])
-{
-
- int res;
- Evas * evas;
-
-// res = engy_pro_args_parse(argc, argv);
-// R(res);
-
- if (!ecore_init()) return -1;
- ecore_app_args_set(argc, (const char **)argv);
-
- ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT,
- handler_signal_exit, NULL);
-
- engy_window_init();
-
- engy_cl_init();
-
- engy_edje_init();
-
- ecore_main_loop_begin();
-
- return 0;
-}
-
+// ready to be removed
===
RCS file: /cvs/e/e17/apps/engycad/src/menu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- menu.c 9 Jul 2007 17:19:54 - 1.3
+++ menu.c 10 Jul 2007 15:16:10 - 1.4
@@ -251,6 +251,8 @@
if(s (strlen(s)4000)) s[4000]=0;
if (strcmp(s, NULL))
mi-pic = s;
+else
+ free(s);
menu_item_create_evas_object(mi);
@@ -810,6 +812,7 @@
Menu_Item *mi = l-data;
IF_FREE(mi-label);
IF_FREE(mi-param);
+ IF_FREE(mi-pic);
free(mi);
}
===
RCS file: /cvs/e/e17/apps/engycad/src/serv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- serv.c 8 Jul 2007 14:56:23 - 1.2
+++ serv.c 10 Jul 2007 15:16:10 - 1.3
@@ -42,6 +42,7 @@
Evas_List *serv_queue = NULL;
int parsed_flag;
+intfl_shutdown = FALSE;
/* protos */
char *_serv_get_string(void);
@@ -213,7 +214,7 @@
void
serv_loop(void)
{
-while (1)
+while (!fl_shutdown)
{
char *s;
@@ -221,6 +222,9 @@
s = serv_get_string();
E CVS: apps/engycad glassy
Enlightenment CVS committal
Author : glassy
Project : e17
Module : apps/engycad
Dir : e17/apps/engycad/src
Modified Files:
arc.c circle.c cl.c cl.h common.c drawing.c earc.c ellipse.c
engy.h image.c layer.c line.c menu.c menu.h panel.c panel.h
point.c shell.c text.c undo.c undo.h
Log Message:
introducing free()
===
RCS file: /cvs/e/e17/apps/engycad/src/arc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- arc.c 8 Jul 2007 14:56:22 - 1.2
+++ arc.c 9 Jul 2007 17:19:54 - 1.3
@@ -621,7 +621,7 @@
dummy = arc-flags;
arc-flags |= FLAG_DELETED;
-append_undo_int((void *)(arc-flags),
+append_undo_long((void *)(arc-flags),
dummy, arc-flags, CMD_SYNC, OBJ_ARC, arc);
msg_create_and_send(CMD_SYNC, OBJ_ARC, arc);
}
@@ -795,7 +795,7 @@
dummy = arc-flags;
arc-flags |= FLAG_SELECTED;
-append_undo_int((void *)(arc-flags),
+append_undo_long((void *)(arc-flags),
dummy, arc-flags, CMD_SYNC, OBJ_ARC, arc);
msg_create_and_send(CMD_SYNC, OBJ_ARC, arc);
return 1;
@@ -816,7 +816,7 @@
{
dummy = arc-flags;
arc-flags |= FLAG_SELECTED;
- append_undo_int((void *)(arc-flags),
+ append_undo_long((void *)(arc-flags),
dummy, arc-flags, CMD_SYNC, OBJ_ARC, arc);
msg_create_and_send(CMD_SYNC, OBJ_ARC, arc);
}
@@ -860,7 +860,7 @@
dummy = arc-flags;
arc-flags ^= FLAG_SELECTED;
-append_undo_int((void *)(arc-flags),
+append_undo_long((void *)(arc-flags),
dummy, arc-flags, CMD_SYNC, OBJ_ARC, arc);
msg_create_and_send(CMD_SYNC, OBJ_ARC, arc);
return 1;
@@ -881,7 +881,7 @@
{
dummy = arc-flags;
arc-flags ^= FLAG_SELECTED;
- append_undo_int((void *)(arc-flags),
+ append_undo_long((void *)(arc-flags),
dummy, arc-flags, CMD_SYNC, OBJ_ARC, arc);
msg_create_and_send(CMD_SYNC, OBJ_ARC, arc);
}
===
RCS file: /cvs/e/e17/apps/engycad/src/circle.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- circle.c8 Jul 2007 14:56:22 - 1.2
+++ circle.c9 Jul 2007 17:19:54 - 1.3
@@ -561,7 +561,7 @@
dummy = ci-flags;
ci-flags |= FLAG_DELETED;
-append_undo_int((void *)(ci-flags),
+append_undo_long((void *)(ci-flags),
dummy, ci-flags, CMD_SYNC, OBJ_CIRCLE, ci);
msg_create_and_send(CMD_SYNC, OBJ_CIRCLE, ci);
}
@@ -710,7 +710,7 @@
dummy = ci-flags;
ci-flags |= FLAG_SELECTED;
-append_undo_int((void *)(ci-flags),
+append_undo_long((void *)(ci-flags),
dummy, ci-flags, CMD_SYNC, OBJ_CIRCLE, ci);
msg_create_and_send(CMD_SYNC, OBJ_CIRCLE, ci);
return 1;
@@ -730,7 +730,7 @@
{
dummy = ci-flags;
ci-flags |= FLAG_SELECTED;
- append_undo_int((void *)(ci-flags),
+ append_undo_long((void *)(ci-flags),
dummy, ci-flags, CMD_SYNC, OBJ_CIRCLE, ci);
msg_create_and_send(CMD_SYNC, OBJ_CIRCLE, ci);
}
@@ -754,7 +754,7 @@
dummy = ci-flags;
ci-flags ^= FLAG_SELECTED;
-append_undo_int((void *)(ci-flags),
+append_undo_long((void *)(ci-flags),
dummy, ci-flags, CMD_SYNC, OBJ_CIRCLE, ci);
msg_create_and_send(CMD_SYNC, OBJ_CIRCLE, ci);
}
@@ -773,7 +773,7 @@
{
dummy = ci-flags;
ci-flags ^= FLAG_SELECTED;
- append_undo_int((void *)(ci-flags),
+ append_undo_long((void *)(ci-flags),
dummy, ci-flags, CMD_SYNC, OBJ_CIRCLE, ci);
msg_create_and_send(CMD_SYNC, OBJ_CIRCLE, ci);
}
===
RCS file: /cvs/e/e17/apps/engycad/src/cl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- cl.c8 Jul 2007 14:56:22 - 1.2
+++ cl.c9 Jul 2007 17:19:54 - 1.3
@@ -969,3 +969,9 @@
evas_object_move(o_cl, 0, h - 20);
evas_object_resize(o_cl, w, 20);
}
+
+
+void cl_shutdown(void)
+{
+ iconv_close(dcd);
+}
===
RCS file: /cvs/e/e17/apps/engycad/src/cl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- cl.h8 Jul 2007 14:56:22 - 1.2
+++ cl.h9 Jul 2007 17:19:54 - 1.3
@@ -24,3 +24,5 @@
void cl_hint_set(Evas_Object *_o, const char *str);
void cl_handle_key(Evas_Object *oparent, void *event_info);
+
+void cl_shutdown(void);
===
RCS file: /cvs/e/e17/apps/engycad/src/common.c,v
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad Modified Files: configure.in Log Message: configure patch from caro === RCS file: /cvs/e/e17/apps/engycad/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in8 Jul 2007 04:15:48 - 1.1 +++ configure.in8 Jul 2007 15:00:55 - 1.2 @@ -90,6 +90,9 @@ AC_SUBST(ecore_cflags) AC_SUBST(ecore_libs) +PKG_CHECK_MODULES(ENGY, + imlib2 = 1.3 edb = 0.9 evas = 0.9 ecore = 0.9 ecore-evas = 0.9) + AC_CHECK_LIB(pthread,pthread_mutex_lock,pthread_libs=-lpthread, AC_MSG_ERROR([ERROR: pthread library not found.]); exit) - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal
Author : glassy
Project : e17
Module : apps/engycad
Dir : e17/apps/engycad
Modified Files:
configure.in
Log Message:
patch from caro
===
RCS file: /cvs/e/e17/apps/engycad/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure.in8 Jul 2007 15:00:55 - 1.2
+++ configure.in8 Jul 2007 15:02:19 - 1.3
@@ -38,58 +38,6 @@
packagesrcdir=`cd $srcdir pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, ${packagesrcdir})
-PROG=imlib2-config;
-AC_PATH_PROG(IMLIB2_CONFIG, $PROG, , $PATH)
-if [ test -z $IMLIB2_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
-imlib2_cflags=`$IMLIB2_CONFIG --cflags`
-imlib2_libs=`$IMLIB2_CONFIG --libs`
-AC_SUBST(imlib2_cflags)
-AC_SUBST(imlib2_libs)
-
-PROG=evas-config;
-AC_PATH_PROG(EVAS_CONFIG, $PROG, , $PATH)
-if [ test -z $EVAS_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
-evas_cflags=`$EVAS_CONFIG --cflags`
-evas_libs=`$EVAS_CONFIG --libs`
-AC_SUBST(evas_cflags)
-AC_SUBST(evas_libs)
-
-PROG=edb-config;
-AC_PATH_PROG(EDB_CONFIG, $PROG, , $PATH)
-if [ test -z $EDB_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
-edb_cflags=`$EDB_CONFIG --cflags`
-edb_libs=`$EDB_CONFIG --libs`
-AC_SUBST(edb_cflags)
-AC_SUBST(edb_libs)
-
-PROG=ecore-config;
-AC_PATH_PROG(ECORE_CONFIG, $PROG, , $PATH)
-if [ test -z $ECORE_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
-ecore_cflags=`$ECORE_CONFIG --cflags`
-ecore_libs=`$ECORE_CONFIG --libs`
-AC_SUBST(ecore_cflags)
-AC_SUBST(ecore_libs)
-
PKG_CHECK_MODULES(ENGY,
imlib2 = 1.3 edb = 0.9 evas = 0.9 ecore = 0.9 ecore-evas = 0.9)
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/src Modified Files: Makefile.am Log Message: autofoo patch from caro === RCS file: /cvs/e/e17/apps/engycad/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 8 Jul 2007 04:15:49 - 1.1 +++ Makefile.am 8 Jul 2007 15:19:56 - 1.2 @@ -2,7 +2,7 @@ INCLUDES = \ -I../lib \ - @imlib2_cflags@ @evas_cflags@ @edb_cflags@ @ecore_cflags@ + @ENGY_CFLAGS@ bin_PROGRAMS = engycad @@ -75,4 +75,4 @@ undo.c \ undo.h -engycad_LDADD = @imlib2_libs@ @evas_libs@ @pthread_libs@ @edb_libs@ @ecore_libs@ -lm -lc +engycad_LDADD = @ENGY_LIBS@ -lm - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad Log Message: Directory /cvs/e/e17/apps/engycad added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/m4 Log Message: Directory /cvs/e/e17/apps/engycad/m4 added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/po Log Message: Directory /cvs/e/e17/apps/engycad/po added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources Log Message: Directory /cvs/e/e17/apps/engycad/resources added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/fonts Log Message: Directory /cvs/e/e17/apps/engycad/resources/fonts added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/help Log Message: Directory /cvs/e/e17/apps/engycad/resources/help added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/tools Log Message: Directory /cvs/e/e17/apps/engycad/resources/tools added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/src Log Message: Directory /cvs/e/e17/apps/engycad/src added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad Added Files: ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README TODO acconfig.h autogen.sh config.h.in configure.in Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/po Added Files: ChangeLog Makefile.in.in Makevars.template POTFILES.in engycad.pot Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/m4 Added Files: ac_expand_dir.m4 ac_path_generic.m4 Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources Added Files: Makefile.am Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/pics Added Files: Makefile.am No-Ones-Laughing-3.jpg active-old.png active.png arc.png array.png bestfit.png bg.png bg1.png circle.png clone.png cmdline.png copy.png delete.png dim_a.png dim_h.png dim_v.png earc.png ell.png exit.png hand.png hatch.png help.png hilighted.png image.png infopanel.png layers.png line.png log.png logo.png marker.png mirror.png move.png movedown.png moveleft.png moveright.png moveup.png new.png newlayer.png newsheet.png normal.png normal_.png open.png paste.png point.png pointer.png polar.png print.png rect.png redo.png rotate.png runscript.png save-menu.png save.png saveimage.png scale.png scalexy.png sn.png snap.png text.png trim.png undo.png zoomin.png zoomout.png Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/fonts Added Files: Makefile.am arial.ttf times.ttf verdana.ttf Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/help Added Files: Makefile.am index.html my.css Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/src Added Files: Makefile.am arc.c arc.h circle.c circle.h cl.c cl.h common.c common.h dim.c dim.h dimstyle.c dimstyle.h drawing.c drawing.h earc.c earc.h ellipse.c ellipse.h engy.h engytypes.h globals.h gmon.out graserv.c graserv.h guiserv.c guiserv.h hatch.c hatch.h hatchstyle.c hatchstyle.h image.c image.h layer.c layer.h line.c line.h linestyle.c linestyle.h log.c log.h magnet.c magnet.h main.c menu.c menu.h misc.c misc.h mouse.c mouse.h panel.c panel.h point.c point.h rectangle.c rectangle.h sel.c sel.h serv.c serv.h shell.c shell.h text.c text.h textstyle.c textstyle.h trans.c trans.h undo.c undo.h Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/templates Added Files: Makefile.am dim_styles.db hatch_styles.db line_styles.db point_styles.db text_styles.db Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal Author : glassy Project : e17 Module : apps/engycad Dir : e17/apps/engycad/resources/tools Added Files: .engycad.db Makefile.am aliases.txt dim_styles_defs engycad.db.sh hatch_styles_defs icons icons.db line_styles_defs menu menu.db point_styles_def text_styles Log Message: EngyCAD initial commit - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
