[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.210 by root, Tue Jul 24 18:24:03 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
…		…
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
2186	CFPlus::MixChunk	2241	CFPlus::MixChunk
2187	new_from_file (SV class, char path)	2242	new_from_file (SV class, char path)
2188	CODE:	2243	CODE:
2189	RETVAL = Mix_LoadWAV (path);	2244	RETVAL = Mix_LoadWAV (path);
2190	OUTPUT:	2245	OUTPUT:
…		…
2211		2266
2212	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2267	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2213		2268
2214	int	2269	int
2215	volume (int volume = -1)	2270	volume (int volume = -1)
		2271	PROTOTYPE: ;$
2216	CODE:	2272	CODE:
2217	RETVAL = Mix_VolumeMusic (volume);	2273	RETVAL = Mix_VolumeMusic (volume);
2218	OUTPUT:	2274	OUTPUT:
2219	RETVAL	2275	RETVAL
2220		2276
…		…
2250	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2306	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2251	OUTPUT:	2307	OUTPUT:
2252	RETVAL	2308	RETVAL
2253		2309
2254	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2310	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2311
		2312	PROTOTYPES: ENABLE
2255		2313
2256	BOOT:	2314	BOOT:
2257	{	2315	{
2258	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2316	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2259	static const struct {	2317	static const struct {
…		…
2275	const_iv (GL_ALPHA_TEST),	2333	const_iv (GL_ALPHA_TEST),
2276	const_iv (GL_NORMALIZE),	2334	const_iv (GL_NORMALIZE),
2277	const_iv (GL_RESCALE_NORMAL),	2335	const_iv (GL_RESCALE_NORMAL),
2278	const_iv (GL_FRONT),	2336	const_iv (GL_FRONT),
2279	const_iv (GL_BACK),	2337	const_iv (GL_BACK),
		2338	const_iv (GL_AUX0),
2280	const_iv (GL_AND),	2339	const_iv (GL_AND),
2281	const_iv (GL_ONE),	2340	const_iv (GL_ONE),
2282	const_iv (GL_ZERO),	2341	const_iv (GL_ZERO),
2283	const_iv (GL_SRC_ALPHA),	2342	const_iv (GL_SRC_ALPHA),
2284	const_iv (GL_DST_ALPHA),	2343	const_iv (GL_DST_ALPHA),
…		…
2330	const_iv (GL_COLOR_LOGIC_OP),	2389	const_iv (GL_COLOR_LOGIC_OP),
2331	const_iv (GL_SEPARABLE_2D),	2390	const_iv (GL_SEPARABLE_2D),
2332	const_iv (GL_CONVOLUTION_2D),	2391	const_iv (GL_CONVOLUTION_2D),
2333	const_iv (GL_CONVOLUTION_BORDER_MODE),	2392	const_iv (GL_CONVOLUTION_BORDER_MODE),
2334	const_iv (GL_CONSTANT_BORDER),	2393	const_iv (GL_CONSTANT_BORDER),
		2394	const_iv (GL_POINTS),
2335	const_iv (GL_LINES),	2395	const_iv (GL_LINES),
2336	const_iv (GL_LINE_STRIP),	2396	const_iv (GL_LINE_STRIP),
2337	const_iv (GL_LINE_LOOP),	2397	const_iv (GL_LINE_LOOP),
2338	const_iv (GL_QUADS),	2398	const_iv (GL_QUADS),
2339	const_iv (GL_QUAD_STRIP),	2399	const_iv (GL_QUAD_STRIP),
2340	const_iv (GL_TRIANGLES),	2400	const_iv (GL_TRIANGLES),
2341	const_iv (GL_TRIANGLE_STRIP),	2401	const_iv (GL_TRIANGLE_STRIP),
2342	const_iv (GL_TRIANGLE_FAN),	2402	const_iv (GL_TRIANGLE_FAN),
		2403	const_iv (GL_POLYGON),
2343	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2404	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2405	const_iv (GL_POINT_SMOOTH_HINT),
		2406	const_iv (GL_LINE_SMOOTH_HINT),
		2407	const_iv (GL_POLYGON_SMOOTH_HINT),
		2408	const_iv (GL_GENERATE_MIPMAP_HINT),
2344	const_iv (GL_FASTEST),	2409	const_iv (GL_FASTEST),
		2410	const_iv (GL_DONT_CARE),
		2411	const_iv (GL_NICEST),
2345	const_iv (GL_V2F),	2412	const_iv (GL_V2F),
2346	const_iv (GL_V3F),	2413	const_iv (GL_V3F),
2347	const_iv (GL_T2F_V3F),	2414	const_iv (GL_T2F_V3F),
2348	const_iv (GL_T2F_N3F_V3F),	2415	const_iv (GL_T2F_N3F_V3F),
2349	# undef const_iv	2416	# undef const_iv
…		…
2436	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2503	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2437		2504
2438	# near_ and far_ are due to microsofts buggy "c" compiler	2505	# 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_)	2506	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2440		2507
		2508	PROTOTYPES: DISABLE
		2509
2441	void glViewport (int x, int y, int width, int height)	2510	void glViewport (int x, int y, int width, int height)
2442		2511
2443	void glScissor (int x, int y, int width, int height)	2512	void glScissor (int x, int y, int width, int height)
2444		2513
2445	void glTranslate (float x, float y, float z = 0.)	2514	void glTranslate (float x, float y, float z = 0.)
…		…
2452		2521
2453	void glRotate (float angle, float x, float y, float z)	2522	void glRotate (float angle, float x, float y, float z)
2454	CODE:	2523	CODE:
2455	glRotatef (angle, x, y, z);	2524	glRotatef (angle, x, y, z);
2456		2525
2457	void glBegin (int mode)
2458
2459	void glEnd ()
2460
2461	void glColor (float r, float g, float b, float a = 1.0)	2526	void glColor (float r, float g, float b, float a = 1.0)
2462	PROTOTYPE: @
2463	ALIAS:	2527	ALIAS:
2464	glColor_premultiply = 1	2528	glColor_premultiply = 1
2465	CODE:	2529	CODE:
2466	if (ix)	2530	if (ix)
2467	{	2531	{
…		…
2470	b *= a;	2534	b *= a;
2471	}	2535	}
2472	// microsoft visual "c" rounds instead of truncating...	2536	// microsoft visual "c" rounds instead of truncating...
2473	glColor4f (r, g, b, a);	2537	glColor4f (r, g, b, a);
2474		2538
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.)	2539	void glRasterPos (float x, float y, float z = 0.)
2482	CODE:	2540	CODE:
2483	glRasterPos3f (0, 0, z);	2541	glRasterPos3f (0, 0, z);
2484	glBitmap (0, 0, 0, 0, x, y, 0);	2542	glBitmap (0, 0, 0, 0, x, y, 0);
2485		2543
…		…
2488	glVertex3f (x, y, z);	2546	glVertex3f (x, y, z);
2489		2547
2490	void glTexCoord (float s, float t)	2548	void glTexCoord (float s, float t)
2491	CODE:	2549	CODE:
2492	glTexCoord2f (s, t);	2550	glTexCoord2f (s, t);
		2551
		2552	void glRect (float x1, float y1, float x2, float y2)
		2553	CODE:
		2554	glRectf (x1, y1, x2, y2);
		2555
		2556	PROTOTYPES: ENABLE
		2557
		2558	void glBegin (int mode)
		2559
		2560	void glEnd ()
		2561
		2562	void glPointSize (GLfloat size)
		2563
		2564	void glLineWidth (GLfloat width)
		2565
		2566	void glInterleavedArrays (int format, int stride, char *data)
		2567
		2568	void glDrawElements (int mode, int count, int type, char *indices)
		2569
		2570	# 1.2 void glDrawRangeElements (int mode, int start, int end
2493		2571
2494	void glTexEnv (int target, int pname, float param)	2572	void glTexEnv (int target, int pname, float param)
2495	CODE:	2573	CODE:
2496	glTexEnvf (target, pname, param);	2574	glTexEnvf (target, pname, param);
2497		2575
…		…
2550		2628
2551	void glEndList ()	2629	void glEndList ()
2552		2630
2553	void glCallList (int list)	2631	void glCallList (int list)
2554		2632
		2633	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
		2634
		2635	PROTOTYPES: DISABLE
		2636
		2637	void
		2638	find_widget (SV *self, NV x, NV y)
		2639	PPCODE:
		2640	{
		2641	if (within_widget (self, x, y))
		2642	XPUSHs (self);
		2643	}
		2644
		2645	BOOT:
		2646	{
		2647	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2648
		2649	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2650	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2651	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2652	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2653	}
		2654
		2655	void
		2656	draw (SV *self)
		2657	CODE:
		2658	{
		2659	HV *hv;
		2660	SV **svp;
		2661	NV x, y, w, h;
		2662	SV *draw_x_sv = GvSV (draw_x_gv);
		2663	SV *draw_y_sv = GvSV (draw_y_gv);
		2664	SV *draw_w_sv = GvSV (draw_w_gv);
		2665	SV *draw_h_sv = GvSV (draw_h_gv);
		2666	SV *hover;
		2667	double draw_x, draw_y, draw_w, draw_h;
		2668
		2669	if (!SvROK (self))
		2670	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2671
		2672	hv = (HV *)SvRV (self);
		2673
		2674	if (SvTYPE (hv) != SVt_PVHV)
		2675	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2676
		2677	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2678	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2679
		2680	if (!h \|\| !w)
		2681	XSRETURN_EMPTY;
		2682
		2683	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2684	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2685
		2686	draw_x = SvNV (draw_x_sv) + x;
		2687	draw_y = SvNV (draw_y_sv) + y;
		2688
		2689	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2690	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2691	XSRETURN_EMPTY;
		2692
		2693	sv_setnv (draw_x_sv, draw_x);
		2694	sv_setnv (draw_y_sv, draw_y);
		2695
		2696	glPushMatrix ();
		2697	glTranslated (x, y, 0);
		2698
		2699	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2700	{
		2701	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2702
		2703	if (svp && SvTRUE (*svp))
		2704	{
		2705	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2706	glEnable (GL_BLEND);
		2707	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2708	glBegin (GL_QUADS);
		2709	glVertex2f (0, 0);
		2710	glVertex2f (w, 0);
		2711	glVertex2f (w, h);
		2712	glVertex2f (0, h);
		2713	glEnd ();
		2714	glDisable (GL_BLEND);
		2715	}
		2716	}
		2717	#if 0
		2718	if ($ENV{CFPLUS_DEBUG} & 1) {
		2719	glPushMatrix;
		2720	glColor 1, 1, 0, 1;
		2721	glTranslate 0.375, 0.375;
		2722	glBegin GL_LINE_LOOP;
		2723	glVertex 0 , 0;
		2724	glVertex $self->{w} - 1, 0;
		2725	glVertex $self->{w} - 1, $self->{h} - 1;
		2726	glVertex 0 , $self->{h} - 1;
		2727	glEnd;
		2728	glPopMatrix;
		2729	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2730	}
		2731	#endif
		2732	PUSHMARK (SP);
		2733	XPUSHs (self);
		2734	PUTBACK;
		2735	call_method ("_draw", G_VOID \| G_DISCARD);
		2736	SPAGAIN;
		2737
		2738	glPopMatrix ();
		2739
		2740	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2741	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2742	}
		2743

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.210 by root, Tue Jul 24 18:24:03 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.210 by root, Tue Jul 24 18:24:03 2007 UTC