ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
6	#endif	8	#endif
7		9
8	#include "EXTERN.h"	10	#include "EXTERN.h"
9	#include "perl.h"	11	#include "perl.h"
10	#include "XSUB.h"	12	#include "XSUB.h"
11		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
12	#include <math.h>	18	#include <math.h>
13	#include <string.h>	19	#include <string.h>
14	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
15		22
16	#include <SDL.h>	23	#include <SDL.h>
17	#include <SDL_endian.h>	24	#include <SDL_endian.h>
18	#include <SDL_image.h>	25	#include <SDL_image.h>
19	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
21		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
22	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
23		33
24	#include <pango/pango.h>	34	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		35
29	#ifndef _WIN32	36	#ifndef _WIN32
30	# include <sys/types.h>	37	# include <sys/types.h>
31	# include <sys/socket.h>	38	# include <sys/socket.h>
32	# include <netinet/in.h>	39	# include <netinet/in.h>
…		…
39	typedef signed char int8_t;	46	typedef signed char int8_t;
40	typedef signed short int16_t;	47	typedef signed short int16_t;
41	typedef signed int int32_t;	48	typedef signed int int32_t;
42	#endif	49	#endif
43		50
44	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		52
46	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
47		54
48	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
50		57
51	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
		59
		60	#if 0
		61	# define PARACHUTE SDL_INIT_NOPARACHUTE
		62	#else
		63	# define PARACHUTE 0
		64	#endif
52		65
53	static struct	66	static struct
54	{	67	{
55	#define GL_FUNC(ptr,name) ptr name;	68	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	69	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	79	else
67	glBlendFunc (sa, da);	80	glBlendFunc (sa, da);
68	}	81	}
69		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
70	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
72		91
73	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
74		111
75	typedef struct cf_layout {	112	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
79	int base_height;	115	int base_height;
80	CFClient__Font font;	116	CFPlus__Font font;
81	} *CFClient__Layout;	117	} *CFPlus__Layout;
82		118
83	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
84	static PangoContext *ft2_context, *cairo_context;	120	static PangoContext *opengl_context;
85	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
86		122
87	static void	123	static void
88	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
89	{	125	{
90	FcPatternAddBool (pattern, FC_HINTING, 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef FC_HINT_STYLE	127	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#endif	129	#endif
94	#ifdef _WIN32
95	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96	#else
97	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98	#endif
99	}	131	}
100		132
101	static void	133	static void
102	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
103	{	135	{
104	/* use a random scale factor to account for unknown descenders, 0.8 works	136	/* use a random scale factor to account for unknown descenders, 0.8 works
105	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
106	*/	138	*/
107	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
111		143
112	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
113	}	145	}
114		146
115	static void	147	static void
116	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	148	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
118	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
119		154
120	if (!*w) *w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121	if (!*h) *h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122		157
123	*w = (*w + 3) & ~3;	158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
124	}	163	}
125		164
126	typedef uint16_t mapface;	165	typedef uint16_t mapface;
127		166
128	typedef struct {	167	typedef struct {
…		…
131	float s, t;	170	float s, t;
132	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
133	} maptex;	172	} maptex;
134		173
135	typedef struct {	174	typedef struct {
136	int16_t darkness;	175	uint32_t player;
137	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
138	} mapcell;	179	} mapcell;
139		180
140	typedef struct {	181	typedef struct {
141	int32_t c0, c1;	182	int32_t c0, c1;
142	mapcell *col;	183	mapcell *col;
…		…
151	int texs;	192	int texs;
152	maptex *tex;	193	maptex *tex;
153		194
154	int32_t rows;	195	int32_t rows;
155	maprow *row;	196	maprow *row;
156	} *CFClient__Map;	197	} *CFPlus__Map;
157		198
158	static char *	199	static char *
159	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
160	{	201	{
161	char *p;	202	char *p;
…		…
179		220
180	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
181	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	222	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182		223
183	static maprow *	224	static maprow *
184	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
185	{	226	{
186	if (0 > y)	227	if (0 > y)
187	{	228	{
188	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
189	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
227		268
228	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
229	}	270	}
230		271
231	static mapcell *	272	static mapcell *
232	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
233	{	274	{
234	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
235	}	276	}
236		277
237	static void	278	static void
238	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
239	{	280	{
240	int r;	281	int r;
241		282
242	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
243	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
251	self->row = 0;	292	self->row = 0;
252	self->rows = 0;	293	self->rows = 0;
253	}	294	}
254		295
255	static void	296	static void
256	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	297	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
257	{	298	{
258	int x, y;	299	int x, y;
259	maprow *row;	300	maprow *row;
		301	mapcell *cell;
260		302
261	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
262	if (y >= 0)	304	if (y >= 0)
263	{	305	{
264	if (y >= self->rows)	306	if (y >= self->rows)
…		…
270	if (x >= row->c0)	312	if (x >= row->c0)
271	{	313	{
272	if (x >= row->c1)	314	if (x >= row->c1)
273	break;	315	break;
274		316
275	row->col[x - row->c0].darkness = -1;	317	cell = row->col + x - row->c0;
		318
		319	cell->darkness = 0;
		320	cell->stat_hp = 0;
		321	cell->flags = 0;
		322	cell->player = 0;
276	}	323	}
277	}	324	}
278	}	325	}
279		326
280	static void	327	static void
…		…
301	ev.data2 = 0;	348	ev.data2 = 0;
302		349
303	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
304	}	351	}
305		352
		353	static unsigned int
		354	minpot (unsigned int n)
		355	{
		356	if (!n)
		357	return 0;
		358
		359	--n;
		360
		361	n |= n >> 1;
		362	n |= n >> 2;
		363	n |= n >> 4;
		364	n |= n >> 8;
		365	n |= n >> 16;
		366
		367	return n + 1;
		368	}
		369
306	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
307		371
308	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
309		373
310	BOOT:	374	BOOT:
311	{	375	{
312	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
313	static const struct {	377	static const struct {
314	const char *name;	378	const char *name;
315	IV iv;	379	IV iv;
316	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
317	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
418		482
419	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
420	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
421	}	485	}
422		486
		487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
		494	NV floor (NV x)
		495
		496	NV ceil (NV x)
		497
423	void	498	void
424	pango_init ()	499	pango_init ()
425	CODE:	500	CODE:
426	// delayed, so it can pick up new fonts added by AddFontResourceEx
427	{	501	{
428	{
429	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
430	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
431	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432	}
433	{
434	cairo_font_options_t *fopt = cairo_font_options_create ();
435	cairo_fontmap = pango_cairo_font_map_get_default ();
436	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437	#ifdef _WIN32
438	// cairo looks like shit eaten twice on windows
439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440	#else
441	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442	#endif
443	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445	pango_cairo_context_set_font_options (cairo_context, fopt);
446	cairo_font_options_destroy (fopt);
447	}
448	}	505	}
449		506
450	int	507	int
451	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452		509
453	void	510	void
454	SDL_Quit ()	511	SDL_Quit ()
455		512
456	void	513	void
…		…
463	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466		523
467	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469		526
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474		531
475	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
		534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
476		537
477	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
478	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479		540
480	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
567	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569	break;	630	break;
570	}	631	}
571		632
572	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573	}	634	}
574	}	635	}
575		636
576	int	637	int
577	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
591	#ifndef _WIN32	652	#ifndef _WIN32
592	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
593	#endif	654	#endif
594		655
595	void	656	void
		657	win32_proxy_info ()
		658	PPCODE:
		659	{
		660	#ifdef _WIN32
		661	char buffer[2048];
		662	DWORD buflen;
		663
		664	EXTEND (SP, 3);
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		668	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		669	{
		670	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		671
		672	buflen = sizeof (buffer);
		673	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		674	{
		675	PUSHs (newSVpv (buffer, 0));
		676
		677	buflen = sizeof (buffer);
		678	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		679	PUSHs (newSVpv (buffer, 0));
		680	}
		681	}
		682	#endif
		683	}
		684
		685	void
596	add_font (char *file)	686	add_font (char *file)
597	CODE:	687	CODE:
598	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599	#ifdef _WIN32
600	// cairo... sigh... requires win2000
601	AddFontResourceEx (file, FR_PRIVATE, 0);
602	#endif
603		689
604	void	690	void
605	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
606	ALIAS:	692	ALIAS:
607	load_image_file = 1	693	load_image_file = 1
…		…
649		735
650	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651		737
652	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
653		739
		740	SDL_LockSurface (surface2);
654	EXTEND (SP, 5);	741	EXTEND (SP, 6);
655	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
656	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
657	SDL_LockSurface (surface2);
658	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659	SDL_UnlockSurface (surface2);
660	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	745	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
663		749
664	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
665	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
666	}	752	}
667		753
…		…
703	CODE:	789	CODE:
704	fprintf (stderr, "FATAL: %s\n", message);	790	fprintf (stderr, "FATAL: %s\n", message);
705	#ifdef _WIN32	791	#ifdef _WIN32
706	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707	#endif	793	#endif
708	exit (1);	794	_exit (1);
709		795
		796	void
		797	_exit (int retval = 0)
		798	CODE:
		799	_exit (retval);
		800
710	MODULE = CFClient PACKAGE = CFClient::Font	801	MODULE = CFPlus PACKAGE = CFPlus::Font
711		802
712	CFClient::Font	803	CFPlus::Font
713	new_from_file (SV *class, char *path, int id = 0)	804	new_from_file (SV *class, char *path, int id = 0)
714	CODE:	805	CODE:
715	{	806	{
716	int count;	807	int count;
717	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	808	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
720	}	811	}
721	OUTPUT:	812	OUTPUT:
722	RETVAL	813	RETVAL
723		814
724	void	815	void
725	DESTROY (CFClient::Font self)	816	DESTROY (CFPlus::Font self)
726	CODE:	817	CODE:
727	pango_font_description_free (self);	818	pango_font_description_free (self);
728		819
729	void	820	void
730	make_default (CFClient::Font self)	821	make_default (CFPlus::Font self)
731	CODE:	822	CODE:
732	default_font = self;	823	default_font = self;
733		824
734	MODULE = CFClient PACKAGE = CFClient::Layout	825	MODULE = CFPlus PACKAGE = CFPlus::Layout
735		826
736	CFClient::Layout	827	void
737	new (SV *class, int rgba = 0)	828	reset_glyph_cache ()
		829	CODE:
		830	tc_clear ();
		831
		832	CFPlus::Layout
		833	new (SV *class)
738	CODE:	834	CODE:
739	New (0, RETVAL, 1, struct cf_layout);	835	New (0, RETVAL, 1, struct cf_layout);
740		836
741	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	837	RETVAL->pl = pango_layout_new (opengl_context);
742	RETVAL->rgba = rgba;
743	RETVAL->r = 1.;	838	RETVAL->r = 1.;
744	RETVAL->g = 1.;	839	RETVAL->g = 1.;
745	RETVAL->b = 1.;	840	RETVAL->b = 1.;
746	RETVAL->a = 1.;	841	RETVAL->a = 1.;
747	RETVAL->base_height = MIN_FONT_HEIGHT;	842	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
751	layout_update_font (RETVAL);	846	layout_update_font (RETVAL);
752	OUTPUT:	847	OUTPUT:
753	RETVAL	848	RETVAL
754		849
755	void	850	void
756	DESTROY (CFClient::Layout self)	851	DESTROY (CFPlus::Layout self)
757	CODE:	852	CODE:
758	g_object_unref (self->pl);	853	g_object_unref (self->pl);
759	Safefree (self);	854	Safefree (self);
760		855
761	int
762	is_rgba (CFClient::Layout self)
763	CODE:
764	RETVAL = self->rgba;
765	OUTPUT:
766	RETVAL
767
768	void	856	void
769	set_text (CFClient::Layout self, SV *text_)	857	set_text (CFPlus::Layout self, SV *text_)
770	CODE:	858	CODE:
771	{	859	{
772	STRLEN textlen;	860	STRLEN textlen;
773	char *text = SvPVutf8 (text_, textlen);	861	char *text = SvPVutf8 (text_, textlen);
774		862
775	pango_layout_set_text (self->pl, text, textlen);	863	pango_layout_set_text (self->pl, text, textlen);
776	}	864	}
777		865
778	void	866	void
779	set_markup (CFClient::Layout self, SV *text_)	867	set_markup (CFPlus::Layout self, SV *text_)
780	CODE:	868	CODE:
781	{	869	{
782	STRLEN textlen;	870	STRLEN textlen;
783	char *text = SvPVutf8 (text_, textlen);	871	char *text = SvPVutf8 (text_, textlen);
784		872
785	pango_layout_set_markup (self->pl, text, textlen);	873	pango_layout_set_markup (self->pl, text, textlen);
786	}	874	}
787		875
		876	void
		877	set_shapes (CFPlus::Layout self, ...)
		878	CODE:
		879	{
		880	PangoAttrList *attrs = 0;
		881	const char *text = pango_layout_get_text (self->pl);
		882	const char *pos = text;
		883	int arg = 4;
		884
		885	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		886	{
		887	PangoRectangle inkrect, rect;
		888	PangoAttribute *attr;
		889
		890	int x = SvIV (ST (arg - 3));
		891	int y = SvIV (ST (arg - 2));
		892	int w = SvIV (ST (arg - 1));
		893	int h = SvIV (ST (arg ));
		894
		895	inkrect.x = 0;
		896	inkrect.y = 0;
		897	inkrect.width = 0;
		898	inkrect.height = 0;
		899
		900	rect.x = x * PANGO_SCALE;
		901	rect.y = y * PANGO_SCALE;
		902	rect.width = w * PANGO_SCALE;
		903	rect.height = h * PANGO_SCALE;
		904
		905	if (!attrs)
		906	attrs = pango_layout_get_attributes (self->pl);
		907
		908	attr = pango_attr_shape_new (&inkrect, &rect);
		909	attr->start_index = pos - text;
		910	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		911	pango_attr_list_insert (attrs, attr);
		912
		913	arg += 4;
		914	pos += sizeof (OBJ_STR) - 1;
		915	}
		916
		917	if (attrs)
		918	pango_layout_set_attributes (self->pl, attrs);
		919	}
		920
		921	void
		922	get_shapes (CFPlus::Layout self)
		923	PPCODE:
		924	{
		925	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		926
		927	do
		928	{
		929	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		930
		931	if (run && shape_attr_p (run))
		932	{
		933	PangoRectangle extents;
		934	pango_layout_iter_get_run_extents (iter, 0, &extents);
		935
		936	EXTEND (SP, 2);
		937	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		939	}
		940	}
		941	while (pango_layout_iter_next_run (iter));
		942
		943	pango_layout_iter_free (iter);
		944	}
		945
		946	int
		947	has_wrapped (CFPlus::Layout self)
		948	CODE:
		949	{
		950	int lines = 1;
		951	const char *text = pango_layout_get_text (self->pl);
		952
		953	while (*text)
		954	lines += *text++ == '\n';
		955
		956	RETVAL = lines < pango_layout_get_line_count (self->pl);
		957	}
		958	OUTPUT:
		959	RETVAL
		960
788	SV *	961	SV *
789	get_text (CFClient::Layout self)	962	get_text (CFPlus::Layout self)
790	CODE:	963	CODE:
791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	964	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792	sv_utf8_decode (RETVAL);	965	sv_utf8_decode (RETVAL);
793	OUTPUT:	966	OUTPUT:
794	RETVAL	967	RETVAL
795		968
796	void	969	void
797	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	970	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798	CODE:	971	CODE:
799	self->r = r;	972	self->r = r;
800	self->g = g;	973	self->g = g;
801	self->b = b;	974	self->b = b;
802	self->a = a;	975	self->a = a;
803		976
804	void	977	void
805	set_font (CFClient::Layout self, CFClient::Font font = 0)	978	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806	CODE:	979	CODE:
807	if (self->font != font)	980	if (self->font != font)
808	{	981	{
809	self->font = font;	982	self->font = font;
810	layout_update_font (self);	983	layout_update_font (self);
811	}	984	}
812		985
813	void	986	void
814	set_height (CFClient::Layout self, int base_height)	987	set_height (CFPlus::Layout self, int base_height)
815	CODE:	988	CODE:
816	if (self->base_height != base_height)	989	if (self->base_height != base_height)
817	{	990	{
818	self->base_height = base_height;	991	self->base_height = base_height;
819	layout_update_font (self);	992	layout_update_font (self);
820	}	993	}
821		994
822	void	995	void
823	set_width (CFClient::Layout self, int max_width = -1)	996	set_width (CFPlus::Layout self, int max_width = -1)
824	CODE:	997	CODE:
825	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	998	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826		999
827	void	1000	void
828	set_indent (CFClient::Layout self, int indent)	1001	set_indent (CFPlus::Layout self, int indent)
829	CODE:	1002	CODE:
830	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1003	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831		1004
832	void	1005	void
833	set_spacing (CFClient::Layout self, int spacing)	1006	set_spacing (CFPlus::Layout self, int spacing)
834	CODE:	1007	CODE:
835	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1008	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836		1009
837	void	1010	void
838	set_ellipsise (CFClient::Layout self, int ellipsise)	1011	set_ellipsise (CFPlus::Layout self, int ellipsise)
839	CODE:	1012	CODE:
840	pango_layout_set_ellipsize (self->pl,	1013	pango_layout_set_ellipsize (self->pl,
841	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1014	ellipsise == 1 ? PANGO_ELLIPSIZE_START
842	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1015	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1016	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
844	: PANGO_ELLIPSIZE_NONE	1017	: PANGO_ELLIPSIZE_NONE
845	);	1018	);
846		1019
847	void	1020	void
848	set_single_paragraph_mode (CFClient::Layout self, int spm)	1021	set_single_paragraph_mode (CFPlus::Layout self, int spm)
849	CODE:	1022	CODE:
850	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1023	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851		1024
852	void	1025	void
853	size (CFClient::Layout self)	1026	size (CFPlus::Layout self)
854	PPCODE:	1027	PPCODE:
855	{	1028	{
856	int w, h;	1029	int w, h;
857		1030
858	layout_get_pixel_size (self, &w, &h);	1031	layout_get_pixel_size (self, &w, &h);
…		…
861	PUSHs (sv_2mortal (newSViv (w)));	1034	PUSHs (sv_2mortal (newSViv (w)));
862	PUSHs (sv_2mortal (newSViv (h)));	1035	PUSHs (sv_2mortal (newSViv (h)));
863	}	1036	}
864		1037
865	int	1038	int
		1039	descent (CFPlus::Layout self)
		1040	CODE:
		1041	{
		1042	PangoRectangle rect;
		1043	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1044	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1045	RETVAL = PANGO_DESCENT (rect);
		1046	}
		1047	OUTPUT:
		1048	RETVAL
		1049
		1050	int
866	xy_to_index (CFClient::Layout self, int x, int y)	1051	xy_to_index (CFPlus::Layout self, int x, int y)
867	CODE:	1052	CODE:
868	{	1053	{
869	int index, trailing;	1054	int index, trailing;
870	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1055	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871	RETVAL = index;	1056	RETVAL = index;
872	}	1057	}
873	OUTPUT:	1058	OUTPUT:
874	RETVAL	1059	RETVAL
875		1060
876	void	1061	void
877	cursor_pos (CFClient::Layout self, int index)	1062	cursor_pos (CFPlus::Layout self, int index)
878	PPCODE:	1063	PPCODE:
879	{	1064	{
880	PangoRectangle strong_pos;	1065	PangoRectangle strong_pos;
881	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1066	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882		1067
…		…
885	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1070	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887	}	1072	}
888		1073
889	void	1074	void
890	render (CFClient::Layout self)	1075	render (CFPlus::Layout self, float x, float y, int flags = 0)
891	PPCODE:	1076	PPCODE:
892	{	1077	pango_opengl_render_layout_subpixel (
893	SV *retval;	1078	self->pl,
894	int w, h;	1079	x * PANGO_SCALE, y * PANGO_SCALE,
		1080	self->r, self->g, self->b, self->a,
		1081	flags
		1082	);
895		1083
896	layout_get_pixel_size (self, &w, &h);	1084	MODULE = CFPlus PACKAGE = CFPlus::Texture
897		1085
898	if (self->rgba)	1086	void
		1087	pad2pot (SV *data_, SV *w_, SV *h_)
		1088	CODE:
		1089	{
		1090	int ow = SvIV (w_);
		1091	int oh = SvIV (h_);
		1092
		1093	if (ow && oh)
899	{	1094	{
900	cairo_surface_t *surface;	1095	int nw = minpot (ow);
901	cairo_t *cairo;	1096	int nh = minpot (oh);
902		1097
903	retval = newSV (w * h * 4);	1098	if (nw != ow || nh != oh)
904	SvPOK_only (retval);
905	SvCUR_set (retval, w * h * 4);
906
907	memset (SvPVX (retval), 0, w * h * 4);
908
909	surface = cairo_image_surface_create_for_data (
910	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911	cairo = cairo_create (surface);
912	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914	pango_cairo_show_layout (cairo, self->pl);
915
916	cairo_destroy (cairo);
917	cairo_surface_destroy (surface);
918
919	// what a mess, and its premultiplied, too :(
920	{	1099	{
921	uint32_t *p = (uint32_t *)SvPVX (retval);	1100	if (SvOK (data_))
922	uint32_t *e = p + w * h;
923
924	while (p < e)
925	{	1101	{
926	uint32_t rgba = *p;	1102	STRLEN datalen;
927	rgba = (rgba >> 24) | (rgba << 8);	1103	char *data = SvPVbyte (data_, datalen);
928	#if 0	1104	int bpp = datalen / (ow * oh);
929	#ifdef _WIN32	1105	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
930	{//D
931	uint8_t r = rgba >> 24;
932	uint8_t g = rgba >> 16;
933	uint8_t b = rgba >> 8;
934	uint8_t a = rgba >> 0;
935		1106
936	rgba = (rgba & 0xffffff00) | a;	1107	SvPOK_only (result_);
		1108	SvCUR_set (result_, nw * nh * bpp);
		1109
		1110	memset (SvPVX (result_), 0, nw * nh * bpp);
		1111	while (oh--)
		1112	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1113
		1114	sv_setsv (data_, result_);
937	}	1115	}
938	#endif	1116
939	#endif	1117	sv_setiv (w_, nw);
940	rgba = SDL_SwapBE32 (rgba);	1118	sv_setiv (h_, nh);
941	*p++ = rgba;
942	}	1119	}
943	}
944
945	EXTEND (SP, 5);
946	PUSHs (sv_2mortal (newSViv (w)));
947	PUSHs (sv_2mortal (newSViv (h)));
948	PUSHs (sv_2mortal (retval));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951	}	1120	}
952	else
953	{
954	FT_Bitmap bitmap;
955
956	retval = newSV (w * h);
957	SvPOK_only (retval);
958	SvCUR_set (retval, w * h);
959
960	bitmap.rows = h;
961	bitmap.width = w;
962	bitmap.pitch = w;
963	bitmap.buffer = (unsigned char*)SvPVX (retval);
964	bitmap.num_grays = 256;
965	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967	memset (bitmap.buffer, 0, w * h);
968
969	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971	EXTEND (SP, 5);
972	PUSHs (sv_2mortal (newSViv (w)));
973	PUSHs (sv_2mortal (newSViv (h)));
974	PUSHs (sv_2mortal (retval));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977	}
978	}	1121	}
979		1122
980	MODULE = CFClient PACKAGE = CFClient::Texture
981
982	void	1123	void
983	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1124	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984	PROTOTYPE: $$$;$$	1125	PROTOTYPE: $$$;$$
985	ALIAS:	1126	ALIAS:
986	draw_quad_alpha = 1	1127	draw_quad_alpha = 1
987	draw_quad_alpha_premultiplied = 2	1128	draw_quad_alpha_premultiplied = 2
988	CODE:	1129	CODE:
…		…
1026	glDisable (GL_ALPHA_TEST);	1167	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1168	glDisable (GL_BLEND);
1028	}	1169	}
1029	}	1170	}
1030		1171
1031	MODULE = CFClient PACKAGE = CFClient::Map	1172	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1173
1033	CFClient::Map	1174	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1175	new (SV *class, int map_width, int map_height)
1035	CODE:	1176	CODE:
1036	New (0, RETVAL, 1, struct map);	1177	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1178	RETVAL->x = 0;
1038	RETVAL->y = 0;	1179	RETVAL->y = 0;
…		…
1048	RETVAL->row = 0;	1189	RETVAL->row = 0;
1049	OUTPUT:	1190	OUTPUT:
1050	RETVAL	1191	RETVAL
1051		1192
1052	void	1193	void
1053	DESTROY (CFClient::Map self)	1194	DESTROY (CFPlus::Map self)
1054	CODE:	1195	CODE:
1055	{	1196	{
1056	map_clear (self);	1197	map_clear (self);
1057	Safefree (self->face);	1198	Safefree (self->face);
		1199	Safefree (self->tex);
1058	Safefree (self);	1200	Safefree (self);
1059	}	1201	}
1060		1202
1061	void	1203	void
1062	clear (CFClient::Map self)	1204	clear (CFPlus::Map self)
1063	CODE:	1205	CODE:
1064	map_clear (self);	1206	map_clear (self);
1065		1207
1066	void	1208	void
1067	set_face (CFClient::Map self, int face, int texid)	1209	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1210	CODE:
1069	{	1211	{
1070	while (self->faces <= face)	1212	while (self->faces <= face)
1071	{	1213	{
1072	Append (mapface, self->face, self->faces, self->faces);	1214	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1217
1076	self->face [face] = texid;	1218	self->face [face] = texid;
1077	}	1219	}
1078		1220
1079	void	1221	void
1080	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1222	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081	CODE:	1223	CODE:
1082	{	1224	{
1083	while (self->texs <= texid)	1225	while (self->texs <= texid)
1084	{	1226	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1227	Append (maptex, self->tex, self->texs, self->texs);
…		…
1109	// from transparent color bleeding and ugly wrapping effects.	1251	// from transparent color bleeding and ugly wrapping effects.
1110	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1252	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111	}	1253	}
1112		1254
1113	int	1255	int
1114	ox (CFClient::Map self)	1256	ox (CFPlus::Map self)
1115	ALIAS:	1257	ALIAS:
1116	oy = 1	1258	oy = 1
1117	x = 2	1259	x = 2
1118	y = 3	1260	y = 3
1119	w = 4	1261	w = 4
…		…
1130	}	1272	}
1131	OUTPUT:	1273	OUTPUT:
1132	RETVAL	1274	RETVAL
1133		1275
1134	void	1276	void
1135	scroll (CFClient::Map self, int dx, int dy)	1277	scroll (CFPlus::Map self, int dx, int dy)
1136	CODE:	1278	CODE:
1137	{	1279	{
1138	if (dx > 0)	1280	if (dx > 0)
1139	map_blank (self, self->x, self->y, dx - 1, self->h);	1281	map_blank (self, self->x, self->y, dx, self->h);
1140	else if (dx < 0)	1282	else if (dx < 0)
1141	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1283	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1142		1284
1143	if (dy > 0)	1285	if (dy > 0)
1144	map_blank (self, self->x, self->y, self->w, dy - 1);	1286	map_blank (self, self->x, self->y, self->w, dy);
1145	else if (dy < 0)	1287	else if (dy < 0)
1146	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1288	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1147		1289
1148	self->ox += dx; self->x += dx;	1290	self->ox += dx; self->x += dx;
1149	self->oy += dy; self->y += dy;	1291	self->oy += dy; self->y += dy;
1150		1292
1151	while (self->y < 0)	1293	while (self->y < 0)
…		…
1156	self->y += MAP_EXTEND_Y;	1298	self->y += MAP_EXTEND_Y;
1157	}	1299	}
1158	}	1300	}
1159		1301
1160	void	1302	void
1161	map1a_update (CFClient::Map self, SV *data_)	1303	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162	CODE:	1304	CODE:
1163	{	1305	{
1164	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1306	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165	uint8_t *data_end = (uint8_t *)SvEND (data_);	1307	uint8_t *data_end = (uint8_t *)SvEND (data_);
1166	mapcell *cell;	1308	mapcell *cell;
1167	int x, y, flags;	1309	int x, y, flags;
1168		1310
1169	while (data < data_end)	1311	while (data < data_end - 1)
1170	{	1312	{
1171	flags = (data [0] << 8) + data [1]; data += 2;	1313	flags = (data [0] << 8) + data [1]; data += 2;
1172		1314
1173	x = ((flags >> 10) & 63) + self->x;	1315	x = self->x + ((flags >> 10) & 63);
1174	y = ((flags >> 4) & 63) + self->y;	1316	y = self->y + ((flags >> 4) & 63);
1175		1317
1176	cell = map_get_cell (self, x, y);	1318	cell = map_get_cell (self, x, y);
1177		1319
1178	if (flags & 15)	1320	if (flags & 15)
1179	{	1321	{
1180	if (cell->darkness < 0)	1322	if (!cell->darkness)
1181	{	1323	{
		1324	memset (cell, 0, sizeof (*cell));
1182	cell->darkness = 0;	1325	cell->darkness = 256;
1183	cell->face [0] = 0;
1184	cell->face [1] = 0;
1185	cell->face [2] = 0;
1186	}	1326	}
1187		1327
1188	cell->darkness = flags & 8 ? *data++ : 255;
1189
1190	//TODO: don't trust server data to be in-range(!)	1328	//TODO: don't trust server data to be in-range(!)
		1329
		1330	if (flags & 8)
		1331	{
		1332	if (extmap)
		1333	{
		1334	uint8_t ext, cmd;
		1335
		1336	do
		1337	{
		1338	ext = *data++;
		1339	cmd = ext & 0x3f;
		1340
		1341	if (cmd < 4)
		1342	cell->darkness = 255 - ext * 64 + 1;
		1343	else if (cmd == 5) // health
		1344	{
		1345	cell->stat_width = 1;
		1346	cell->stat_hp = *data++;
		1347	}
		1348	else if (cmd == 6) // monster width
		1349	cell->stat_width = *data++ + 1;
		1350	else if (cmd == 0x47) // monster width
		1351	{
		1352	if (*data == 4)
		1353	; // decode player tag
		1354
		1355	data += *data + 1;
		1356	}
		1357	else if (cmd == 8) // cell flags
		1358	cell->flags = *data++;
		1359	else if (ext & 0x40) // unknown, multibyte => skip
		1360	data += *data + 1;
		1361	else
		1362	data++;
		1363	}
		1364	while (ext & 0x80);
		1365	}
		1366	else
		1367	cell->darkness = *data++ + 1;
		1368	}
1191		1369
1192	if (flags & 4)	1370	if (flags & 4)
1193	{	1371	{
1194	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1372	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1195	}	1373	}
…		…
1203	{	1381	{
1204	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1382	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1205	}	1383	}
1206	}	1384	}
1207	else	1385	else
1208	cell->darkness = -1;	1386	cell->darkness = 0;
1209	}	1387	}
1210	}	1388	}
1211		1389
1212	SV *	1390	SV *
1213	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1391	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214	CODE:	1392	CODE:
1215	{	1393	{
1216	int x1, x;	1394	int x1, x;
1217	int y1, y;	1395	int y1, y;
1218	int z;	1396	int z;
…		…
1268	}	1446	}
1269	OUTPUT:	1447	OUTPUT:
1270	RETVAL	1448	RETVAL
1271		1449
1272	void	1450	void
1273	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1451	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1274	PPCODE:	1452	CODE:
1275	{	1453	{
1276	int vx, vy;	1454	int vx, vy;
1277	int x, y, z;	1455	int x, y, z;
1278	int last_name;	1456	int last_name;
1279	mapface face;	1457	mapface face;
1280	int sw4 = (sw + 3) & ~3;
1281	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283		1458
1284	memset (darkness, 255, sw4 * sh);
1285	SvPOK_only (darkness_sv);
1286	SvCUR_set (darkness_sv, sw4 * sh);
1287
1288	vx = self->x + (self->w - sw) / 2 - shift_x;	1459	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1289	vy = self->y + (self->h - sh) / 2 - shift_y;	1460	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1290		1461
1291	/*	1462	/*
1292	int vx = self->vx = self->w >= sw	1463	int vx = self->vx = self->w >= sw
1293	? self->x + (self->w - sw) / 2	1464	? self->x + (self->w - sw) / 2
1294	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1465	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1298	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1469	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299	*/	1470	*/
1300		1471
1301	glColor4ub (255, 255, 255, 255);	1472	glColor4ub (255, 255, 255, 255);
1302		1473
		1474	glEnable (GL_BLEND);
1303	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1475	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304	glEnable (GL_BLEND);
1305	glEnable (GL_TEXTURE_2D);	1476	glEnable (GL_TEXTURE_2D);
1306	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1477	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307		1478
1308	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1309		1480
…		…
1318	for (x = 0; x < sw; x++)	1489	for (x = 0; x < sw; x++)
1319	if (row->c0 <= x + vx && x + vx < row->c1)	1490	if (row->c0 <= x + vx && x + vx < row->c1)
1320	{	1491	{
1321	mapcell *cell = row->col + (x + vx - row->c0);	1492	mapcell *cell = row->col + (x + vx - row->c0);
1322		1493
1323	darkness[y * sw4 + x] = cell->darkness < 0
1324	? 255 - FOW_DARKNESS
1325	: 255 - cell->darkness;
1326
1327	face = cell->face [z];	1494	face = cell->face [z];
1328		1495
1329	if (face)	1496	if (face && face < self->texs)
1330	{	1497	{
1331	maptex tex = self->tex [face];	1498	maptex tex = self->tex [face];
1332
1333	int px = (x + 1) * 32 - tex.w;	1499	int px = (x + 1) * 32 - tex.w;
1334	int py = (y + 1) * 32 - tex.h;	1500	int py = (y + 1) * 32 - tex.h;
1335		1501
1336	if (last_name != tex.name)	1502	if (last_name != tex.name)
1337	{	1503	{
1338	glEnd ();	1504	glEnd ();
1339	last_name = tex.name;
1340	glBindTexture (GL_TEXTURE_2D, last_name);	1505	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1341	glBegin (GL_QUADS);	1506	glBegin (GL_QUADS);
1342	}	1507	}
1343		1508
1344	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1509	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1510	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1511	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1512	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348	}	1513	}
		1514
		1515	if (cell->flags && z == 2)
		1516	{
		1517	if (cell->flags & 1)
		1518	{
		1519	maptex tex = self->tex [1];
		1520	int px = (x + 1) * 32 - tex.w + 2;
		1521	int py = (y + 1) * 32 - tex.h - 6;
		1522
		1523	glEnd ();
		1524	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1525	glBegin (GL_QUADS);
		1526
		1527	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1528	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1529	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1530	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1531	}
		1532	}
1349	}	1533	}
1350	}	1534	}
1351		1535
1352	glEnd ();	1536	glEnd ();
1353		1537
1354	glDisable (GL_TEXTURE_2D);	1538	glDisable (GL_TEXTURE_2D);
1355	glDisable (GL_BLEND);	1539	glDisable (GL_BLEND);
		1540
		1541	// top layer: overlays such as the health bar
		1542	for (y = 0; y < sh; y++)
		1543	if (0 <= y + vy && y + vy < self->rows)
		1544	{
		1545	maprow *row = self->row + (y + vy);
		1546
		1547	for (x = 0; x < sw; x++)
		1548	if (row->c0 <= x + vx && x + vx < row->c1)
		1549	{
		1550	mapcell *cell = row->col + (x + vx - row->c0);
		1551
		1552	int px = x * 32;
		1553	int py = y * 32;
		1554
		1555	if (cell->stat_hp)
		1556	{
		1557	int width = cell->stat_width * 32;
		1558	int thick = sh / 28 + 1 + cell->stat_width;
		1559
		1560	glColor3ub (0, 0, 0);
		1561	glRectf (px + 1, py - thick - 2,
		1562	px + width - 1, py);
		1563
		1564	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1565	glRectf (px + 2,
		1566	py - thick - 1,
		1567	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1568	}
		1569	}
		1570	}
		1571	}
		1572
		1573	void
		1574	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1575	CODE:
		1576	{
		1577	static float color[16][3] = {
		1578	{ 0.00F, 0.00F, 0.00F },
		1579	{ 1.00F, 1.00F, 1.00F },
		1580	{ 0.00F, 0.00F, 0.55F },
		1581	{ 1.00F, 0.00F, 0.00F },
		1582
		1583	{ 1.00F, 0.54F, 0.00F },
		1584	{ 0.11F, 0.56F, 1.00F },
		1585	{ 0.93F, 0.46F, 0.00F },
		1586	{ 0.18F, 0.54F, 0.34F },
		1587
		1588	{ 0.56F, 0.73F, 0.56F },
		1589	{ 0.80F, 0.80F, 0.80F },
		1590	{ 0.55F, 0.41F, 0.13F },
		1591	{ 0.99F, 0.77F, 0.26F },
		1592
		1593	{ 0.74F, 0.65F, 0.41F },
		1594
		1595	{ 0.00F, 1.00F, 1.00F },
		1596	{ 1.00F, 0.00F, 1.00F },
		1597	{ 1.00F, 1.00F, 0.00F },
		1598	};
		1599
		1600	int x, y;
		1601
		1602	glEnable (GL_TEXTURE_2D);
		1603	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1604	glEnable (GL_BLEND);
		1605	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1606	glBegin (GL_QUADS);
		1607
		1608	for (y = 0; y < h; y++)
		1609	for (x = 0; x < w; x++)
		1610	{
		1611	unsigned char m = data [x + y * w];
		1612
		1613	if (m)
		1614	{
		1615	float *c = color [m & 15];
		1616
		1617	float tx1 = m & 0x40 ? 0.5 : 0.;
		1618	float tx2 = tx1 + 0.5;
		1619
		1620	glColor4f (c[0], c[1], c[2], 0.75);
		1621	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1622	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1623	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1624	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1625	}
		1626	}
		1627
		1628	glEnd ();
		1629	glDisable (GL_BLEND);
		1630	glDisable (GL_TEXTURE_2D);
		1631	}
		1632
		1633	void
		1634	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1635	PPCODE:
		1636	{
		1637	int vx, vy;
		1638	int x, y;
		1639	int sw4 = (sw + 3) & ~3;
		1640	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1641	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1642
		1643	memset (darkness, 255, sw4 * sh);
		1644	SvPOK_only (darkness_sv);
		1645	SvCUR_set (darkness_sv, sw4 * sh);
		1646
		1647	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1648	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1649
		1650	for (y = 0; y < sh; y++)
		1651	if (0 <= y + vy && y + vy < self->rows)
		1652	{
		1653	maprow *row = self->row + (y + vy);
		1654
		1655	for (x = 0; x < sw; x++)
		1656	if (row->c0 <= x + vx && x + vx < row->c1)
		1657	{
		1658	mapcell *cell = row->col + (x + vx - row->c0);
		1659
		1660	darkness[y * sw4 + x] = cell->darkness
		1661	? 255 - (cell->darkness - 1)
		1662	: 255 - FOW_DARKNESS;
		1663	}
		1664	}
1356		1665
1357	EXTEND (SP, 3);	1666	EXTEND (SP, 3);
1358	PUSHs (sv_2mortal (newSViv (sw4)));	1667	PUSHs (sv_2mortal (newSViv (sw4)));
1359	PUSHs (sv_2mortal (newSViv (sh)));	1668	PUSHs (sv_2mortal (newSViv (sh)));
1360	PUSHs (darkness_sv);	1669	PUSHs (darkness_sv);
1361	}	1670	}
1362		1671
1363	SV *	1672	SV *
1364	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1673	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365	CODE:	1674	CODE:
1366	{	1675	{
1367	int x, y, x1, y1;	1676	int x, y, x1, y1;
1368	SV *data_sv = newSV (w * h * 7 + 5);	1677	SV *data_sv = newSV (w * h * 7 + 5);
1369	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1678	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1431	}	1740	}
1432	OUTPUT:	1741	OUTPUT:
1433	RETVAL	1742	RETVAL
1434		1743
1435	void	1744	void
1436	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1745	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437	PPCODE:	1746	PPCODE:
1438	{	1747	{
1439	int x, y, z;	1748	int x, y, z;
1440	int w, h;	1749	int w, h;
1441	int x1, y1;	1750	int x1, y1;
…		…
1473		1782
1474	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1783	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1784	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1785	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477		1786
1478	if (cell->darkness <= 0)	1787	if (cell->darkness == 0)
1479	{	1788	{
1480	cell->darkness = -1;	1789	cell->darkness = 0;
1481		1790
1482	for (z = 0; z <= 2; z++)	1791	for (z = 0; z <= 2; z++)
1483	{	1792	{
1484	cell->face[z] = face[z];	1793	cell->face[z] = face[z];
1485		1794
…		…
1490	}	1799	}
1491	}	1800	}
1492	}	1801	}
1493	}	1802	}
1494		1803
1495	MODULE = CFClient PACKAGE = CFClient::MixChunk	1804	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496		1805
1497	CFClient::MixChunk	1806	CFPlus::MixChunk
1498	new_from_file (SV *class, char *path)	1807	new_from_file (SV *class, char *path)
1499	CODE:	1808	CODE:
1500	RETVAL = Mix_LoadWAV (path);	1809	RETVAL = Mix_LoadWAV (path);
1501	OUTPUT:	1810	OUTPUT:
1502	RETVAL	1811	RETVAL
1503		1812
1504	void	1813	void
1505	DESTROY (CFClient::MixChunk self)	1814	DESTROY (CFPlus::MixChunk self)
1506	CODE:	1815	CODE:
1507	Mix_FreeChunk (self);	1816	Mix_FreeChunk (self);
1508		1817
1509	int	1818	int
1510	volume (CFClient::MixChunk self, int volume = -1)	1819	volume (CFPlus::MixChunk self, int volume = -1)
1511	CODE:	1820	CODE:
1512	RETVAL = Mix_VolumeChunk (self, volume);	1821	RETVAL = Mix_VolumeChunk (self, volume);
1513	OUTPUT:	1822	OUTPUT:
1514	RETVAL	1823	RETVAL
1515		1824
1516	int	1825	int
1517	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1826	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518	CODE:	1827	CODE:
1519	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1828	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520	OUTPUT:	1829	OUTPUT:
1521	RETVAL	1830	RETVAL
1522		1831
1523	MODULE = CFClient PACKAGE = CFClient::MixMusic	1832	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524		1833
1525	int	1834	int
1526	volume (int volume = -1)	1835	volume (int volume = -1)
1527	CODE:	1836	CODE:
1528	RETVAL = Mix_VolumeMusic (volume);	1837	RETVAL = Mix_VolumeMusic (volume);
1529	OUTPUT:	1838	OUTPUT:
1530	RETVAL	1839	RETVAL
1531		1840
1532	CFClient::MixMusic	1841	CFPlus::MixMusic
1533	new_from_file (SV *class, char *path)	1842	new_from_file (SV *class, char *path)
1534	CODE:	1843	CODE:
1535	RETVAL = Mix_LoadMUS (path);	1844	RETVAL = Mix_LoadMUS (path);
1536	OUTPUT:	1845	OUTPUT:
1537	RETVAL	1846	RETVAL
1538		1847
1539	void	1848	void
1540	DESTROY (CFClient::MixMusic self)	1849	DESTROY (CFPlus::MixMusic self)
1541	CODE:	1850	CODE:
1542	Mix_FreeMusic (self);	1851	Mix_FreeMusic (self);
1543		1852
1544	int	1853	int
1545	play (CFClient::MixMusic self, int loops = -1)	1854	play (CFPlus::MixMusic self, int loops = -1)
1546	CODE:	1855	CODE:
1547	RETVAL = Mix_PlayMusic (self, loops);	1856	RETVAL = Mix_PlayMusic (self, loops);
1548	OUTPUT:	1857	OUTPUT:
1549	RETVAL	1858	RETVAL
1550		1859
1551	MODULE = CFClient PACKAGE = CFClient::OpenGL	1860	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552		1861
1553	BOOT:	1862	BOOT:
1554	{	1863	{
1555	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1864	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556	static const struct {	1865	static const struct {
1557	const char *name;	1866	const char *name;
1558	IV iv;	1867	IV iv;
1559	} *civ, const_iv[] = {	1868	} *civ, const_iv[] = {
1560	# define const_iv(name) { # name, (IV)name }	1869	# define const_iv(name) { # name, (IV)name }
…		…
1567	const_iv (GL_SCISSOR_TEST),	1876	const_iv (GL_SCISSOR_TEST),
1568	const_iv (GL_DEPTH_TEST),	1877	const_iv (GL_DEPTH_TEST),
1569	const_iv (GL_ALPHA_TEST),	1878	const_iv (GL_ALPHA_TEST),
1570	const_iv (GL_NORMALIZE),	1879	const_iv (GL_NORMALIZE),
1571	const_iv (GL_RESCALE_NORMAL),	1880	const_iv (GL_RESCALE_NORMAL),
		1881	const_iv (GL_FRONT),
		1882	const_iv (GL_BACK),
1572	const_iv (GL_AND),	1883	const_iv (GL_AND),
1573	const_iv (GL_ONE),	1884	const_iv (GL_ONE),
1574	const_iv (GL_ZERO),	1885	const_iv (GL_ZERO),
1575	const_iv (GL_SRC_ALPHA),	1886	const_iv (GL_SRC_ALPHA),
1576	const_iv (GL_DST_ALPHA),	1887	const_iv (GL_DST_ALPHA),
1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1888	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578	const_iv (GL_ONE_MINUS_DST_ALPHA),	1889	const_iv (GL_ONE_MINUS_DST_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1890	const_iv (GL_SRC_ALPHA_SATURATE),
1580	const_iv (GL_RGB),	1891	const_iv (GL_RGB),
1581	const_iv (GL_RGBA),	1892	const_iv (GL_RGBA),
		1893	const_iv (GL_RGBA4),
		1894	const_iv (GL_RGBA8),
		1895	const_iv (GL_RGB5_A1),
1582	const_iv (GL_UNSIGNED_BYTE),	1896	const_iv (GL_UNSIGNED_BYTE),
1583	const_iv (GL_UNSIGNED_SHORT),	1897	const_iv (GL_UNSIGNED_SHORT),
1584	const_iv (GL_UNSIGNED_INT),	1898	const_iv (GL_UNSIGNED_INT),
1585	const_iv (GL_ALPHA),	1899	const_iv (GL_ALPHA),
1586	const_iv (GL_INTENSITY),	1900	const_iv (GL_INTENSITY),
…		…
1618	const_iv (GL_SEPARABLE_2D),	1932	const_iv (GL_SEPARABLE_2D),
1619	const_iv (GL_CONVOLUTION_2D),	1933	const_iv (GL_CONVOLUTION_2D),
1620	const_iv (GL_CONVOLUTION_BORDER_MODE),	1934	const_iv (GL_CONVOLUTION_BORDER_MODE),
1621	const_iv (GL_CONSTANT_BORDER),	1935	const_iv (GL_CONSTANT_BORDER),
1622	const_iv (GL_LINES),	1936	const_iv (GL_LINES),
		1937	const_iv (GL_LINE_STRIP),
1623	const_iv (GL_LINE_LOOP),	1938	const_iv (GL_LINE_LOOP),
1624	const_iv (GL_QUADS),	1939	const_iv (GL_QUADS),
1625	const_iv (GL_QUAD_STRIP),	1940	const_iv (GL_QUAD_STRIP),
1626	const_iv (GL_TRIANGLES),	1941	const_iv (GL_TRIANGLES),
1627	const_iv (GL_TRIANGLE_STRIP),	1942	const_iv (GL_TRIANGLE_STRIP),
…		…
1660	OUTPUT:	1975	OUTPUT:
1661	RETVAL	1976	RETVAL
1662		1977
1663	int glGetError ()	1978	int glGetError ()
1664		1979
		1980	void glFinish ()
		1981
1665	void glClear (int mask)	1982	void glClear (int mask)
1666		1983
1667	void glClearColor (float r, float g, float b, float a = 1.0)	1984	void glClearColor (float r, float g, float b, float a = 1.0)
1668	PROTOTYPE: @	1985	PROTOTYPE: @
1669		1986
…		…
1692	void glPushMatrix ()	2009	void glPushMatrix ()
1693		2010
1694	void glPopMatrix ()	2011	void glPopMatrix ()
1695		2012
1696	void glLoadIdentity ()	2013	void glLoadIdentity ()
		2014
		2015	void glDrawBuffer (int buffer)
		2016
		2017	void glReadBuffer (int buffer)
1697		2018
1698	# near_ and far_ are due to microsofts buggy "c" compiler	2019	# near_ and far_ are due to microsofts buggy "c" compiler
1699	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2020	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700		2021
1701	# near_ and far_ are due to microsofts buggy "c" compiler	2022	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1731	r *= a;	2052	r *= a;
1732	g *= a;	2053	g *= a;
1733	b *= a;	2054	b *= a;
1734	}	2055	}
1735	// microsoft visual "c" rounds instead of truncating...	2056	// microsoft visual "c" rounds instead of truncating...
1736	glColor4ub (MIN ((int)(r * 256.f), 255),	2057	glColor4f (r, g, b, a);
1737	MIN ((int)(g * 256.f), 255),
1738	MIN ((int)(b * 256.f), 255),
1739	MIN ((int)(a * 256.f), 255));
1740		2058
1741	void glInterleavedArrays (int format, int stride, char *data)	2059	void glInterleavedArrays (int format, int stride, char *data)
1742		2060
1743	void glDrawElements (int mode, int count, int type, char *indices)	2061	void glDrawElements (int mode, int count, int type, char *indices)
1744		2062
…		…
1821		2139
1822	void glEndList ()	2140	void glEndList ()
1823		2141
1824	void glCallList (int list)	2142	void glCallList (int list)
1825		2143
1826

Diff Legend

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