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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
21		22
		23	#define PANGO_ENABLE_BACKEND
		24	#define G_DISABLE_CAST_CHECKS
		25
22	#include <glib/gmacros.h>	26	#include <glib/gmacros.h>
23		27
24	#include <pango/pango.h>	28	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		29
29	#ifndef _WIN32	30	#ifndef _WIN32
30	# include <sys/types.h>	31	# include <sys/types.h>
31	# include <sys/socket.h>	32	# include <sys/socket.h>
32	# include <netinet/in.h>	33	# include <netinet/in.h>
…		…
41	typedef signed int int32_t;	42	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#include "glext.h"
45		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
46	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
47		50
48	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
50		53
51	#define MIN_FONT_HEIGHT 10	54	#define MIN_FONT_HEIGHT 10
52		55
53	#define GL_CALL(type,func,args) \	56	#if 0
54	{ \	57	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	58	#else
56	static type fptr_; \	59	# define PARACHUTE 0
57	\	60	#endif
58	if (!init_) \	61
59	{ \	62	static struct
60	init_ = 1; \	63	{
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	64	#define GL_FUNC(ptr,name) ptr name;
62	} \	65	#include "glfunc.h"
63	\	66	#undef GL_FUNC
64	if (fptr_) \	67	} gl;
65	fptr_ args; \	68
66	}	69	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		70	{
		71	if (gl.BlendFuncSeparate)
		72	gl.BlendFuncSeparate (sa, da, saa, daa);
		73	else if (gl.BlendFuncSeparateEXT)
		74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		75	else
		76	glBlendFunc (sa, da);
		77	}
		78
		79	#include "texcache.c"
		80
		81	#include "pango-font.c"
		82	#include "pango-fontmap.c"
		83	#include "pango-render.c"
67		84
68	typedef Mix_Chunk *CFClient__MixChunk;	85	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	86	typedef Mix_Music *CFClient__MixMusic;
70		87
71	typedef PangoFontDescription *CFClient__Font;	88	typedef PangoFontDescription *CFClient__Font;
72		89
		90	static int
		91	shape_attr_p (PangoLayoutRun *run)
		92	{
		93	GSList *attrs = run->item->analysis.extra_attrs;
		94
		95	while (attrs)
		96	{
		97	PangoAttribute *attr = attrs->data;
		98
		99	if (attr->klass->type == PANGO_ATTR_SHAPE)
		100	return 1;
		101
		102	attrs = attrs->next;
		103	}
		104
		105	return 0;
		106	}
		107
73	typedef struct cf_layout {	108	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	109	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	110	float r, g, b, a; // default color for rgba mode
77	int base_height;	111	int base_height;
78	CFClient__Font font;	112	CFClient__Font font;
79	} *CFClient__Layout;	113	} *CFClient__Layout;
80		114
81	static CFClient__Font default_font;	115	static CFClient__Font default_font;
82	static PangoContext ft2_context, cairo_context;	116	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	117	static PangoFontMap *opengl_fontmap;
84		118
85	static void	119	static void
86	substitute_func (FcPattern *pattern, gpointer data)	120	substitute_func (FcPattern *pattern, gpointer data)
87	{	121	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	122	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	123	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	125	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	127	}
95		128
96	static void	129	static void
97	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
98	{	131	{
…		…
294	ev.code = 1;	327	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	328	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	329	ev.data2 = 0;
297		330
298	SDL_PushEvent ((SDL_Event *)&ev);	331	SDL_PushEvent ((SDL_Event *)&ev);
		332	}
		333
		334	static unsigned int
		335	minpot (unsigned int n)
		336	{
		337	if (!n)
		338	return 0;
		339
		340	--n;
		341
		342	n \|= n >> 1;
		343	n \|= n >> 2;
		344	n \|= n >> 4;
		345	n \|= n >> 8;
		346	n \|= n >> 16;
		347
		348	return n + 1;
299	}	349	}
300		350
301	MODULE = CFClient PACKAGE = CFClient	351	MODULE = CFClient PACKAGE = CFClient
302		352
303	PROTOTYPES: ENABLE	353	PROTOTYPES: ENABLE
…		…
413		463
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	464	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	466	}
417		467
		468	int
		469	in_destruct ()
		470	CODE:
		471	RETVAL = PL_main_cv == Nullcv;
		472	OUTPUT:
		473	RETVAL
		474
		475	NV floor (NV x)
		476
		477	NV ceil (NV x)
		478
418	void	479	void
419	pango_init ()	480	pango_init ()
420	CODE:	481	CODE:
421	{	482	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	483	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	484	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	485	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	486	}
430		487
431	int	488	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	489	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		490
434	void	491	void
435	SDL_Quit ()	492	SDL_Quit ()
436		493
437	void	494	void
…		…
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	500	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	501	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	502	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	503	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		504
		505	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		506	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		507
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	508	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	509	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	510	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		512
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	513	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456		514
457	SDL_EnableUNICODE (1);	515	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	516	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		517
460	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	518	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
469		527
470	++m;	528	++m;
471	}	529	}
472	}	530	}
473		531
		532	char *
		533	SDL_GetError ()
		534
474	int	535	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	536	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	537	CODE:
477	RETVAL = !!SDL_SetVideoMode (	538	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	539	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
479	);	540	);
		541	if (RETVAL)
		542	{
480	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	543	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		544	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		545	# include "glfunc.h"
		546	# undef GL_FUNC
		547	}
481	OUTPUT:	548	OUTPUT:
482	RETVAL	549	RETVAL
483		550
484	void	551	void
485	SDL_GL_SwapBuffers ()	552	SDL_GL_SwapBuffers ()
		553
		554	char *
		555	SDL_GetKeyName (int sym)
486		556
487	void	557	void
488	SDL_PollEvent ()	558	SDL_PollEvent ()
489	PPCODE:	559	PPCODE:
490	{	560	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	579	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	580	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	581	break;
512		582
513	case SDL_MOUSEMOTION:	583	case SDL_MOUSEMOTION:
		584	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		585
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	586	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	587	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	588	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	589	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	590	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	591	break;
520		592
521	case SDL_MOUSEBUTTONDOWN:	593	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	594	case SDL_MOUSEBUTTONUP:
		595	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		596
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	597	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	598	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	599	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	600	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	601	break;
…		…
554	CODE:	628	CODE:
555	#ifndef _WIN32	629	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	630	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	631	#endif
558		632
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572
573	void	633	void
574	add_font (char *file)	634	add_font (char *file)
575	CODE:	635	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	636	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
577	#ifdef _WIN32
578	// cairo... sigh... requires win2000
579	AddFontResourceEx (file, FR_PRIVATE, 0);
580	#endif
581		637
582	void	638	void
583	load_image_inline (SV *image_)	639	load_image_inline (SV *image_)
584	ALIAS:	640	ALIAS:
585	load_image_file = 1	641	load_image_file = 1
…		…
627		683
628	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	684	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
629		685
630	assert (surface2->pitch == surface2->w * 4);	686	assert (surface2->pitch == surface2->w * 4);
631		687
		688	SDL_LockSurface (surface2);
632	EXTEND (SP, 5);	689	EXTEND (SP, 6);
633	PUSHs (sv_2mortal (newSViv (surface2->w)));	690	PUSHs (sv_2mortal (newSViv (surface2->w)));
634	PUSHs (sv_2mortal (newSViv (surface2->h)));	691	PUSHs (sv_2mortal (newSViv (surface2->h)));
635	SDL_LockSurface (surface2);
636	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	692	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
637	SDL_UnlockSurface (surface2);
638	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	693	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
639	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	694	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
640	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	695	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		696	SDL_UnlockSurface (surface2);
641		697
642	SDL_FreeSurface (surface);	698	SDL_FreeSurface (surface);
643	SDL_FreeSurface (surface2);	699	SDL_FreeSurface (surface2);
644	}	700	}
645		701
…		…
669	}	725	}
670		726
671	void	727	void
672	error (char *message)	728	error (char *message)
673	CODE:	729	CODE:
		730	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	731	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	732	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	733	#endif
679		734
680	void	735	void
681	fatal (char *message)	736	fatal (char *message)
682	CODE:	737	CODE:
		738	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	739	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	740	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	741	#endif
688	exit (1);	742	_exit (1);
		743
		744	void
		745	_exit (int retval)
		746	CODE:
		747	_exit (retval);
689		748
690	MODULE = CFClient PACKAGE = CFClient::Font	749	MODULE = CFClient PACKAGE = CFClient::Font
691		750
692	CFClient::Font	751	CFClient::Font
693	new_from_file (SV class, char path, int id = 0)	752	new_from_file (SV class, char path, int id = 0)
…		…
711	CODE:	770	CODE:
712	default_font = self;	771	default_font = self;
713		772
714	MODULE = CFClient PACKAGE = CFClient::Layout	773	MODULE = CFClient PACKAGE = CFClient::Layout
715		774
		775	void
		776	reset_glyph_cache ()
		777	CODE:
		778	tc_clear ();
		779
716	CFClient::Layout	780	CFClient::Layout
717	new (SV *class, int rgba = 0)	781	new (SV *class)
718	CODE:	782	CODE:
719	New (0, RETVAL, 1, struct cf_layout);	783	New (0, RETVAL, 1, struct cf_layout);
720		784
721	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	785	RETVAL->pl = pango_layout_new (opengl_context);
722	RETVAL->rgba = rgba;
723	RETVAL->r = 1.;	786	RETVAL->r = 1.;
724	RETVAL->g = 1.;	787	RETVAL->g = 1.;
725	RETVAL->b = 1.;	788	RETVAL->b = 1.;
726	RETVAL->a = 1.;	789	RETVAL->a = 1.;
727	RETVAL->base_height = MIN_FONT_HEIGHT;	790	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
736	DESTROY (CFClient::Layout self)	799	DESTROY (CFClient::Layout self)
737	CODE:	800	CODE:
738	g_object_unref (self->pl);	801	g_object_unref (self->pl);
739	Safefree (self);	802	Safefree (self);
740		803
741	int
742	is_rgba (CFClient::Layout self)
743	CODE:
744	RETVAL = self->rgba;
745	OUTPUT:
746	RETVAL
747
748	void	804	void
749	set_text (CFClient::Layout self, SV *text_)	805	set_text (CFClient::Layout self, SV *text_)
750	CODE:	806	CODE:
751	{	807	{
752	STRLEN textlen;	808	STRLEN textlen;
…		…
763	char *text = SvPVutf8 (text_, textlen);	819	char *text = SvPVutf8 (text_, textlen);
764		820
765	pango_layout_set_markup (self->pl, text, textlen);	821	pango_layout_set_markup (self->pl, text, textlen);
766	}	822	}
767		823
		824	void
		825	set_shapes (CFClient::Layout self, ...)
		826	CODE:
		827	{
		828	PangoAttrList *attrs = 0;
		829	const char *text = pango_layout_get_text (self->pl);
		830	const char *pos = text;
		831	int arg = 4;
		832
		833	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		834	{
		835	PangoRectangle inkrect, rect;
		836	PangoAttribute *attr;
		837
		838	int x = SvIV (ST (arg - 3));
		839	int y = SvIV (ST (arg - 2));
		840	int w = SvIV (ST (arg - 1));
		841	int h = SvIV (ST (arg ));
		842
		843	inkrect.x = 0;
		844	inkrect.y = 0;
		845	inkrect.width = 0;
		846	inkrect.height = 0;
		847
		848	rect.x = x * PANGO_SCALE;
		849	rect.y = y * PANGO_SCALE;
		850	rect.width = w * PANGO_SCALE;
		851	rect.height = h * PANGO_SCALE;
		852
		853	if (!attrs)
		854	attrs = pango_layout_get_attributes (self->pl);
		855
		856	attr = pango_attr_shape_new (&inkrect, &rect);
		857	attr->start_index = pos - text;
		858	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		859	pango_attr_list_insert (attrs, attr);
		860
		861	arg += 4;
		862	pos += sizeof (OBJ_STR) - 1;
		863	}
		864
		865	if (attrs)
		866	pango_layout_set_attributes (self->pl, attrs);
		867	}
		868
		869	void
		870	get_shapes (CFClient::Layout self)
		871	PPCODE:
		872	{
		873	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		874
		875	do
		876	{
		877	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		878
		879	if (run && shape_attr_p (run))
		880	{
		881	PangoRectangle extents;
		882	pango_layout_iter_get_run_extents (iter, 0, &extents);
		883
		884	EXTEND (SP, 2);
		885	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		886	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		887	}
		888	}
		889	while (pango_layout_iter_next_run (iter));
		890
		891	pango_layout_iter_free (iter);
		892	}
		893
		894	int
		895	has_wrapped (CFClient::Layout self)
		896	CODE:
		897	{
		898	int lines = 1;
		899	const char *text = pango_layout_get_text (self->pl);
		900
		901	while (*text)
		902	lines += *text++ == '\n';
		903
		904	RETVAL = lines < pango_layout_get_line_count (self->pl);
		905	}
		906	OUTPUT:
		907	RETVAL
		908
768	SV *	909	SV *
769	get_text (CFClient::Layout self)	910	get_text (CFClient::Layout self)
770	CODE:	911	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	912	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	913	sv_utf8_decode (RETVAL);
773	OUTPUT:	914	OUTPUT:
774	RETVAL	915	RETVAL
775		916
776	void	917	void
777	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	918	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
803	set_width (CFClient::Layout self, int max_width = -1)	944	set_width (CFClient::Layout self, int max_width = -1)
804	CODE:	945	CODE:
805	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	946	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
806		947
807	void	948	void
		949	set_indent (CFClient::Layout self, int indent)
		950	CODE:
		951	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		952
		953	void
		954	set_spacing (CFClient::Layout self, int spacing)
		955	CODE:
		956	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		957
		958	void
		959	set_ellipsise (CFClient::Layout self, int ellipsise)
		960	CODE:
		961	pango_layout_set_ellipsize (self->pl,
		962	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		963	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		964	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		965	: PANGO_ELLIPSIZE_NONE
		966	);
		967
		968	void
		969	set_single_paragraph_mode (CFClient::Layout self, int spm)
		970	CODE:
		971	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		972
		973	void
808	size (CFClient::Layout self)	974	size (CFClient::Layout self)
809	PPCODE:	975	PPCODE:
810	{	976	{
811	int w, h;	977	int w, h;
812		978
…		…
814		980
815	EXTEND (SP, 2);	981	EXTEND (SP, 2);
816	PUSHs (sv_2mortal (newSViv (w)));	982	PUSHs (sv_2mortal (newSViv (w)));
817	PUSHs (sv_2mortal (newSViv (h)));	983	PUSHs (sv_2mortal (newSViv (h)));
818	}	984	}
		985
		986	int
		987	descent (CFClient::Layout self)
		988	CODE:
		989	{
		990	PangoRectangle rect;
		991	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		992	pango_layout_line_get_pixel_extents (line, 0, &rect);
		993	RETVAL = PANGO_DESCENT (rect);
		994	}
		995	OUTPUT:
		996	RETVAL
819		997
820	int	998	int
821	xy_to_index (CFClient::Layout self, int x, int y)	999	xy_to_index (CFClient::Layout self, int x, int y)
822	CODE:	1000	CODE:
823	{	1001	{
…		…
840	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1018	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
841	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1019	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
842	}	1020	}
843		1021
844	void	1022	void
845	render (CFClient::Layout self)	1023	render (CFClient::Layout self, float x, float y)
846	PPCODE:	1024	PPCODE:
847	{	1025	pango_opengl_render_layout_subpixel (
848	SV *retval;	1026	self->pl,
849	int w, h;	1027	x * PANGO_SCALE, y * PANGO_SCALE,
		1028	self->r, self->g, self->b, self->a
		1029	);
850		1030
851	layout_get_pixel_size (self, &w, &h);	1031	MODULE = CFClient PACKAGE = CFClient::Texture
852		1032
853	if (self->rgba)	1033	void
		1034	pad2pot (SV data_, SV w_, SV *h_)
		1035	CODE:
		1036	{
		1037	int ow = SvIV (w_);
		1038	int oh = SvIV (h_);
		1039
		1040	if (ow && oh)
854	{	1041	{
855	cairo_surface_t *surface;	1042	int nw = minpot (ow);
856	cairo_t *cairo;	1043	int nh = minpot (oh);
857		1044
858	retval = newSV (w * h * 4);	1045	if (nw != ow \|\| nh != oh)
859	SvPOK_only (retval);
860	SvCUR_set (retval, w * h * 4);
861
862	memset (SvPVX (retval), 0, w * h * 4);
863
864	surface = cairo_image_surface_create_for_data (
865	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
866	cairo = cairo_create (surface);
867	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
868
869	pango_cairo_show_layout (cairo, self->pl);
870
871	cairo_destroy (cairo);
872	cairo_surface_destroy (surface);
873
874	// what a mess, and its premultiplied, too :(
875	{	1046	{
876	uint32_t p = (uint32_t )SvPVX (retval);	1047	if (SvOK (data_))
877	uint32_t e = p + w h;
878
879	while (p < e)
880	{	1048	{
881	uint32_t rgba = *p;	1049	STRLEN datalen;
882	rgba = (rgba >> 24) \| (rgba << 8);	1050	char *data = SvPVbyte (data_, datalen);
883	rgba = SDL_SwapBE32 (rgba);	1051	int bpp = datalen / (ow * oh);
884	*p++ = rgba;	1052	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1053
		1054	SvPOK_only (result_);
		1055	SvCUR_set (result_, nw * nh * bpp);
		1056
		1057	memset (SvPVX (result_), 0, nw * nh * bpp);
		1058	while (oh--)
		1059	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1060
		1061	sv_setsv (data_, result_);
885	}	1062	}
		1063
		1064	sv_setiv (w_, nw);
		1065	sv_setiv (h_, nh);
886	}	1066	}
887
888	EXTEND (SP, 5);
889	PUSHs (sv_2mortal (newSViv (w)));
890	PUSHs (sv_2mortal (newSViv (h)));
891	PUSHs (sv_2mortal (retval));
892	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
893	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
894	}	1067	}
895	else
896	{
897	FT_Bitmap bitmap;
898
899	retval = newSV (w * h);
900	SvPOK_only (retval);
901	SvCUR_set (retval, w * h);
902
903	bitmap.rows = h;
904	bitmap.width = w;
905	bitmap.pitch = w;
906	bitmap.buffer = (unsigned char*)SvPVX (retval);
907	bitmap.num_grays = 256;
908	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
909
910	memset (bitmap.buffer, 0, w * h);
911
912	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
913
914	EXTEND (SP, 5);
915	PUSHs (sv_2mortal (newSViv (w)));
916	PUSHs (sv_2mortal (newSViv (h)));
917	PUSHs (sv_2mortal (retval));
918	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
919	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
920	}
921	}	1068	}
922		1069
923	MODULE = CFClient PACKAGE = CFClient::Texture
924
925	void	1070	void
926	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1071	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
927	PROTOTYPE: $$$;$$	1072	PROTOTYPE: $$$;$$
928	ALIAS:	1073	ALIAS:
929	draw_quad_alpha = 1	1074	draw_quad_alpha = 1
930	draw_quad_alpha_premultiplied = 2	1075	draw_quad_alpha_premultiplied = 2
931	CODE:	1076	CODE:
932	{	1077	{
933	HV hv = (HV )SvRV (self);	1078	HV hv = (HV )SvRV (self);
934	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1079	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
935	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1080	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
936	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1081	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
937	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
938		1082
939	if (items < 5)	1083	if (items < 5)
940	{	1084	{
941	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1085	w = SvNV (*hv_fetch (hv, "w", 1, 1));
942	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1086	h = SvNV (*hv_fetch (hv, "h", 1, 1));
943	}	1087	}
944		1088
945	if (ix)	1089	if (ix)
946	{	1090	{
947	glEnable (GL_BLEND);	1091	glEnable (GL_BLEND);
		1092
		1093	if (ix == 2)
948	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1094	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1095	else
		1096	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1097	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1098
		1099	glEnable (GL_ALPHA_TEST);
		1100	glAlphaFunc (GL_GREATER, 0.01f);
949	}	1101	}
950		1102
951	glBindTexture (GL_TEXTURE_2D, name);	1103	glBindTexture (GL_TEXTURE_2D, name);
952
953	if (wrap_mode)
954	{
955	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
956	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
957	}
958		1104
959	glBegin (GL_QUADS);	1105	glBegin (GL_QUADS);
960	glTexCoord2f (0, 0); glVertex2f (x , y );	1106	glTexCoord2f (0, 0); glVertex2f (x , y );
961	glTexCoord2f (0, t); glVertex2f (x , y + h);	1107	glTexCoord2f (0, t); glVertex2f (x , y + h);
962	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1108	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
963	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1109	glTexCoord2f (s, 0); glVertex2f (x + w, y );
964	glEnd ();	1110	glEnd ();
965		1111
966	if (ix)	1112	if (ix)
		1113	{
		1114	glDisable (GL_ALPHA_TEST);
967	glDisable (GL_BLEND);	1115	glDisable (GL_BLEND);
		1116	}
968	}	1117	}
969		1118
970	MODULE = CFClient PACKAGE = CFClient::Map	1119	MODULE = CFClient PACKAGE = CFClient::Map
971		1120
972	CFClient::Map	1121	CFClient::Map
…		…
992	DESTROY (CFClient::Map self)	1141	DESTROY (CFClient::Map self)
993	CODE:	1142	CODE:
994	{	1143	{
995	map_clear (self);	1144	map_clear (self);
996	Safefree (self->face);	1145	Safefree (self->face);
		1146	Safefree (self->tex);
997	Safefree (self);	1147	Safefree (self);
998	}	1148	}
999		1149
1000	void	1150	void
1001	clear (CFClient::Map self)	1151	clear (CFClient::Map self)
…		…
1036	tex->r = r;	1186	tex->r = r;
1037	tex->g = g;	1187	tex->g = g;
1038	tex->b = b;	1188	tex->b = b;
1039	tex->a = a;	1189	tex->a = a;
1040	}	1190	}
		1191
		1192	// somewhat hackish, but for textures that require it, it really
		1193	// improves the look, and most others don't suffer.
		1194	glBindTexture (GL_TEXTURE_2D, name);
		1195	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1196	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1197	// use uglier nearest interpolation because linear suffers
		1198	// from transparent color bleeding and ugly wrapping effects.
		1199	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1041	}	1200	}
1042		1201
1043	int	1202	int
1044	ox (CFClient::Map self)	1203	ox (CFClient::Map self)
1045	ALIAS:	1204	ALIAS:
1046	oy = 1	1205	oy = 1
		1206	x = 2
		1207	y = 3
		1208	w = 4
		1209	h = 5
1047	CODE:	1210	CODE:
1048	switch (ix)	1211	switch (ix)
1049	{	1212	{
1050	case 0: RETVAL = self->ox; break;	1213	case 0: RETVAL = self->ox; break;
1051	case 1: RETVAL = self->oy; break;	1214	case 1: RETVAL = self->oy; break;
		1215	case 2: RETVAL = self->x; break;
		1216	case 3: RETVAL = self->y; break;
		1217	case 4: RETVAL = self->w; break;
		1218	case 5: RETVAL = self->h; break;
1052	}	1219	}
1053	OUTPUT:	1220	OUTPUT:
1054	RETVAL	1221	RETVAL
1055		1222
1056	void	1223	void
…		…
1090		1257
1091	while (data < data_end)	1258	while (data < data_end)
1092	{	1259	{
1093	flags = (data [0] << 8) + data [1]; data += 2;	1260	flags = (data [0] << 8) + data [1]; data += 2;
1094		1261
1095	x = ((flags >> 10) & 63) + self->x;	1262	x = self->x + ((flags >> 10) & 63);
1096	y = ((flags >> 4) & 63) + self->y;	1263	y = self->y + ((flags >> 4) & 63);
1097		1264
1098	cell = map_get_cell (self, x, y);	1265	cell = map_get_cell (self, x, y);
1099		1266
1100	if (flags & 15)	1267	if (flags & 15)
1101	{	1268	{
…		…
1191	OUTPUT:	1358	OUTPUT:
1192	RETVAL	1359	RETVAL
1193		1360
1194	void	1361	void
1195	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1362	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1196	PPCODE:	1363	CODE:
1197	{	1364	{
1198	int vx, vy;	1365	int vx, vy;
1199	int x, y, z;	1366	int x, y, z;
1200	int last_name;	1367	int last_name;
1201	mapface face;	1368	mapface face;
1202	int sw4 = (sw + 3) & ~3;
1203	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1204	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1205		1369
1206	memset (darkness, 255, sw4 * sh);
1207	SvPOK_only (darkness_sv);
1208	SvCUR_set (darkness_sv, sw4 * sh);
1209
1210	vx = self->x + (self->w - sw) / 2 - shift_x;	1370	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1211	vy = self->y + (self->h - sh) / 2 - shift_y;	1371	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1212		1372
1213	/*	1373	/*
1214	int vx = self->vx = self->w >= sw	1374	int vx = self->vx = self->w >= sw
1215	? self->x + (self->w - sw) / 2	1375	? self->x + (self->w - sw) / 2
1216	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1376	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1220	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1380	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1221	*/	1381	*/
1222		1382
1223	glColor4ub (255, 255, 255, 255);	1383	glColor4ub (255, 255, 255, 255);
1224		1384
		1385	glEnable (GL_BLEND);
1225	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1386	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1226	glEnable (GL_BLEND);
1227	glEnable (GL_TEXTURE_2D);	1387	glEnable (GL_TEXTURE_2D);
1228	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1388	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1229		1389
1230	glBegin (GL_QUADS);	1390	glBegin (GL_QUADS);
1231		1391
…		…
1239		1399
1240	for (x = 0; x < sw; x++)	1400	for (x = 0; x < sw; x++)
1241	if (row->c0 <= x + vx && x + vx < row->c1)	1401	if (row->c0 <= x + vx && x + vx < row->c1)
1242	{	1402	{
1243	mapcell *cell = row->col + (x + vx - row->c0);	1403	mapcell *cell = row->col + (x + vx - row->c0);
1244
1245	darkness[y * sw4 + x] = cell->darkness < 0
1246	? 255 - FOW_DARKNESS
1247	: 255 - cell->darkness;
1248		1404
1249	face = cell->face [z];	1405	face = cell->face [z];
1250		1406
1251	if (face)	1407	if (face)
1252	{	1408	{
…		…
1273		1429
1274	glEnd ();	1430	glEnd ();
1275		1431
1276	glDisable (GL_TEXTURE_2D);	1432	glDisable (GL_TEXTURE_2D);
1277	glDisable (GL_BLEND);	1433	glDisable (GL_BLEND);
		1434	}
		1435
		1436	void
		1437	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1438	CODE:
		1439	{
		1440	static float color[16][3] = {
		1441	{ 0.00F, 0.00F, 0.00F },
		1442	{ 1.00F, 1.00F, 1.00F },
		1443	{ 0.00F, 0.00F, 0.55F },
		1444	{ 1.00F, 0.00F, 0.00F },
		1445
		1446	{ 1.00F, 0.54F, 0.00F },
		1447	{ 0.11F, 0.56F, 1.00F },
		1448	{ 0.93F, 0.46F, 0.00F },
		1449	{ 0.18F, 0.54F, 0.34F },
		1450
		1451	{ 0.56F, 0.73F, 0.56F },
		1452	{ 0.80F, 0.80F, 0.80F },
		1453	{ 0.55F, 0.41F, 0.13F },
		1454	{ 0.99F, 0.77F, 0.26F },
		1455
		1456	{ 0.74F, 0.65F, 0.41F },
		1457
		1458	{ 0.00F, 1.00F, 1.00F },
		1459	{ 1.00F, 0.00F, 1.00F },
		1460	{ 1.00F, 1.00F, 0.00F },
		1461	};
		1462
		1463	int x, y;
		1464
		1465	glEnable (GL_TEXTURE_2D);
		1466	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1467	glEnable (GL_BLEND);
		1468	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1469	glBegin (GL_QUADS);
		1470
		1471	for (y = 0; y < h; y++)
		1472	for (x = 0; x < w; x++)
		1473	{
		1474	unsigned char m = data [x + y * w];
		1475
		1476	if (m)
		1477	{
		1478	float *c = color [m & 15];
		1479
		1480	float tx1 = m & 0x40 ? 0.5 : 0.;
		1481	float tx2 = tx1 + 0.5;
		1482
		1483	glColor4f (c[0], c[1], c[2], 0.75);
		1484	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1485	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1486	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1487	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1488	}
		1489	}
		1490
		1491	glEnd ();
		1492	glDisable (GL_BLEND);
		1493	glDisable (GL_TEXTURE_2D);
		1494	}
		1495
		1496	void
		1497	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1498	PPCODE:
		1499	{
		1500	int vx, vy;
		1501	int x, y;
		1502	int sw4 = (sw + 3) & ~3;
		1503	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1504	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1505
		1506	memset (darkness, 255, sw4 * sh);
		1507	SvPOK_only (darkness_sv);
		1508	SvCUR_set (darkness_sv, sw4 * sh);
		1509
		1510	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1511	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1512
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	darkness[y * sw4 + x] = cell->darkness < 0
		1524	? 255 - FOW_DARKNESS
		1525	: 255 - cell->darkness;
		1526	}
		1527	}
1278		1528
1279	EXTEND (SP, 3);	1529	EXTEND (SP, 3);
1280	PUSHs (sv_2mortal (newSViv (sw4)));	1530	PUSHs (sv_2mortal (newSViv (sw4)));
1281	PUSHs (sv_2mortal (newSViv (sh)));	1531	PUSHs (sv_2mortal (newSViv (sh)));
1282	PUSHs (darkness_sv);	1532	PUSHs (darkness_sv);
…		…
1483	const_iv (GL_COLOR_MATERIAL),	1733	const_iv (GL_COLOR_MATERIAL),
1484	const_iv (GL_SMOOTH),	1734	const_iv (GL_SMOOTH),
1485	const_iv (GL_FLAT),	1735	const_iv (GL_FLAT),
1486	const_iv (GL_DITHER),	1736	const_iv (GL_DITHER),
1487	const_iv (GL_BLEND),	1737	const_iv (GL_BLEND),
		1738	const_iv (GL_CULL_FACE),
1488	const_iv (GL_SCISSOR_TEST),	1739	const_iv (GL_SCISSOR_TEST),
		1740	const_iv (GL_DEPTH_TEST),
		1741	const_iv (GL_ALPHA_TEST),
		1742	const_iv (GL_NORMALIZE),
		1743	const_iv (GL_RESCALE_NORMAL),
		1744	const_iv (GL_FRONT),
		1745	const_iv (GL_BACK),
1489	const_iv (GL_AND),	1746	const_iv (GL_AND),
1490	const_iv (GL_ONE),	1747	const_iv (GL_ONE),
1491	const_iv (GL_ZERO),	1748	const_iv (GL_ZERO),
1492	const_iv (GL_SRC_ALPHA),	1749	const_iv (GL_SRC_ALPHA),
1493	const_iv (GL_SRC_ALPHA_SATURATE),	1750	const_iv (GL_DST_ALPHA),
1494	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1751	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495	const_iv (GL_ONE_MINUS_DST_ALPHA),	1752	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1753	const_iv (GL_SRC_ALPHA_SATURATE),
1496	const_iv (GL_RGB),	1754	const_iv (GL_RGB),
1497	const_iv (GL_RGBA),	1755	const_iv (GL_RGBA),
		1756	const_iv (GL_RGBA4),
		1757	const_iv (GL_RGBA8),
		1758	const_iv (GL_RGB5_A1),
1498	const_iv (GL_UNSIGNED_BYTE),	1759	const_iv (GL_UNSIGNED_BYTE),
		1760	const_iv (GL_UNSIGNED_SHORT),
		1761	const_iv (GL_UNSIGNED_INT),
1499	const_iv (GL_ALPHA),	1762	const_iv (GL_ALPHA),
		1763	const_iv (GL_INTENSITY),
1500	const_iv (GL_LUMINANCE),	1764	const_iv (GL_LUMINANCE),
		1765	const_iv (GL_LUMINANCE_ALPHA),
1501	const_iv (GL_FLOAT),	1766	const_iv (GL_FLOAT),
1502	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1767	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1503	const_iv (GL_COMPILE),	1768	const_iv (GL_COMPILE),
1504	const_iv (GL_TEXTURE_1D),	1769	const_iv (GL_TEXTURE_1D),
1505	const_iv (GL_TEXTURE_2D),	1770	const_iv (GL_TEXTURE_2D),
…		…
1507	const_iv (GL_TEXTURE_MAG_FILTER),	1772	const_iv (GL_TEXTURE_MAG_FILTER),
1508	const_iv (GL_TEXTURE_MIN_FILTER),	1773	const_iv (GL_TEXTURE_MIN_FILTER),
1509	const_iv (GL_TEXTURE_ENV_MODE),	1774	const_iv (GL_TEXTURE_ENV_MODE),
1510	const_iv (GL_TEXTURE_WRAP_S),	1775	const_iv (GL_TEXTURE_WRAP_S),
1511	const_iv (GL_TEXTURE_WRAP_T),	1776	const_iv (GL_TEXTURE_WRAP_T),
		1777	const_iv (GL_REPEAT),
1512	const_iv (GL_CLAMP),	1778	const_iv (GL_CLAMP),
1513	const_iv (GL_REPEAT),	1779	const_iv (GL_CLAMP_TO_EDGE),
1514	const_iv (GL_NEAREST),	1780	const_iv (GL_NEAREST),
1515	const_iv (GL_LINEAR),	1781	const_iv (GL_LINEAR),
1516	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1782	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1517	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1783	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1518	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1784	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1519	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1785	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520	const_iv (GL_GENERATE_MIPMAP),	1786	const_iv (GL_GENERATE_MIPMAP),
1521	const_iv (GL_MODULATE),	1787	const_iv (GL_MODULATE),
1522	const_iv (GL_DECAL),	1788	const_iv (GL_DECAL),
1523	const_iv (GL_REPLACE),	1789	const_iv (GL_REPLACE),
		1790	const_iv (GL_DEPTH_BUFFER_BIT),
1524	const_iv (GL_COLOR_BUFFER_BIT),	1791	const_iv (GL_COLOR_BUFFER_BIT),
1525	const_iv (GL_PROJECTION),	1792	const_iv (GL_PROJECTION),
1526	const_iv (GL_MODELVIEW),	1793	const_iv (GL_MODELVIEW),
1527	const_iv (GL_COLOR_LOGIC_OP),	1794	const_iv (GL_COLOR_LOGIC_OP),
1528	const_iv (GL_SEPARABLE_2D),	1795	const_iv (GL_SEPARABLE_2D),
1529	const_iv (GL_CONVOLUTION_2D),	1796	const_iv (GL_CONVOLUTION_2D),
1530	const_iv (GL_CONVOLUTION_BORDER_MODE),	1797	const_iv (GL_CONVOLUTION_BORDER_MODE),
1531	const_iv (GL_CONSTANT_BORDER),	1798	const_iv (GL_CONSTANT_BORDER),
1532	const_iv (GL_LINES),	1799	const_iv (GL_LINES),
		1800	const_iv (GL_LINE_LOOP),
1533	const_iv (GL_QUADS),	1801	const_iv (GL_QUADS),
1534	const_iv (GL_LINE_LOOP),	1802	const_iv (GL_QUAD_STRIP),
		1803	const_iv (GL_TRIANGLES),
		1804	const_iv (GL_TRIANGLE_STRIP),
		1805	const_iv (GL_TRIANGLE_FAN),
1535	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1806	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1536	const_iv (GL_FASTEST),	1807	const_iv (GL_FASTEST),
		1808	const_iv (GL_V2F),
		1809	const_iv (GL_V3F),
		1810	const_iv (GL_T2F_V3F),
		1811	const_iv (GL_T2F_N3F_V3F),
1537	# undef const_iv	1812	# undef const_iv
1538	};	1813	};
1539		1814
1540	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1815	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1541	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1816	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1542	}	1817	}
1543		1818
		1819	char *
		1820	gl_vendor ()
		1821	CODE:
		1822	RETVAL = (char *)glGetString (GL_VENDOR);
		1823	OUTPUT:
		1824	RETVAL
		1825
		1826	char *
		1827	gl_version ()
		1828	CODE:
		1829	RETVAL = (char *)glGetString (GL_VERSION);
		1830	OUTPUT:
		1831	RETVAL
		1832
		1833	char *
		1834	gl_extensions ()
		1835	CODE:
		1836	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1837	OUTPUT:
		1838	RETVAL
		1839
1544	int glGetError ()	1840	int glGetError ()
		1841
		1842	void glFinish ()
1545		1843
1546	void glClear (int mask)	1844	void glClear (int mask)
1547		1845
1548	void glClearColor (float r, float g, float b, float a = 1.0)	1846	void glClearColor (float r, float g, float b, float a = 1.0)
1549	PROTOTYPE: @	1847	PROTOTYPE: @
…		…
1556		1854
1557	void glHint (int target, int mode)	1855	void glHint (int target, int mode)
1558		1856
1559	void glBlendFunc (int sfactor, int dfactor)	1857	void glBlendFunc (int sfactor, int dfactor)
1560		1858
		1859	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1860	CODE:
		1861	gl_BlendFuncSeparate (sa, da, saa, daa);
		1862
		1863	void glDepthMask (int flag)
		1864
1561	void glLogicOp (int opcode)	1865	void glLogicOp (int opcode)
1562		1866
1563	void glColorMask (int red, int green, int blue, int alpha)	1867	void glColorMask (int red, int green, int blue, int alpha)
1564		1868
1565	void glMatrixMode (int mode)	1869	void glMatrixMode (int mode)
…		…
1568		1872
1569	void glPopMatrix ()	1873	void glPopMatrix ()
1570		1874
1571	void glLoadIdentity ()	1875	void glLoadIdentity ()
1572		1876
		1877	void glDrawBuffer (int buffer)
		1878
		1879	void glReadBuffer (int buffer)
		1880
1573	# near and far are due to microsofts buggy c compiler	1881	# near_ and far_ are due to microsofts buggy "c" compiler
		1882	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1883
		1884	# near_ and far_ are due to microsofts buggy "c" compiler
1574	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1885	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1575		1886
1576	void glViewport (int x, int y, int width, int height)	1887	void glViewport (int x, int y, int width, int height)
1577		1888
1578	void glScissor (int x, int y, int width, int height)	1889	void glScissor (int x, int y, int width, int height)
…		…
1593		1904
1594	void glEnd ()	1905	void glEnd ()
1595		1906
1596	void glColor (float r, float g, float b, float a = 1.0)	1907	void glColor (float r, float g, float b, float a = 1.0)
1597	PROTOTYPE: @	1908	PROTOTYPE: @
		1909	ALIAS:
		1910	glColor_premultiply = 1
1598	CODE:	1911	CODE:
1599	glColor4ub (MIN ((int)(r * 255.f), 255),	1912	if (ix)
1600	MIN ((int)(g * 255.f), 255),	1913	{
1601	MIN ((int)(b * 255.f), 255),	1914	r *= a;
1602	MIN ((int)(a * 255.f), 255));	1915	g *= a;
		1916	b *= a;
		1917	}
		1918	// microsoft visual "c" rounds instead of truncating...
		1919	glColor4f (r, g, b, a);
		1920
		1921	void glInterleavedArrays (int format, int stride, char *data)
		1922
		1923	void glDrawElements (int mode, int count, int type, char *indices)
		1924
		1925	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1926
		1927	void glRasterPos (float x, float y, float z = 0.)
		1928	CODE:
		1929	glRasterPos3f (0, 0, z);
		1930	glBitmap (0, 0, 0, 0, x, y, 0);
1603		1931
1604	void glVertex (float x, float y, float z = 0.)	1932	void glVertex (float x, float y, float z = 0.)
1605	CODE:	1933	CODE:
1606	glVertex3f (x, y, z);	1934	glVertex3f (x, y, z);
1607		1935
…		…
1619		1947
1620	void glBindTexture (int target, int name)	1948	void glBindTexture (int target, int name)
1621		1949
1622	void glConvolutionParameter (int target, int pname, float params)	1950	void glConvolutionParameter (int target, int pname, float params)
1623	CODE:	1951	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1952	if (gl.ConvolutionParameterf)
		1953	gl.ConvolutionParameterf (target, pname, params);
1625		1954
1626	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1955	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1627	CODE:	1956	CODE:
1628	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1957	if (gl.ConvolutionFilter2D)
1629	(target, internalformat, width, height, format, type, data));	1958	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1630		1959
1631	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1960	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1632	CODE:	1961	CODE:
1633	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1962	if (gl.SeparableFilter2D)
1634	(target, internalformat, width, height, format, type, row, column));	1963	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1635		1964
1636	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1965	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1637		1966
1638	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1967	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1639		1968
1640	void glRasterPos (int x, int y)	1969	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1641	CODE:
1642	glRasterPos2i (x, y);
1643		1970
1644	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1971	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1645		1972
1646	int glGenTexture ()	1973	int glGenTexture ()
1647	CODE:	1974	CODE:
…		…
1674		2001
1675	void glEndList ()	2002	void glEndList ()
1676		2003
1677	void glCallList (int list)	2004	void glCallList (int list)
1678		2005
		2006

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs. Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC