Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl
Modified Files:
Etk.xs EtkTypes.c EtkTypes.h MANIFEST README TODO typemap
Log Message:
- fix for tree_sorting callbacks
- Etk::Timer fix
- Etk::Signal stuff
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/Etk.xs,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- Etk.xs 4 Aug 2006 23:23:53 -0000 1.37
+++ Etk.xs 5 Aug 2006 20:51:19 -0000 1.38
@@ -179,7 +179,6 @@
PUSHMARK(SP) ;
XPUSHs(sv_2mortal(newSVsv(cbd->perl_object)));
- //XPUSHs(sv_2mortal(newSViv(value)));
XPUSHs(sv_2mortal(newSVsv(cbd->perl_data)));
PUTBACK ;
@@ -250,7 +249,6 @@
PUSHMARK(SP) ;
XPUSHs(sv_2mortal(newSVsv(cbd->perl_object)));
- //XPUSHs(sv_2mortal(newSViv(value)));
XPUSHs(sv_2mortal(newSVsv(cbd->perl_data)));
PUTBACK ;
@@ -408,15 +406,6 @@
{
dSP;
Callback_Tree_Compare_Data *cbd;
- HV *row1_hv;
- HV *row2_hv;
- HV *col_hv;
- HV *tree_hv;
- SV *data_sv;
- SV *row1_rv;
- SV *row2_rv;
- SV *col_rv;
- SV *tree_rv;
int count;
int ret;
@@ -425,47 +414,12 @@
cbd = data;
- tree_hv = (HV*)sv_2mortal((SV*)newHV());
- row1_hv = (HV*)sv_2mortal((SV*)newHV());
- row2_hv = (HV*)sv_2mortal((SV*)newHV());
- col_hv = (HV*)sv_2mortal((SV*)newHV());
-
- tree_rv = newRV(newSViv(0));
- sv_setref_iv(tree_rv, "Etk_WidgetPtr", (IV) tree);
- tree_hv = newHV();
- hv_store(tree_hv, "WIDGET", strlen("WIDGET"), tree_rv, 0);
- row1_rv = newRV((SV*)tree_hv);
- sv_bless(tree_rv, gv_stashpv("Etk::Tree", FALSE));
-
- row1_rv = newRV(newSViv(0));
- sv_setref_iv(row1_rv, "Etk_Tree_RowPtr", (IV) row1);
- row1_hv = newHV();
- hv_store(row1_hv, "WIDGET", strlen("WIDGET"), row1_rv, 0);
- row1_rv = newRV((SV*)row1_hv);
- sv_bless(row1_rv, gv_stashpv("Etk::Tree::Row", FALSE));
-
- row2_rv = newRV(newSViv(0));
- sv_setref_iv(row2_rv, "Etk_Tree_RowPtr", (IV) row2);
- row2_hv = newHV();
- hv_store(row2_hv, "WIDGET", strlen("WIDGET"), row2_rv, 0);
- row2_rv = newRV((SV*)row2_hv);
- sv_bless(row2_rv, gv_stashpv("Etk::Tree::Row", FALSE));
-
- col_rv = newRV(newSViv(0));
- sv_setref_iv(col_rv, "Etk_Tree_ColPtr", (IV) col);
- col_hv = newHV();
- hv_store(col_hv, "WIDGET", strlen("WIDGET"), col_rv, 0);
- col_rv = newRV((SV*)col_hv);
- sv_bless(col_rv, gv_stashpv("Etk::Tree::Col", FALSE));
-
- data_sv = newSVsv(cbd->perl_data);
-
PUSHMARK(SP);
- XPUSHs(sv_2mortal(tree_rv));
- XPUSHs(sv_2mortal(row1_rv));
- XPUSHs(sv_2mortal(row2_rv));
- XPUSHs(sv_2mortal(col_rv));
- XPUSHs(sv_2mortal(data_sv));
+ XPUSHs(sv_2mortal(newSVEtkTreePtr(tree)));
+ XPUSHs(sv_2mortal(newSVEtkTreeRowPtr(row1)));
+ XPUSHs(sv_2mortal(newSVEtkTreeRowPtr(row2)));
+ XPUSHs(sv_2mortal(newSVEtkTreeColPtr(col)));
+ XPUSHs(sv_2mortal(newSVsv(cbd->perl_data)));
PUTBACK;
count = call_sv(cbd->perl_callback, G_SCALAR);
@@ -2739,68 +2693,9 @@
char * data
int length
-# TODO XXX
-MODULE = Etk PACKAGE = Etk
+MODULE = Etk::Signal PACKAGE = Etk::Signal PREFIX = etk_signal_
-
-
-void
-etk_signal_callback_call(callback, object, return_value, ...)
- Etk_Signal_Callback * callback
- Etk_Object * object
- void * return_value
-
-void
-etk_signal_callback_del(signal_callback)
- Etk_Signal_Callback * signal_callback
-
-#
-# Etk_Signal_Callback *
-# etk_signal_callback_new(signal, callback, data, swapped)
-# Etk_Signal * signal
-# Etk_Signal_Callback_Function callback
-# void * data
-# Etk_Bool swapped
-
-void
-etk_signal_delete(signal)
- Etk_Signal * signal
-
-void
-etk_signal_emit(signal, object, return_value, ...)
- Etk_Signal * signal
- Etk_Object * object
- void * return_value
-
-void
-etk_signal_emit_by_name(signal_name, object, return_value, ...)
- char * signal_name
- Etk_Object * object
- void * return_value
-
-Etk_Signal *
-etk_signal_lookup(signal_name, type)
- char * signal_name
- Etk_Type * type
-
-Etk_Marshaller
-etk_signal_marshaller_get(signal)
- Etk_Signal * signal
-
-const char *
-etk_signal_name_get(signal)
- Etk_Signal * signal
-
-Etk_Signal *
-etk_signal_new(signal_name, object_type, default_handler_offset, marshaller,
accumulator, accum_data)
- char * signal_name
- Etk_Type * object_type
- long default_handler_offset
- Etk_Marshaller marshaller
- Etk_Accumulator accumulator
- void * accum_data
-
void
etk_signal_shutdown()
@@ -4540,10 +4435,11 @@
char * window_class
-MODULE = Etk PACKAGE = Etk
+MODULE = Etk::Timer PACKAGE = Etk::Timer
Ecore_Timer *
-etkpl_timer_add(interval, callback, data)
+new(class, interval, callback, data=&PL_sv_undef)
+ SV * class
double interval
SV * callback
SV * data
@@ -4551,18 +4447,17 @@
Callback_Timer_Data *cbd;
cbd = calloc(1, sizeof(Callback_Timer_Data));
- if(SvOK(data))
- cbd->perl_data = newSVsv(data);
- else
- cbd->perl_data = NULL;
+ cbd->perl_data = newSVsv(data);
cbd->perl_callback = newSVsv(callback);
RETVAL = ecore_timer_add(interval, callback_timer, cbd);
OUTPUT:
RETVAL
void
-etkpl_timer_del(timer)
+Delete(timer)
Ecore_Timer * timer
CODE:
ecore_timer_del(timer);
+
+MODULE = Etk PACKAGE = Etk
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/EtkTypes.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- EtkTypes.c 4 Aug 2006 23:23:53 -0000 1.4
+++ EtkTypes.c 5 Aug 2006 20:51:19 -0000 1.5
@@ -311,7 +311,8 @@
}
-
+SV * newSVEcoreTimerPtr(Ecore_Timer *o) { return newSVObj(o, "Etk::Timer", 0);
}
+Ecore_Timer * SvEcoreTimerPtr(SV *data) { return SvObj(data, "Etk::Timer"); }
SV * newSVEtkAlignmentPtr(Etk_Alignment *o) { return newSVObj(o,
"Etk::Alignment", 0); }
Etk_Alignment * SvEtkAlignmentPtr(SV *data) { return SvObj(data,
"Etk::Alignment"); }
SV * newSVEtkBinPtr(Etk_Bin *o) { return newSVObj(o, "Etk::Bin", 0); }
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/EtkTypes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- EtkTypes.h 4 Aug 2006 23:23:53 -0000 1.3
+++ EtkTypes.h 5 Aug 2006 20:51:19 -0000 1.4
@@ -29,6 +29,8 @@
SV * newSVEvasList(Evas_List *list);
SV * newSVCharEvasList(Evas_List *list);
+SV * newSVEcoreTimerPtr(Ecore_Timer *o);
+Ecore_Timer * SvEcoreTimerPtr(SV *data);
SV * newSVEtkAlignmentPtr(Etk_Alignment *o);
Etk_Alignment * SvEtkAlignmentPtr(SV *data);
SV * newSVEtkBinPtr(Etk_Bin *o);
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- MANIFEST 30 Jul 2006 19:50:29 -0000 1.3
+++ MANIFEST 5 Aug 2006 20:51:19 -0000 1.4
@@ -7,6 +7,8 @@
ppport.h
README
typemap
+const-c.inc
+const-xs.inc
etk_test/etk_test.pl
etk_test/images/1star.png
etk_test/images/2stars.png
@@ -17,11 +19,17 @@
t/Etk/Alignment.t
t/Etk/Box.t
t/Etk/Button.t
-t/Etk/CVS
t/Etk/CheckButton.t
t/Etk/Colorpicker.t
t/Etk/Combobox.t
t/Etk/Container.t
+t/Etk/Dialog.t
+t/Etk/Entry.t
+t/Etk/Filechooser.t
+t/Etk/Frame.t
+t/Etk/Iconbox.t
+t/Etk/Image.t
+t/Etk/Label.t
t/Etk/Window.t
fallback/const-c.inc
fallback/const-xs.inc
@@ -29,7 +37,6 @@
lib/Etk/Object.pm
lib/Etk/Stock.pm
lib/Etk/Constants.pm
-lib/Etk/Timer.pm Should die soon
META.yml Module meta-data (added by MakeMaker)
TODO
test.pl
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- README 4 Aug 2006 23:23:53 -0000 1.3
+++ README 5 Aug 2006 20:51:19 -0000 1.4
@@ -33,7 +33,7 @@
This module requires the etk library.
You can get etk from the Enlightenment CVS repository:
-http://www.enlightenment.org/??/Get_Enlightenment/
+http://www.enlightenment.org/Enlightenment/Get_Enlightenment/
COPYRIGHT AND LICENCE
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/TODO,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- TODO 4 Aug 2006 23:23:53 -0000 1.11
+++ TODO 5 Aug 2006 20:51:19 -0000 1.12
@@ -2,7 +2,6 @@
=============
- callback system needs to convert event structs to perl equivalents
- port evas key modifiers and locks
-- finish signal callback functions
- perldoc everything
- create Test cases
@@ -37,6 +36,7 @@
- etk_text_view.h [DONE]
- etk_textblock.h [DONE]
- etk_editable_text_object.h [NOT NEEDED]
+- finish signal callback functions [DONE]
Pending:
========
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/typemap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- typemap 4 Aug 2006 23:23:53 -0000 1.8
+++ typemap 5 Aug 2006 20:51:19 -0000 1.9
@@ -107,7 +107,7 @@
const char ** T_PTROBJ
void * T_PTROBJ
float * T_PTROBJ
-Ecore_Timer * T_PTROBJ
+Ecore_Timer * T_PTROBJ_ETK
int ( * ) ( Etk_Tree * tree, Etk_Tree_Row * row1, Etk_Tree_Row * row2,
Etk_Tree_Col * col, void * data ) T_PTROBJ
int * T_PTROBJ
va_list T_PTROBJ
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
