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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC vs.
Revision 1.211 by root, Sat Jul 28 00:45:28 2007 UTC

…		…
432	}	432	}
433		433
434	/* SDL should provide this, really. */	434	/* SDL should provide this, really. */
435	#define SDLK_MODIFIER_MIN 300	435	#define SDLK_MODIFIER_MIN 300
436	#define SDLK_MODIFIER_MAX 314	436	#define SDLK_MODIFIER_MAX 314
		437
		438	/******************************************************************************/
		439
		440	static GV draw_x_gv, draw_y_gv, draw_w_gv, draw_h_gv;
		441	static GV *hover_gv;
		442
		443	static int
		444	within_widget (SV *widget, NV x, NV y)
		445	{
		446	HV *self;
		447	SV **svp;
		448	NV wx, ww, wy, wh;
		449
		450	if (!SvROK (widget))
		451	return 0;
		452
		453	self = (HV *)SvRV (widget);
		454
		455	if (SvTYPE (self) != SVt_PVHV)
		456	return 0;
		457
		458	svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
		459	if (y < wy)
		460	return 0;
		461
		462	svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
		463	if (y >= wy + wh)
		464	return 0;
		465
		466	svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
		467	if (x < wx)
		468	return 0;
		469
		470	svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
		471	if (x >= wx + ww)
		472	return 0;
		473
		474	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
		475	if (!svp \|\| !SvTRUE (*svp))
		476	return 0;
		477
		478	return 1;
		479	}
437		480
438	MODULE = CFPlus PACKAGE = CFPlus	481	MODULE = CFPlus PACKAGE = CFPlus
439		482
440	PROTOTYPES: ENABLE	483	PROTOTYPES: ENABLE
441		484
…		…
757	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	800	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
758	}	801	}
759	}	802	}
760		803
761	int	804	int
762	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	805	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763	POSTCALL:	806	POSTCALL:
764	Mix_HookMusicFinished (music_finished);	807	Mix_HookMusicFinished (music_finished);
765	Mix_ChannelFinished (channel_finished);	808	Mix_ChannelFinished (channel_finished);
766		809
767	void	810	void
…		…
933	#endif	976	#endif
934	}	977	}
935		978
936	MODULE = CFPlus PACKAGE = CFPlus::Font	979	MODULE = CFPlus PACKAGE = CFPlus::Font
937		980
		981	PROTOTYPES: DISABLE
		982
938	CFPlus::Font	983	CFPlus::Font
939	new_from_file (SV class, char path, int id = 0)	984	new_from_file (SV class, char path, int id = 0)
940	CODE:	985	CODE:
941	{	986	{
942	int count;	987	int count;
…		…
952	CODE:	997	CODE:
953	pango_font_description_free (self);	998	pango_font_description_free (self);
954		999
955	void	1000	void
956	make_default (CFPlus::Font self)	1001	make_default (CFPlus::Font self)
		1002	PROTOTYPE: $
957	CODE:	1003	CODE:
958	default_font = self;	1004	default_font = self;
959		1005
960	MODULE = CFPlus PACKAGE = CFPlus::Layout	1006	MODULE = CFPlus PACKAGE = CFPlus::Layout
961		1007
		1008	PROTOTYPES: DISABLE
		1009
962	void	1010	void
963	reset_glyph_cache ()	1011	reset_glyph_cache ()
		1012	PROTOTYPE:
964	CODE:	1013	CODE:
965	tc_clear ();	1014	tc_clear ();
966		1015
967	CFPlus::Layout	1016	CFPlus::Layout
968	new (SV *class)	1017	new (SV *class)
…		…
1255	flags	1304	flags
1256	);	1305	);
1257		1306
1258	MODULE = CFPlus PACKAGE = CFPlus::Texture	1307	MODULE = CFPlus PACKAGE = CFPlus::Texture
1259		1308
		1309	PROTOTYPES: ENABLE
		1310
1260	int minpot (int n)	1311	int minpot (int n)
1261		1312
1262	void	1313	void
1263	pad (SV *data_, int ow, int oh, int nw, int nh)	1314	pad (SV *data_, int ow, int oh, int nw, int nh)
1264	CODE:	1315	CODE:
…		…
1340	}	1391	}
1341	OUTPUT:	1392	OUTPUT:
1342	RETVAL	1393	RETVAL
1343		1394
1344	MODULE = CFPlus PACKAGE = CFPlus::Map	1395	MODULE = CFPlus PACKAGE = CFPlus::Map
		1396
		1397	PROTOTYPES: DISABLE
1345		1398
1346	CFPlus::Map	1399	CFPlus::Map
1347	new (SV *class)	1400	new (SV *class)
1348	CODE:	1401	CODE:
1349	New (0, RETVAL, 1, struct map);	1402	New (0, RETVAL, 1, struct map);
…		…
2181	}	2234	}
2182	}	2235	}
2183		2236
2184	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2237	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2185		2238
		2239	PROTOTYPES: DISABLE
		2240
		2241	CFPlus::MixChunk
		2242	new (SV class, SV data_sv)
		2243	CODE:
		2244	{
		2245	STRLEN datalen;
		2246	char *data = SvPVbyte (data_sv, datalen);
		2247
		2248	RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1);
		2249	}
		2250	OUTPUT:
		2251	RETVAL
		2252
2186	CFPlus::MixChunk	2253	CFPlus::MixChunk
2187	new_from_file (SV class, char path)	2254	new_from_file (SV class, char path)
2188	CODE:	2255	CODE:
2189	RETVAL = Mix_LoadWAV (path);	2256	RETVAL = Mix_LoadWAV (path);
2190	OUTPUT:	2257	OUTPUT:
…		…
2211		2278
2212	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2279	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2213		2280
2214	int	2281	int
2215	volume (int volume = -1)	2282	volume (int volume = -1)
		2283	PROTOTYPE: ;$
2216	CODE:	2284	CODE:
2217	RETVAL = Mix_VolumeMusic (volume);	2285	RETVAL = Mix_VolumeMusic (volume);
2218	OUTPUT:	2286	OUTPUT:
2219	RETVAL	2287	RETVAL
2220		2288
…		…
2250	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2318	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2251	OUTPUT:	2319	OUTPUT:
2252	RETVAL	2320	RETVAL
2253		2321
2254	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2322	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2323
		2324	PROTOTYPES: ENABLE
2255		2325
2256	BOOT:	2326	BOOT:
2257	{	2327	{
2258	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2328	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2259	static const struct {	2329	static const struct {
…		…
2275	const_iv (GL_ALPHA_TEST),	2345	const_iv (GL_ALPHA_TEST),
2276	const_iv (GL_NORMALIZE),	2346	const_iv (GL_NORMALIZE),
2277	const_iv (GL_RESCALE_NORMAL),	2347	const_iv (GL_RESCALE_NORMAL),
2278	const_iv (GL_FRONT),	2348	const_iv (GL_FRONT),
2279	const_iv (GL_BACK),	2349	const_iv (GL_BACK),
		2350	const_iv (GL_AUX0),
2280	const_iv (GL_AND),	2351	const_iv (GL_AND),
2281	const_iv (GL_ONE),	2352	const_iv (GL_ONE),
2282	const_iv (GL_ZERO),	2353	const_iv (GL_ZERO),
2283	const_iv (GL_SRC_ALPHA),	2354	const_iv (GL_SRC_ALPHA),
2284	const_iv (GL_DST_ALPHA),	2355	const_iv (GL_DST_ALPHA),
…		…
2330	const_iv (GL_COLOR_LOGIC_OP),	2401	const_iv (GL_COLOR_LOGIC_OP),
2331	const_iv (GL_SEPARABLE_2D),	2402	const_iv (GL_SEPARABLE_2D),
2332	const_iv (GL_CONVOLUTION_2D),	2403	const_iv (GL_CONVOLUTION_2D),
2333	const_iv (GL_CONVOLUTION_BORDER_MODE),	2404	const_iv (GL_CONVOLUTION_BORDER_MODE),
2334	const_iv (GL_CONSTANT_BORDER),	2405	const_iv (GL_CONSTANT_BORDER),
		2406	const_iv (GL_POINTS),
2335	const_iv (GL_LINES),	2407	const_iv (GL_LINES),
2336	const_iv (GL_LINE_STRIP),	2408	const_iv (GL_LINE_STRIP),
2337	const_iv (GL_LINE_LOOP),	2409	const_iv (GL_LINE_LOOP),
2338	const_iv (GL_QUADS),	2410	const_iv (GL_QUADS),
2339	const_iv (GL_QUAD_STRIP),	2411	const_iv (GL_QUAD_STRIP),
2340	const_iv (GL_TRIANGLES),	2412	const_iv (GL_TRIANGLES),
2341	const_iv (GL_TRIANGLE_STRIP),	2413	const_iv (GL_TRIANGLE_STRIP),
2342	const_iv (GL_TRIANGLE_FAN),	2414	const_iv (GL_TRIANGLE_FAN),
		2415	const_iv (GL_POLYGON),
2343	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2416	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2417	const_iv (GL_POINT_SMOOTH_HINT),
		2418	const_iv (GL_LINE_SMOOTH_HINT),
		2419	const_iv (GL_POLYGON_SMOOTH_HINT),
		2420	const_iv (GL_GENERATE_MIPMAP_HINT),
2344	const_iv (GL_FASTEST),	2421	const_iv (GL_FASTEST),
		2422	const_iv (GL_DONT_CARE),
		2423	const_iv (GL_NICEST),
2345	const_iv (GL_V2F),	2424	const_iv (GL_V2F),
2346	const_iv (GL_V3F),	2425	const_iv (GL_V3F),
2347	const_iv (GL_T2F_V3F),	2426	const_iv (GL_T2F_V3F),
2348	const_iv (GL_T2F_N3F_V3F),	2427	const_iv (GL_T2F_N3F_V3F),
2349	# undef const_iv	2428	# undef const_iv
…		…
2436	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2515	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2437		2516
2438	# near_ and far_ are due to microsofts buggy "c" compiler	2517	# near_ and far_ are due to microsofts buggy "c" compiler
2439	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2518	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2440		2519
		2520	PROTOTYPES: DISABLE
		2521
2441	void glViewport (int x, int y, int width, int height)	2522	void glViewport (int x, int y, int width, int height)
2442		2523
2443	void glScissor (int x, int y, int width, int height)	2524	void glScissor (int x, int y, int width, int height)
2444		2525
2445	void glTranslate (float x, float y, float z = 0.)	2526	void glTranslate (float x, float y, float z = 0.)
…		…
2452		2533
2453	void glRotate (float angle, float x, float y, float z)	2534	void glRotate (float angle, float x, float y, float z)
2454	CODE:	2535	CODE:
2455	glRotatef (angle, x, y, z);	2536	glRotatef (angle, x, y, z);
2456		2537
2457	void glBegin (int mode)
2458
2459	void glEnd ()
2460
2461	void glColor (float r, float g, float b, float a = 1.0)	2538	void glColor (float r, float g, float b, float a = 1.0)
2462	PROTOTYPE: @
2463	ALIAS:	2539	ALIAS:
2464	glColor_premultiply = 1	2540	glColor_premultiply = 1
2465	CODE:	2541	CODE:
2466	if (ix)	2542	if (ix)
2467	{	2543	{
…		…
2470	b *= a;	2546	b *= a;
2471	}	2547	}
2472	// microsoft visual "c" rounds instead of truncating...	2548	// microsoft visual "c" rounds instead of truncating...
2473	glColor4f (r, g, b, a);	2549	glColor4f (r, g, b, a);
2474		2550
2475	void glInterleavedArrays (int format, int stride, char *data)
2476
2477	void glDrawElements (int mode, int count, int type, char *indices)
2478
2479	# 1.2 void glDrawRangeElements (int mode, int start, int end
2480
2481	void glRasterPos (float x, float y, float z = 0.)	2551	void glRasterPos (float x, float y, float z = 0.)
2482	CODE:	2552	CODE:
2483	glRasterPos3f (0, 0, z);	2553	glRasterPos3f (0, 0, z);
2484	glBitmap (0, 0, 0, 0, x, y, 0);	2554	glBitmap (0, 0, 0, 0, x, y, 0);
2485		2555
…		…
2489		2559
2490	void glTexCoord (float s, float t)	2560	void glTexCoord (float s, float t)
2491	CODE:	2561	CODE:
2492	glTexCoord2f (s, t);	2562	glTexCoord2f (s, t);
2493		2563
		2564	void glRect (float x1, float y1, float x2, float y2)
		2565	CODE:
		2566	glRectf (x1, y1, x2, y2);
		2567
		2568	PROTOTYPES: ENABLE
		2569
		2570	void glBegin (int mode)
		2571
		2572	void glEnd ()
		2573
		2574	void glPointSize (GLfloat size)
		2575
		2576	void glLineWidth (GLfloat width)
		2577
		2578	void glInterleavedArrays (int format, int stride, char *data)
		2579
		2580	void glDrawElements (int mode, int count, int type, char *indices)
		2581
		2582	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2583
2494	void glTexEnv (int target, int pname, float param)	2584	void glTexEnv (int target, int pname, float param)
2495	CODE:	2585	CODE:
2496	glTexEnvf (target, pname, param);	2586	glTexEnvf (target, pname, param);
2497		2587
2498	void glTexParameter (int target, int pname, float param)	2588	void glTexParameter (int target, int pname, float param)
…		…
2550		2640
2551	void glEndList ()	2641	void glEndList ()
2552		2642
2553	void glCallList (int list)	2643	void glCallList (int list)
2554		2644
		2645	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
		2646
		2647	PROTOTYPES: DISABLE
		2648
		2649	void
		2650	find_widget (SV *self, NV x, NV y)
		2651	PPCODE:
		2652	{
		2653	if (within_widget (self, x, y))
		2654	XPUSHs (self);
		2655	}
		2656
		2657	BOOT:
		2658	{
		2659	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2660
		2661	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2662	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2663	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2664	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2665	}
		2666
		2667	void
		2668	draw (SV *self)
		2669	CODE:
		2670	{
		2671	HV *hv;
		2672	SV **svp;
		2673	NV x, y, w, h;
		2674	SV *draw_x_sv = GvSV (draw_x_gv);
		2675	SV *draw_y_sv = GvSV (draw_y_gv);
		2676	SV *draw_w_sv = GvSV (draw_w_gv);
		2677	SV *draw_h_sv = GvSV (draw_h_gv);
		2678	SV *hover;
		2679	double draw_x, draw_y, draw_w, draw_h;
		2680
		2681	if (!SvROK (self))
		2682	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2683
		2684	hv = (HV *)SvRV (self);
		2685
		2686	if (SvTYPE (hv) != SVt_PVHV)
		2687	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2688
		2689	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2690	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2691
		2692	if (!h \|\| !w)
		2693	XSRETURN_EMPTY;
		2694
		2695	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2696	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2697
		2698	draw_x = SvNV (draw_x_sv) + x;
		2699	draw_y = SvNV (draw_y_sv) + y;
		2700
		2701	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2702	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2703	XSRETURN_EMPTY;
		2704
		2705	sv_setnv (draw_x_sv, draw_x);
		2706	sv_setnv (draw_y_sv, draw_y);
		2707
		2708	glPushMatrix ();
		2709	glTranslated (x, y, 0);
		2710
		2711	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2712	{
		2713	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2714
		2715	if (svp && SvTRUE (*svp))
		2716	{
		2717	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2718	glEnable (GL_BLEND);
		2719	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2720	glBegin (GL_QUADS);
		2721	glVertex2f (0, 0);
		2722	glVertex2f (w, 0);
		2723	glVertex2f (w, h);
		2724	glVertex2f (0, h);
		2725	glEnd ();
		2726	glDisable (GL_BLEND);
		2727	}
		2728	}
		2729	#if 0
		2730	if ($ENV{CFPLUS_DEBUG} & 1) {
		2731	glPushMatrix;
		2732	glColor 1, 1, 0, 1;
		2733	glTranslate 0.375, 0.375;
		2734	glBegin GL_LINE_LOOP;
		2735	glVertex 0 , 0;
		2736	glVertex $self->{w} - 1, 0;
		2737	glVertex $self->{w} - 1, $self->{h} - 1;
		2738	glVertex 0 , $self->{h} - 1;
		2739	glEnd;
		2740	glPopMatrix;
		2741	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2742	}
		2743	#endif
		2744	PUSHMARK (SP);
		2745	XPUSHs (self);
		2746	PUTBACK;
		2747	call_method ("_draw", G_VOID \| G_DISCARD);
		2748	SPAGAIN;
		2749
		2750	glPopMatrix ();
		2751
		2752	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2753	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2754	}
		2755

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC vs. Revision 1.211 by root, Sat Jul 28 00:45:28 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC vs.
Revision 1.211 by root, Sat Jul 28 00:45:28 2007 UTC