Navigation

← Previous Changeset
Next Changeset →

Changeset 203

Timestamp:

01/12/07 01:27:32 (2 years ago)

Author:

Ant

Message:

new Duit untested installer

Files:

downloads/duit.tar.gz (modified) (previous)
downloads/duit.zip (modified) (previous)
trunk/installer (added)
trunk/installer/cli (added)
trunk/installer/ui (added)
trunk/installer/ui/Exec.d (added)
trunk/installer/ui/Installer.d (added)
trunk/installer/ui/Main.d (added)
trunk/installer/ui/duitLogo.d (added)
trunk/makeRelease.sh (modified) (4 diffs)
trunk/src/gtk/Duit.d (modified) (4 diffs)
trunk/src/gtk/Widget.d (modified) (1 diff)
trunk/src/lib/Loader.d (modified) (2 diffs)
trunk/src/lib/gdkpixbuf.d (modified) (1 diff)
trunk/src/lib/gthread.d (modified) (1 diff)
trunk/srcgl/glgtk/GLCapability.d (modified) (3 diffs)
trunk/wrap/APILookupGLt.txt (modified) (1 diff)
trunk/wrap/HTODopenGL.txt (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/makeRelease.sh

r197	r203
12	12
13	13
14		cp `which compd` release/duit/compd
15		cp compd.exe release/duit/compd.exe
	14	#cp `which compd` release/duit/compd
	15	#cp compd.exe release/duit/compd.exe
16	16
17	17	cp -R src/* release/duit/src
…	…
21	21	cp -R images/* release/duit/images
22	22
23		cp ~~compdDuit.sh compdDuitTests.sh~~ release/duit
24		cp ~~compdDuit.bat compdDuitTests.bat~~ release/duit
	23	cp setup release/duit
	24	cp setup.exe release/duit
25	25
26		~~cp compdDuitgl.sh compdShapesGL.sh compdSimpleGL.sh release/duit~~
27		~~cp compdDuitgl.bat compdShapesGL.bat compdSimpleGL.bat release/duit~~
28	26
29		cp makeAll.sh release/duit
30		cp makeAll.bat release/duit
	27	#cp compdDuit.sh compdDuitTests.sh release/duit
	28	#cp compdDuit.bat compdDuitTests.bat release/duit
	29
	30	#cp compdDuitgl.sh compdShapesGL.sh compdSimpleGL.sh release/duit
	31	#cp compdDuitgl.bat compdShapesGL.bat compdSimpleGL.bat release/duit
	32
	33	#cp makeAll.sh release/duit
	34	#cp makeAll.bat release/duit
31	35
32	36	cd release
…	…
37	41	rm -fr //*/.svn
38	42	rm -fr ////.svn
39		rm -fr /////.svn
40		rm -fr //////*.svn
	43	rm -fr ////*/.svn
	44	rm -fr //////.svn
41	45
42	46	tar -cf ../duit.tar duit
…	…
49	53	mv duit.tar.gz duit.zip ../downloads
50	54
51		rm -fr release
	55	#rm -fr release
52	56

trunk/src/gtk/Duit.d

r192	r203
54	54	* - lib.gtk
55	55	* - gtk.gtktypes
	56	* - gthread.Thread;
	57	* - gdk.Threads;
56	58	* structWrap:
57	59	* - GdkEvent* -> Event
…	…
75	77	private import lib.gtk;
76	78	private import gtk.gtktypes;
77		private import gthread.Thread;
78		private import gdk.Threads;
79
80
	79	private import gthread.Thread;;
	80	private import gdk.Threads;;
81	81
82	82	/**
…	…
148	148	* read full documantation at http://gtk.org/faq/#AEN482
149	149	* from the FAQ:
150		* "There is a single global lock that you must acquire with
151		* gdk_threads_enter() before making any GDK calls,
	150	* "There is a single global lock that you must acquire with
	151	* gdk_threads_enter() before making any GDK calls,
152	152	* and release with gdk_threads_leave() afterwards throughout your code."
153	153	* This is to be used on any call to GDK not executed from the main thread.
…	…
160	160	}
161	161
162
163	162
164	163	/**

trunk/src/gtk/Widget.d

r183	r203
247	247	/**
248	248	* Modifies the font for this widget.
249		* This just calls modifyFont(new PgFontDescription(~~family,size~~));
	249	* This just calls modifyFont(new PgFontDescription(PgFontDescription.fromString(family ~ " " ~ size)));
250	250	*/
251	251	public void modifyFont(char[] family, int size)
252	252	{
253	253	if ( size < 0 ) size = -size; // hack to workaround leds bug - TO BE REMOVED
254		modifyFont(new PgFontDescription(family,size));
	254	modifyFont(new PgFontDescription(
	255	PgFontDescription.fromString(
	256	family ~ " " ~ std.string.toString(size))));
255	257	}
256	258

trunk/src/lib/Loader.d

r194	r203
163	163	version(Windows)
164	164	{
165		handle = LoadLibraryA( ~~(this.libraryName ~ "\0").ptr~~ );
	165	handle = LoadLibraryA( this.libraryName ~ "\0" );
166	166	if ( alternateLibraryName !is null )
167	167	{
168		alternateHandle = LoadLibraryA( ~~(this.alternateLibraryName ~ "\0").ptr~~ );
	168	alternateHandle = LoadLibraryA( this.alternateLibraryName ~ "\0" );
169	169	}
170	170	}
…	…
172	172	{
173	173	handle = dlopen( (this.libraryName ~ "\0").ptr, RTLD_NOW);
	174	if (handle is null)
	175	{
	176	// non-dev libraries tend to be called xxxx.so.0
	177	handle = dlopen( (this.libraryName ~ ".0\0").ptr, RTLD_NOW);
	178	}
174	179	if ( alternateLibraryName !is null )
175	180	{

trunk/src/lib/gdkpixbuf.d

r194	r203
35	35	static this()
36	36	{
37		gdkpixbuf_Linker = new Linker(libPath ~ importLibs[LIBRARY.GDKPIXBUF]~~, libPath ~ importLibs[LIBRARY.GDK]~~ );
	37	gdkpixbuf_Linker = new Linker(libPath ~ importLibs[LIBRARY.GDKPIXBUF] );
38	38	gdkpixbuf_Linker.link(gdkpixbufLinks);
39	39	debug writefln("* Finished static this(): gdkpixbuf");

trunk/src/lib/gthread.d

r194	r203
35	35	static this()
36	36	{
37		gthread_Linker = new Linker(libPath ~ importLibs[LIBRARY.GTHREAD]~~, libPath ~ importLibs[LIBRARY.GLIB]~~ );
	37	gthread_Linker = new Linker(libPath ~ importLibs[LIBRARY.GTHREAD] );
38	38	gthread_Linker.link(gthreadLinks);
39	39	debug writefln("* Finished static this(): gthread");

trunk/srcgl/glgtk/GLCapability.d

r198	r203
131	131	return glDrawFrame(this);
132	132	}
133
	133
134	134	/**
135	135	* The application should use this method to redraw the scene at any time
…	…
137	137	bit glDrawFrame(Widget widget)
138	138	{
139		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 1\n" );
140		GLContext context = GLWidget.getGLContext(widget);
141		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 2\n" );
142		GLDrawable drawable = GLWidget.getGLDrawable(widget);
143		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 3\n" );
144
145		/* OpenGL BEGIN */
146		if ( !drawable.glBegin(context) )
147		{
148		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 4\n" );
149		return false;
150		}
151		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 5\n" );
	139	//printf("GLCapabilityT.realizeFrame \n" );
	140	GLContext context = GLWidget.getGLContext(widget);
	141	GLDrawable drawable = GLWidget.getGLDrawable(widget);
	142
	143	/* OpenGL BEGIN */
	144	if ( !drawable.glBegin(context) )
	145	{
	146	return false;
	147	}
152	148
153	149	/* do user actions */
154	150	bit consumeEvent = typeof(this).drawGL(null);
155	151
156		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 6\n" );
157		//writefln("glDrawFrame");
158		/* flush */
159		if ( drawable.isDoubleBuffered() )
160		{
161		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 7\n" );
162		drawable.swapBuffers();
163		}
164		else
165		{
166		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 8\n" );
167		glFlush ();
168		}
169
170		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 9\n" );
171		drawable.glEnd();
172		debug(drawFrame)printf("GLCapabilityT.glDrawFrame 10\n" );
173
174
175
176		/* OpenGL END */
177		return true;
178
179		}
180
181		bool alreadyRealized;
182
183		bool getAlreadyRealized()
184		{
185		return alreadyRealized;
	152	/* flush */
	153	if ( drawable.isDoubleBuffered() )
	154	{
	155	drawable.swapBuffers();
	156	}
	157	else
	158	{
	159	glFlush ();
	160	}
	161
	162	drawable.glEnd();
	163	/* OpenGL END */
	164	return true;
	165
186	166	}
187	167
188	168	void realizeFrame(Widget widget)
189	169	{
190		if ( alreadyRealized )
191		{
192		// return;
193		}
194		alreadyRealized = true;
195		printf("GLCapabilityT.realizeFrame \n" );
	170
	171	//printf("GLCapabilityT.realizeFrame \n" );
196	172	GLContext context = GLWidget.getGLContext(widget);
197	173	GLDrawable drawable = GLWidget.getGLDrawable(widget);
…	…
235	211
236	212	/* do user actions */
237		bit consumeEvent = typeof(this).drawGL(event);
	213	int consumeEvent = typeof(this).drawGL(event);
238	214
239	215	/* flush */

trunk/wrap/APILookupGLt.txt

r191	r203
317	317	//writefln("configureFrame 2");
318	318	/* do user actions */
319		bit consumeEvent = typeof(this).resizeGL(event);
	319	int consumeEvent = typeof(this).resizeGL(event);
320	320	//printf("here\n");
321	321	//writefln("configureFrame 3");

trunk/wrap/HTODopenGL.txt

r191	r203
46	46	outfile: srcgl/lib/glu.d
47	47
48		#runthis: wine ~/dm/bin/htod.exe wrap/cHeaders/GL/glx.hpp wrap/cHeaders/GL/glx.d -Iwrap/cHeaders
49		#prefile: wrap/cHeaders/GL/glx.hpp
50		pack: glgdk
51		lib: GLX
52		dynload: yes
53		file: wrap/cHeaders/GL/glx.d
54		outfile: srcgl/lib/glx.d
	48	##runthis: wine ~/dm/bin/htod.exe wrap/cHeaders/GL/glx.hpp wrap/cHeaders/GL/glx.d -Iwrap/cHeaders
	49	##prefile: wrap/cHeaders/GL/glx.hpp
	50	#pack: glgdk
	51	#lib: GLX
	52	#dynload: yes
	53	#file: wrap/cHeaders/GL/glx.d
	54	#outfile: srcgl/lib/glx.d
55	55

gtkd

Navigation

Changeset 203

Legend:

trunk/makeRelease.sh

trunk/src/gtk/Duit.d

trunk/src/gtk/Widget.d

trunk/src/lib/Loader.d

trunk/src/lib/gdkpixbuf.d

trunk/src/lib/gthread.d

trunk/srcgl/glgtk/GLCapability.d

trunk/wrap/APILookupGLt.txt

trunk/wrap/HTODopenGL.txt

Download in other formats: