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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.205 by root, Thu Jul 19 22:38:52 2007 UTC vs.
Revision 1.212 by root, Sun Jul 29 03:58:26 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
…		…
432	}	436	}
433		437
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
		441
		442	/******************************************************************************/
		443
		444	static GV draw_x_gv, draw_y_gv, draw_w_gv, draw_h_gv;
		445	static GV *hover_gv;
		446
		447	static int
		448	within_widget (SV *widget, NV x, NV y)
		449	{
		450	HV *self;
		451	SV **svp;
		452	NV wx, ww, wy, wh;
		453
		454	if (!SvROK (widget))
		455	return 0;
		456
		457	self = (HV *)SvRV (widget);
		458
		459	if (SvTYPE (self) != SVt_PVHV)
		460	return 0;
		461
		462	svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
		463	if (y < wy)
		464	return 0;
		465
		466	svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
		467	if (y >= wy + wh)
		468	return 0;
		469
		470	svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
		471	if (x < wx)
		472	return 0;
		473
		474	svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
		475	if (x >= wx + ww)
		476	return 0;
		477
		478	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
		479	if (!svp \|\| !SvTRUE (*svp))
		480	return 0;
		481
		482	return 1;
		483	}
437		484
438	MODULE = CFPlus PACKAGE = CFPlus	485	MODULE = CFPlus PACKAGE = CFPlus
439		486
440	PROTOTYPES: ENABLE	487	PROTOTYPES: ENABLE
441		488
…		…
757	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))));
758	}	805	}
759	}	806	}
760		807
761	int	808	int
762	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)
763	POSTCALL:	810	POSTCALL:
764	Mix_HookMusicFinished (music_finished);	811	Mix_HookMusicFinished (music_finished);
765	Mix_ChannelFinished (channel_finished);	812	Mix_ChannelFinished (channel_finished);
766		813
767	void	814	void
…		…
818	STRLEN image_len;	865	STRLEN image_len;
819	char image = (char )SvPVbyte (image_, image_len);	866	char image = (char )SvPVbyte (image_, image_len);
820	SDL_Surface surface, surface2;	867	SDL_Surface surface, surface2;
821	SDL_PixelFormat fmt;	868	SDL_PixelFormat fmt;
822	SDL_RWops *rw = ix	869	SDL_RWops *rw = ix
823	? SDL_RWFromFile (image, "r")	870	? SDL_RWFromFile (image, "rb")
824	: SDL_RWFromConstMem (image, image_len);	871	: SDL_RWFromConstMem (image, image_len);
825		872
826	if (!rw)	873	if (!rw)
827	croak ("load_image: %s", SDL_GetError ());	874	croak ("load_image: %s", SDL_GetError ());
828		875
…		…
2189	}	2236	}
2190	}	2237	}
2191	}	2238	}
2192	}	2239	}
2193		2240
		2241	MODULE = CFPlus PACKAGE = CFPlus::RW
		2242
		2243	CFPlus::RW
		2244	new (SV class, SV data_sv)
		2245	CODE:
		2246	{
		2247	STRLEN datalen;
		2248	char *data = SvPVbyte (data_sv, datalen);
		2249
		2250	RETVAL = SDL_RWFromConstMem (data, datalen);
		2251	}
		2252	OUTPUT:
		2253	RETVAL
		2254
		2255	CFPlus::RW
		2256	new_from_file (SV class, const char path, const char *mode = "rb")
		2257	CODE:
		2258	RETVAL = SDL_RWFromFile (path, mode);
		2259	OUTPUT:
		2260	RETVAL
		2261
		2262	void
		2263	close (CFPlus::RW self)
		2264	CODE:
		2265	SDL_RWclose (self);
		2266
		2267	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2268
		2269	PROTOTYPES: DISABLE
		2270
		2271	int
		2272	volume (CFPlus::Channel self, int volume)
		2273	CODE:
		2274	RETVAL = Mix_Volume (self, volume);
		2275	OUTPUT:
		2276	RETVAL
		2277
		2278	int
		2279	unregister_all_effects (CFPlus::Channel self)
		2280	CODE:
		2281	RETVAL = Mix_UnregisterAllEffects (self);
		2282	OUTPUT:
		2283	RETVAL
		2284
		2285	int
		2286	set_panning (CFPlus::Channel self, int left, int right)
		2287	CODE:
		2288	RETVAL = Mix_SetPanning (self, left, right);
		2289	OUTPUT:
		2290	RETVAL
		2291
		2292	int
		2293	set_distance (CFPlus::Channel self, int distance)
		2294	CODE:
		2295	RETVAL = Mix_SetDistance (self, distance);
		2296	OUTPUT:
		2297	RETVAL
		2298
		2299	int
		2300	set_position (CFPlus::Channel self, int angle, int distance)
		2301	CODE:
		2302	RETVAL = Mix_SetPosition (self, angle, distance);
		2303	OUTPUT:
		2304	RETVAL
		2305
		2306	int
		2307	set_reverse_stereo (CFPlus::Channel self, int flip)
		2308	CODE:
		2309	RETVAL = Mix_SetReverseStereo (self, flip);
		2310	OUTPUT:
		2311	RETVAL
		2312
2194	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2313	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2195		2314
2196	PROTOTYPES: DISABLE	2315	PROTOTYPES: DISABLE
2197		2316
2198	CFPlus::MixChunk	2317	CFPlus::MixChunk
2199	new_from_file (SV class, char path)	2318	new (SV *class, CFPlus::RW rwops)
2200	CODE:	2319	CODE:
2201	RETVAL = Mix_LoadWAV (path);	2320	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2202	OUTPUT:	2321	OUTPUT:
2203	RETVAL	2322	RETVAL
2204		2323
2205	void	2324	void
2206	DESTROY (CFPlus::MixChunk self)	2325	DESTROY (CFPlus::MixChunk self)
…		…
2212	CODE:	2331	CODE:
2213	RETVAL = Mix_VolumeChunk (self, volume);	2332	RETVAL = Mix_VolumeChunk (self, volume);
2214	OUTPUT:	2333	OUTPUT:
2215	RETVAL	2334	RETVAL
2216		2335
2217	int	2336	CFPlus::Channel
2218	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2337	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
2219	CODE:	2338	CODE:
2220	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2339	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2340	Mix_UnregisterAllEffects (RETVAL);
2221	OUTPUT:	2341	OUTPUT:
2222	RETVAL	2342	RETVAL
2223		2343
2224	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2344	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2225		2345
…		…
2236	CODE:	2356	CODE:
2237	RETVAL = Mix_FadeOutMusic (ms);	2357	RETVAL = Mix_FadeOutMusic (ms);
2238	OUTPUT:	2358	OUTPUT:
2239	RETVAL	2359	RETVAL
2240		2360
		2361	void
		2362	halt ()
		2363	CODE:
		2364	Mix_HaltMusic ();
		2365
2241	CFPlus::MixMusic	2366	CFPlus::MixMusic
2242	new_from_file (SV class, char path)	2367	new (SV *class, CFPlus::RW rwops)
2243	CODE:	2368	CODE:
2244	RETVAL = Mix_LoadMUS (path);	2369	RETVAL = Mix_LoadMUS_RW (rwops);
2245	OUTPUT:	2370	OUTPUT:
2246	RETVAL	2371	RETVAL
2247		2372
2248	void	2373	void
2249	DESTROY (CFPlus::MixMusic self)	2374	DESTROY (CFPlus::MixMusic self)
…		…
2290	const_iv (GL_ALPHA_TEST),	2415	const_iv (GL_ALPHA_TEST),
2291	const_iv (GL_NORMALIZE),	2416	const_iv (GL_NORMALIZE),
2292	const_iv (GL_RESCALE_NORMAL),	2417	const_iv (GL_RESCALE_NORMAL),
2293	const_iv (GL_FRONT),	2418	const_iv (GL_FRONT),
2294	const_iv (GL_BACK),	2419	const_iv (GL_BACK),
		2420	const_iv (GL_AUX0),
2295	const_iv (GL_AND),	2421	const_iv (GL_AND),
2296	const_iv (GL_ONE),	2422	const_iv (GL_ONE),
2297	const_iv (GL_ZERO),	2423	const_iv (GL_ZERO),
2298	const_iv (GL_SRC_ALPHA),	2424	const_iv (GL_SRC_ALPHA),
2299	const_iv (GL_DST_ALPHA),	2425	const_iv (GL_DST_ALPHA),
…		…
2345	const_iv (GL_COLOR_LOGIC_OP),	2471	const_iv (GL_COLOR_LOGIC_OP),
2346	const_iv (GL_SEPARABLE_2D),	2472	const_iv (GL_SEPARABLE_2D),
2347	const_iv (GL_CONVOLUTION_2D),	2473	const_iv (GL_CONVOLUTION_2D),
2348	const_iv (GL_CONVOLUTION_BORDER_MODE),	2474	const_iv (GL_CONVOLUTION_BORDER_MODE),
2349	const_iv (GL_CONSTANT_BORDER),	2475	const_iv (GL_CONSTANT_BORDER),
		2476	const_iv (GL_POINTS),
2350	const_iv (GL_LINES),	2477	const_iv (GL_LINES),
2351	const_iv (GL_LINE_STRIP),	2478	const_iv (GL_LINE_STRIP),
2352	const_iv (GL_LINE_LOOP),	2479	const_iv (GL_LINE_LOOP),
2353	const_iv (GL_QUADS),	2480	const_iv (GL_QUADS),
2354	const_iv (GL_QUAD_STRIP),	2481	const_iv (GL_QUAD_STRIP),
2355	const_iv (GL_TRIANGLES),	2482	const_iv (GL_TRIANGLES),
2356	const_iv (GL_TRIANGLE_STRIP),	2483	const_iv (GL_TRIANGLE_STRIP),
2357	const_iv (GL_TRIANGLE_FAN),	2484	const_iv (GL_TRIANGLE_FAN),
		2485	const_iv (GL_POLYGON),
2358	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2486	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2487	const_iv (GL_POINT_SMOOTH_HINT),
		2488	const_iv (GL_LINE_SMOOTH_HINT),
		2489	const_iv (GL_POLYGON_SMOOTH_HINT),
		2490	const_iv (GL_GENERATE_MIPMAP_HINT),
2359	const_iv (GL_FASTEST),	2491	const_iv (GL_FASTEST),
		2492	const_iv (GL_DONT_CARE),
		2493	const_iv (GL_NICEST),
2360	const_iv (GL_V2F),	2494	const_iv (GL_V2F),
2361	const_iv (GL_V3F),	2495	const_iv (GL_V3F),
2362	const_iv (GL_T2F_V3F),	2496	const_iv (GL_T2F_V3F),
2363	const_iv (GL_T2F_N3F_V3F),	2497	const_iv (GL_T2F_N3F_V3F),
2364	# undef const_iv	2498	# undef const_iv
…		…
2451	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2585	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2452		2586
2453	# near_ and far_ are due to microsofts buggy "c" compiler	2587	# near_ and far_ are due to microsofts buggy "c" compiler
2454	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2588	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2455		2589
		2590	PROTOTYPES: DISABLE
		2591
2456	void glViewport (int x, int y, int width, int height)	2592	void glViewport (int x, int y, int width, int height)
2457		2593
2458	void glScissor (int x, int y, int width, int height)	2594	void glScissor (int x, int y, int width, int height)
2459		2595
2460	void glTranslate (float x, float y, float z = 0.)	2596	void glTranslate (float x, float y, float z = 0.)
…		…
2467		2603
2468	void glRotate (float angle, float x, float y, float z)	2604	void glRotate (float angle, float x, float y, float z)
2469	CODE:	2605	CODE:
2470	glRotatef (angle, x, y, z);	2606	glRotatef (angle, x, y, z);
2471		2607
2472	void glBegin (int mode)
2473
2474	void glEnd ()
2475
2476	void glColor (float r, float g, float b, float a = 1.0)	2608	void glColor (float r, float g, float b, float a = 1.0)
2477	PROTOTYPE: @
2478	ALIAS:	2609	ALIAS:
2479	glColor_premultiply = 1	2610	glColor_premultiply = 1
2480	CODE:	2611	CODE:
2481	if (ix)	2612	if (ix)
2482	{	2613	{
…		…
2485	b *= a;	2616	b *= a;
2486	}	2617	}
2487	// microsoft visual "c" rounds instead of truncating...	2618	// microsoft visual "c" rounds instead of truncating...
2488	glColor4f (r, g, b, a);	2619	glColor4f (r, g, b, a);
2489		2620
2490	void glInterleavedArrays (int format, int stride, char *data)
2491
2492	void glDrawElements (int mode, int count, int type, char *indices)
2493
2494	# 1.2 void glDrawRangeElements (int mode, int start, int end
2495
2496	void glRasterPos (float x, float y, float z = 0.)	2621	void glRasterPos (float x, float y, float z = 0.)
2497	CODE:	2622	CODE:
2498	glRasterPos3f (0, 0, z);	2623	glRasterPos3f (0, 0, z);
2499	glBitmap (0, 0, 0, 0, x, y, 0);	2624	glBitmap (0, 0, 0, 0, x, y, 0);
2500		2625
…		…
2504		2629
2505	void glTexCoord (float s, float t)	2630	void glTexCoord (float s, float t)
2506	CODE:	2631	CODE:
2507	glTexCoord2f (s, t);	2632	glTexCoord2f (s, t);
2508		2633
		2634	void glRect (float x1, float y1, float x2, float y2)
		2635	CODE:
		2636	glRectf (x1, y1, x2, y2);
		2637
		2638	PROTOTYPES: ENABLE
		2639
		2640	void glBegin (int mode)
		2641
		2642	void glEnd ()
		2643
		2644	void glPointSize (GLfloat size)
		2645
		2646	void glLineWidth (GLfloat width)
		2647
		2648	void glInterleavedArrays (int format, int stride, char *data)
		2649
		2650	void glDrawElements (int mode, int count, int type, char *indices)
		2651
		2652	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2653
2509	void glTexEnv (int target, int pname, float param)	2654	void glTexEnv (int target, int pname, float param)
2510	CODE:	2655	CODE:
2511	glTexEnvf (target, pname, param);	2656	glTexEnvf (target, pname, param);
2512		2657
2513	void glTexParameter (int target, int pname, float param)	2658	void glTexParameter (int target, int pname, float param)
…		…
2565		2710
2566	void glEndList ()	2711	void glEndList ()
2567		2712
2568	void glCallList (int list)	2713	void glCallList (int list)
2569		2714
		2715	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
		2716
		2717	PROTOTYPES: DISABLE
		2718
		2719	void
		2720	find_widget (SV *self, NV x, NV y)
		2721	PPCODE:
		2722	{
		2723	if (within_widget (self, x, y))
		2724	XPUSHs (self);
		2725	}
		2726
		2727	BOOT:
		2728	{
		2729	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2730
		2731	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2732	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2733	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2734	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2735	}
		2736
		2737	void
		2738	draw (SV *self)
		2739	CODE:
		2740	{
		2741	HV *hv;
		2742	SV **svp;
		2743	NV x, y, w, h;
		2744	SV *draw_x_sv = GvSV (draw_x_gv);
		2745	SV *draw_y_sv = GvSV (draw_y_gv);
		2746	SV *draw_w_sv = GvSV (draw_w_gv);
		2747	SV *draw_h_sv = GvSV (draw_h_gv);
		2748	SV *hover;
		2749	double draw_x, draw_y, draw_w, draw_h;
		2750
		2751	if (!SvROK (self))
		2752	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2753
		2754	hv = (HV *)SvRV (self);
		2755
		2756	if (SvTYPE (hv) != SVt_PVHV)
		2757	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2758
		2759	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2760	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2761
		2762	if (!h \|\| !w)
		2763	XSRETURN_EMPTY;
		2764
		2765	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2766	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2767
		2768	draw_x = SvNV (draw_x_sv) + x;
		2769	draw_y = SvNV (draw_y_sv) + y;
		2770
		2771	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2772	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2773	XSRETURN_EMPTY;
		2774
		2775	sv_setnv (draw_x_sv, draw_x);
		2776	sv_setnv (draw_y_sv, draw_y);
		2777
		2778	glPushMatrix ();
		2779	glTranslated (x, y, 0);
		2780
		2781	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2782	{
		2783	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2784
		2785	if (svp && SvTRUE (*svp))
		2786	{
		2787	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2788	glEnable (GL_BLEND);
		2789	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2790	glBegin (GL_QUADS);
		2791	glVertex2f (0, 0);
		2792	glVertex2f (w, 0);
		2793	glVertex2f (w, h);
		2794	glVertex2f (0, h);
		2795	glEnd ();
		2796	glDisable (GL_BLEND);
		2797	}
		2798	}
		2799	#if 0
		2800	if ($ENV{CFPLUS_DEBUG} & 1) {
		2801	glPushMatrix;
		2802	glColor 1, 1, 0, 1;
		2803	glTranslate 0.375, 0.375;
		2804	glBegin GL_LINE_LOOP;
		2805	glVertex 0 , 0;
		2806	glVertex $self->{w} - 1, 0;
		2807	glVertex $self->{w} - 1, $self->{h} - 1;
		2808	glVertex 0 , $self->{h} - 1;
		2809	glEnd;
		2810	glPopMatrix;
		2811	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2812	}
		2813	#endif
		2814	PUSHMARK (SP);
		2815	XPUSHs (self);
		2816	PUTBACK;
		2817	call_method ("_draw", G_VOID \| G_DISCARD);
		2818	SPAGAIN;
		2819
		2820	glPopMatrix ();
		2821
		2822	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2823	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2824	}
		2825

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.205 by root, Thu Jul 19 22:38:52 2007 UTC vs. Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.205 by root, Thu Jul 19 22:38:52 2007 UTC vs.
Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC