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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
11		16
12	#include <SDL.h>	17	#include <SDL.h>
		18	#include <SDL_endian.h>
13	#include <SDL_image.h>	19	#include <SDL_image.h>
14	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
16		22
17	#include <glib/gmacros.h>	23	#include <glib/gmacros.h>
18		24
19	#include <pango/pango.h>	25	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	26	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	27	#include <pango/pangoft2.h>
		28	#include <pango/pangocairo.h>
22		29
23	#ifndef _WIN32	30	#ifndef _WIN32
24	# include <sys/types.h>	31	# include <sys/types.h>
25	# include <sys/socket.h>	32	# include <sys/socket.h>
26	# include <netinet/in.h>	33	# include <netinet/in.h>
42	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
44		51
45	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
46		53
47	#define GL_CALL(type,func,args) \	54	static struct
48	{ \	55	{
49	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
50	static type fptr_; \	57	#include "glfunc.h"
51	\	58	#undef GL_FUNC
52	if (!init_) \	59	} gl;
53	{ \	60
54	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
56	} \	63	if (gl.BlendFuncSeparate)
57	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
58	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
59	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
60	}	67	else
		68	glBlendFunc (sa, da);
		69	}
61		70
62	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
64		73
65	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
66		75
67	typedef struct cf_layout {	76	typedef struct cf_layout {
68	PangoLayout *pl;	77	PangoLayout *pl; // either derived from a cairo or ft2 context
		78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		79	float r, g, b, a; // default color for rgba mode
69	int base_height;	80	int base_height;
70	CFClient__Font font;	81	CFClient__Font font;
71	} *CFClient__Layout;	82	} *CFClient__Layout;
72		83
73	static CFClient__Font default_font;	84	static CFClient__Font default_font;
74	static PangoContext *context;	85	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		87
77	static void	88	static void
78	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
79	{	90	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
		95	#ifdef _WIN32
		96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		99	#endif
82	}	100	}
83		101
84	static void	102	static void
85	layout_update_font (CFClient__Layout self)	103	layout_update_font (CFClient__Layout self)
86	{	104	{
…		…
98	static void	116	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	117	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	118	{
101	pango_layout_get_pixel_size (self->pl, w, h);	119	pango_layout_get_pixel_size (self->pl, w, h);
102		120
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	121	if (!w) w = 1;
105	if (!h) h = 1;	122	if (!h) h = 1;
		123
		124	w = (w + 3) & ~3;
106	}	125	}
107		126
108	typedef uint16_t mapface;	127	typedef uint16_t mapface;
109		128
110	typedef struct {	129	typedef struct {
…		…
258	}	277	}
259	}	278	}
260	}	279	}
261		280
262	static void	281	static void
263	music_finished ()	282	music_finished (void)
264	{	283	{
265	SDL_UserEvent ev;	284	SDL_UserEvent ev;
266		285
267	ev.type = SDL_USEREVENT;	286	ev.type = SDL_USEREVENT;
268	ev.code = 0;	287	ev.code = 0;
…		…
277	{	296	{
278	SDL_UserEvent ev;	297	SDL_UserEvent ev;
279		298
280	ev.type = SDL_USEREVENT;	299	ev.type = SDL_USEREVENT;
281	ev.code = 1;	300	ev.code = 1;
282	ev.data1 = channel;	301	ev.data1 = (void *)(long)channel;
283	ev.data2 = 0;	302	ev.data2 = 0;
284		303
285	SDL_PushEvent ((SDL_Event *)&ev);	304	SDL_PushEvent ((SDL_Event *)&ev);
286	}	305	}
287		306
…		…
398	# undef const_iv	417	# undef const_iv
399	};	418	};
400		419
401	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	420	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
402	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	421	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		422	}
403		423
		424	void
		425	pango_init ()
		426	CODE:
		427	// delayed, so it can pick up new fonts added by AddFontResourceEx
		428	{
		429	{
404	fontmap = pango_ft2_font_map_new ();	430	ft2_fontmap = pango_ft2_font_map_new ();
405	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	431	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
406	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		433	}
		434	{
		435	cairo_font_options_t *fopt = cairo_font_options_create ();
		436	cairo_fontmap = pango_cairo_font_map_get_default ();
		437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		438	#ifdef _WIN32
		439	// cairo looks like shit eaten twice on windows
		440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		441	#else
		442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		443	#endif
		444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		446	pango_cairo_context_set_font_options (cairo_context, fopt);
		447	cairo_font_options_destroy (fopt);
		448	}
407	}	449	}
408		450
409	int	451	int
410	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
411		453
…		…
421	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	463	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
422	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
425		467
		468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		470
426	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
430		475
431	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	476	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
432	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
433	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
434		477
435	SDL_EnableUNICODE (1);	478	SDL_EnableUNICODE (1);
436	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
437		480
438	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	481	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
447		490
448	++m;	491	++m;
449	}	492	}
450	}	493	}
451		494
		495	char *
		496	SDL_GetError ()
		497
452	int	498	int
453	SDL_SetVideoMode (int w, int h, int fullscreen)	499	SDL_SetVideoMode (int w, int h, int fullscreen)
454	CODE:	500	CODE:
455	RETVAL = !!SDL_SetVideoMode (	501	RETVAL = !!SDL_SetVideoMode (
456	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	502	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
457	);	503	);
		504	if (RETVAL)
		505	{
458	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	506	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		507	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		508	# include "glfunc.h"
		509	# undef GL_FUNC
		510	}
459	OUTPUT:	511	OUTPUT:
460	RETVAL	512	RETVAL
461		513
462	void	514	void
463	SDL_GL_SwapBuffers ()	515	SDL_GL_SwapBuffers ()
		516
		517	char *
		518	SDL_GetKeyName (int sym)
464		519
465	void	520	void
466	SDL_PollEvent ()	521	SDL_PollEvent ()
467	PPCODE:	522	PPCODE:
468	{	523	{
…		…
487	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	542	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
488	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
489	break;	544	break;
490		545
491	case SDL_MOUSEMOTION:	546	case SDL_MOUSEMOTION:
		547	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		548
492	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	549	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
493	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	550	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
494	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	551	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
495	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	552	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
496	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	553	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
497	break;	554	break;
498		555
499	case SDL_MOUSEBUTTONDOWN:	556	case SDL_MOUSEBUTTONDOWN:
500	case SDL_MOUSEBUTTONUP:	557	case SDL_MOUSEBUTTONUP:
		558	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		559
501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	560	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	561	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	562	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	563	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505	break;	564	break;
		565
		566	case SDL_USEREVENT:
		567	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		568	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		569	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		570	break;
506	}	571	}
507		572
508	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	573	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
509	}	574	}
510	}	575	}
511		576
512	int	577	int
513	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	578	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
514	POSTCALL:	579	POSTCALL:
515	Mix_HookMusicFinished (music_finished);	580	Mix_HookMusicFinished (music_finished);
516	Mix_ChannelFinished (channel_finished);	581	Mix_ChannelFinished (channel_finished);
517		582
518	void	583	void
…		…
526	CODE:	591	CODE:
527	#ifndef _WIN32	592	#ifndef _WIN32
528	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	593	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
529	#endif	594	#endif
530		595
531	char *
532	gl_version ()
533	CODE:
534	RETVAL = (char *)glGetString (GL_VERSION);
535	OUTPUT:
536	RETVAL
537
538	char *
539	gl_extensions ()
540	CODE:
541	RETVAL = (char *)glGetString (GL_EXTENSIONS);
542	OUTPUT:
543	RETVAL
544
545	void	596	void
546	add_font (char *file)	597	add_font (char *file)
547	CODE:	598	CODE:
548	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	599	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		600	#ifdef _WIN32
		601	// cairo... sigh... requires win2000
		602	AddFontResourceEx (file, FR_PRIVATE, 0);
		603	#endif
549		604
550	void	605	void
551	load_image_inline (SV *image_)	606	load_image_inline (SV *image_)
552	ALIAS:	607	ALIAS:
553	load_image_file = 1	608	load_image_file = 1
…		…
637	}	692	}
638		693
639	void	694	void
640	error (char *message)	695	error (char *message)
641	CODE:	696	CODE:
		697	fprintf (stderr, "ERROR: %s\n", message);
642	#ifdef _WIN32	698	#ifdef _WIN32
643	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	699	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
644	#else
645	fprintf (stderr, "ERROR: %s\n", message);
646	#endif	700	#endif
647		701
648	void	702	void
649	fatal (char *message)	703	fatal (char *message)
650	CODE:	704	CODE:
		705	fprintf (stderr, "FATAL: %s\n", message);
651	#ifdef _WIN32	706	#ifdef _WIN32
652	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
653	#else
654	fprintf (stderr, "FATAL: %s\n", message);
655	#endif	708	#endif
656	exit (1);	709	_Exit (1);
		710
		711	void
		712	_exit (int retval)
		713	CODE:
		714	_Exit (retval);
657		715
658	MODULE = CFClient PACKAGE = CFClient::Font	716	MODULE = CFClient PACKAGE = CFClient::Font
659		717
660	CFClient::Font	718	CFClient::Font
661	new_from_file (SV class, char path, int id = 0)	719	new_from_file (SV class, char path, int id = 0)
…		…
680	default_font = self;	738	default_font = self;
681		739
682	MODULE = CFClient PACKAGE = CFClient::Layout	740	MODULE = CFClient PACKAGE = CFClient::Layout
683		741
684	CFClient::Layout	742	CFClient::Layout
685	new (SV *class, int base_height = MIN_FONT_HEIGHT)	743	new (SV *class, int rgba = 0)
686	CODE:	744	CODE:
687	New (0, RETVAL, 1, struct cf_layout);	745	New (0, RETVAL, 1, struct cf_layout);
688	RETVAL->pl = pango_layout_new (context);	746
689	RETVAL->base_height = base_height;	747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		748	RETVAL->rgba = rgba;
		749	RETVAL->r = 1.;
		750	RETVAL->g = 1.;
		751	RETVAL->b = 1.;
		752	RETVAL->a = 1.;
		753	RETVAL->base_height = MIN_FONT_HEIGHT;
690	RETVAL->font = 0;	754	RETVAL->font = 0;
		755
691	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	756	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
692	pango_layout_set_font_description (RETVAL->pl, default_font);	757	layout_update_font (RETVAL);
693	OUTPUT:	758	OUTPUT:
694	RETVAL	759	RETVAL
695		760
696	void	761	void
697	DESTROY (CFClient::Layout self)	762	DESTROY (CFClient::Layout self)
698	CODE:	763	CODE:
699	g_object_unref (self->pl);	764	g_object_unref (self->pl);
700	Safefree (self);	765	Safefree (self);
701		766
		767	int
		768	is_rgba (CFClient::Layout self)
		769	CODE:
		770	RETVAL = self->rgba;
		771	OUTPUT:
		772	RETVAL
		773
702	void	774	void
703	set_text (CFClient::Layout self, SV *text_)	775	set_text (CFClient::Layout self, SV *text_)
704	CODE:	776	CODE:
705	{	777	{
706	STRLEN textlen;	778	STRLEN textlen;
…		…
721		793
722	SV *	794	SV *
723	get_text (CFClient::Layout self)	795	get_text (CFClient::Layout self)
724	CODE:	796	CODE:
725	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
726	SvUTF8_on (RETVAL);	798	sv_utf8_decode (RETVAL);
727	OUTPUT:	799	OUTPUT:
728	RETVAL	800	RETVAL
		801
		802	void
		803	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		804	CODE:
		805	self->r = r;
		806	self->g = g;
		807	self->b = b;
		808	self->a = a;
729		809
730	void	810	void
731	set_font (CFClient::Layout self, CFClient::Font font = 0)	811	set_font (CFClient::Layout self, CFClient::Font font = 0)
732	CODE:	812	CODE:
733	if (self->font != font)	813	if (self->font != font)
…		…
749	set_width (CFClient::Layout self, int max_width = -1)	829	set_width (CFClient::Layout self, int max_width = -1)
750	CODE:	830	CODE:
751	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	831	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
752		832
753	void	833	void
		834	set_indent (CFClient::Layout self, int indent)
		835	CODE:
		836	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		837
		838	void
		839	set_spacing (CFClient::Layout self, int spacing)
		840	CODE:
		841	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		842
		843	void
		844	set_ellipsise (CFClient::Layout self, int ellipsise)
		845	CODE:
		846	pango_layout_set_ellipsize (self->pl,
		847	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		848	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		849	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		850	: PANGO_ELLIPSIZE_NONE
		851	);
		852
		853	void
		854	set_single_paragraph_mode (CFClient::Layout self, int spm)
		855	CODE:
		856	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		857
		858	void
754	size (CFClient::Layout self)	859	size (CFClient::Layout self)
755	PPCODE:	860	PPCODE:
756	{	861	{
757	int w, h;	862	int w, h;
758		863
…		…
791	render (CFClient::Layout self)	896	render (CFClient::Layout self)
792	PPCODE:	897	PPCODE:
793	{	898	{
794	SV *retval;	899	SV *retval;
795	int w, h;	900	int w, h;
796	FT_Bitmap bitmap;
797		901
798	layout_get_pixel_size (self, &w, &h);	902	layout_get_pixel_size (self, &w, &h);
799		903
		904	if (self->rgba)
		905	{
		906	cairo_surface_t *surface;
		907	cairo_t *cairo;
		908
		909	retval = newSV (w * h * 4);
		910	SvPOK_only (retval);
		911	SvCUR_set (retval, w * h * 4);
		912
		913	memset (SvPVX (retval), 0, w * h * 4);
		914
		915	surface = cairo_image_surface_create_for_data (
		916	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		917	cairo = cairo_create (surface);
		918	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		919
		920	pango_cairo_show_layout (cairo, self->pl);
		921
		922	cairo_destroy (cairo);
		923	cairo_surface_destroy (surface);
		924
		925	// what a mess, and its premultiplied, too :(
		926	{
		927	uint32_t p = (uint32_t )SvPVX (retval);
		928	uint32_t e = p + w h;
		929
		930	while (p < e)
		931	{
		932	uint32_t rgba = *p;
		933	rgba = (rgba >> 24) \| (rgba << 8);
		934	#if 0
		935	#ifdef _WIN32
		936	{//D
		937	uint8_t r = rgba >> 24;
		938	uint8_t g = rgba >> 16;
		939	uint8_t b = rgba >> 8;
		940	uint8_t a = rgba >> 0;
		941
		942	rgba = (rgba & 0xffffff00) \| a;
		943	}
		944	#endif
		945	#endif
		946	rgba = SDL_SwapBE32 (rgba);
		947	*p++ = rgba;
		948	}
		949	}
		950
		951	EXTEND (SP, 5);
		952	PUSHs (sv_2mortal (newSViv (w)));
		953	PUSHs (sv_2mortal (newSViv (h)));
		954	PUSHs (sv_2mortal (retval));
		955	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		956	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		957	}
		958	else
		959	{
		960	FT_Bitmap bitmap;
		961
800	retval = newSV (w * h);	962	retval = newSV (w * h);
801	SvPOK_only (retval);	963	SvPOK_only (retval);
802	SvCUR_set (retval, w * h);	964	SvCUR_set (retval, w * h);
803		965
804	bitmap.rows = h;	966	bitmap.rows = h;
805	bitmap.width = w;	967	bitmap.width = w;
806	bitmap.pitch = w;	968	bitmap.pitch = w;
807	bitmap.buffer = (unsigned char*)SvPVX (retval);	969	bitmap.buffer = (unsigned char*)SvPVX (retval);
808	bitmap.num_grays = 256;	970	bitmap.num_grays = 256;
809	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	971	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
810		972
811	memset (bitmap.buffer, 0, w * h);	973	memset (bitmap.buffer, 0, w * h);
812		974
813	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	975	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
814		976
815	EXTEND (SP, 3);	977	EXTEND (SP, 5);
816	PUSHs (sv_2mortal (newSViv (w)));	978	PUSHs (sv_2mortal (newSViv (w)));
817	PUSHs (sv_2mortal (newSViv (h)));	979	PUSHs (sv_2mortal (newSViv (h)));
818	PUSHs (sv_2mortal (retval));	980	PUSHs (sv_2mortal (retval));
		981	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		982	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		983	}
819	}	984	}
820		985
821	MODULE = CFClient PACKAGE = CFClient::Texture	986	MODULE = CFClient PACKAGE = CFClient::Texture
822		987
823	void	988	void
824	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	989	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
825	PROTOTYPE: $$$;$$	990	PROTOTYPE: $$$;$$
		991	ALIAS:
		992	draw_quad_alpha = 1
		993	draw_quad_alpha_premultiplied = 2
826	CODE:	994	CODE:
827	{	995	{
828	HV hv = (HV )SvRV (self);	996	HV hv = (HV )SvRV (self);
829	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	997	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
830	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	998	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
831	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	999	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
832	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
833		1000
834	if (items < 5)	1001	if (items < 5)
835	{	1002	{
836	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1003	w = SvNV (*hv_fetch (hv, "w", 1, 1));
837	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1004	h = SvNV (*hv_fetch (hv, "h", 1, 1));
838	}	1005	}
839		1006
		1007	if (ix)
		1008	{
		1009	glEnable (GL_BLEND);
		1010
		1011	if (ix == 2)
		1012	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1013	else
		1014	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1015	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1016
		1017	glEnable (GL_ALPHA_TEST);
		1018	glAlphaFunc (GL_GREATER, 0.01f);
		1019	}
		1020
840	glBindTexture (GL_TEXTURE_2D, name);	1021	glBindTexture (GL_TEXTURE_2D, name);
841	if (wrap_mode) {	1022
842	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
843	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
844	}
845	glBegin (GL_QUADS);	1023	glBegin (GL_QUADS);
846	glTexCoord2f (0, 0); glVertex2f (x , y );	1024	glTexCoord2f (0, 0); glVertex2f (x , y );
847	glTexCoord2f (0, t); glVertex2f (x , y + h);	1025	glTexCoord2f (0, t); glVertex2f (x , y + h);
848	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1026	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
849	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1027	glTexCoord2f (s, 0); glVertex2f (x + w, y );
850	glEnd ();	1028	glEnd ();
		1029
		1030	if (ix)
		1031	{
		1032	glDisable (GL_ALPHA_TEST);
		1033	glDisable (GL_BLEND);
		1034	}
851	}	1035	}
852		1036
853	MODULE = CFClient PACKAGE = CFClient::Map	1037	MODULE = CFClient PACKAGE = CFClient::Map
854		1038
855	CFClient::Map	1039	CFClient::Map
…		…
875	DESTROY (CFClient::Map self)	1059	DESTROY (CFClient::Map self)
876	CODE:	1060	CODE:
877	{	1061	{
878	map_clear (self);	1062	map_clear (self);
879	Safefree (self->face);	1063	Safefree (self->face);
		1064	Safefree (self->tex);
880	Safefree (self);	1065	Safefree (self);
881	}	1066	}
882		1067
883	void	1068	void
884	clear (CFClient::Map self)	1069	clear (CFClient::Map self)
…		…
919	tex->r = r;	1104	tex->r = r;
920	tex->g = g;	1105	tex->g = g;
921	tex->b = b;	1106	tex->b = b;
922	tex->a = a;	1107	tex->a = a;
923	}	1108	}
		1109
		1110	// somewhat hackish, but for textures that require it, it really
		1111	// improves the look, and most others don't suffer.
		1112	glBindTexture (GL_TEXTURE_2D, name);
		1113	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1114	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1115	// use uglier nearest interpolation because linear suffers
		1116	// from transparent color bleeding and ugly wrapping effects.
		1117	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
924	}	1118	}
925		1119
926	int	1120	int
927	ox (CFClient::Map self)	1121	ox (CFClient::Map self)
928	ALIAS:	1122	ALIAS:
929	oy = 1	1123	oy = 1
		1124	x = 2
		1125	y = 3
		1126	w = 4
		1127	h = 5
930	CODE:	1128	CODE:
931	switch (ix)	1129	switch (ix)
932	{	1130	{
933	case 0: RETVAL = self->ox; break;	1131	case 0: RETVAL = self->ox; break;
934	case 1: RETVAL = self->oy; break;	1132	case 1: RETVAL = self->oy; break;
		1133	case 2: RETVAL = self->x; break;
		1134	case 3: RETVAL = self->y; break;
		1135	case 4: RETVAL = self->w; break;
		1136	case 5: RETVAL = self->h; break;
935	}	1137	}
936	OUTPUT:	1138	OUTPUT:
937	RETVAL	1139	RETVAL
938		1140
939	void	1141	void
…		…
1366	const_iv (GL_COLOR_MATERIAL),	1568	const_iv (GL_COLOR_MATERIAL),
1367	const_iv (GL_SMOOTH),	1569	const_iv (GL_SMOOTH),
1368	const_iv (GL_FLAT),	1570	const_iv (GL_FLAT),
1369	const_iv (GL_DITHER),	1571	const_iv (GL_DITHER),
1370	const_iv (GL_BLEND),	1572	const_iv (GL_BLEND),
		1573	const_iv (GL_CULL_FACE),
1371	const_iv (GL_SCISSOR_TEST),	1574	const_iv (GL_SCISSOR_TEST),
		1575	const_iv (GL_DEPTH_TEST),
		1576	const_iv (GL_ALPHA_TEST),
		1577	const_iv (GL_NORMALIZE),
		1578	const_iv (GL_RESCALE_NORMAL),
1372	const_iv (GL_AND),	1579	const_iv (GL_AND),
1373	const_iv (GL_ONE),	1580	const_iv (GL_ONE),
1374	const_iv (GL_ZERO),	1581	const_iv (GL_ZERO),
1375	const_iv (GL_SRC_ALPHA),	1582	const_iv (GL_SRC_ALPHA),
1376	const_iv (GL_SRC_ALPHA_SATURATE),	1583	const_iv (GL_DST_ALPHA),
1377	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1378	const_iv (GL_ONE_MINUS_DST_ALPHA),	1585	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1586	const_iv (GL_SRC_ALPHA_SATURATE),
1379	const_iv (GL_RGB),	1587	const_iv (GL_RGB),
1380	const_iv (GL_RGBA),	1588	const_iv (GL_RGBA),
1381	const_iv (GL_UNSIGNED_BYTE),	1589	const_iv (GL_UNSIGNED_BYTE),
		1590	const_iv (GL_UNSIGNED_SHORT),
		1591	const_iv (GL_UNSIGNED_INT),
1382	const_iv (GL_ALPHA),	1592	const_iv (GL_ALPHA),
		1593	const_iv (GL_INTENSITY),
		1594	const_iv (GL_LUMINANCE),
		1595	const_iv (GL_LUMINANCE_ALPHA),
1383	const_iv (GL_FLOAT),	1596	const_iv (GL_FLOAT),
1384	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1597	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1385	const_iv (GL_COMPILE),	1598	const_iv (GL_COMPILE),
1386	const_iv (GL_TEXTURE_1D),	1599	const_iv (GL_TEXTURE_1D),
1387	const_iv (GL_TEXTURE_2D),	1600	const_iv (GL_TEXTURE_2D),
…		…
1389	const_iv (GL_TEXTURE_MAG_FILTER),	1602	const_iv (GL_TEXTURE_MAG_FILTER),
1390	const_iv (GL_TEXTURE_MIN_FILTER),	1603	const_iv (GL_TEXTURE_MIN_FILTER),
1391	const_iv (GL_TEXTURE_ENV_MODE),	1604	const_iv (GL_TEXTURE_ENV_MODE),
1392	const_iv (GL_TEXTURE_WRAP_S),	1605	const_iv (GL_TEXTURE_WRAP_S),
1393	const_iv (GL_TEXTURE_WRAP_T),	1606	const_iv (GL_TEXTURE_WRAP_T),
		1607	const_iv (GL_REPEAT),
1394	const_iv (GL_CLAMP),	1608	const_iv (GL_CLAMP),
1395	const_iv (GL_REPEAT),	1609	const_iv (GL_CLAMP_TO_EDGE),
1396	const_iv (GL_NEAREST),	1610	const_iv (GL_NEAREST),
1397	const_iv (GL_LINEAR),	1611	const_iv (GL_LINEAR),
1398	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1612	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1399	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1613	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1400	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1614	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1401	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1615	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1402	const_iv (GL_GENERATE_MIPMAP),	1616	const_iv (GL_GENERATE_MIPMAP),
1403	const_iv (GL_MODULATE),	1617	const_iv (GL_MODULATE),
1404	const_iv (GL_DECAL),	1618	const_iv (GL_DECAL),
1405	const_iv (GL_REPLACE),	1619	const_iv (GL_REPLACE),
		1620	const_iv (GL_DEPTH_BUFFER_BIT),
1406	const_iv (GL_COLOR_BUFFER_BIT),	1621	const_iv (GL_COLOR_BUFFER_BIT),
1407	const_iv (GL_PROJECTION),	1622	const_iv (GL_PROJECTION),
1408	const_iv (GL_MODELVIEW),	1623	const_iv (GL_MODELVIEW),
1409	const_iv (GL_COLOR_LOGIC_OP),	1624	const_iv (GL_COLOR_LOGIC_OP),
1410	const_iv (GL_SEPARABLE_2D),	1625	const_iv (GL_SEPARABLE_2D),
1411	const_iv (GL_CONVOLUTION_2D),	1626	const_iv (GL_CONVOLUTION_2D),
1412	const_iv (GL_CONVOLUTION_BORDER_MODE),	1627	const_iv (GL_CONVOLUTION_BORDER_MODE),
1413	const_iv (GL_CONSTANT_BORDER),	1628	const_iv (GL_CONSTANT_BORDER),
1414	const_iv (GL_LINES),	1629	const_iv (GL_LINES),
		1630	const_iv (GL_LINE_LOOP),
1415	const_iv (GL_QUADS),	1631	const_iv (GL_QUADS),
1416	const_iv (GL_LINE_LOOP),	1632	const_iv (GL_QUAD_STRIP),
		1633	const_iv (GL_TRIANGLES),
		1634	const_iv (GL_TRIANGLE_STRIP),
		1635	const_iv (GL_TRIANGLE_FAN),
1417	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1636	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1418	const_iv (GL_FASTEST),	1637	const_iv (GL_FASTEST),
		1638	const_iv (GL_V2F),
		1639	const_iv (GL_V3F),
		1640	const_iv (GL_T2F_V3F),
		1641	const_iv (GL_T2F_N3F_V3F),
1419	# undef const_iv	1642	# undef const_iv
1420	};	1643	};
1421		1644
1422	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1645	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1423	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1646	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1424	}	1647	}
1425		1648
		1649	char *
		1650	gl_vendor ()
		1651	CODE:
		1652	RETVAL = (char *)glGetString (GL_VENDOR);
		1653	OUTPUT:
		1654	RETVAL
		1655
		1656	char *
		1657	gl_version ()
		1658	CODE:
		1659	RETVAL = (char *)glGetString (GL_VERSION);
		1660	OUTPUT:
		1661	RETVAL
		1662
		1663	char *
		1664	gl_extensions ()
		1665	CODE:
		1666	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1667	OUTPUT:
		1668	RETVAL
		1669
1426	int glGetError ()	1670	int glGetError ()
1427		1671
1428	void glClear (int mask)	1672	void glClear (int mask)
1429		1673
1430	void glClearColor (float r, float g, float b, float a = 1.0)	1674	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1438		1682
1439	void glHint (int target, int mode)	1683	void glHint (int target, int mode)
1440		1684
1441	void glBlendFunc (int sfactor, int dfactor)	1685	void glBlendFunc (int sfactor, int dfactor)
1442		1686
		1687	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1688	CODE:
		1689	gl_BlendFuncSeparate (sa, da, saa, daa);
		1690
		1691	void glDepthMask (int flag)
		1692
1443	void glLogicOp (int opcode)	1693	void glLogicOp (int opcode)
1444		1694
1445	void glColorMask (int red, int green, int blue, int alpha)	1695	void glColorMask (int red, int green, int blue, int alpha)
1446		1696
1447	void glMatrixMode (int mode)	1697	void glMatrixMode (int mode)
…		…
1450		1700
1451	void glPopMatrix ()	1701	void glPopMatrix ()
1452		1702
1453	void glLoadIdentity ()	1703	void glLoadIdentity ()
1454		1704
1455	# near and far are due to microsofts buggy c compiler	1705	# near_ and far_ are due to microsofts buggy "c" compiler
		1706	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1707
		1708	# near_ and far_ are due to microsofts buggy "c" compiler
1456	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1709	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1457		1710
1458	void glViewport (int x, int y, int width, int height)	1711	void glViewport (int x, int y, int width, int height)
1459		1712
1460	void glScissor (int x, int y, int width, int height)	1713	void glScissor (int x, int y, int width, int height)
…		…
1475		1728
1476	void glEnd ()	1729	void glEnd ()
1477		1730
1478	void glColor (float r, float g, float b, float a = 1.0)	1731	void glColor (float r, float g, float b, float a = 1.0)
1479	PROTOTYPE: @	1732	PROTOTYPE: @
		1733	ALIAS:
		1734	glColor_premultiply = 1
1480	CODE:	1735	CODE:
1481	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1736	if (ix)
		1737	{
		1738	r *= a;
		1739	g *= a;
		1740	b *= a;
		1741	}
		1742	// microsoft visual "c" rounds instead of truncating...
		1743	glColor4ub (MIN ((int)(r * 256.f), 255),
		1744	MIN ((int)(g * 256.f), 255),
		1745	MIN ((int)(b * 256.f), 255),
		1746	MIN ((int)(a * 256.f), 255));
		1747
		1748	void glInterleavedArrays (int format, int stride, char *data)
		1749
		1750	void glDrawElements (int mode, int count, int type, char *indices)
		1751
		1752	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1753
		1754	void glRasterPos (float x, float y, float z = 0.)
		1755	CODE:
		1756	glRasterPos3f (0, 0, z);
		1757	glBitmap (0, 0, 0, 0, x, y, 0);
1482		1758
1483	void glVertex (float x, float y, float z = 0.)	1759	void glVertex (float x, float y, float z = 0.)
1484	CODE:	1760	CODE:
1485	glVertex3f (x, y, z);	1761	glVertex3f (x, y, z);
1486		1762
…		…
1498		1774
1499	void glBindTexture (int target, int name)	1775	void glBindTexture (int target, int name)
1500		1776
1501	void glConvolutionParameter (int target, int pname, float params)	1777	void glConvolutionParameter (int target, int pname, float params)
1502	CODE:	1778	CODE:
1503	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1779	if (gl.ConvolutionParameterf)
		1780	gl.ConvolutionParameterf (target, pname, params);
1504		1781
1505	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1782	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1506	CODE:	1783	CODE:
1507	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1784	if (gl.ConvolutionFilter2D)
1508	(target, internalformat, width, height, format, type, data));	1785	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1509		1786
1510	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1787	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1511	CODE:	1788	CODE:
1512	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1789	if (gl.SeparableFilter2D)
1513	(target, internalformat, width, height, format, type, row, column));	1790	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1514		1791
1515	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1792	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1516		1793
1517	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1794	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1518		1795
1519	void glRasterPos (int x, int y)	1796	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1520	CODE:
1521	glRasterPos2i (x, y);
1522		1797
1523	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1798	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1524		1799
1525	int glGenTexture ()	1800	int glGenTexture ()
1526	CODE:	1801	CODE:
…		…
1553		1828
1554	void glEndList ()	1829	void glEndList ()
1555		1830
1556	void glCallList (int list)	1831	void glCallList (int list)
1557		1832
		1833

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs. Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC