ruby-iup 0.0.1 → 0.0.2

data/ext/rb_iup.h

@@ -1,6 +1,7 @@
 #include <ruby.h>
 #include "iup.h"
 #include "iupcontrols.h"
+#include "cd.h"
 
 extern VALUE rb_eIupError;
 static char IdleAction[100];
@@ -32,6 +33,7 @@ VALUE rb_cIupMultiLine;
 VALUE rb_cIupUser;
 VALUE rb_cIupControl;
 VALUE rb_cIupTimer;
+VALUE rb_cIupProgressBar;
 VALUE rb_cIupFileDlg;
 VALUE rb_cIupTree;
 VALUE rb_cIupNode;
@@ -81,7 +83,7 @@ VALUE rb_method_missing(int argc,VALUE *argv, VALUE self)
 	if(!*mname) {
         	rb_raise(rb_eRuntimeError, "fail: unknown method or property");
     	} 	
-	n = strlen(mname);
+		n = strlen(mname);
     	if(mname[n-1] == '=') 
     		mname[n-1] = 0;
     	if(argc==2) {
@@ -931,7 +933,7 @@ static int _idle_cb()
 	return IUP_DEFAULT;
 }
 
-static int _postdraw_cb(Ihandle* ih, void* cnv)
+static int _postdraw_cb(Ihandle* ih,void *cnv)
 {
 	char* func = (char*)IupGetAttribute(ih,"RB_POSTDRAW_CB");
 	VALUE v;
@@ -939,16 +941,16 @@ static int _postdraw_cb(Ihandle* ih, void* cnv)
 		VALUE node = (VALUE)IupGetAttribute(ih,"RB_CLASS");
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_POSTDRAW_CB");
-			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
-			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
 	return IUP_DEFAULT;
 }
 
-static int _predraw_cb(Ihandle* ih, void* cnv)
+static int _predraw_cb(Ihandle* ih,void *cnv)
 {
 	char* func = (char*)IupGetAttribute(ih,"RB_PREDRAW_CB");
 	VALUE v;
@@ -956,9 +958,9 @@ static int _predraw_cb(Ihandle* ih, void* cnv)
 		VALUE node = (VALUE)IupGetAttribute(ih,"RB_CLASS");
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_PREDRAW_CB");
-			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
-			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
@@ -1078,10 +1080,10 @@ static int _draw_cb(Ihandle* ih, void* cnv)
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_DRAW_CB");
 			v = rb_funcall(proc,rb_intern("call"),2,node,
-				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
 			v = rb_funcall(rb_cObject,rb_intern(func),2,node,
-				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
@@ -1335,20 +1337,21 @@ static int _motion_cb(Ihandle* ih,int x, int y, char* status)
 	return IUP_DEFAULT;
 }
 
-static int _cell_draw_cb(Ihandle* ih,int line, int column, int xmin, int xmax, int ymin, int ymax, void* cnv)
+static int _cell_draw_cb(Ihandle* ih,int line, int column, int xmin, int xmax, int ymin, int ymax)
 {
 	char* func = (char*)IupGetAttribute(ih,"RB_DRAW_CB");
 	VALUE v;
+	void *cnv = (void*)cdActiveCanvas();
 	if(func) {
 		VALUE node = (VALUE)IupGetAttribute(ih,"RB_CLASS");
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_DRAW_CB");
 			v = rb_funcall(proc,rb_intern("call"),8,node,
 			INT2FIX(line),INT2FIX(column),INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax),
-			rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
 			v = rb_funcall(rb_cObject,rb_intern(func),8,node,
-			INT2FIX(line),INT2FIX(column),INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax),rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			INT2FIX(line),INT2FIX(column),INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax),rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
@@ -1535,12 +1538,12 @@ static int _rightclick_cb(Ihandle* ih, int id)
 
 static int _k_any_cb(Ihandle* ih, int c)
 {
-	extern char *iupKeyEncode(int c);
+	extern char *iupKeyCodeToName(int c);
 	char* func = NULL;
 	VALUE v;
 	static char key[100];
 	static char pkey[100];
-	sprintf(key,"RB_%s",(char*)iupKeyEncode(c));
+	sprintf(key,"RB_%s",(char*)iupKeyCodeToName(c));
 	func = (char*)IupGetAttribute(ih,key);
 	if(func==NULL) {
 		func = (char*)IupGetAttribute(ih,"RB_K_ANY");
@@ -1806,7 +1809,7 @@ VALUE rb_IupSetCallback(VALUE node,VALUE v_name,VALUE v_func)
 		v = (Icallback)_button_release_cb;
 	else if(strcmp(name,"MOUSEMOVE_CB")==0)
 		v = (Icallback)_mousemove_cb;
-	else if(strcmp(name,"SCROLL_CB")==0)
+	else if(strcmp(name,"SCROLL_CB")==0) 
 		v = (Icallback)_scroll_cb;
 	else if(strcmp(name,"RESIZE_CB")==0)
 		v = (Icallback)_resize_cb;
@@ -2444,3 +2447,33 @@ VALUE rb_IupTimer(VALUE self)
 	return Qnil;
 }
 
+VALUE rb_IupProgressBar(VALUE self)
+{
+	Ihandle* v;
+	v = IupProgressBar();
+	if(v)
+		return rb_funcall(rb_cIupProgressBar,rb_intern("new"),1,UINT2NUM((unsigned)v));
+	return Qnil;
+}
+
+VALUE rb_IupCboxv(int argc,VALUE *argv,VALUE self)
+{
+	extern VALUE rb_cIupCbox;
+	Ihandle* v;
+	int i;
+	Ihandle *params[100];
+	VALUE v_params,v_hash;
+	VALUE node;
+	rb_scan_args(argc,argv,"11",&v_params,&v_hash);
+	for(i=0;i<RARRAY(v_params)->len;i++) {
+		node = RARRAY(v_params)->ptr[i];
+		params[i] = (Ihandle*)NUM2UINT(rb_iv_get(node,"@ihandle"));
+	}
+	params[i] = NULL;
+	v = IupCboxv(params);
+	if(TYPE(v_hash)==T_HASH) 
+		rb_set_attribute(v,v_hash);	
+	if(v)
+		return rb_funcall(rb_cIupCbox,rb_intern("new"),1,UINT2NUM((unsigned)v));
+	return Qnil;
+}

data/ext/rb_iupcb.h

@@ -6,6 +6,7 @@ VALUE rb_IupColorBrowser(VALUE self)
 {
 	extern VALUE rb_cIupColorBrowser;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupColorBrowser();
 	if(v)
 		return rb_funcall(rb_cIupColorBrowser,rb_intern("new"),1,UINT2NUM((unsigned)v));

data/ext/rb_iupcells.h

@@ -6,6 +6,7 @@ VALUE rb_IupCells(int argc,VALUE *argv, VALUE self)
 {
 	extern VALUE rb_cIupCells;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupCells();
         if(argc==1 && TYPE(argv[0])==T_HASH)
                 rb_set_attribute(v,argv[0]);

data/ext/rb_iupcolorbar.h

@@ -4,13 +4,10 @@
 
 VALUE rb_IupColorbar(VALUE self)
 {
-	extern char* iupGetEnv(Ihandle* n,const char* a);
-	unsigned *obj;
 	extern VALUE rb_cIupColorbar;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupColorbar();
-	obj = (unsigned*)iupGetEnv(v,"_IUPCOLORBAR_DATA");
-	obj[4] = 0; /* initialize cddbuffer to NULL */
 	if(v)
 		return rb_funcall(rb_cIupColorbar,rb_intern("new"),1,UINT2NUM((unsigned)v));
 	return Qnil;

data/ext/rb_iupcontrols.h

@@ -21,8 +21,3 @@ VALUE rb_IupImageLibOpen(VALUE self)
 	return Qnil;
 }
 
-VALUE rb_IupImageLibClose(VALUE self)
-{
-	IupImageLibClose();
-	return Qnil;
-}

data/ext/rb_iupdial.h

@@ -15,6 +15,7 @@ VALUE rb_IupDial(int argc,VALUE *argv,VALUE self)
 	}
 	if(v_type!=Qnil)
 		type = RSTRING(v_type)->ptr;
+	IupControlsOpen();
 	v = IupDial(type);
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	

data/ext/rb_iupgauge.h

@@ -6,6 +6,7 @@ VALUE rb_IupGauge(int argc,VALUE *argv,VALUE self)
 {
 	extern VALUE rb_cIupGauge;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupGauge();
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	

data/ext/rb_iupgc.h

@@ -1,6 +1,5 @@
 #include <ruby.h>
 #include "iup.h"
-#include "iupgc.h"
 
 VALUE rb_IupGetColor(VALUE self,VALUE v_x,VALUE v_y)
 {

data/ext/rb_iupmatrix.h

@@ -15,6 +15,7 @@ VALUE rb_IupMatrix(int argc,VALUE *argv,VALUE self)
 	}
 	if(v_action!=Qnil)
 		action = RSTRING(v_action)->ptr;
+	IupControlsOpen();
 	v = IupMatrix(action);
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	

data/ext/rb_iupsbox.h

@@ -1,6 +1,5 @@
 #include <ruby.h>
 #include "iup.h"
-#include "iupsbox.h"
 
 VALUE rb_IupSbox(int argc,VALUE *argv,VALUE self)
 {

data/ext/rb_iuptabs.h

@@ -19,6 +19,7 @@ VALUE rb_IupTabsv(int argc,VALUE *argv,VALUE self)
 	  		params[i] = (Ihandle*)NUM2UINT(rb_iv_get(node,"@ihandle"));	
 	}
 	params[i] = NULL;
+	IupControlsOpen();
 	v = IupTabsv(params);
 	if(TYPE(v_hash)==T_HASH) 
 		rb_set_attribute(v,v_hash);	

data/ext/rb_iuptree.h

@@ -6,6 +6,7 @@ VALUE rb_IupTree(int argc,VALUE *argv,VALUE self)
 {
 	extern VALUE rb_cIupTree;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupTree();
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	

data/ext/rb_iupval.h

@@ -15,6 +15,7 @@ VALUE rb_IupVal(int argc,VALUE *argv,VALUE self)
 	}
 	if(v_type!=Qnil)
 		type = RSTRING(v_type)->ptr;
+	IupControlsOpen();
 	v = IupVal(type);
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: ruby-iup
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2008-12-08 00:00:00 +09:00
+  version: 0.0.2
+date: 2008-12-21 00:00:00 +09:00
 summary: IUP Interface for Ruby
 require_paths: 
 - lib
@@ -98,17 +98,13 @@ files:
 - ext/iup-linux/include/im_util.h
 - ext/iup-linux/include/iup.h
 - ext/iup-linux/include/iupcb.h
-- ext/iup-linux/include/iupcbox.h
 - ext/iup-linux/include/iupcbs.h
 - ext/iup-linux/include/iupcells.h
 - ext/iup-linux/include/iupcolorbar.h
-- ext/iup-linux/include/iupcompat.h
 - ext/iup-linux/include/iupcontrols.h
-- ext/iup-linux/include/iupcpi.h
 - ext/iup-linux/include/iupdef.h
 - ext/iup-linux/include/iupdial.h
 - ext/iup-linux/include/iupgauge.h
-- ext/iup-linux/include/iupgc.h
 - ext/iup-linux/include/iupgetparam.h
 - ext/iup-linux/include/iupgl.h
 - ext/iup-linux/include/iupim.h
@@ -122,8 +118,6 @@ files:
 - ext/iup-linux/include/iupmask.h
 - ext/iup-linux/include/iupmatrix.h
 - ext/iup-linux/include/iupole.h
-- ext/iup-linux/include/iupsbox.h
-- ext/iup-linux/include/iupspeech.h
 - ext/iup-linux/include/iupspin.h
 - ext/iup-linux/include/iuptabs.h
 - ext/iup-linux/include/iuptree.h
@@ -139,7 +133,6 @@ files:
 - ext/iup-linux/include/wd_old.h
 - ext/iup-linux/libcd.so
 - ext/iup-linux/libcdcontextplus.so
-- ext/iup-linux/libcdluacontextplus51.so
 - ext/iup-linux/libcdpdf.so
 - ext/iup-linux/libfreetype.so
 - ext/iup-linux/libim.so
@@ -152,6 +145,7 @@ files:
 - ext/iup-linux/libiupgl.so
 - ext/iup-linux/libiupim.so
 - ext/iup-linux/libiupimglib.so
+- ext/iup-linux/libiupmot.so
 - ext/iup-linux/libiup_pplot.so
 - ext/iup-linux/libpdflib.so
 - ext/iup-win32
@@ -159,22 +153,29 @@ files:
 - ext/iup-win32/cd.lib
 - ext/iup-win32/cdcontextplus.dll
 - ext/iup-win32/cdcontextplus.lib
-- ext/iup-win32/cdlua51.lib
-- ext/iup-win32/cdluacontextplus51.lib
-- ext/iup-win32/cdluaim51.lib
-- ext/iup-win32/cdluapdf51.lib
 - ext/iup-win32/cdpdf.dll
 - ext/iup-win32/cdpdf.lib
 - ext/iup-win32/freetype6.dll
 - ext/iup-win32/freetype6.lib
 - ext/iup-win32/im.dll
+- ext/iup-win32/im.lib
+- ext/iup-win32/imlua_capture51.dll
+- ext/iup-win32/imlua_capture51.lib
+- ext/iup-win32/imlua_wmv51.dll
+- ext/iup-win32/imlua_wmv51.lib
 - ext/iup-win32/im_avi.dll
+- ext/iup-win32/im_avi.lib
 - ext/iup-win32/im_capture.dll
+- ext/iup-win32/im_capture.lib
 - ext/iup-win32/im_ecw.dll
 - ext/iup-win32/im_fftw.dll
+- ext/iup-win32/im_fftw.lib
 - ext/iup-win32/im_jp2.dll
+- ext/iup-win32/im_jp2.lib
 - ext/iup-win32/im_process.dll
+- ext/iup-win32/im_process.lib
 - ext/iup-win32/im_wmv.dll
+- ext/iup-win32/im_wmv.lib
 - ext/iup-win32/include
 - ext/iup-win32/include/cd.h
 - ext/iup-win32/include/cdcgm.h
@@ -207,17 +208,13 @@ files:
 - ext/iup-win32/include/cd_private.h
 - ext/iup-win32/include/iup.h
 - ext/iup-win32/include/iupcb.h
-- ext/iup-win32/include/iupcbox.h
 - ext/iup-win32/include/iupcbs.h
 - ext/iup-win32/include/iupcells.h
 - ext/iup-win32/include/iupcolorbar.h
-- ext/iup-win32/include/iupcompat.h
 - ext/iup-win32/include/iupcontrols.h
-- ext/iup-win32/include/iupcpi.h
 - ext/iup-win32/include/iupdef.h
 - ext/iup-win32/include/iupdial.h
 - ext/iup-win32/include/iupgauge.h
-- ext/iup-win32/include/iupgc.h
 - ext/iup-win32/include/iupgetparam.h
 - ext/iup-win32/include/iupgl.h
 - ext/iup-win32/include/iupim.h
@@ -231,8 +228,6 @@ files:
 - ext/iup-win32/include/iupmask.h
 - ext/iup-win32/include/iupmatrix.h
 - ext/iup-win32/include/iupole.h
-- ext/iup-win32/include/iupsbox.h
-- ext/iup-win32/include/iupspeech.h
 - ext/iup-win32/include/iupspin.h
 - ext/iup-win32/include/iuptabs.h
 - ext/iup-win32/include/iuptree.h
@@ -248,18 +243,12 @@ files:
 - ext/iup-win32/iupcontrols.lib
 - ext/iup-win32/iupgl.dll
 - ext/iup-win32/iupgl.lib
+- ext/iup-win32/iupgtk.dll
+- ext/iup-win32/iupgtk.lib
 - ext/iup-win32/iupim.dll
 - ext/iup-win32/iupim.lib
 - ext/iup-win32/iupimglib.dll
 - ext/iup-win32/iupimglib.lib
-- ext/iup-win32/iuplua51.lib
-- ext/iup-win32/iupluacd51.lib
-- ext/iup-win32/iupluacontrols51.lib
-- ext/iup-win32/iupluagl51.lib
-- ext/iup-win32/iupluaim51.lib
-- ext/iup-win32/iupluaimglib51.lib
-- ext/iup-win32/iupluaole51.lib
-- ext/iup-win32/iuplua_pplot51.lib
 - ext/iup-win32/iupole.dll
 - ext/iup-win32/iupole.lib
 - ext/iup-win32/iupstub.lib
@@ -272,7 +261,6 @@ files:
 - ext/rb_cd.h
 - ext/rb_iup.h
 - ext/rb_iupcb.h
-- ext/rb_iupcbox.h
 - ext/rb_iupcells.h
 - ext/rb_iupcolorbar.h
 - ext/rb_iupcompat.h
@@ -288,7 +276,6 @@ files:
 - ext/rb_iupmatrix.h
 - ext/rb_iupole.h
 - ext/rb_iupsbox.h
-- ext/rb_iupspeech.h
 - ext/rb_iupspin.h
 - ext/rb_iuptabs.h
 - ext/rb_iuptree.h

data/ext/iup-linux/include/iupcbox.h

@@ -1,23 +0,0 @@
-/** \file
- * \brief iupcbox control.
- *
- * See Copyright Notice in iup.h
- */
- 
-#ifndef __IUPCBOX_H 
-#define __IUPCBOX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Ihandle *IupCbox(Ihandle* first, ...);
-Ihandle *IupCboxv(Ihandle** params);
-Ihandle *IupCboxBuilder(Ihandle * first,...);
-Ihandle *IupCboxBuilderv(Ihandle** params);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

data/ext/iup-linux/include/iupcompat.h

@@ -1,62 +0,0 @@
-/** \file
- * \brief Internal exported functions. repeted from <iglobal.h>
- * should remove this file!!!!
- *
- * See Copyright Notice in iup.h
- */
- 
-#ifndef __IUPCOMPAT_H 
-#define __IUPCOMPAT_H
-
-#include <iupcbs.h>
-#include <string.h>
-#include <istrutil.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* idrv.h */
-void  iupdrvGetCharSize (Ihandle* n, int *w, int *h);
-void  iupdrvResizeObjects (Ihandle *n);
-void  iupdrvStringSize(Ihandle* n, const char* text, int *w, int *h);
-int   iupdrvGetScrollSize(void);
-
-/* env.c */
-int   iupGetSize (Ihandle* n, int* w, int *h);
-int   iupGetColor(Ihandle* n, const char *a, unsigned int *r, unsigned int *g, unsigned int *b);
-int   iupGetRGB (const char *color, unsigned int *r, unsigned int *g, unsigned int *b);
-void  iupSetEnv(Ihandle* n, const char* a, const char* v);
-void  iupStoreEnv(Ihandle* n, const char* a, const char* v);
-char* iupGetEnv(Ihandle* n, const char* a);
-int   iupGetEnvInt (Ihandle* n, const char* a);
-char* iupGetEnvRaw (Ihandle* n, const char* a);   /* no inheritance */
-int   iupCheck (Ihandle *n, const char *a);
-char *iupGetBgColor(Ihandle* self);
-char *iupGetParentBgColor (Ihandle* self);
-
-/* calcsize.c  */
-int iupSetSize(Ihandle* root);
-
-/* iup.c */
-void  iupSetPosX(Ihandle* self, int x);
-void  iupSetPosY(Ihandle* self, int y);
-int   iupGetPosX(Ihandle* self);
-int   iupGetPosY(Ihandle* self);
-void  iupSetCurrentWidth(Ihandle* self, int w);
-void  iupSetCurrentHeight(Ihandle* self, int h);
-int   iupGetCurrentWidth(Ihandle* self);
-int   iupGetCurrentHeight(Ihandle* self);
-void* iupGetNativeHandle(Ihandle* self);
-void  iupSetNativeHandle(Ihandle* self, void* handle);
-void  iupSetNaturalWidth(Ihandle* self, int w);
-void  iupSetNaturalHeight(Ihandle* self, int h);
-int   iupGetNaturalWidth(Ihandle* self);
-int   iupGetNaturalHeight(Ihandle* self);
-void* iupGetImageData(Ihandle* self);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif