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.161 by root, Mon Oct 9 23:30:44 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	#ifdef WIN32
		800	ExitThread (retval); // unclean, please beam me up
		801	#else
		802	_exit (retval);
		803	#endif
		804
710	MODULE = CFClient PACKAGE = CFClient::Font	805	MODULE = CFPlus PACKAGE = CFPlus::Font
711		806
712	CFClient::Font	807	CFPlus::Font
713	new_from_file (SV *class, char *path, int id = 0)	808	new_from_file (SV *class, char *path, int id = 0)
714	CODE:	809	CODE:
715	{	810	{
716	int count;	811	int count;
717	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	812	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
720	}	815	}
721	OUTPUT:	816	OUTPUT:
722	RETVAL	817	RETVAL
723		818
724	void	819	void
725	DESTROY (CFClient::Font self)	820	DESTROY (CFPlus::Font self)
726	CODE:	821	CODE:
727	pango_font_description_free (self);	822	pango_font_description_free (self);
728		823
729	void	824	void
730	make_default (CFClient::Font self)	825	make_default (CFPlus::Font self)
731	CODE:	826	CODE:
732	default_font = self;	827	default_font = self;
733		828
734	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
735		830
736	CFClient::Layout	831	void
737	new (SV *class, int rgba = 0)	832	reset_glyph_cache ()
		833	CODE:
		834	tc_clear ();
		835
		836	CFPlus::Layout
		837	new (SV *class)
738	CODE:	838	CODE:
739	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
740		840
741	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	841	RETVAL->pl = pango_layout_new (opengl_context);
742	RETVAL->rgba = rgba;
743	RETVAL->r = 1.;	842	RETVAL->r = 1.;
744	RETVAL->g = 1.;	843	RETVAL->g = 1.;
745	RETVAL->b = 1.;	844	RETVAL->b = 1.;
746	RETVAL->a = 1.;	845	RETVAL->a = 1.;
747	RETVAL->base_height = MIN_FONT_HEIGHT;	846	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
751	layout_update_font (RETVAL);	850	layout_update_font (RETVAL);
752	OUTPUT:	851	OUTPUT:
753	RETVAL	852	RETVAL
754		853
755	void	854	void
756	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
757	CODE:	856	CODE:
758	g_object_unref (self->pl);	857	g_object_unref (self->pl);
759	Safefree (self);	858	Safefree (self);
760		859
761	int
762	is_rgba (CFClient::Layout self)
763	CODE:
764	RETVAL = self->rgba;
765	OUTPUT:
766	RETVAL
767
768	void	860	void
769	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
770	CODE:	862	CODE:
771	{	863	{
772	STRLEN textlen;	864	STRLEN textlen;
773	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
774		866
775	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
776	}	868	}
777		869
778	void	870	void
779	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
780	CODE:	872	CODE:
781	{	873	{
782	STRLEN textlen;	874	STRLEN textlen;
783	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
784		876
785	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
786	}	878	}
787		879
		880	void
		881	set_shapes (CFPlus::Layout self, ...)
		882	CODE:
		883	{
		884	PangoAttrList *attrs = 0;
		885	const char *text = pango_layout_get_text (self->pl);
		886	const char *pos = text;
		887	int arg = 4;
		888
		889	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		890	{
		891	PangoRectangle inkrect, rect;
		892	PangoAttribute *attr;
		893
		894	int x = SvIV (ST (arg - 3));
		895	int y = SvIV (ST (arg - 2));
		896	int w = SvIV (ST (arg - 1));
		897	int h = SvIV (ST (arg ));
		898
		899	inkrect.x = 0;
		900	inkrect.y = 0;
		901	inkrect.width = 0;
		902	inkrect.height = 0;
		903
		904	rect.x = x * PANGO_SCALE;
		905	rect.y = y * PANGO_SCALE;
		906	rect.width = w * PANGO_SCALE;
		907	rect.height = h * PANGO_SCALE;
		908
		909	if (!attrs)
		910	attrs = pango_layout_get_attributes (self->pl);
		911
		912	attr = pango_attr_shape_new (&inkrect, &rect);
		913	attr->start_index = pos - text;
		914	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		915	pango_attr_list_insert (attrs, attr);
		916
		917	arg += 4;
		918	pos += sizeof (OBJ_STR) - 1;
		919	}
		920
		921	if (attrs)
		922	pango_layout_set_attributes (self->pl, attrs);
		923	}
		924
		925	void
		926	get_shapes (CFPlus::Layout self)
		927	PPCODE:
		928	{
		929	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		930
		931	do
		932	{
		933	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		934
		935	if (run && shape_attr_p (run))
		936	{
		937	PangoRectangle extents;
		938	pango_layout_iter_get_run_extents (iter, 0, &extents);
		939
		940	EXTEND (SP, 2);
		941	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		942	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		943	}
		944	}
		945	while (pango_layout_iter_next_run (iter));
		946
		947	pango_layout_iter_free (iter);
		948	}
		949
		950	int
		951	has_wrapped (CFPlus::Layout self)
		952	CODE:
		953	{
		954	int lines = 1;
		955	const char *text = pango_layout_get_text (self->pl);
		956
		957	while (*text)
		958	lines += *text++ == '\n';
		959
		960	RETVAL = lines < pango_layout_get_line_count (self->pl);
		961	}
		962	OUTPUT:
		963	RETVAL
		964
788	SV *	965	SV *
789	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
790	CODE:	967	CODE:
791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792	sv_utf8_decode (RETVAL);	969	sv_utf8_decode (RETVAL);
793	OUTPUT:	970	OUTPUT:
794	RETVAL	971	RETVAL
795		972
796	void	973	void
797	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	974	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798	CODE:	975	CODE:
799	self->r = r;	976	self->r = r;
800	self->g = g;	977	self->g = g;
801	self->b = b;	978	self->b = b;
802	self->a = a;	979	self->a = a;
803		980
804	void	981	void
805	set_font (CFClient::Layout self, CFClient::Font font = 0)	982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806	CODE:	983	CODE:
807	if (self->font != font)	984	if (self->font != font)
808	{	985	{
809	self->font = font;	986	self->font = font;
810	layout_update_font (self);	987	layout_update_font (self);
811	}	988	}
812		989
813	void	990	void
814	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
815	CODE:	992	CODE:
816	if (self->base_height != base_height)	993	if (self->base_height != base_height)
817	{	994	{
818	self->base_height = base_height;	995	self->base_height = base_height;
819	layout_update_font (self);	996	layout_update_font (self);
820	}	997	}
821		998
822	void	999	void
823	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
824	CODE:	1001	CODE:
825	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1002	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826		1003
827	void	1004	void
828	set_indent (CFClient::Layout self, int indent)	1005	set_indent (CFPlus::Layout self, int indent)
829	CODE:	1006	CODE:
830	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1007	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831		1008
832	void	1009	void
833	set_spacing (CFClient::Layout self, int spacing)	1010	set_spacing (CFPlus::Layout self, int spacing)
834	CODE:	1011	CODE:
835	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1012	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836		1013
837	void	1014	void
838	set_ellipsise (CFClient::Layout self, int ellipsise)	1015	set_ellipsise (CFPlus::Layout self, int ellipsise)
839	CODE:	1016	CODE:
840	pango_layout_set_ellipsize (self->pl,	1017	pango_layout_set_ellipsize (self->pl,
841	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1018	ellipsise == 1 ? PANGO_ELLIPSIZE_START
842	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1019	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1020	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
844	: PANGO_ELLIPSIZE_NONE	1021	: PANGO_ELLIPSIZE_NONE
845	);	1022	);
846		1023
847	void	1024	void
848	set_single_paragraph_mode (CFClient::Layout self, int spm)	1025	set_single_paragraph_mode (CFPlus::Layout self, int spm)
849	CODE:	1026	CODE:
850	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1027	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851		1028
852	void	1029	void
853	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
854	PPCODE:	1031	PPCODE:
855	{	1032	{
856	int w, h;	1033	int w, h;
857		1034
858	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
…		…
861	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
862	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
863	}	1040	}
864		1041
865	int	1042	int
		1043	descent (CFPlus::Layout self)
		1044	CODE:
		1045	{
		1046	PangoRectangle rect;
		1047	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1048	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1049	RETVAL = PANGO_DESCENT (rect);
		1050	}
		1051	OUTPUT:
		1052	RETVAL
		1053
		1054	int
866	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
867	CODE:	1056	CODE:
868	{	1057	{
869	int index, trailing;	1058	int index, trailing;
870	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1059	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871	RETVAL = index;	1060	RETVAL = index;
872	}	1061	}
873	OUTPUT:	1062	OUTPUT:
874	RETVAL	1063	RETVAL
875		1064
876	void	1065	void
877	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
878	PPCODE:	1067	PPCODE:
879	{	1068	{
880	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
881	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882		1071
…		…
885	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887	}	1076	}
888		1077
889	void	1078	void
890	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
891	PPCODE:	1080	PPCODE:
892	{	1081	pango_opengl_render_layout_subpixel (
893	SV *retval;	1082	self->pl,
894	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
		1084	self->r, self->g, self->b, self->a,
		1085	flags
		1086	);
895		1087
896	layout_get_pixel_size (self, &w, &h);	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
897		1089
898	if (self->rgba)	1090	void
		1091	pad2pot (SV *data_, SV *w_, SV *h_)
		1092	CODE:
		1093	{
		1094	int ow = SvIV (w_);
		1095	int oh = SvIV (h_);
		1096
		1097	if (ow && oh)
899	{	1098	{
900	cairo_surface_t *surface;	1099	int nw = minpot (ow);
901	cairo_t *cairo;	1100	int nh = minpot (oh);
902		1101
903	retval = newSV (w * h * 4);	1102	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	{	1103	{
921	uint32_t *p = (uint32_t *)SvPVX (retval);	1104	if (SvOK (data_))
922	uint32_t *e = p + w * h;
923
924	while (p < e)
925	{	1105	{
926	uint32_t rgba = *p;	1106	STRLEN datalen;
927	rgba = (rgba >> 24) | (rgba << 8);	1107	char *data = SvPVbyte (data_, datalen);
928	#if 0	1108	int bpp = datalen / (ow * oh);
929	#ifdef _WIN32	1109	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		1110
936	rgba = (rgba & 0xffffff00) | a;	1111	SvPOK_only (result_);
		1112	SvCUR_set (result_, nw * nh * bpp);
		1113
		1114	memset (SvPVX (result_), 0, nw * nh * bpp);
		1115	while (oh--)
		1116	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1117
		1118	sv_setsv (data_, result_);
937	}	1119	}
938	#endif	1120
939	#endif	1121	sv_setiv (w_, nw);
940	rgba = SDL_SwapBE32 (rgba);	1122	sv_setiv (h_, nh);
941	*p++ = rgba;
942	}	1123	}
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	}	1124	}
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	}	1125	}
979		1126
980	MODULE = CFClient PACKAGE = CFClient::Texture
981
982	void	1127	void
983	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1128	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984	PROTOTYPE: $$$;$$	1129	PROTOTYPE: $$$;$$
985	ALIAS:	1130	ALIAS:
986	draw_quad_alpha = 1	1131	draw_quad_alpha = 1
987	draw_quad_alpha_premultiplied = 2	1132	draw_quad_alpha_premultiplied = 2
988	CODE:	1133	CODE:
…		…
1026	glDisable (GL_ALPHA_TEST);	1171	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1172	glDisable (GL_BLEND);
1028	}	1173	}
1029	}	1174	}
1030		1175
1031	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1177
1033	CFClient::Map	1178	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
1035	CODE:	1180	CODE:
1036	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1182	RETVAL->x = 0;
1038	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
1048	RETVAL->row = 0;	1193	RETVAL->row = 0;
1049	OUTPUT:	1194	OUTPUT:
1050	RETVAL	1195	RETVAL
1051		1196
1052	void	1197	void
1053	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
1054	CODE:	1199	CODE:
1055	{	1200	{
1056	map_clear (self);	1201	map_clear (self);
1057	Safefree (self->face);	1202	Safefree (self->face);
		1203	Safefree (self->tex);
1058	Safefree (self);	1204	Safefree (self);
1059	}	1205	}
1060		1206
1061	void	1207	void
1062	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1063	CODE:	1209	CODE:
1064	map_clear (self);	1210	map_clear (self);
1065		1211
1066	void	1212	void
1067	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1214	CODE:
1069	{	1215	{
1070	while (self->faces <= face)	1216	while (self->faces <= face)
1071	{	1217	{
1072	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1221
1076	self->face [face] = texid;	1222	self->face [face] = texid;
1077	}	1223	}
1078		1224
1079	void	1225	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)	1226	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:	1227	CODE:
1082	{	1228	{
1083	while (self->texs <= texid)	1229	while (self->texs <= texid)
1084	{	1230	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1109	// from transparent color bleeding and ugly wrapping effects.	1255	// from transparent color bleeding and ugly wrapping effects.
1110	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111	}	1257	}
1112		1258
1113	int	1259	int
1114	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1115	ALIAS:	1261	ALIAS:
1116	oy = 1	1262	oy = 1
1117	x = 2	1263	x = 2
1118	y = 3	1264	y = 3
1119	w = 4	1265	w = 4
…		…
1130	}	1276	}
1131	OUTPUT:	1277	OUTPUT:
1132	RETVAL	1278	RETVAL
1133		1279
1134	void	1280	void
1135	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1136	CODE:	1282	CODE:
1137	{	1283	{
1138	if (dx > 0)	1284	if (dx > 0)
1139	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1140	else if (dx < 0)	1286	else if (dx < 0)
1141	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1142		1288
1143	if (dy > 0)	1289	if (dy > 0)
1144	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1145	else if (dy < 0)	1291	else if (dy < 0)
1146	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1147		1293
1148	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1149	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1150		1296
1151	while (self->y < 0)	1297	while (self->y < 0)
…		…
1156	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1157	}	1303	}
1158	}	1304	}
1159		1305
1160	void	1306	void
1161	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162	CODE:	1308	CODE:
1163	{	1309	{
1164	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1310	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165	uint8_t *data_end = (uint8_t *)SvEND (data_);	1311	uint8_t *data_end = (uint8_t *)SvEND (data_);
1166	mapcell *cell;	1312	mapcell *cell;
1167	int x, y, flags;	1313	int x, y, flags;
1168		1314
1169	while (data < data_end)	1315	while (data < data_end - 1)
1170	{	1316	{
1171	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1172		1318
1173	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
1174	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
1175		1321
1176	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1177		1323
1178	if (flags & 15)	1324	if (flags & 15)
1179	{	1325	{
1180	if (cell->darkness < 0)	1326	if (!cell->darkness)
1181	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1182	cell->darkness = 0;	1329	cell->darkness = 256;
1183	cell->face [0] = 0;
1184	cell->face [1] = 0;
1185	cell->face [2] = 0;
1186	}	1330	}
1187		1331
1188	cell->darkness = flags & 8 ? *data++ : 255;
1189
1190	//TODO: don't trust server data to be in-range(!)	1332	//TODO: don't trust server data to be in-range(!)
		1333
		1334	if (flags & 8)
		1335	{
		1336	if (extmap)
		1337	{
		1338	uint8_t ext, cmd;
		1339
		1340	do
		1341	{
		1342	ext = *data++;
		1343	cmd = ext & 0x3f;
		1344
		1345	if (cmd < 4)
		1346	cell->darkness = 255 - ext * 64 + 1;
		1347	else if (cmd == 5) // health
		1348	{
		1349	cell->stat_width = 1;
		1350	cell->stat_hp = *data++;
		1351	}
		1352	else if (cmd == 6) // monster width
		1353	cell->stat_width = *data++ + 1;
		1354	else if (cmd == 0x47) // monster width
		1355	{
		1356	if (*data == 4)
		1357	; // decode player tag
		1358
		1359	data += *data + 1;
		1360	}
		1361	else if (cmd == 8) // cell flags
		1362	cell->flags = *data++;
		1363	else if (ext & 0x40) // unknown, multibyte => skip
		1364	data += *data + 1;
		1365	else
		1366	data++;
		1367	}
		1368	while (ext & 0x80);
		1369	}
		1370	else
		1371	cell->darkness = *data++ + 1;
		1372	}
1191		1373
1192	if (flags & 4)	1374	if (flags & 4)
1193	{	1375	{
1194	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1195	}	1377	}
…		…
1203	{	1385	{
1204	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1205	}	1387	}
1206	}	1388	}
1207	else	1389	else
1208	cell->darkness = -1;	1390	cell->darkness = 0;
1209	}	1391	}
1210	}	1392	}
1211		1393
1212	SV *	1394	SV *
1213	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214	CODE:	1396	CODE:
1215	{	1397	{
1216	int x1, x;	1398	int x1, x;
1217	int y1, y;	1399	int y1, y;
1218	int z;	1400	int z;
…		…
1268	}	1450	}
1269	OUTPUT:	1451	OUTPUT:
1270	RETVAL	1452	RETVAL
1271		1453
1272	void	1454	void
1273	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1455	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1274	PPCODE:	1456	CODE:
1275	{	1457	{
1276	int vx, vy;	1458	int vx, vy;
1277	int x, y, z;	1459	int x, y, z;
1278	int last_name;	1460	int last_name;
1279	mapface face;	1461	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		1462
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;	1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1289	vy = self->y + (self->h - sh) / 2 - shift_y;	1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1290		1465
1291	/*	1466	/*
1292	int vx = self->vx = self->w >= sw	1467	int vx = self->vx = self->w >= sw
1293	? self->x + (self->w - sw) / 2	1468	? self->x + (self->w - sw) / 2
1294	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1469	: 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));	1473	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299	*/	1474	*/
1300		1475
1301	glColor4ub (255, 255, 255, 255);	1476	glColor4ub (255, 255, 255, 255);
1302		1477
		1478	glEnable (GL_BLEND);
1303	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304	glEnable (GL_BLEND);
1305	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
1306	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1481	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307		1482
1308	glBegin (GL_QUADS);	1483	glBegin (GL_QUADS);
1309		1484
…		…
1318	for (x = 0; x < sw; x++)	1493	for (x = 0; x < sw; x++)
1319	if (row->c0 <= x + vx && x + vx < row->c1)	1494	if (row->c0 <= x + vx && x + vx < row->c1)
1320	{	1495	{
1321	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1322		1497
1323	darkness[y * sw4 + x] = cell->darkness < 0
1324	? 255 - FOW_DARKNESS
1325	: 255 - cell->darkness;
1326
1327	face = cell->face [z];	1498	face = cell->face [z];
1328		1499
1329	if (face)	1500	if (face && face < self->texs)
1330	{	1501	{
1331	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1332
1333	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1334	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1335		1505
1336	if (last_name != tex.name)	1506	if (last_name != tex.name)
1337	{	1507	{
1338	glEnd ();	1508	glEnd ();
1339	last_name = tex.name;
1340	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1341	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1342	}	1511	}
1343		1512
1344	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1515	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348	}	1517	}
		1518
		1519	if (cell->flags && z == 2)
		1520	{
		1521	if (cell->flags & 1)
		1522	{
		1523	maptex tex = self->tex [1];
		1524	int px = (x + 1) * 32 - tex.w + 2;
		1525	int py = (y + 1) * 32 - tex.h - 6;
		1526
		1527	glEnd ();
		1528	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1529	glBegin (GL_QUADS);
		1530
		1531	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1532	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1533	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1534	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1535	}
		1536	}
1349	}	1537	}
1350	}	1538	}
1351		1539
1352	glEnd ();	1540	glEnd ();
1353		1541
1354	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1355	glDisable (GL_BLEND);	1543	glDisable (GL_BLEND);
		1544
		1545	// top layer: overlays such as the health bar
		1546	for (y = 0; y < sh; y++)
		1547	if (0 <= y + vy && y + vy < self->rows)
		1548	{
		1549	maprow *row = self->row + (y + vy);
		1550
		1551	for (x = 0; x < sw; x++)
		1552	if (row->c0 <= x + vx && x + vx < row->c1)
		1553	{
		1554	mapcell *cell = row->col + (x + vx - row->c0);
		1555
		1556	int px = x * 32;
		1557	int py = y * 32;
		1558
		1559	if (cell->stat_hp)
		1560	{
		1561	int width = cell->stat_width * 32;
		1562	int thick = sh / 28 + 1 + cell->stat_width;
		1563
		1564	glColor3ub (0, 0, 0);
		1565	glRectf (px + 1, py - thick - 2,
		1566	px + width - 1, py);
		1567
		1568	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1569	glRectf (px + 2,
		1570	py - thick - 1,
		1571	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1572	}
		1573	}
		1574	}
		1575	}
		1576
		1577	void
		1578	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1579	CODE:
		1580	{
		1581	static float color[16][3] = {
		1582	{ 0.00F, 0.00F, 0.00F },
		1583	{ 1.00F, 1.00F, 1.00F },
		1584	{ 0.00F, 0.00F, 0.55F },
		1585	{ 1.00F, 0.00F, 0.00F },
		1586
		1587	{ 1.00F, 0.54F, 0.00F },
		1588	{ 0.11F, 0.56F, 1.00F },
		1589	{ 0.93F, 0.46F, 0.00F },
		1590	{ 0.18F, 0.54F, 0.34F },
		1591
		1592	{ 0.56F, 0.73F, 0.56F },
		1593	{ 0.80F, 0.80F, 0.80F },
		1594	{ 0.55F, 0.41F, 0.13F },
		1595	{ 0.99F, 0.77F, 0.26F },
		1596
		1597	{ 0.74F, 0.65F, 0.41F },
		1598
		1599	{ 0.00F, 1.00F, 1.00F },
		1600	{ 1.00F, 0.00F, 1.00F },
		1601	{ 1.00F, 1.00F, 0.00F },
		1602	};
		1603
		1604	int x, y;
		1605
		1606	glEnable (GL_TEXTURE_2D);
		1607	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1608	glEnable (GL_BLEND);
		1609	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1610	glBegin (GL_QUADS);
		1611
		1612	for (y = 0; y < h; y++)
		1613	for (x = 0; x < w; x++)
		1614	{
		1615	unsigned char m = data [x + y * w];
		1616
		1617	if (m)
		1618	{
		1619	float *c = color [m & 15];
		1620
		1621	float tx1 = m & 0x40 ? 0.5 : 0.;
		1622	float tx2 = tx1 + 0.5;
		1623
		1624	glColor4f (c[0], c[1], c[2], 0.75);
		1625	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1626	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1627	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1628	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1629	}
		1630	}
		1631
		1632	glEnd ();
		1633	glDisable (GL_BLEND);
		1634	glDisable (GL_TEXTURE_2D);
		1635	}
		1636
		1637	void
		1638	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1639	PPCODE:
		1640	{
		1641	int vx, vy;
		1642	int x, y;
		1643	int sw4 = (sw + 3) & ~3;
		1644	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1645	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1646
		1647	memset (darkness, 255, sw4 * sh);
		1648	SvPOK_only (darkness_sv);
		1649	SvCUR_set (darkness_sv, sw4 * sh);
		1650
		1651	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1652	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1653
		1654	for (y = 0; y < sh; y++)
		1655	if (0 <= y + vy && y + vy < self->rows)
		1656	{
		1657	maprow *row = self->row + (y + vy);
		1658
		1659	for (x = 0; x < sw; x++)
		1660	if (row->c0 <= x + vx && x + vx < row->c1)
		1661	{
		1662	mapcell *cell = row->col + (x + vx - row->c0);
		1663
		1664	darkness[y * sw4 + x] = cell->darkness
		1665	? 255 - (cell->darkness - 1)
		1666	: 255 - FOW_DARKNESS;
		1667	}
		1668	}
1356		1669
1357	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1358	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1359	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1360	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1361	}	1674	}
1362		1675
1363	SV *	1676	SV *
1364	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1677	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365	CODE:	1678	CODE:
1366	{	1679	{
1367	int x, y, x1, y1;	1680	int x, y, x1, y1;
1368	SV *data_sv = newSV (w * h * 7 + 5);	1681	SV *data_sv = newSV (w * h * 7 + 5);
1369	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1682	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1431	}	1744	}
1432	OUTPUT:	1745	OUTPUT:
1433	RETVAL	1746	RETVAL
1434		1747
1435	void	1748	void
1436	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1749	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437	PPCODE:	1750	PPCODE:
1438	{	1751	{
1439	int x, y, z;	1752	int x, y, z;
1440	int w, h;	1753	int w, h;
1441	int x1, y1;	1754	int x1, y1;
…		…
1473		1786
1474	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1787	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1788	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1789	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477		1790
1478	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1479	{	1792	{
1480	cell->darkness = -1;	1793	cell->darkness = 0;
1481		1794
1482	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1483	{	1796	{
1484	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1485		1798
…		…
1490	}	1803	}
1491	}	1804	}
1492	}	1805	}
1493	}	1806	}
1494		1807
1495	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496		1809
1497	CFClient::MixChunk	1810	CFPlus::MixChunk
1498	new_from_file (SV *class, char *path)	1811	new_from_file (SV *class, char *path)
1499	CODE:	1812	CODE:
1500	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1501	OUTPUT:	1814	OUTPUT:
1502	RETVAL	1815	RETVAL
1503		1816
1504	void	1817	void
1505	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1506	CODE:	1819	CODE:
1507	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1508		1821
1509	int	1822	int
1510	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1511	CODE:	1824	CODE:
1512	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1513	OUTPUT:	1826	OUTPUT:
1514	RETVAL	1827	RETVAL
1515		1828
1516	int	1829	int
1517	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1830	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518	CODE:	1831	CODE:
1519	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520	OUTPUT:	1833	OUTPUT:
1521	RETVAL	1834	RETVAL
1522		1835
1523	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524		1837
1525	int	1838	int
1526	volume (int volume = -1)	1839	volume (int volume = -1)
1527	CODE:	1840	CODE:
1528	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1529	OUTPUT:	1842	OUTPUT:
1530	RETVAL	1843	RETVAL
1531		1844
1532	CFClient::MixMusic	1845	CFPlus::MixMusic
1533	new_from_file (SV *class, char *path)	1846	new_from_file (SV *class, char *path)
1534	CODE:	1847	CODE:
1535	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1536	OUTPUT:	1849	OUTPUT:
1537	RETVAL	1850	RETVAL
1538		1851
1539	void	1852	void
1540	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1541	CODE:	1854	CODE:
1542	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1543		1856
1544	int	1857	int
1545	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1546	CODE:	1859	CODE:
1547	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1548	OUTPUT:	1861	OUTPUT:
1549	RETVAL	1862	RETVAL
1550		1863
1551	MODULE = CFClient PACKAGE = CFClient::OpenGL	1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552		1865
1553	BOOT:	1866	BOOT:
1554	{	1867	{
1555	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556	static const struct {	1869	static const struct {
1557	const char *name;	1870	const char *name;
1558	IV iv;	1871	IV iv;
1559	} *civ, const_iv[] = {	1872	} *civ, const_iv[] = {
1560	# define const_iv(name) { # name, (IV)name }	1873	# define const_iv(name) { # name, (IV)name }
…		…
1567	const_iv (GL_SCISSOR_TEST),	1880	const_iv (GL_SCISSOR_TEST),
1568	const_iv (GL_DEPTH_TEST),	1881	const_iv (GL_DEPTH_TEST),
1569	const_iv (GL_ALPHA_TEST),	1882	const_iv (GL_ALPHA_TEST),
1570	const_iv (GL_NORMALIZE),	1883	const_iv (GL_NORMALIZE),
1571	const_iv (GL_RESCALE_NORMAL),	1884	const_iv (GL_RESCALE_NORMAL),
		1885	const_iv (GL_FRONT),
		1886	const_iv (GL_BACK),
1572	const_iv (GL_AND),	1887	const_iv (GL_AND),
1573	const_iv (GL_ONE),	1888	const_iv (GL_ONE),
1574	const_iv (GL_ZERO),	1889	const_iv (GL_ZERO),
1575	const_iv (GL_SRC_ALPHA),	1890	const_iv (GL_SRC_ALPHA),
1576	const_iv (GL_DST_ALPHA),	1891	const_iv (GL_DST_ALPHA),
1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1892	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578	const_iv (GL_ONE_MINUS_DST_ALPHA),	1893	const_iv (GL_ONE_MINUS_DST_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1894	const_iv (GL_SRC_ALPHA_SATURATE),
1580	const_iv (GL_RGB),	1895	const_iv (GL_RGB),
1581	const_iv (GL_RGBA),	1896	const_iv (GL_RGBA),
		1897	const_iv (GL_RGBA4),
		1898	const_iv (GL_RGBA8),
		1899	const_iv (GL_RGB5_A1),
1582	const_iv (GL_UNSIGNED_BYTE),	1900	const_iv (GL_UNSIGNED_BYTE),
1583	const_iv (GL_UNSIGNED_SHORT),	1901	const_iv (GL_UNSIGNED_SHORT),
1584	const_iv (GL_UNSIGNED_INT),	1902	const_iv (GL_UNSIGNED_INT),
1585	const_iv (GL_ALPHA),	1903	const_iv (GL_ALPHA),
1586	const_iv (GL_INTENSITY),	1904	const_iv (GL_INTENSITY),
…		…
1618	const_iv (GL_SEPARABLE_2D),	1936	const_iv (GL_SEPARABLE_2D),
1619	const_iv (GL_CONVOLUTION_2D),	1937	const_iv (GL_CONVOLUTION_2D),
1620	const_iv (GL_CONVOLUTION_BORDER_MODE),	1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
1621	const_iv (GL_CONSTANT_BORDER),	1939	const_iv (GL_CONSTANT_BORDER),
1622	const_iv (GL_LINES),	1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
1623	const_iv (GL_LINE_LOOP),	1942	const_iv (GL_LINE_LOOP),
1624	const_iv (GL_QUADS),	1943	const_iv (GL_QUADS),
1625	const_iv (GL_QUAD_STRIP),	1944	const_iv (GL_QUAD_STRIP),
1626	const_iv (GL_TRIANGLES),	1945	const_iv (GL_TRIANGLES),
1627	const_iv (GL_TRIANGLE_STRIP),	1946	const_iv (GL_TRIANGLE_STRIP),
…		…
1660	OUTPUT:	1979	OUTPUT:
1661	RETVAL	1980	RETVAL
1662		1981
1663	int glGetError ()	1982	int glGetError ()
1664		1983
		1984	void glFinish ()
		1985
1665	void glClear (int mask)	1986	void glClear (int mask)
1666		1987
1667	void glClearColor (float r, float g, float b, float a = 1.0)	1988	void glClearColor (float r, float g, float b, float a = 1.0)
1668	PROTOTYPE: @	1989	PROTOTYPE: @
1669		1990
…		…
1692	void glPushMatrix ()	2013	void glPushMatrix ()
1693		2014
1694	void glPopMatrix ()	2015	void glPopMatrix ()
1695		2016
1696	void glLoadIdentity ()	2017	void glLoadIdentity ()
		2018
		2019	void glDrawBuffer (int buffer)
		2020
		2021	void glReadBuffer (int buffer)
1697		2022
1698	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# 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_)	2024	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700		2025
1701	# near_ and far_ are due to microsofts buggy "c" compiler	2026	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1731	r *= a;	2056	r *= a;
1732	g *= a;	2057	g *= a;
1733	b *= a;	2058	b *= a;
1734	}	2059	}
1735	// microsoft visual "c" rounds instead of truncating...	2060	// microsoft visual "c" rounds instead of truncating...
1736	glColor4ub (MIN ((int)(r * 256.f), 255),	2061	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		2062
1741	void glInterleavedArrays (int format, int stride, char *data)	2063	void glInterleavedArrays (int format, int stride, char *data)
1742		2064
1743	void glDrawElements (int mode, int count, int type, char *indices)	2065	void glDrawElements (int mode, int count, int type, char *indices)
1744		2066
…		…
1821		2143
1822	void glEndList ()	2144	void glEndList ()
1823		2145
1824	void glCallList (int list)	2146	void glCallList (int list)
1825		2147
1826

Diff Legend

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