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.108 by root, Wed Jun 7 23:28:12 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

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