[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.215 by root, Tue Jul 31 00:50:04 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	CFPlus::Channel
		2275	find ()
		2276	CODE:
		2277	{
		2278	RETVAL = Mix_GroupAvailable (-1);
		2279
		2280	if (RETVAL < 0)
		2281	{
		2282	RETVAL = Mix_GroupOldest (-1);
		2283
		2284	if (RETVAL < 0)
		2285	XSRETURN_UNDEF;
		2286
		2287	Mix_HaltChannel (RETVAL);
		2288	}
		2289
		2290	Mix_UnregisterAllEffects (RETVAL);
		2291	Mix_Volume (RETVAL, 128);
		2292	}
		2293	OUTPUT:
		2294	RETVAL
		2295
		2296	void
		2297	halt (CFPlus::Channel self)
		2298	CODE:
		2299	Mix_HaltChannel (self);
		2300
		2301	void
		2302	expire (CFPlus::Channel self, int ticks = -1)
		2303	CODE:
		2304	Mix_ExpireChannel (self, ticks);
		2305
		2306	void
		2307	fade_out (CFPlus::Channel self, int ticks = -1)
		2308	CODE:
		2309	Mix_FadeOutChannel (self, ticks);
		2310
		2311	int
		2312	volume (CFPlus::Channel self, int volume)
		2313	CODE:
		2314	RETVAL = Mix_Volume (self, volume);
		2315	OUTPUT:
		2316	RETVAL
		2317
		2318	void
		2319	unregister_all_effects (CFPlus::Channel self)
		2320	CODE:
		2321	Mix_UnregisterAllEffects (self);
		2322
		2323	void
		2324	set_panning (CFPlus::Channel self, int left, int right)
		2325	CODE:
		2326	Mix_SetPanning (self, left, right);
		2327
		2328	void
		2329	set_distance (CFPlus::Channel self, int distance)
		2330	CODE:
		2331	Mix_SetDistance (self, distance);
		2332
		2333	void
		2334	set_position (CFPlus::Channel self, int angle, int distance)
		2335	CODE:
		2336	Mix_SetPosition (self, angle, distance);
		2337
		2338	void
		2339	set_reverse_stereo (CFPlus::Channel self, int flip)
		2340	CODE:
		2341	Mix_SetReverseStereo (self, flip);
		2342
2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2343	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2235		2344
2236	PROTOTYPES: DISABLE	2345	PROTOTYPES: DISABLE
2237		2346
2238	CFPlus::MixChunk	2347	CFPlus::MixChunk
2239	new_from_file (SV class, char path)	2348	new (SV *class, CFPlus::RW rwops)
2240	CODE:	2349	CODE:
2241	RETVAL = Mix_LoadWAV (path);	2350	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2242	OUTPUT:	2351	OUTPUT:
2243	RETVAL	2352	RETVAL
2244		2353
2245	void	2354	void
2246	DESTROY (CFPlus::MixChunk self)	2355	DESTROY (CFPlus::MixChunk self)
…		…
2252	CODE:	2361	CODE:
2253	RETVAL = Mix_VolumeChunk (self, volume);	2362	RETVAL = Mix_VolumeChunk (self, volume);
2254	OUTPUT:	2363	OUTPUT:
2255	RETVAL	2364	RETVAL
2256		2365
2257	int	2366	CFPlus::Channel
2258	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2367	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
2259	CODE:	2368	CODE:
		2369	{
2260	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2370	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2371
		2372	if (RETVAL < 0)
		2373	XSRETURN_UNDEF;
		2374
		2375	if (channel < 0)
		2376	{
		2377	Mix_UnregisterAllEffects (RETVAL);
		2378	Mix_Volume (RETVAL, 128);
		2379	}
		2380	}
2261	OUTPUT:	2381	OUTPUT:
2262	RETVAL	2382	RETVAL
2263		2383
2264	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2384	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2265		2385
…		…
2269	CODE:	2389	CODE:
2270	RETVAL = Mix_VolumeMusic (volume);	2390	RETVAL = Mix_VolumeMusic (volume);
2271	OUTPUT:	2391	OUTPUT:
2272	RETVAL	2392	RETVAL
2273		2393
2274	int	2394	void
2275	fade_out (int ms)	2395	fade_out (int ms)
2276	CODE:	2396	CODE:
2277	RETVAL = Mix_FadeOutMusic (ms);	2397	Mix_FadeOutMusic (ms);
2278	OUTPUT:	2398
2279	RETVAL	2399	void
		2400	halt ()
		2401	CODE:
		2402	Mix_HaltMusic ();
2280		2403
2281	CFPlus::MixMusic	2404	CFPlus::MixMusic
2282	new_from_file (SV class, char path)	2405	new (SV *class, CFPlus::RW rwops)
2283	CODE:	2406	CODE:
2284	RETVAL = Mix_LoadMUS (path);	2407	RETVAL = Mix_LoadMUS_RW (rwops);
2285	OUTPUT:	2408	OUTPUT:
2286	RETVAL	2409	RETVAL
2287		2410
2288	void	2411	void
2289	DESTROY (CFPlus::MixMusic self)	2412	DESTROY (CFPlus::MixMusic self)
…		…
2295	CODE:	2418	CODE:
2296	RETVAL = Mix_PlayMusic (self, loops);	2419	RETVAL = Mix_PlayMusic (self, loops);
2297	OUTPUT:	2420	OUTPUT:
2298	RETVAL	2421	RETVAL
2299		2422
2300	int	2423	void
2301	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2424	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2302	CODE:	2425	CODE:
2303	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2426	Mix_FadeInMusicPos (self, loops, ms, position);
2304	OUTPUT:
2305	RETVAL
2306		2427
2307	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2428	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308		2429
2309	PROTOTYPES: ENABLE	2430	PROTOTYPES: ENABLE
2310		2431
…		…
2386	const_iv (GL_COLOR_LOGIC_OP),	2507	const_iv (GL_COLOR_LOGIC_OP),
2387	const_iv (GL_SEPARABLE_2D),	2508	const_iv (GL_SEPARABLE_2D),
2388	const_iv (GL_CONVOLUTION_2D),	2509	const_iv (GL_CONVOLUTION_2D),
2389	const_iv (GL_CONVOLUTION_BORDER_MODE),	2510	const_iv (GL_CONVOLUTION_BORDER_MODE),
2390	const_iv (GL_CONSTANT_BORDER),	2511	const_iv (GL_CONSTANT_BORDER),
		2512	const_iv (GL_POINTS),
2391	const_iv (GL_LINES),	2513	const_iv (GL_LINES),
2392	const_iv (GL_LINE_STRIP),	2514	const_iv (GL_LINE_STRIP),
2393	const_iv (GL_LINE_LOOP),	2515	const_iv (GL_LINE_LOOP),
2394	const_iv (GL_QUADS),	2516	const_iv (GL_QUADS),
2395	const_iv (GL_QUAD_STRIP),	2517	const_iv (GL_QUAD_STRIP),
2396	const_iv (GL_TRIANGLES),	2518	const_iv (GL_TRIANGLES),
2397	const_iv (GL_TRIANGLE_STRIP),	2519	const_iv (GL_TRIANGLE_STRIP),
2398	const_iv (GL_TRIANGLE_FAN),	2520	const_iv (GL_TRIANGLE_FAN),
		2521	const_iv (GL_POLYGON),
2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2522	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400	const_iv (GL_POINT_SMOOTH_HINT),	2523	const_iv (GL_POINT_SMOOTH_HINT),
2401	const_iv (GL_LINE_SMOOTH_HINT),	2524	const_iv (GL_LINE_SMOOTH_HINT),
2402	const_iv (GL_POLYGON_SMOOTH_HINT),	2525	const_iv (GL_POLYGON_SMOOTH_HINT),
2403	const_iv (GL_GENERATE_MIPMAP_HINT),	2526	const_iv (GL_GENERATE_MIPMAP_HINT),
…		…
2498	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2621	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499		2622
2500	# near_ and far_ are due to microsofts buggy "c" compiler	2623	# 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_)	2624	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2502		2625
		2626	PROTOTYPES: DISABLE
		2627
2503	void glViewport (int x, int y, int width, int height)	2628	void glViewport (int x, int y, int width, int height)
2504		2629
2505	void glScissor (int x, int y, int width, int height)	2630	void glScissor (int x, int y, int width, int height)
2506		2631
2507	void glTranslate (float x, float y, float z = 0.)	2632	void glTranslate (float x, float y, float z = 0.)
…		…
2514		2639
2515	void glRotate (float angle, float x, float y, float z)	2640	void glRotate (float angle, float x, float y, float z)
2516	CODE:	2641	CODE:
2517	glRotatef (angle, x, y, z);	2642	glRotatef (angle, x, y, z);
2518		2643
2519	void glBegin (int mode)
2520
2521	void glEnd ()
2522
2523	void glColor (float r, float g, float b, float a = 1.0)	2644	void glColor (float r, float g, float b, float a = 1.0)
2524	PROTOTYPE: @
2525	ALIAS:	2645	ALIAS:
2526	glColor_premultiply = 1	2646	glColor_premultiply = 1
2527	CODE:	2647	CODE:
2528	if (ix)	2648	if (ix)
2529	{	2649	{
…		…
2532	b *= a;	2652	b *= a;
2533	}	2653	}
2534	// microsoft visual "c" rounds instead of truncating...	2654	// microsoft visual "c" rounds instead of truncating...
2535	glColor4f (r, g, b, a);	2655	glColor4f (r, g, b, a);
2536		2656
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.)	2657	void glRasterPos (float x, float y, float z = 0.)
2544	CODE:	2658	CODE:
2545	glRasterPos3f (0, 0, z);	2659	glRasterPos3f (0, 0, z);
2546	glBitmap (0, 0, 0, 0, x, y, 0);	2660	glBitmap (0, 0, 0, 0, x, y, 0);
2547		2661
…		…
2551		2665
2552	void glTexCoord (float s, float t)	2666	void glTexCoord (float s, float t)
2553	CODE:	2667	CODE:
2554	glTexCoord2f (s, t);	2668	glTexCoord2f (s, t);
2555		2669
		2670	void glRect (float x1, float y1, float x2, float y2)
		2671	CODE:
		2672	glRectf (x1, y1, x2, y2);
		2673
		2674	PROTOTYPES: ENABLE
		2675
		2676	void glBegin (int mode)
		2677
		2678	void glEnd ()
		2679
		2680	void glPointSize (GLfloat size)
		2681
		2682	void glLineWidth (GLfloat width)
		2683
		2684	void glInterleavedArrays (int format, int stride, char *data)
		2685
		2686	void glDrawElements (int mode, int count, int type, char *indices)
		2687
		2688	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2689
2556	void glTexEnv (int target, int pname, float param)	2690	void glTexEnv (int target, int pname, float param)
2557	CODE:	2691	CODE:
2558	glTexEnvf (target, pname, param);	2692	glTexEnvf (target, pname, param);
2559		2693
2560	void glTexParameter (int target, int pname, float param)	2694	void glTexParameter (int target, int pname, float param)
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2751	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2752
2619	PROTOTYPES: DISABLE	2753	PROTOTYPES: DISABLE
2620		2754
2621	void	2755	void
2622	find_widget (SV *widget, NV x, NV y)	2756	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2757	PPCODE:
2624	{	2758	{
2625	if (within_widget (widget, x, y))	2759	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2760	XPUSHs (self);
2627	}	2761	}
2628		2762
		2763	BOOT:
		2764	{
		2765	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2766
		2767	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2768	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2769	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2770	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2771	}
		2772
		2773	void
		2774	draw (SV *self)
		2775	CODE:
		2776	{
		2777	HV *hv;
		2778	SV **svp;
		2779	NV x, y, w, h;
		2780	SV *draw_x_sv = GvSV (draw_x_gv);
		2781	SV *draw_y_sv = GvSV (draw_y_gv);
		2782	SV *draw_w_sv = GvSV (draw_w_gv);
		2783	SV *draw_h_sv = GvSV (draw_h_gv);
		2784	SV *hover;
		2785	double draw_x, draw_y, draw_w, draw_h;
		2786
		2787	if (!SvROK (self))
		2788	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2789
		2790	hv = (HV *)SvRV (self);
		2791
		2792	if (SvTYPE (hv) != SVt_PVHV)
		2793	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2794
		2795	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2796	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2797
		2798	if (!h \|\| !w)
		2799	XSRETURN_EMPTY;
		2800
		2801	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2802	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2803
		2804	draw_x = SvNV (draw_x_sv) + x;
		2805	draw_y = SvNV (draw_y_sv) + y;
		2806
		2807	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2808	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2809	XSRETURN_EMPTY;
		2810
		2811	sv_setnv (draw_x_sv, draw_x);
		2812	sv_setnv (draw_y_sv, draw_y);
		2813
		2814	glPushMatrix ();
		2815	glTranslated (x, y, 0);
		2816
		2817	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2818	{
		2819	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2820
		2821	if (svp && SvTRUE (*svp))
		2822	{
		2823	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2824	glEnable (GL_BLEND);
		2825	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2826	glBegin (GL_QUADS);
		2827	glVertex2f (0, 0);
		2828	glVertex2f (w, 0);
		2829	glVertex2f (w, h);
		2830	glVertex2f (0, h);
		2831	glEnd ();
		2832	glDisable (GL_BLEND);
		2833	}
		2834	}
		2835	#if 0
		2836	if ($ENV{CFPLUS_DEBUG} & 1) {
		2837	glPushMatrix;
		2838	glColor 1, 1, 0, 1;
		2839	glTranslate 0.375, 0.375;
		2840	glBegin GL_LINE_LOOP;
		2841	glVertex 0 , 0;
		2842	glVertex $self->{w} - 1, 0;
		2843	glVertex $self->{w} - 1, $self->{h} - 1;
		2844	glVertex 0 , $self->{h} - 1;
		2845	glEnd;
		2846	glPopMatrix;
		2847	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2848	}
		2849	#endif
		2850	PUSHMARK (SP);
		2851	XPUSHs (self);
		2852	PUTBACK;
		2853	call_method ("_draw", G_VOID \| G_DISCARD);
		2854	SPAGAIN;
		2855
		2856	glPopMatrix ();
		2857
		2858	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2859	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2860	}
		2861

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.215 by root, Tue Jul 31 00:50:04 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.215 by root, Tue Jul 31 00:50:04 2007 UTC