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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.108 by root, Wed Jun 7 23:28:12 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>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
42	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
44		50
45	#define MIN_FONT_HEIGHT 10	51	#define MIN_FONT_HEIGHT 10
46		52
		53	static struct
		54	{
		55	#define GL_FUNC(ptr,name) ptr name;
		56	#include "glfunc.h"
		57	#undef GL_FUNC
		58	} gl;
		59
		60	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		61	{
		62	if (gl.BlendFuncSeparate)
		63	gl.BlendFuncSeparate (sa, da, saa, daa);
		64	else if (gl.BlendFuncSeparateEXT)
		65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		66	else
		67	glBlendFunc (sa, da);
		68	}
		69
47	typedef Mix_Chunk *CFClient__MixChunk;	70	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	71	typedef Mix_Music *CFClient__MixMusic;
49		72
50	typedef PangoFontDescription *CFClient__Font;	73	typedef PangoFontDescription *CFClient__Font;
51		74
52	typedef struct cf_layout {	75	typedef struct cf_layout {
53	PangoLayout *pl;	76	PangoLayout *pl; // either derived from a cairo or ft2 context
		77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		78	float r, g, b, a; // default color for rgba mode
54	int base_height;	79	int base_height;
55	CFClient__Font font;	80	CFClient__Font font;
56	} *CFClient__Layout;	81	} *CFClient__Layout;
57		82
58	static CFClient__Font default_font;	83	static CFClient__Font default_font;
59	static PangoContext *context;	84	static PangoContext ft2_context, cairo_context;
60	static PangoFontMap *fontmap;	85	static PangoFontMap ft2_fontmap, cairo_fontmap;
61		86
62	static void	87	static void
63	substitute_func (FcPattern *pattern, gpointer data)	88	substitute_func (FcPattern *pattern, gpointer data)
64	{	89	{
65	FcPatternAddBool (pattern, FC_HINTING , 1);	90	FcPatternAddBool (pattern, FC_HINTING, 1);
		91	FcPatternAddBool (pattern, FC_HINTSTYLE, FC_HINT_FULL);
		92	#ifdef _WIN32
		93	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		94	#else
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		96	#endif
67	}	97	}
68		98
69	static void	99	static void
70	layout_update_font (CFClient__Layout self)	100	layout_update_font (CFClient__Layout self)
71	{	101	{
…		…
83	static void	113	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	114	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	115	{
86	pango_layout_get_pixel_size (self->pl, w, h);	116	pango_layout_get_pixel_size (self->pl, w, h);
87		117
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	118	if (!w) w = 1;
90	if (!h) h = 1;	119	if (!h) h = 1;
		120
		121	w = (w + 3) & ~3;
91	}	122	}
92		123
93	typedef uint16_t mapface;	124	typedef uint16_t mapface;
94		125
95	typedef struct {	126	typedef struct {
…		…
243	}	274	}
244	}	275	}
245	}	276	}
246		277
247	static void	278	static void
248	music_finished ()	279	music_finished (void)
249	{	280	{
250	SDL_UserEvent ev;	281	SDL_UserEvent ev;
251		282
252	ev.type = SDL_USEREVENT;	283	ev.type = SDL_USEREVENT;
253	ev.code = 0;	284	ev.code = 0;
254	ev.data1 = 0;	285	ev.data1 = 0;
		286	ev.data2 = 0;
		287
		288	SDL_PushEvent ((SDL_Event *)&ev);
		289	}
		290
		291	static void
		292	channel_finished (int channel)
		293	{
		294	SDL_UserEvent ev;
		295
		296	ev.type = SDL_USEREVENT;
		297	ev.code = 1;
		298	ev.data1 = (void *)(long)channel;
255	ev.data2 = 0;	299	ev.data2 = 0;
256		300
257	SDL_PushEvent ((SDL_Event *)&ev);	301	SDL_PushEvent ((SDL_Event *)&ev);
258	}	302	}
259		303
…		…
370	# undef const_iv	414	# undef const_iv
371	};	415	};
372		416
373	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	417	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	418	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		419	}
375		420
		421	void
		422	pango_init ()
		423	CODE:
		424	// delayed, so it can pick up new fonts added by AddFontResourceEx
		425	{
		426	{
376	fontmap = pango_ft2_font_map_new ();	427	ft2_fontmap = pango_ft2_font_map_new ();
377	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	428	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
378	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	429	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		430	}
		431	{
		432	cairo_font_options_t *fopt = cairo_font_options_create ();
		433	cairo_fontmap = pango_cairo_font_map_get_default ();
		434	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		435	#ifdef _WIN32
		436	// cairo looks like shit eaten twice on windows
		437	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		438	#else
		439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		440	#endif
		441	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		442	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		443	pango_cairo_context_set_font_options (cairo_context, fopt);
		444	cairo_font_options_destroy (fopt);
		445	}
379	}	446	}
380		447
381	int	448	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	449	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		450
…		…
393	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	460	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	461	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	462	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	463	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397		464
		465	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		466	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		467
398	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	468	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	469	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402		472
403	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	473	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
404	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
405	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
406		474
407	SDL_EnableUNICODE (1);	475	SDL_EnableUNICODE (1);
408	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	476	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409		477
410	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	478	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
419		487
420	++m;	488	++m;
421	}	489	}
422	}	490	}
423		491
		492	char *
		493	SDL_GetError ()
		494
424	int	495	int
425	SDL_SetVideoMode (int w, int h, int fullscreen)	496	SDL_SetVideoMode (int w, int h, int fullscreen)
426	CODE:	497	CODE:
427	RETVAL = !!SDL_SetVideoMode (	498	RETVAL = !!SDL_SetVideoMode (
428	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	499	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
429	);	500	);
		501	if (RETVAL)
		502	{
430	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	503	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		504	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		505	# include "glfunc.h"
		506	# undef GL_FUNC
		507	}
431	OUTPUT:	508	OUTPUT:
432	RETVAL	509	RETVAL
433		510
434	void	511	void
435	SDL_GL_SwapBuffers ()	512	SDL_GL_SwapBuffers ()
		513
		514	char *
		515	SDL_GetKeyName (int sym)
436		516
437	void	517	void
438	SDL_PollEvent ()	518	SDL_PollEvent ()
439	PPCODE:	519	PPCODE:
440	{	520	{
…		…
442		522
443	while (SDL_PollEvent (&ev))	523	while (SDL_PollEvent (&ev))
444	{	524	{
445	HV *hv = newHV ();	525	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	526	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		527
447	switch (ev.type)	528	switch (ev.type)
448	{	529	{
449	case SDL_KEYDOWN:	530	case SDL_KEYDOWN:
450	case SDL_KEYUP:	531	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	532	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
458	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	539	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
459	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	540	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
460	break;	541	break;
461		542
462	case SDL_MOUSEMOTION:	543	case SDL_MOUSEMOTION:
		544	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		545
463	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	546	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
464	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	547	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
465	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	548	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
466	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	549	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
467	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	550	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
468	break;	551	break;
469		552
470	case SDL_MOUSEBUTTONDOWN:	553	case SDL_MOUSEBUTTONDOWN:
471	case SDL_MOUSEBUTTONUP:	554	case SDL_MOUSEBUTTONUP:
		555	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		556
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	557	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	558	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	559	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	560	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		561	break;
		562
		563	case SDL_USEREVENT:
		564	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		565	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		566	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		567	break;
476	}	568	}
477		569
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	570	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	571	}
480	}	572	}
481		573
482	int	574	int
483	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	575	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
484	POSTCALL:	576	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	577	Mix_HookMusicFinished (music_finished);
		578	Mix_ChannelFinished (channel_finished);
486		579
487	void	580	void
488	Mix_CloseAudio ()	581	Mix_CloseAudio ()
489		582
490	int	583	int
…		…
495	CODE:	588	CODE:
496	#ifndef _WIN32	589	#ifndef _WIN32
497	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	590	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
498	#endif	591	#endif
499		592
500	char *
501	gl_version ()
502	CODE:
503	RETVAL = (char *)glGetString (GL_VERSION);
504	OUTPUT:
505	RETVAL
506
507	char *
508	gl_extensions ()
509	CODE:
510	RETVAL = (char *)glGetString (GL_EXTENSIONS);
511	OUTPUT:
512	RETVAL
513
514	void	593	void
515	add_font (char *file)	594	add_font (char *file)
516	CODE:	595	CODE:
517	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	596	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		597	#ifdef _WIN32
		598	// cairo... sigh... requires win2000
		599	AddFontResourceEx (file, FR_PRIVATE, 0);
		600	#endif
518		601
519	void	602	void
520	load_image_inline (SV *image_)	603	load_image_inline (SV *image_)
521	ALIAS:	604	ALIAS:
522	load_image_file = 1	605	load_image_file = 1
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	687	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	688	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	689	}
607		690
608	void	691	void
		692	error (char *message)
		693	CODE:
		694	fprintf (stderr, "ERROR: %s\n", message);
		695	#ifdef _WIN32
		696	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		697	#endif
		698
		699	void
609	fatal (char *message)	700	fatal (char *message)
610	CODE:	701	CODE:
		702	fprintf (stderr, "FATAL: %s\n", message);
611	#ifdef _WIN32	703	#ifdef _WIN32
612	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	704	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
613	#else
614	fprintf (stderr, "FATAL: %s\n", message);
615	#endif	705	#endif
616	exit (1);	706	exit (1);
617		707
618	MODULE = CFClient PACKAGE = CFClient::Font	708	MODULE = CFClient PACKAGE = CFClient::Font
619		709
620	CFClient::Font	710	CFClient::Font
621	new_from_file (SV class, char path)	711	new_from_file (SV class, char path, int id = 0)
622	CODE:	712	CODE:
623	{	713	{
624	int count;	714	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	715	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	716	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	717	FcPatternDestroy (pattern);
628	}	718	}
629	OUTPUT:	719	OUTPUT:
630	RETVAL	720	RETVAL
…		…
640	default_font = self;	730	default_font = self;
641		731
642	MODULE = CFClient PACKAGE = CFClient::Layout	732	MODULE = CFClient PACKAGE = CFClient::Layout
643		733
644	CFClient::Layout	734	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	735	new (SV *class, int rgba = 0)
646	CODE:	736	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	737	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	738
649	RETVAL->base_height = base_height;	739	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		740	RETVAL->rgba = rgba;
		741	RETVAL->r = 1.;
		742	RETVAL->g = 1.;
		743	RETVAL->b = 1.;
		744	RETVAL->a = 1.;
		745	RETVAL->base_height = MIN_FONT_HEIGHT;
650	RETVAL->font = 0;	746	RETVAL->font = 0;
		747
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	748	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	749	layout_update_font (RETVAL);
653	OUTPUT:	750	OUTPUT:
654	RETVAL	751	RETVAL
655		752
656	void	753	void
657	DESTROY (CFClient::Layout self)	754	DESTROY (CFClient::Layout self)
658	CODE:	755	CODE:
659	g_object_unref (self->pl);	756	g_object_unref (self->pl);
660	Safefree (self);	757	Safefree (self);
661		758
		759	int
		760	is_rgba (CFClient::Layout self)
		761	CODE:
		762	RETVAL = self->rgba;
		763	OUTPUT:
		764	RETVAL
		765
662	void	766	void
663	set_text (CFClient::Layout self, SV *text_)	767	set_text (CFClient::Layout self, SV *text_)
664	CODE:	768	CODE:
665	{	769	{
666	STRLEN textlen;	770	STRLEN textlen;
…		…
681		785
682	SV *	786	SV *
683	get_text (CFClient::Layout self)	787	get_text (CFClient::Layout self)
684	CODE:	788	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	789	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	790	sv_utf8_decode (RETVAL);
687	OUTPUT:	791	OUTPUT:
688	RETVAL	792	RETVAL
		793
		794	void
		795	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		796	CODE:
		797	self->r = r;
		798	self->g = g;
		799	self->b = b;
		800	self->a = a;
689		801
690	void	802	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	803	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	804	CODE:
693	if (self->font != font)	805	if (self->font != font)
…		…
709	set_width (CFClient::Layout self, int max_width = -1)	821	set_width (CFClient::Layout self, int max_width = -1)
710	CODE:	822	CODE:
711	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	823	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
712		824
713	void	825	void
		826	set_indent (CFClient::Layout self, int indent)
		827	CODE:
		828	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		829
		830	void
		831	set_spacing (CFClient::Layout self, int spacing)
		832	CODE:
		833	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		834
		835	void
		836	set_ellipsise (CFClient::Layout self, int ellipsise)
		837	CODE:
		838	pango_layout_set_ellipsize (self->pl,
		839	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		840	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		841	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		842	: PANGO_ELLIPSIZE_NONE
		843	);
		844
		845	void
		846	set_single_paragraph_mode (CFClient::Layout self, int spm)
		847	CODE:
		848	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		849
		850	void
714	size (CFClient::Layout self)	851	size (CFClient::Layout self)
715	PPCODE:	852	PPCODE:
716	{	853	{
717	int w, h;	854	int w, h;
718		855
…		…
751	render (CFClient::Layout self)	888	render (CFClient::Layout self)
752	PPCODE:	889	PPCODE:
753	{	890	{
754	SV *retval;	891	SV *retval;
755	int w, h;	892	int w, h;
756	FT_Bitmap bitmap;
757		893
758	layout_get_pixel_size (self, &w, &h);	894	layout_get_pixel_size (self, &w, &h);
759		895
		896	if (self->rgba)
		897	{
		898	cairo_surface_t *surface;
		899	cairo_t *cairo;
		900
		901	retval = newSV (w * h * 4);
		902	SvPOK_only (retval);
		903	SvCUR_set (retval, w * h * 4);
		904
		905	memset (SvPVX (retval), 0, w * h * 4);
		906
		907	surface = cairo_image_surface_create_for_data (
		908	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		909	cairo = cairo_create (surface);
		910	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		911
		912	pango_cairo_show_layout (cairo, self->pl);
		913
		914	cairo_destroy (cairo);
		915	cairo_surface_destroy (surface);
		916
		917	// what a mess, and its premultiplied, too :(
		918	{
		919	uint32_t p = (uint32_t )SvPVX (retval);
		920	uint32_t e = p + w h;
		921
		922	while (p < e)
		923	{
		924	uint32_t rgba = *p;
		925	rgba = (rgba >> 24) \| (rgba << 8);
		926	#if 0
		927	#ifdef _WIN32
		928	{//D
		929	uint8_t r = rgba >> 24;
		930	uint8_t g = rgba >> 16;
		931	uint8_t b = rgba >> 8;
		932	uint8_t a = rgba >> 0;
		933
		934	rgba = (rgba & 0xffffff00) \| a;
		935	}
		936	#endif
		937	#endif
		938	rgba = SDL_SwapBE32 (rgba);
		939	*p++ = rgba;
		940	}
		941	}
		942
		943	EXTEND (SP, 5);
		944	PUSHs (sv_2mortal (newSViv (w)));
		945	PUSHs (sv_2mortal (newSViv (h)));
		946	PUSHs (sv_2mortal (retval));
		947	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		949	}
		950	else
		951	{
		952	FT_Bitmap bitmap;
		953
760	retval = newSV (w * h);	954	retval = newSV (w * h);
761	SvPOK_only (retval);	955	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	956	SvCUR_set (retval, w * h);
763		957
764	bitmap.rows = h;	958	bitmap.rows = h;
765	bitmap.width = w;	959	bitmap.width = w;
766	bitmap.pitch = w;	960	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	961	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	962	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	963	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		964
771	memset (bitmap.buffer, 0, w * h);	965	memset (bitmap.buffer, 0, w * h);
772		966
773	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	967	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
774		968
775	EXTEND (SP, 3);	969	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	970	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	971	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	972	PUSHs (sv_2mortal (retval));
		973	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		975	}
779	}	976	}
780		977
781	MODULE = CFClient PACKAGE = CFClient::Texture	978	MODULE = CFClient PACKAGE = CFClient::Texture
782		979
783	void	980	void
784	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	981	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
785	PROTOTYPE: $$$;$$	982	PROTOTYPE: $$$;$$
		983	ALIAS:
		984	draw_quad_alpha = 1
		985	draw_quad_alpha_premultiplied = 2
786	CODE:	986	CODE:
787	{	987	{
788	HV hv = (HV )SvRV (self);	988	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	989	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	990	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
791	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	991	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
792	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
793		992
794	if (items < 5)	993	if (items < 5)
795	{	994	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	995	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	996	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	997	}
799		998
		999	if (ix)
		1000	{
		1001	glEnable (GL_BLEND);
		1002
		1003	if (ix == 2)
		1004	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1005	else
		1006	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1007	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1008
		1009	glEnable (GL_ALPHA_TEST);
		1010	glAlphaFunc (GL_GREATER, 0.01f);
		1011	}
		1012
800	glBindTexture (GL_TEXTURE_2D, name);	1013	glBindTexture (GL_TEXTURE_2D, name);
801	if (wrap_mode) {	1014
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}
805	glBegin (GL_QUADS);	1015	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	1016	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	1017	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1018	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1019	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	1020	glEnd ();
		1021
		1022	if (ix)
		1023	{
		1024	glDisable (GL_ALPHA_TEST);
		1025	glDisable (GL_BLEND);
		1026	}
811	}	1027	}
812		1028
813	MODULE = CFClient PACKAGE = CFClient::Map	1029	MODULE = CFClient PACKAGE = CFClient::Map
814		1030
815	CFClient::Map	1031	CFClient::Map
…		…
879	tex->r = r;	1095	tex->r = r;
880	tex->g = g;	1096	tex->g = g;
881	tex->b = b;	1097	tex->b = b;
882	tex->a = a;	1098	tex->a = a;
883	}	1099	}
		1100
		1101	// somewhat hackish, but for textures that require it, it really
		1102	// improves the look, and most others don't suffer.
		1103	glBindTexture (GL_TEXTURE_2D, name);
		1104	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1105	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1106	// use uglier nearest interpolation because linear suffers
		1107	// from transparent color bleeding and ugly wrapping effects.
		1108	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
884	}	1109	}
885		1110
886	int	1111	int
887	ox (CFClient::Map self)	1112	ox (CFClient::Map self)
888	ALIAS:	1113	ALIAS:
889	oy = 1	1114	oy = 1
		1115	x = 2
		1116	y = 3
		1117	w = 4
		1118	h = 5
890	CODE:	1119	CODE:
891	switch (ix)	1120	switch (ix)
892	{	1121	{
893	case 0: RETVAL = self->ox; break;	1122	case 0: RETVAL = self->ox; break;
894	case 1: RETVAL = self->oy; break;	1123	case 1: RETVAL = self->oy; break;
		1124	case 2: RETVAL = self->x; break;
		1125	case 3: RETVAL = self->y; break;
		1126	case 4: RETVAL = self->w; break;
		1127	case 5: RETVAL = self->h; break;
895	}	1128	}
896	OUTPUT:	1129	OUTPUT:
897	RETVAL	1130	RETVAL
898		1131
899	void	1132	void
…		…
1324	} *civ, const_iv[] = {	1557	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1558	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1559	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1560	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1561	const_iv (GL_FLAT),
		1562	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1563	const_iv (GL_BLEND),
		1564	const_iv (GL_CULL_FACE),
		1565	const_iv (GL_SCISSOR_TEST),
		1566	const_iv (GL_DEPTH_TEST),
		1567	const_iv (GL_ALPHA_TEST),
		1568	const_iv (GL_NORMALIZE),
		1569	const_iv (GL_RESCALE_NORMAL),
1330	const_iv (GL_AND),	1570	const_iv (GL_AND),
		1571	const_iv (GL_ONE),
		1572	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1573	const_iv (GL_SRC_ALPHA),
		1574	const_iv (GL_DST_ALPHA),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1576	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1577	const_iv (GL_SRC_ALPHA_SATURATE),
1333	const_iv (GL_RGB),	1578	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1579	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1580	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),	1581	const_iv (GL_UNSIGNED_SHORT),
		1582	const_iv (GL_UNSIGNED_INT),
1337	const_iv (GL_ALPHA),	1583	const_iv (GL_ALPHA),
		1584	const_iv (GL_INTENSITY),
		1585	const_iv (GL_LUMINANCE),
		1586	const_iv (GL_LUMINANCE_ALPHA),
1338	const_iv (GL_FLOAT),	1587	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1588	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1589	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1590	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1591	const_iv (GL_TEXTURE_2D),
…		…
1344	const_iv (GL_TEXTURE_MAG_FILTER),	1593	const_iv (GL_TEXTURE_MAG_FILTER),
1345	const_iv (GL_TEXTURE_MIN_FILTER),	1594	const_iv (GL_TEXTURE_MIN_FILTER),
1346	const_iv (GL_TEXTURE_ENV_MODE),	1595	const_iv (GL_TEXTURE_ENV_MODE),
1347	const_iv (GL_TEXTURE_WRAP_S),	1596	const_iv (GL_TEXTURE_WRAP_S),
1348	const_iv (GL_TEXTURE_WRAP_T),	1597	const_iv (GL_TEXTURE_WRAP_T),
		1598	const_iv (GL_REPEAT),
1349	const_iv (GL_CLAMP),	1599	const_iv (GL_CLAMP),
1350	const_iv (GL_REPEAT),	1600	const_iv (GL_CLAMP_TO_EDGE),
1351	const_iv (GL_NEAREST),	1601	const_iv (GL_NEAREST),
1352	const_iv (GL_LINEAR),	1602	const_iv (GL_LINEAR),
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1603	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1604	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1605	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1606	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1607	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1608	const_iv (GL_MODULATE),
		1609	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1610	const_iv (GL_REPLACE),
		1611	const_iv (GL_DEPTH_BUFFER_BIT),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1612	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1613	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1614	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1615	const_iv (GL_COLOR_LOGIC_OP),
		1616	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1617	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1618	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1619	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1620	const_iv (GL_LINES),
		1621	const_iv (GL_LINE_LOOP),
1369	const_iv (GL_QUADS),	1622	const_iv (GL_QUADS),
1370	const_iv (GL_LINE_LOOP),	1623	const_iv (GL_QUAD_STRIP),
		1624	const_iv (GL_TRIANGLES),
		1625	const_iv (GL_TRIANGLE_STRIP),
		1626	const_iv (GL_TRIANGLE_FAN),
1371	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1627	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372	const_iv (GL_FASTEST),	1628	const_iv (GL_FASTEST),
		1629	const_iv (GL_V2F),
		1630	const_iv (GL_V3F),
		1631	const_iv (GL_T2F_V3F),
		1632	const_iv (GL_T2F_N3F_V3F),
1373	# undef const_iv	1633	# undef const_iv
1374	};	1634	};
1375		1635
1376	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1636	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1377	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1378	}	1638	}
1379		1639
		1640	char *
		1641	gl_vendor ()
		1642	CODE:
		1643	RETVAL = (char *)glGetString (GL_VENDOR);
		1644	OUTPUT:
		1645	RETVAL
		1646
		1647	char *
		1648	gl_version ()
		1649	CODE:
		1650	RETVAL = (char *)glGetString (GL_VERSION);
		1651	OUTPUT:
		1652	RETVAL
		1653
		1654	char *
		1655	gl_extensions ()
		1656	CODE:
		1657	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1658	OUTPUT:
		1659	RETVAL
		1660
1380	int glGetError ()	1661	int glGetError ()
1381		1662
1382	void glClear (int mask)	1663	void glClear (int mask)
1383		1664
1384	void glClearColor (float r, float g, float b, float a = 1.0)	1665	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1392		1673
1393	void glHint (int target, int mode)	1674	void glHint (int target, int mode)
1394		1675
1395	void glBlendFunc (int sfactor, int dfactor)	1676	void glBlendFunc (int sfactor, int dfactor)
1396		1677
		1678	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1679	CODE:
		1680	gl_BlendFuncSeparate (sa, da, saa, daa);
		1681
		1682	void glDepthMask (int flag)
		1683
1397	void glLogicOp (int opcode)	1684	void glLogicOp (int opcode)
1398		1685
		1686	void glColorMask (int red, int green, int blue, int alpha)
		1687
1399	void glMatrixMode (int mode)	1688	void glMatrixMode (int mode)
1400		1689
1401	void glPushMatrix ()	1690	void glPushMatrix ()
1402		1691
1403	void glPopMatrix ()	1692	void glPopMatrix ()
1404		1693
1405	void glLoadIdentity ()	1694	void glLoadIdentity ()
1406		1695
		1696	# near_ and far_ are due to microsofts buggy "c" compiler
		1697	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1698
		1699	# near_ and far_ are due to microsofts buggy "c" compiler
1407	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1700	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408		1701
1409	void glViewport (int x, int y, int width, int height)	1702	void glViewport (int x, int y, int width, int height)
		1703
		1704	void glScissor (int x, int y, int width, int height)
1410		1705
1411	void glTranslate (float x, float y, float z = 0.)	1706	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1707	CODE:
1413	glTranslatef (x, y, z);	1708	glTranslatef (x, y, z);
1414		1709
…		…
1424		1719
1425	void glEnd ()	1720	void glEnd ()
1426		1721
1427	void glColor (float r, float g, float b, float a = 1.0)	1722	void glColor (float r, float g, float b, float a = 1.0)
1428	PROTOTYPE: @	1723	PROTOTYPE: @
		1724	ALIAS:
		1725	glColor_premultiply = 1
1429	CODE:	1726	CODE:
1430	glColor4f (r, g, b, a);	1727	if (ix)
		1728	{
		1729	r *= a;
		1730	g *= a;
		1731	b *= a;
		1732	}
		1733	// microsoft visual "c" rounds instead of truncating...
		1734	glColor4ub (MIN ((int)(r * 256.f), 255),
		1735	MIN ((int)(g * 256.f), 255),
		1736	MIN ((int)(b * 256.f), 255),
		1737	MIN ((int)(a * 256.f), 255));
		1738
		1739	void glInterleavedArrays (int format, int stride, char *data)
		1740
		1741	void glDrawElements (int mode, int count, int type, char *indices)
		1742
		1743	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1744
		1745	void glRasterPos (float x, float y, float z = 0.)
		1746	CODE:
		1747	glRasterPos3f (0, 0, z);
		1748	glBitmap (0, 0, 0, 0, x, y, 0);
1431		1749
1432	void glVertex (float x, float y, float z = 0.)	1750	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1751	CODE:
1434	glVertex3f (x, y, z);	1752	glVertex3f (x, y, z);
1435		1753
…		…
1447		1765
1448	void glBindTexture (int target, int name)	1766	void glBindTexture (int target, int name)
1449		1767
1450	void glConvolutionParameter (int target, int pname, float params)	1768	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1769	CODE:
		1770	if (gl.ConvolutionParameterf)
1452	glConvolutionParameterf (target, pname, params);	1771	gl.ConvolutionParameterf (target, pname, params);
1453		1772
1454	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1773	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1774	CODE:
		1775	if (gl.ConvolutionFilter2D)
		1776	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		1777
		1778	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1779	CODE:
		1780	if (gl.SeparableFilter2D)
		1781	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1455		1782
1456	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1783	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457		1784
1458	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1785	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1786
		1787	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		1788
		1789	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459		1790
1460	int glGenTexture ()	1791	int glGenTexture ()
1461	CODE:	1792	CODE:
1462	{	1793	{
1463	GLuint name;	1794	GLuint name;
…		…
1488		1819
1489	void glEndList ()	1820	void glEndList ()
1490		1821
1491	void glCallList (int list)	1822	void glCallList (int list)
1492		1823
		1824

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.63 by root, Mon Apr 24 06:05:33 2006 UTC vs. Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC