[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.214 by root, Sun Jul 29 18:56:02 2007 UTC

…		…
25	#include <math.h>	25	#include <math.h>
26	#include <string.h>	26	#include <string.h>
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <stdlib.h>	28	#include <stdlib.h>
29		29
		30	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
		31
30	#include <SDL.h>	32	#include <SDL.h>
31	#include <SDL_thread.h>	33	#include <SDL_thread.h>
32	#include <SDL_endian.h>	34	#include <SDL_endian.h>
33	#include <SDL_image.h>	35	#include <SDL_image.h>
34	#include <SDL_mixer.h>	36	#include <SDL_mixer.h>
…		…
112		114
113	#include "pango-font.c"	115	#include "pango-font.c"
114	#include "pango-fontmap.c"	116	#include "pango-fontmap.c"
115	#include "pango-render.c"	117	#include "pango-render.c"
116		118
		119	typedef IV CFPlus__Channel;
		120	typedef SDL_RWops *CFPlus__RW;
117	typedef Mix_Chunk *CFPlus__MixChunk;	121	typedef Mix_Chunk *CFPlus__MixChunk;
118	typedef Mix_Music *CFPlus__MixMusic;	122	typedef Mix_Music *CFPlus__MixMusic;
119		123
120	typedef PangoFontDescription *CFPlus__Font;	124	typedef PangoFontDescription *CFPlus__Font;
121		125
…		…
434	/* SDL should provide this, really. */	438	/* SDL should provide this, really. */
435	#define SDLK_MODIFIER_MIN 300	439	#define SDLK_MODIFIER_MIN 300
436	#define SDLK_MODIFIER_MAX 314	440	#define SDLK_MODIFIER_MAX 314
437		441
438	/******************************************************************************/	442	/******************************************************************************/
		443
		444	static GV draw_x_gv, draw_y_gv, draw_w_gv, draw_h_gv;
		445	static GV *hover_gv;
439		446
440	static int	447	static int
441	within_widget (SV *widget, NV x, NV y)	448	within_widget (SV *widget, NV x, NV y)
442	{	449	{
443	HV *self;	450	HV *self;
…		…
797	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	804	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
798	}	805	}
799	}	806	}
800		807
801	int	808	int
802	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
803	POSTCALL:	810	POSTCALL:
804	Mix_HookMusicFinished (music_finished);	811	Mix_HookMusicFinished (music_finished);
805	Mix_ChannelFinished (channel_finished);	812	Mix_ChannelFinished (channel_finished);
806		813
807	void	814	void
808	Mix_CloseAudio ()	815	Mix_CloseAudio ()
809		816
810	int	817	int
811	Mix_AllocateChannels (int numchans = -1)	818	Mix_AllocateChannels (int numchans = -1)
		819
		820	const char *
		821	Mix_GetError ()
812		822
813	void	823	void
814	lowdelay (int fd, int val = 1)	824	lowdelay (int fd, int val = 1)
815	CODE:	825	CODE:
816	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	826	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
858	STRLEN image_len;	868	STRLEN image_len;
859	char image = (char )SvPVbyte (image_, image_len);	869	char image = (char )SvPVbyte (image_, image_len);
860	SDL_Surface surface, surface2;	870	SDL_Surface surface, surface2;
861	SDL_PixelFormat fmt;	871	SDL_PixelFormat fmt;
862	SDL_RWops *rw = ix	872	SDL_RWops *rw = ix
863	? SDL_RWFromFile (image, "r")	873	? SDL_RWFromFile (image, "rb")
864	: SDL_RWFromConstMem (image, image_len);	874	: SDL_RWFromConstMem (image, image_len);
865		875
866	if (!rw)	876	if (!rw)
867	croak ("load_image: %s", SDL_GetError ());	877	croak ("load_image: %s", SDL_GetError ());
868		878
…		…
2229	}	2239	}
2230	}	2240	}
2231	}	2241	}
2232	}	2242	}
2233		2243
		2244	MODULE = CFPlus PACKAGE = CFPlus::RW
		2245
		2246	CFPlus::RW
		2247	new (SV class, SV data_sv)
		2248	CODE:
		2249	{
		2250	STRLEN datalen;
		2251	char *data = SvPVbyte (data_sv, datalen);
		2252
		2253	RETVAL = SDL_RWFromConstMem (data, datalen);
		2254	}
		2255	OUTPUT:
		2256	RETVAL
		2257
		2258	CFPlus::RW
		2259	new_from_file (SV class, const char path, const char *mode = "rb")
		2260	CODE:
		2261	RETVAL = SDL_RWFromFile (path, mode);
		2262	OUTPUT:
		2263	RETVAL
		2264
		2265	void
		2266	close (CFPlus::RW self)
		2267	CODE:
		2268	SDL_RWclose (self);
		2269
		2270	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2271
		2272	PROTOTYPES: DISABLE
		2273
		2274	void
		2275	halt (CFPlus::Channel self)
		2276	CODE:
		2277	Mix_HaltChannel (self);
		2278
		2279	void
		2280	expire (CFPlus::Channel self, int ticks = -1)
		2281	CODE:
		2282	Mix_ExpireChannel (self, ticks);
		2283
		2284	void
		2285	fade_out (CFPlus::Channel self, int ticks = -1)
		2286	CODE:
		2287	Mix_FadeOutChannel (self, ticks);
		2288
		2289	int
		2290	volume (CFPlus::Channel self, int volume)
		2291	CODE:
		2292	RETVAL = Mix_Volume (self, volume);
		2293	OUTPUT:
		2294	RETVAL
		2295
		2296	void
		2297	unregister_all_effects (CFPlus::Channel self)
		2298	CODE:
		2299	Mix_UnregisterAllEffects (self);
		2300
		2301	void
		2302	set_panning (CFPlus::Channel self, int left, int right)
		2303	CODE:
		2304	Mix_SetPanning (self, left, right);
		2305
		2306	void
		2307	set_distance (CFPlus::Channel self, int distance)
		2308	CODE:
		2309	Mix_SetDistance (self, distance);
		2310
		2311	void
		2312	set_position (CFPlus::Channel self, int angle, int distance)
		2313	CODE:
		2314	Mix_SetPosition (self, angle, distance);
		2315
		2316	void
		2317	set_reverse_stereo (CFPlus::Channel self, int flip)
		2318	CODE:
		2319	Mix_SetReverseStereo (self, flip);
		2320
2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2321	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2235		2322
2236	PROTOTYPES: DISABLE	2323	PROTOTYPES: DISABLE
2237		2324
2238	CFPlus::MixChunk	2325	CFPlus::MixChunk
2239	new_from_file (SV class, char path)	2326	new (SV *class, CFPlus::RW rwops)
2240	CODE:	2327	CODE:
2241	RETVAL = Mix_LoadWAV (path);	2328	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2242	OUTPUT:	2329	OUTPUT:
2243	RETVAL	2330	RETVAL
2244		2331
2245	void	2332	void
2246	DESTROY (CFPlus::MixChunk self)	2333	DESTROY (CFPlus::MixChunk self)
…		…
2252	CODE:	2339	CODE:
2253	RETVAL = Mix_VolumeChunk (self, volume);	2340	RETVAL = Mix_VolumeChunk (self, volume);
2254	OUTPUT:	2341	OUTPUT:
2255	RETVAL	2342	RETVAL
2256		2343
2257	int	2344	CFPlus::Channel
2258	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2345	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
2259	CODE:	2346	CODE:
2260	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2347	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2348	Mix_UnregisterAllEffects (RETVAL);
2261	OUTPUT:	2349	OUTPUT:
2262	RETVAL	2350	RETVAL
2263		2351
2264	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2352	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2265		2353
…		…
2269	CODE:	2357	CODE:
2270	RETVAL = Mix_VolumeMusic (volume);	2358	RETVAL = Mix_VolumeMusic (volume);
2271	OUTPUT:	2359	OUTPUT:
2272	RETVAL	2360	RETVAL
2273		2361
2274	int	2362	void
2275	fade_out (int ms)	2363	fade_out (int ms)
2276	CODE:	2364	CODE:
2277	RETVAL = Mix_FadeOutMusic (ms);	2365	Mix_FadeOutMusic (ms);
2278	OUTPUT:	2366
2279	RETVAL	2367	void
		2368	halt ()
		2369	CODE:
		2370	Mix_HaltMusic ();
2280		2371
2281	CFPlus::MixMusic	2372	CFPlus::MixMusic
2282	new_from_file (SV class, char path)	2373	new (SV *class, CFPlus::RW rwops)
2283	CODE:	2374	CODE:
2284	RETVAL = Mix_LoadMUS (path);	2375	RETVAL = Mix_LoadMUS_RW (rwops);
2285	OUTPUT:	2376	OUTPUT:
2286	RETVAL	2377	RETVAL
2287		2378
2288	void	2379	void
2289	DESTROY (CFPlus::MixMusic self)	2380	DESTROY (CFPlus::MixMusic self)
…		…
2295	CODE:	2386	CODE:
2296	RETVAL = Mix_PlayMusic (self, loops);	2387	RETVAL = Mix_PlayMusic (self, loops);
2297	OUTPUT:	2388	OUTPUT:
2298	RETVAL	2389	RETVAL
2299		2390
2300	int	2391	void
2301	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2392	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2302	CODE:	2393	CODE:
2303	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2394	Mix_FadeInMusicPos (self, loops, ms, position);
2304	OUTPUT:
2305	RETVAL
2306		2395
2307	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2396	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308		2397
2309	PROTOTYPES: ENABLE	2398	PROTOTYPES: ENABLE
2310		2399
…		…
2386	const_iv (GL_COLOR_LOGIC_OP),	2475	const_iv (GL_COLOR_LOGIC_OP),
2387	const_iv (GL_SEPARABLE_2D),	2476	const_iv (GL_SEPARABLE_2D),
2388	const_iv (GL_CONVOLUTION_2D),	2477	const_iv (GL_CONVOLUTION_2D),
2389	const_iv (GL_CONVOLUTION_BORDER_MODE),	2478	const_iv (GL_CONVOLUTION_BORDER_MODE),
2390	const_iv (GL_CONSTANT_BORDER),	2479	const_iv (GL_CONSTANT_BORDER),
		2480	const_iv (GL_POINTS),
2391	const_iv (GL_LINES),	2481	const_iv (GL_LINES),
2392	const_iv (GL_LINE_STRIP),	2482	const_iv (GL_LINE_STRIP),
2393	const_iv (GL_LINE_LOOP),	2483	const_iv (GL_LINE_LOOP),
2394	const_iv (GL_QUADS),	2484	const_iv (GL_QUADS),
2395	const_iv (GL_QUAD_STRIP),	2485	const_iv (GL_QUAD_STRIP),
2396	const_iv (GL_TRIANGLES),	2486	const_iv (GL_TRIANGLES),
2397	const_iv (GL_TRIANGLE_STRIP),	2487	const_iv (GL_TRIANGLE_STRIP),
2398	const_iv (GL_TRIANGLE_FAN),	2488	const_iv (GL_TRIANGLE_FAN),
		2489	const_iv (GL_POLYGON),
2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2490	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400	const_iv (GL_POINT_SMOOTH_HINT),	2491	const_iv (GL_POINT_SMOOTH_HINT),
2401	const_iv (GL_LINE_SMOOTH_HINT),	2492	const_iv (GL_LINE_SMOOTH_HINT),
2402	const_iv (GL_POLYGON_SMOOTH_HINT),	2493	const_iv (GL_POLYGON_SMOOTH_HINT),
2403	const_iv (GL_GENERATE_MIPMAP_HINT),	2494	const_iv (GL_GENERATE_MIPMAP_HINT),
…		…
2498	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2589	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499		2590
2500	# near_ and far_ are due to microsofts buggy "c" compiler	2591	# near_ and far_ are due to microsofts buggy "c" compiler
2501	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2592	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2502		2593
		2594	PROTOTYPES: DISABLE
		2595
2503	void glViewport (int x, int y, int width, int height)	2596	void glViewport (int x, int y, int width, int height)
2504		2597
2505	void glScissor (int x, int y, int width, int height)	2598	void glScissor (int x, int y, int width, int height)
2506		2599
2507	void glTranslate (float x, float y, float z = 0.)	2600	void glTranslate (float x, float y, float z = 0.)
…		…
2514		2607
2515	void glRotate (float angle, float x, float y, float z)	2608	void glRotate (float angle, float x, float y, float z)
2516	CODE:	2609	CODE:
2517	glRotatef (angle, x, y, z);	2610	glRotatef (angle, x, y, z);
2518		2611
2519	void glBegin (int mode)
2520
2521	void glEnd ()
2522
2523	void glColor (float r, float g, float b, float a = 1.0)	2612	void glColor (float r, float g, float b, float a = 1.0)
2524	PROTOTYPE: @
2525	ALIAS:	2613	ALIAS:
2526	glColor_premultiply = 1	2614	glColor_premultiply = 1
2527	CODE:	2615	CODE:
2528	if (ix)	2616	if (ix)
2529	{	2617	{
…		…
2532	b *= a;	2620	b *= a;
2533	}	2621	}
2534	// microsoft visual "c" rounds instead of truncating...	2622	// microsoft visual "c" rounds instead of truncating...
2535	glColor4f (r, g, b, a);	2623	glColor4f (r, g, b, a);
2536		2624
2537	void glInterleavedArrays (int format, int stride, char *data)
2538
2539	void glDrawElements (int mode, int count, int type, char *indices)
2540
2541	# 1.2 void glDrawRangeElements (int mode, int start, int end
2542
2543	void glRasterPos (float x, float y, float z = 0.)	2625	void glRasterPos (float x, float y, float z = 0.)
2544	CODE:	2626	CODE:
2545	glRasterPos3f (0, 0, z);	2627	glRasterPos3f (0, 0, z);
2546	glBitmap (0, 0, 0, 0, x, y, 0);	2628	glBitmap (0, 0, 0, 0, x, y, 0);
2547		2629
…		…
2550	glVertex3f (x, y, z);	2632	glVertex3f (x, y, z);
2551		2633
2552	void glTexCoord (float s, float t)	2634	void glTexCoord (float s, float t)
2553	CODE:	2635	CODE:
2554	glTexCoord2f (s, t);	2636	glTexCoord2f (s, t);
		2637
		2638	void glRect (float x1, float y1, float x2, float y2)
		2639	CODE:
		2640	glRectf (x1, y1, x2, y2);
		2641
		2642	PROTOTYPES: ENABLE
		2643
		2644	void glBegin (int mode)
		2645
		2646	void glEnd ()
		2647
		2648	void glPointSize (GLfloat size)
		2649
		2650	void glLineWidth (GLfloat width)
		2651
		2652	void glInterleavedArrays (int format, int stride, char *data)
		2653
		2654	void glDrawElements (int mode, int count, int type, char *indices)
		2655
		2656	# 1.2 void glDrawRangeElements (int mode, int start, int end
2555		2657
2556	void glTexEnv (int target, int pname, float param)	2658	void glTexEnv (int target, int pname, float param)
2557	CODE:	2659	CODE:
2558	glTexEnvf (target, pname, param);	2660	glTexEnvf (target, pname, param);
2559		2661
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2719	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2720
2619	PROTOTYPES: DISABLE	2721	PROTOTYPES: DISABLE
2620		2722
2621	void	2723	void
2622	find_widget (SV *widget, NV x, NV y)	2724	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2725	PPCODE:
2624	{	2726	{
2625	if (within_widget (widget, x, y))	2727	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2728	XPUSHs (self);
2627	}	2729	}
2628		2730
		2731	BOOT:
		2732	{
		2733	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2734
		2735	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2736	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2737	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2738	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2739	}
		2740
		2741	void
		2742	draw (SV *self)
		2743	CODE:
		2744	{
		2745	HV *hv;
		2746	SV **svp;
		2747	NV x, y, w, h;
		2748	SV *draw_x_sv = GvSV (draw_x_gv);
		2749	SV *draw_y_sv = GvSV (draw_y_gv);
		2750	SV *draw_w_sv = GvSV (draw_w_gv);
		2751	SV *draw_h_sv = GvSV (draw_h_gv);
		2752	SV *hover;
		2753	double draw_x, draw_y, draw_w, draw_h;
		2754
		2755	if (!SvROK (self))
		2756	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2757
		2758	hv = (HV *)SvRV (self);
		2759
		2760	if (SvTYPE (hv) != SVt_PVHV)
		2761	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2762
		2763	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2764	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2765
		2766	if (!h \|\| !w)
		2767	XSRETURN_EMPTY;
		2768
		2769	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2770	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2771
		2772	draw_x = SvNV (draw_x_sv) + x;
		2773	draw_y = SvNV (draw_y_sv) + y;
		2774
		2775	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2776	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2777	XSRETURN_EMPTY;
		2778
		2779	sv_setnv (draw_x_sv, draw_x);
		2780	sv_setnv (draw_y_sv, draw_y);
		2781
		2782	glPushMatrix ();
		2783	glTranslated (x, y, 0);
		2784
		2785	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2786	{
		2787	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2788
		2789	if (svp && SvTRUE (*svp))
		2790	{
		2791	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2792	glEnable (GL_BLEND);
		2793	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2794	glBegin (GL_QUADS);
		2795	glVertex2f (0, 0);
		2796	glVertex2f (w, 0);
		2797	glVertex2f (w, h);
		2798	glVertex2f (0, h);
		2799	glEnd ();
		2800	glDisable (GL_BLEND);
		2801	}
		2802	}
		2803	#if 0
		2804	if ($ENV{CFPLUS_DEBUG} & 1) {
		2805	glPushMatrix;
		2806	glColor 1, 1, 0, 1;
		2807	glTranslate 0.375, 0.375;
		2808	glBegin GL_LINE_LOOP;
		2809	glVertex 0 , 0;
		2810	glVertex $self->{w} - 1, 0;
		2811	glVertex $self->{w} - 1, $self->{h} - 1;
		2812	glVertex 0 , $self->{h} - 1;
		2813	glEnd;
		2814	glPopMatrix;
		2815	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2816	}
		2817	#endif
		2818	PUSHMARK (SP);
		2819	XPUSHs (self);
		2820	PUTBACK;
		2821	call_method ("_draw", G_VOID \| G_DISCARD);
		2822	SPAGAIN;
		2823
		2824	glPopMatrix ();
		2825
		2826	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2827	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2828	}
		2829

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs. Revision 1.214 by root, Sun Jul 29 18:56:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.214 by root, Sun Jul 29 18:56:02 2007 UTC