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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.69 by root, Sun Apr 30 08:09:44 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
47	#define GL_CALL(type,func,args) \	53	static struct
48	{ \	54	{
49	static int init_; \	55	#define GL_FUNC(ptr,name) ptr name;
50	static type fptr_; \	56	#include "glfunc.h"
51	\	57	#undef GL_FUNC
52	if (!init_) \	58	} gl;
53	{ \	59
54	init_ = 1; \	60	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	61	{
56	} \	62	if (gl.BlendFuncSeparate)
57	\	63	gl.BlendFuncSeparate (sa, da, saa, daa);
58	if (fptr_) \	64	else if (gl.BlendFuncSeparateEXT)
59	fptr_ args; \	65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
60	}	66	else
		67	glBlendFunc (sa, da);
		68	}
61		69
62	typedef Mix_Chunk *CFClient__MixChunk;	70	typedef Mix_Chunk *CFClient__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	71	typedef Mix_Music *CFClient__MixMusic;
64		72
65	typedef PangoFontDescription *CFClient__Font;	73	typedef PangoFontDescription *CFClient__Font;
66		74
67	typedef struct cf_layout {	75	typedef struct cf_layout {
68	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
69	int base_height;	79	int base_height;
70	CFClient__Font font;	80	CFClient__Font font;
71	} *CFClient__Layout;	81	} *CFClient__Layout;
72		82
73	static CFClient__Font default_font;	83	static CFClient__Font default_font;
74	static PangoContext *context;	84	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	85	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		86
77	static void	87	static void
78	substitute_func (FcPattern *pattern, gpointer data)	88	substitute_func (FcPattern *pattern, gpointer data)
79	{	89	{
80	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
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		96	#endif
82	}	97	}
83		98
84	static void	99	static void
85	layout_update_font (CFClient__Layout self)	100	layout_update_font (CFClient__Layout self)
86	{	101	{
…		…
98	static void	113	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	114	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	115	{
101	pango_layout_get_pixel_size (self->pl, w, h);	116	pango_layout_get_pixel_size (self->pl, w, h);
102		117
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	118	if (!w) w = 1;
105	if (!h) h = 1;	119	if (!h) h = 1;
		120
		121	w = (w + 3) & ~3;
106	}	122	}
107		123
108	typedef uint16_t mapface;	124	typedef uint16_t mapface;
109		125
110	typedef struct {	126	typedef struct {
…		…
258	}	274	}
259	}	275	}
260	}	276	}
261		277
262	static void	278	static void
263	music_finished ()	279	music_finished (void)
264	{	280	{
265	SDL_UserEvent ev;	281	SDL_UserEvent ev;
266		282
267	ev.type = SDL_USEREVENT;	283	ev.type = SDL_USEREVENT;
268	ev.code = 0;	284	ev.code = 0;
269	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;
270	ev.data2 = 0;	299	ev.data2 = 0;
271		300
272	SDL_PushEvent ((SDL_Event *)&ev);	301	SDL_PushEvent ((SDL_Event *)&ev);
273	}	302	}
274		303
…		…
385	# undef const_iv	414	# undef const_iv
386	};	415	};
387		416
388	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; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	418	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		419	}
390		420
		421	void
		422	pango_init ()
		423	CODE:
		424	// delayed, so it can pick up new fonts added by AddFontResourceEx
		425	{
		426	{
391	fontmap = pango_ft2_font_map_new ();	427	ft2_fontmap = pango_ft2_font_map_new ();
392	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);
393	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	}
394	}	446	}
395		447
396	int	448	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	449	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		450
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	460	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	461	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	462	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	463	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		464
		465	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		466	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		467
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	468	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	469	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		472
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	473	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
421		474
422	SDL_EnableUNICODE (1);	475	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	476	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		477
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	478	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
434		487
435	++m;	488	++m;
436	}	489	}
437	}	490	}
438		491
		492	char *
		493	SDL_GetError ()
		494
439	int	495	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	496	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	497	CODE:
442	RETVAL = !!SDL_SetVideoMode (	498	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	499	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
444	);	500	);
		501	if (RETVAL)
		502	{
445	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	}
446	OUTPUT:	508	OUTPUT:
447	RETVAL	509	RETVAL
448		510
449	void	511	void
450	SDL_GL_SwapBuffers ()	512	SDL_GL_SwapBuffers ()
		513
		514	char *
		515	SDL_GetKeyName (int sym)
451		516
452	void	517	void
453	SDL_PollEvent ()	518	SDL_PollEvent ()
454	PPCODE:	519	PPCODE:
455	{	520	{
…		…
457		522
458	while (SDL_PollEvent (&ev))	523	while (SDL_PollEvent (&ev))
459	{	524	{
460	HV *hv = newHV ();	525	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	526	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		527
462	switch (ev.type)	528	switch (ev.type)
463	{	529	{
464	case SDL_KEYDOWN:	530	case SDL_KEYDOWN:
465	case SDL_KEYUP:	531	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	532	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
473	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	539	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
474	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	540	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
475	break;	541	break;
476		542
477	case SDL_MOUSEMOTION:	543	case SDL_MOUSEMOTION:
		544	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		545
478	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	546	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
479	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	547	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
480	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	548	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
481	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	549	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
482	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	550	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
483	break;	551	break;
484		552
485	case SDL_MOUSEBUTTONDOWN:	553	case SDL_MOUSEBUTTONDOWN:
486	case SDL_MOUSEBUTTONUP:	554	case SDL_MOUSEBUTTONUP:
		555	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		556
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	557	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	558	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	559	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	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;
491	}	568	}
492		569
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	570	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	571	}
495	}	572	}
496		573
497	int	574	int
498	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)
499	POSTCALL:	576	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	577	Mix_HookMusicFinished (music_finished);
		578	Mix_ChannelFinished (channel_finished);
501		579
502	void	580	void
503	Mix_CloseAudio ()	581	Mix_CloseAudio ()
504		582
505	int	583	int
…		…
510	CODE:	588	CODE:
511	#ifndef _WIN32	589	#ifndef _WIN32
512	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	590	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
513	#endif	591	#endif
514		592
515	char *
516	gl_version ()
517	CODE:
518	RETVAL = (char *)glGetString (GL_VERSION);
519	OUTPUT:
520	RETVAL
521
522	char *
523	gl_extensions ()
524	CODE:
525	RETVAL = (char *)glGetString (GL_EXTENSIONS);
526	OUTPUT:
527	RETVAL
528
529	void	593	void
530	add_font (char *file)	594	add_font (char *file)
531	CODE:	595	CODE:
532	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
533		601
534	void	602	void
535	load_image_inline (SV *image_)	603	load_image_inline (SV *image_)
536	ALIAS:	604	ALIAS:
537	load_image_file = 1	605	load_image_file = 1
…		…
621	}	689	}
622		690
623	void	691	void
624	error (char *message)	692	error (char *message)
625	CODE:	693	CODE:
		694	fprintf (stderr, "ERROR: %s\n", message);
626	#ifdef _WIN32	695	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	696	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
628	#else
629	fprintf (stderr, "ERROR: %s\n", message);
630	#endif	697	#endif
631		698
632	void	699	void
633	fatal (char *message)	700	fatal (char *message)
634	CODE:	701	CODE:
		702	fprintf (stderr, "FATAL: %s\n", message);
635	#ifdef _WIN32	703	#ifdef _WIN32
636	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	704	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
637	#else
638	fprintf (stderr, "FATAL: %s\n", message);
639	#endif	705	#endif
640	exit (1);	706	exit (1);
641		707
642	MODULE = CFClient PACKAGE = CFClient::Font	708	MODULE = CFClient PACKAGE = CFClient::Font
643		709
644	CFClient::Font	710	CFClient::Font
645	new_from_file (SV class, char path)	711	new_from_file (SV class, char path, int id = 0)
646	CODE:	712	CODE:
647	{	713	{
648	int count;	714	int count;
649	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	715	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
650	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	716	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651	FcPatternDestroy (pattern);	717	FcPatternDestroy (pattern);
652	}	718	}
653	OUTPUT:	719	OUTPUT:
654	RETVAL	720	RETVAL
…		…
664	default_font = self;	730	default_font = self;
665		731
666	MODULE = CFClient PACKAGE = CFClient::Layout	732	MODULE = CFClient PACKAGE = CFClient::Layout
667		733
668	CFClient::Layout	734	CFClient::Layout
669	new (SV *class, int base_height = MIN_FONT_HEIGHT)	735	new (SV *class, int rgba = 0)
670	CODE:	736	CODE:
671	New (0, RETVAL, 1, struct cf_layout);	737	New (0, RETVAL, 1, struct cf_layout);
672	RETVAL->pl = pango_layout_new (context);	738
673	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;
674	RETVAL->font = 0;	746	RETVAL->font = 0;
		747
675	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	748	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676	pango_layout_set_font_description (RETVAL->pl, default_font);	749	layout_update_font (RETVAL);
677	OUTPUT:	750	OUTPUT:
678	RETVAL	751	RETVAL
679		752
680	void	753	void
681	DESTROY (CFClient::Layout self)	754	DESTROY (CFClient::Layout self)
682	CODE:	755	CODE:
683	g_object_unref (self->pl);	756	g_object_unref (self->pl);
684	Safefree (self);	757	Safefree (self);
685		758
		759	int
		760	is_rgba (CFClient::Layout self)
		761	CODE:
		762	RETVAL = self->rgba;
		763	OUTPUT:
		764	RETVAL
		765
686	void	766	void
687	set_text (CFClient::Layout self, SV *text_)	767	set_text (CFClient::Layout self, SV *text_)
688	CODE:	768	CODE:
689	{	769	{
690	STRLEN textlen;	770	STRLEN textlen;
…		…
705		785
706	SV *	786	SV *
707	get_text (CFClient::Layout self)	787	get_text (CFClient::Layout self)
708	CODE:	788	CODE:
709	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	789	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710	SvUTF8_on (RETVAL);	790	sv_utf8_decode (RETVAL);
711	OUTPUT:	791	OUTPUT:
712	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;
713		801
714	void	802	void
715	set_font (CFClient::Layout self, CFClient::Font font = 0)	803	set_font (CFClient::Layout self, CFClient::Font font = 0)
716	CODE:	804	CODE:
717	if (self->font != font)	805	if (self->font != font)
…		…
733	set_width (CFClient::Layout self, int max_width = -1)	821	set_width (CFClient::Layout self, int max_width = -1)
734	CODE:	822	CODE:
735	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);
736		824
737	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
738	size (CFClient::Layout self)	851	size (CFClient::Layout self)
739	PPCODE:	852	PPCODE:
740	{	853	{
741	int w, h;	854	int w, h;
742		855
…		…
775	render (CFClient::Layout self)	888	render (CFClient::Layout self)
776	PPCODE:	889	PPCODE:
777	{	890	{
778	SV *retval;	891	SV *retval;
779	int w, h;	892	int w, h;
780	FT_Bitmap bitmap;
781		893
782	layout_get_pixel_size (self, &w, &h);	894	layout_get_pixel_size (self, &w, &h);
783		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
784	retval = newSV (w * h);	954	retval = newSV (w * h);
785	SvPOK_only (retval);	955	SvPOK_only (retval);
786	SvCUR_set (retval, w * h);	956	SvCUR_set (retval, w * h);
787		957
788	bitmap.rows = h;	958	bitmap.rows = h;
789	bitmap.width = w;	959	bitmap.width = w;
790	bitmap.pitch = w;	960	bitmap.pitch = w;
791	bitmap.buffer = (unsigned char*)SvPVX (retval);	961	bitmap.buffer = (unsigned char*)SvPVX (retval);
792	bitmap.num_grays = 256;	962	bitmap.num_grays = 256;
793	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	963	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794		964
795	memset (bitmap.buffer, 0, w * h);	965	memset (bitmap.buffer, 0, w * h);
796		966
797	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);
798		968
799	EXTEND (SP, 3);	969	EXTEND (SP, 5);
800	PUSHs (sv_2mortal (newSViv (w)));	970	PUSHs (sv_2mortal (newSViv (w)));
801	PUSHs (sv_2mortal (newSViv (h)));	971	PUSHs (sv_2mortal (newSViv (h)));
802	PUSHs (sv_2mortal (retval));	972	PUSHs (sv_2mortal (retval));
		973	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		975	}
803	}	976	}
804		977
805	MODULE = CFClient PACKAGE = CFClient::Texture	978	MODULE = CFClient PACKAGE = CFClient::Texture
806		979
807	void	980	void
808	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)
809	PROTOTYPE: $$$;$$	982	PROTOTYPE: $$$;$$
		983	ALIAS:
		984	draw_quad_alpha = 1
		985	draw_quad_alpha_premultiplied = 2
810	CODE:	986	CODE:
811	{	987	{
812	HV hv = (HV )SvRV (self);	988	HV hv = (HV )SvRV (self);
813	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	989	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	990	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
815	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	991	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
816	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
817		992
818	if (items < 5)	993	if (items < 5)
819	{	994	{
820	w = SvNV (*hv_fetch (hv, "w", 1, 1));	995	w = SvNV (*hv_fetch (hv, "w", 1, 1));
821	h = SvNV (*hv_fetch (hv, "h", 1, 1));	996	h = SvNV (*hv_fetch (hv, "h", 1, 1));
822	}	997	}
823		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
824	glBindTexture (GL_TEXTURE_2D, name);	1013	glBindTexture (GL_TEXTURE_2D, name);
825	if (wrap_mode) {	1014
826	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828	}
829	glBegin (GL_QUADS);	1015	glBegin (GL_QUADS);
830	glTexCoord2f (0, 0); glVertex2f (x , y );	1016	glTexCoord2f (0, 0); glVertex2f (x , y );
831	glTexCoord2f (0, t); glVertex2f (x , y + h);	1017	glTexCoord2f (0, t); glVertex2f (x , y + h);
832	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1018	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1019	glTexCoord2f (s, 0); glVertex2f (x + w, y );
834	glEnd ();	1020	glEnd ();
		1021
		1022	if (ix)
		1023	{
		1024	glDisable (GL_ALPHA_TEST);
		1025	glDisable (GL_BLEND);
		1026	}
835	}	1027	}
836		1028
837	MODULE = CFClient PACKAGE = CFClient::Map	1029	MODULE = CFClient PACKAGE = CFClient::Map
838		1030
839	CFClient::Map	1031	CFClient::Map
…		…
903	tex->r = r;	1095	tex->r = r;
904	tex->g = g;	1096	tex->g = g;
905	tex->b = b;	1097	tex->b = b;
906	tex->a = a;	1098	tex->a = a;
907	}	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);
908	}	1109	}
909		1110
910	int	1111	int
911	ox (CFClient::Map self)	1112	ox (CFClient::Map self)
912	ALIAS:	1113	ALIAS:
913	oy = 1	1114	oy = 1
		1115	x = 2
		1116	y = 3
		1117	w = 4
		1118	h = 5
914	CODE:	1119	CODE:
915	switch (ix)	1120	switch (ix)
916	{	1121	{
917	case 0: RETVAL = self->ox; break;	1122	case 0: RETVAL = self->ox; break;
918	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;
919	}	1128	}
920	OUTPUT:	1129	OUTPUT:
921	RETVAL	1130	RETVAL
922		1131
923	void	1132	void
…		…
1350	const_iv (GL_COLOR_MATERIAL),	1559	const_iv (GL_COLOR_MATERIAL),
1351	const_iv (GL_SMOOTH),	1560	const_iv (GL_SMOOTH),
1352	const_iv (GL_FLAT),	1561	const_iv (GL_FLAT),
1353	const_iv (GL_DITHER),	1562	const_iv (GL_DITHER),
1354	const_iv (GL_BLEND),	1563	const_iv (GL_BLEND),
		1564	const_iv (GL_CULL_FACE),
1355	const_iv (GL_SCISSOR_TEST),	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),
1356	const_iv (GL_AND),	1570	const_iv (GL_AND),
1357	const_iv (GL_ONE),	1571	const_iv (GL_ONE),
1358	const_iv (GL_ZERO),	1572	const_iv (GL_ZERO),
1359	const_iv (GL_SRC_ALPHA),	1573	const_iv (GL_SRC_ALPHA),
1360	const_iv (GL_SRC_ALPHA_SATURATE),	1574	const_iv (GL_DST_ALPHA),
1361	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1362	const_iv (GL_ONE_MINUS_DST_ALPHA),	1576	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1577	const_iv (GL_SRC_ALPHA_SATURATE),
1363	const_iv (GL_RGB),	1578	const_iv (GL_RGB),
1364	const_iv (GL_RGBA),	1579	const_iv (GL_RGBA),
1365	const_iv (GL_UNSIGNED_BYTE),	1580	const_iv (GL_UNSIGNED_BYTE),
		1581	const_iv (GL_UNSIGNED_SHORT),
		1582	const_iv (GL_UNSIGNED_INT),
1366	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),
1367	const_iv (GL_FLOAT),	1587	const_iv (GL_FLOAT),
1368	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1588	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1369	const_iv (GL_COMPILE),	1589	const_iv (GL_COMPILE),
1370	const_iv (GL_TEXTURE_1D),	1590	const_iv (GL_TEXTURE_1D),
1371	const_iv (GL_TEXTURE_2D),	1591	const_iv (GL_TEXTURE_2D),
…		…
1373	const_iv (GL_TEXTURE_MAG_FILTER),	1593	const_iv (GL_TEXTURE_MAG_FILTER),
1374	const_iv (GL_TEXTURE_MIN_FILTER),	1594	const_iv (GL_TEXTURE_MIN_FILTER),
1375	const_iv (GL_TEXTURE_ENV_MODE),	1595	const_iv (GL_TEXTURE_ENV_MODE),
1376	const_iv (GL_TEXTURE_WRAP_S),	1596	const_iv (GL_TEXTURE_WRAP_S),
1377	const_iv (GL_TEXTURE_WRAP_T),	1597	const_iv (GL_TEXTURE_WRAP_T),
		1598	const_iv (GL_REPEAT),
1378	const_iv (GL_CLAMP),	1599	const_iv (GL_CLAMP),
1379	const_iv (GL_REPEAT),	1600	const_iv (GL_CLAMP_TO_EDGE),
1380	const_iv (GL_NEAREST),	1601	const_iv (GL_NEAREST),
1381	const_iv (GL_LINEAR),	1602	const_iv (GL_LINEAR),
1382	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1603	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1383	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1604	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1384	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1605	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1385	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1606	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1386	const_iv (GL_GENERATE_MIPMAP),	1607	const_iv (GL_GENERATE_MIPMAP),
1387	const_iv (GL_MODULATE),	1608	const_iv (GL_MODULATE),
1388	const_iv (GL_DECAL),	1609	const_iv (GL_DECAL),
1389	const_iv (GL_REPLACE),	1610	const_iv (GL_REPLACE),
		1611	const_iv (GL_DEPTH_BUFFER_BIT),
1390	const_iv (GL_COLOR_BUFFER_BIT),	1612	const_iv (GL_COLOR_BUFFER_BIT),
1391	const_iv (GL_PROJECTION),	1613	const_iv (GL_PROJECTION),
1392	const_iv (GL_MODELVIEW),	1614	const_iv (GL_MODELVIEW),
1393	const_iv (GL_COLOR_LOGIC_OP),	1615	const_iv (GL_COLOR_LOGIC_OP),
1394	const_iv (GL_SEPARABLE_2D),	1616	const_iv (GL_SEPARABLE_2D),
1395	const_iv (GL_CONVOLUTION_2D),	1617	const_iv (GL_CONVOLUTION_2D),
1396	const_iv (GL_CONVOLUTION_BORDER_MODE),	1618	const_iv (GL_CONVOLUTION_BORDER_MODE),
1397	const_iv (GL_CONSTANT_BORDER),	1619	const_iv (GL_CONSTANT_BORDER),
1398	const_iv (GL_LINES),	1620	const_iv (GL_LINES),
		1621	const_iv (GL_LINE_LOOP),
1399	const_iv (GL_QUADS),	1622	const_iv (GL_QUADS),
1400	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),
1401	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1627	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1402	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),
1403	# undef const_iv	1633	# undef const_iv
1404	};	1634	};
1405		1635
1406	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; )
1407	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1408	}	1638	}
1409		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
1410	int glGetError ()	1661	int glGetError ()
1411		1662
1412	void glClear (int mask)	1663	void glClear (int mask)
1413		1664
1414	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)
…		…
1422		1673
1423	void glHint (int target, int mode)	1674	void glHint (int target, int mode)
1424		1675
1425	void glBlendFunc (int sfactor, int dfactor)	1676	void glBlendFunc (int sfactor, int dfactor)
1426		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
1427	void glLogicOp (int opcode)	1684	void glLogicOp (int opcode)
1428		1685
1429	void glColorMask (int red, int green, int blue, int alpha)	1686	void glColorMask (int red, int green, int blue, int alpha)
1430		1687
1431	void glMatrixMode (int mode)	1688	void glMatrixMode (int mode)
…		…
1434		1691
1435	void glPopMatrix ()	1692	void glPopMatrix ()
1436		1693
1437	void glLoadIdentity ()	1694	void glLoadIdentity ()
1438		1695
1439	# near and far are due to microsofts buggy c compiler	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
1440	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_)
1441		1701
1442	void glViewport (int x, int y, int width, int height)	1702	void glViewport (int x, int y, int width, int height)
1443		1703
1444	void glScissor (int x, int y, int width, int height)	1704	void glScissor (int x, int y, int width, int height)
…		…
1459		1719
1460	void glEnd ()	1720	void glEnd ()
1461		1721
1462	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)
1463	PROTOTYPE: @	1723	PROTOTYPE: @
		1724	ALIAS:
		1725	glColor_premultiply = 1
1464	CODE:	1726	CODE:
1465	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);
1466		1749
1467	void glVertex (float x, float y, float z = 0.)	1750	void glVertex (float x, float y, float z = 0.)
1468	CODE:	1751	CODE:
1469	glVertex3f (x, y, z);	1752	glVertex3f (x, y, z);
1470		1753
…		…
1482		1765
1483	void glBindTexture (int target, int name)	1766	void glBindTexture (int target, int name)
1484		1767
1485	void glConvolutionParameter (int target, int pname, float params)	1768	void glConvolutionParameter (int target, int pname, float params)
1486	CODE:	1769	CODE:
1487	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1770	if (gl.ConvolutionParameterf)
		1771	gl.ConvolutionParameterf (target, pname, params);
1488		1772
1489	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)
1490	CODE:	1774	CODE:
1491	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1775	if (gl.ConvolutionFilter2D)
1492	(target, internalformat, width, height, format, type, data));	1776	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1493		1777
1494	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1778	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1495	CODE:	1779	CODE:
1496	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1780	if (gl.SeparableFilter2D)
1497	(target, internalformat, width, height, format, type, row, column));	1781	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1498		1782
1499	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)
1500		1784
1501	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)
1502		1786
1503	void glRasterPos (int x, int y)	1787	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1504	CODE:
1505	glRasterPos2i (x, y);
1506		1788
1507	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1789	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1508		1790
1509	int glGenTexture ()	1791	int glGenTexture ()
1510	CODE:	1792	CODE:
…		…
1537		1819
1538	void glEndList ()	1820	void glEndList ()
1539		1821
1540	void glCallList (int list)	1822	void glCallList (int list)
1541		1823
		1824

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.69 by root, Sun Apr 30 08:09:44 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.69 by root, Sun Apr 30 08:09:44 2006 UTC vs.
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC