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.109 by root, Wed Jun 7 23:29:13 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);
		127	#ifdef FC_HINT_STYLE
91	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
92	#ifdef _WIN32	129	#endif
93	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
94	#else
95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
96	#endif
97	}	131	}
98		132
99	static void	133	static void
100	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
101	{	135	{
102	/* 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
103	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
104	*/	138	*/
105	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
109		143
110	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
111	}	145	}
112		146
113	static void	147	static void
114	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	148	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
115	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
116	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
117		154
118	if (!*w) *w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
119	if (!*h) *h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
120		157
121	*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;
122	}	163	}
123		164
124	typedef uint16_t mapface;	165	typedef uint16_t mapface;
125		166
126	typedef struct {	167	typedef struct {
…		…
129	float s, t;	170	float s, t;
130	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
131	} maptex;	172	} maptex;
132		173
133	typedef struct {	174	typedef struct {
134	int16_t darkness;	175	uint32_t player;
135	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
136	} mapcell;	179	} mapcell;
137		180
138	typedef struct {	181	typedef struct {
139	int32_t c0, c1;	182	int32_t c0, c1;
140	mapcell *col;	183	mapcell *col;
…		…
149	int texs;	192	int texs;
150	maptex *tex;	193	maptex *tex;
151		194
152	int32_t rows;	195	int32_t rows;
153	maprow *row;	196	maprow *row;
154	} *CFClient__Map;	197	} *CFPlus__Map;
155		198
156	static char *	199	static char *
157	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
158	{	201	{
159	char *p;	202	char *p;
…		…
177		220
178	#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))
179	#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))
180		223
181	static maprow *	224	static maprow *
182	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
183	{	226	{
184	if (0 > y)	227	if (0 > y)
185	{	228	{
186	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
187	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
225		268
226	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
227	}	270	}
228		271
229	static mapcell *	272	static mapcell *
230	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
231	{	274	{
232	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
233	}	276	}
234		277
235	static void	278	static void
236	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
237	{	280	{
238	int r;	281	int r;
239		282
240	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
241	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
249	self->row = 0;	292	self->row = 0;
250	self->rows = 0;	293	self->rows = 0;
251	}	294	}
252		295
253	static void	296	static void
254	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)
255	{	298	{
256	int x, y;	299	int x, y;
257	maprow *row;	300	maprow *row;
		301	mapcell *cell;
258		302
259	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
260	if (y >= 0)	304	if (y >= 0)
261	{	305	{
262	if (y >= self->rows)	306	if (y >= self->rows)
…		…
268	if (x >= row->c0)	312	if (x >= row->c0)
269	{	313	{
270	if (x >= row->c1)	314	if (x >= row->c1)
271	break;	315	break;
272		316
273	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;
274	}	323	}
275	}	324	}
276	}	325	}
277		326
278	static void	327	static void
…		…
299	ev.data2 = 0;	348	ev.data2 = 0;
300		349
301	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
302	}	351	}
303		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
304	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
305		371
306	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
307		373
308	BOOT:	374	BOOT:
309	{	375	{
310	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
311	static const struct {	377	static const struct {
312	const char *name;	378	const char *name;
313	IV iv;	379	IV iv;
314	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
315	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
416		482
417	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; )
418	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
419	}	485	}
420		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
421	void	498	void
422	pango_init ()	499	pango_init ()
423	CODE:	500	CODE:
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	{	501	{
426	{
427	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
428	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);
429	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	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	}	505	}
447		506
448	int	507	int
449	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
450		509
451	void	510	void
452	SDL_Quit ()	511	SDL_Quit ()
453		512
454	void	513	void
…		…
461	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
462	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
463	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
464		523
465	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
466	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
467		526
468	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
469	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
472		531
473	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
474		537
475	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
476	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
477		540
478	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
565	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
566	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
567	break;	630	break;
568	}	631	}
569		632
570	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
571	}	634	}
572	}	635	}
573		636
574	int	637	int
575	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)
…		…
589	#ifndef _WIN32	652	#ifndef _WIN32
590	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
591	#endif	654	#endif
592		655
593	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
594	add_font (char *file)	686	add_font (char *file)
595	CODE:	687	CODE:
596	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
597	#ifdef _WIN32
598	// cairo... sigh... requires win2000
599	AddFontResourceEx (file, FR_PRIVATE, 0);
600	#endif
601		689
602	void	690	void
603	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
604	ALIAS:	692	ALIAS:
605	load_image_file = 1	693	load_image_file = 1
…		…
647		735
648	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
649		737
650	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
651		739
		740	SDL_LockSurface (surface2);
652	EXTEND (SP, 5);	741	EXTEND (SP, 6);
653	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
654	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
655	SDL_LockSurface (surface2);
656	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	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)));	745	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
659	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
660	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
661		749
662	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
663	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
664	}	752	}
665		753
…		…
701	CODE:	789	CODE:
702	fprintf (stderr, "FATAL: %s\n", message);	790	fprintf (stderr, "FATAL: %s\n", message);
703	#ifdef _WIN32	791	#ifdef _WIN32
704	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
705	#endif	793	#endif
706	exit (1);	794	_exit (1);
707		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
708	MODULE = CFClient PACKAGE = CFClient::Font	805	MODULE = CFPlus PACKAGE = CFPlus::Font
709		806
710	CFClient::Font	807	CFPlus::Font
711	new_from_file (SV *class, char *path, int id = 0)	808	new_from_file (SV *class, char *path, int id = 0)
712	CODE:	809	CODE:
713	{	810	{
714	int count;	811	int count;
715	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	812	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
718	}	815	}
719	OUTPUT:	816	OUTPUT:
720	RETVAL	817	RETVAL
721		818
722	void	819	void
723	DESTROY (CFClient::Font self)	820	DESTROY (CFPlus::Font self)
724	CODE:	821	CODE:
725	pango_font_description_free (self);	822	pango_font_description_free (self);
726		823
727	void	824	void
728	make_default (CFClient::Font self)	825	make_default (CFPlus::Font self)
729	CODE:	826	CODE:
730	default_font = self;	827	default_font = self;
731		828
732	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
733		830
734	CFClient::Layout	831	void
735	new (SV *class, int rgba = 0)	832	reset_glyph_cache ()
		833	CODE:
		834	tc_clear ();
		835
		836	CFPlus::Layout
		837	new (SV *class)
736	CODE:	838	CODE:
737	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
738		840
739	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	841	RETVAL->pl = pango_layout_new (opengl_context);
740	RETVAL->rgba = rgba;
741	RETVAL->r = 1.;	842	RETVAL->r = 1.;
742	RETVAL->g = 1.;	843	RETVAL->g = 1.;
743	RETVAL->b = 1.;	844	RETVAL->b = 1.;
744	RETVAL->a = 1.;	845	RETVAL->a = 1.;
745	RETVAL->base_height = MIN_FONT_HEIGHT;	846	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
749	layout_update_font (RETVAL);	850	layout_update_font (RETVAL);
750	OUTPUT:	851	OUTPUT:
751	RETVAL	852	RETVAL
752		853
753	void	854	void
754	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
755	CODE:	856	CODE:
756	g_object_unref (self->pl);	857	g_object_unref (self->pl);
757	Safefree (self);	858	Safefree (self);
758		859
759	int
760	is_rgba (CFClient::Layout self)
761	CODE:
762	RETVAL = self->rgba;
763	OUTPUT:
764	RETVAL
765
766	void	860	void
767	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
768	CODE:	862	CODE:
769	{	863	{
770	STRLEN textlen;	864	STRLEN textlen;
771	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
772		866
773	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
774	}	868	}
775		869
776	void	870	void
777	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
778	CODE:	872	CODE:
779	{	873	{
780	STRLEN textlen;	874	STRLEN textlen;
781	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
782		876
783	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
784	}	878	}
785		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
786	SV *	965	SV *
787	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
788	CODE:	967	CODE:
789	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
790	sv_utf8_decode (RETVAL);	969	sv_utf8_decode (RETVAL);
791	OUTPUT:	970	OUTPUT:
792	RETVAL	971	RETVAL
793		972
794	void	973	void
795	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.)
796	CODE:	975	CODE:
797	self->r = r;	976	self->r = r;
798	self->g = g;	977	self->g = g;
799	self->b = b;	978	self->b = b;
800	self->a = a;	979	self->a = a;
801		980
802	void	981	void
803	set_font (CFClient::Layout self, CFClient::Font font = 0)	982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
804	CODE:	983	CODE:
805	if (self->font != font)	984	if (self->font != font)
806	{	985	{
807	self->font = font;	986	self->font = font;
808	layout_update_font (self);	987	layout_update_font (self);
809	}	988	}
810		989
811	void	990	void
812	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
813	CODE:	992	CODE:
814	if (self->base_height != base_height)	993	if (self->base_height != base_height)
815	{	994	{
816	self->base_height = base_height;	995	self->base_height = base_height;
817	layout_update_font (self);	996	layout_update_font (self);
818	}	997	}
819		998
820	void	999	void
821	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
822	CODE:	1001	CODE:
823	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);
824		1003
825	void	1004	void
826	set_indent (CFClient::Layout self, int indent)	1005	set_indent (CFPlus::Layout self, int indent)
827	CODE:	1006	CODE:
828	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1007	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
829		1008
830	void	1009	void
831	set_spacing (CFClient::Layout self, int spacing)	1010	set_spacing (CFPlus::Layout self, int spacing)
832	CODE:	1011	CODE:
833	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1012	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
834		1013
835	void	1014	void
836	set_ellipsise (CFClient::Layout self, int ellipsise)	1015	set_ellipsise (CFPlus::Layout self, int ellipsise)
837	CODE:	1016	CODE:
838	pango_layout_set_ellipsize (self->pl,	1017	pango_layout_set_ellipsize (self->pl,
839	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1018	ellipsise == 1 ? PANGO_ELLIPSIZE_START
840	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1019	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
841	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1020	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
842	: PANGO_ELLIPSIZE_NONE	1021	: PANGO_ELLIPSIZE_NONE
843	);	1022	);
844		1023
845	void	1024	void
846	set_single_paragraph_mode (CFClient::Layout self, int spm)	1025	set_single_paragraph_mode (CFPlus::Layout self, int spm)
847	CODE:	1026	CODE:
848	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1027	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
849		1028
850	void	1029	void
851	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
852	PPCODE:	1031	PPCODE:
853	{	1032	{
854	int w, h;	1033	int w, h;
855		1034
856	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
…		…
859	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
860	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
861	}	1040	}
862		1041
863	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
864	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
865	CODE:	1056	CODE:
866	{	1057	{
867	int index, trailing;	1058	int index, trailing;
868	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);
869	RETVAL = index;	1060	RETVAL = index;
870	}	1061	}
871	OUTPUT:	1062	OUTPUT:
872	RETVAL	1063	RETVAL
873		1064
874	void	1065	void
875	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
876	PPCODE:	1067	PPCODE:
877	{	1068	{
878	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
879	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
880		1071
…		…
883	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
884	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
885	}	1076	}
886		1077
887	void	1078	void
888	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
889	PPCODE:	1080	PPCODE:
890	{	1081	pango_opengl_render_layout_subpixel (
891	SV *retval;	1082	self->pl,
892	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
		1084	self->r, self->g, self->b, self->a,
		1085	flags
		1086	);
893		1087
894	layout_get_pixel_size (self, &w, &h);	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
895		1089
896	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)
897	{	1098	{
898	cairo_surface_t *surface;	1099	int nw = minpot (ow);
899	cairo_t *cairo;	1100	int nh = minpot (oh);
900		1101
901	retval = newSV (w * h * 4);	1102	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	{	1103	{
919	uint32_t *p = (uint32_t *)SvPVX (retval);	1104	if (SvOK (data_))
920	uint32_t *e = p + w * h;
921
922	while (p < e)
923	{	1105	{
924	uint32_t rgba = *p;	1106	STRLEN datalen;
925	rgba = (rgba >> 24) | (rgba << 8);	1107	char *data = SvPVbyte (data_, datalen);
926	#if 0	1108	int bpp = datalen / (ow * oh);
927	#ifdef _WIN32	1109	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		1110
934	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_);
935	}	1119	}
936	#endif	1120
937	#endif	1121	sv_setiv (w_, nw);
938	rgba = SDL_SwapBE32 (rgba);	1122	sv_setiv (h_, nh);
939	*p++ = rgba;
940	}	1123	}
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	}	1124	}
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	}	1125	}
977		1126
978	MODULE = CFClient PACKAGE = CFClient::Texture
979
980	void	1127	void
981	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.)
982	PROTOTYPE: $$$;$$	1129	PROTOTYPE: $$$;$$
983	ALIAS:	1130	ALIAS:
984	draw_quad_alpha = 1	1131	draw_quad_alpha = 1
985	draw_quad_alpha_premultiplied = 2	1132	draw_quad_alpha_premultiplied = 2
986	CODE:	1133	CODE:
…		…
1024	glDisable (GL_ALPHA_TEST);	1171	glDisable (GL_ALPHA_TEST);
1025	glDisable (GL_BLEND);	1172	glDisable (GL_BLEND);
1026	}	1173	}
1027	}	1174	}
1028		1175
1029	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
1030		1177
1031	CFClient::Map	1178	CFPlus::Map
1032	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
1033	CODE:	1180	CODE:
1034	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
1035	RETVAL->x = 0;	1182	RETVAL->x = 0;
1036	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
1046	RETVAL->row = 0;	1193	RETVAL->row = 0;
1047	OUTPUT:	1194	OUTPUT:
1048	RETVAL	1195	RETVAL
1049		1196
1050	void	1197	void
1051	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
1052	CODE:	1199	CODE:
1053	{	1200	{
1054	map_clear (self);	1201	map_clear (self);
1055	Safefree (self->face);	1202	Safefree (self->face);
		1203	Safefree (self->tex);
1056	Safefree (self);	1204	Safefree (self);
1057	}	1205	}
1058		1206
1059	void	1207	void
1060	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1061	CODE:	1209	CODE:
1062	map_clear (self);	1210	map_clear (self);
1063		1211
1064	void	1212	void
1065	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1066	CODE:	1214	CODE:
1067	{	1215	{
1068	while (self->faces <= face)	1216	while (self->faces <= face)
1069	{	1217	{
1070	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1073		1221
1074	self->face [face] = texid;	1222	self->face [face] = texid;
1075	}	1223	}
1076		1224
1077	void	1225	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)	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)
1079	CODE:	1227	CODE:
1080	{	1228	{
1081	while (self->texs <= texid)	1229	while (self->texs <= texid)
1082	{	1230	{
1083	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1107	// from transparent color bleeding and ugly wrapping effects.	1255	// from transparent color bleeding and ugly wrapping effects.
1108	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1109	}	1257	}
1110		1258
1111	int	1259	int
1112	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1113	ALIAS:	1261	ALIAS:
1114	oy = 1	1262	oy = 1
1115	x = 2	1263	x = 2
1116	y = 3	1264	y = 3
1117	w = 4	1265	w = 4
…		…
1128	}	1276	}
1129	OUTPUT:	1277	OUTPUT:
1130	RETVAL	1278	RETVAL
1131		1279
1132	void	1280	void
1133	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1134	CODE:	1282	CODE:
1135	{	1283	{
1136	if (dx > 0)	1284	if (dx > 0)
1137	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1138	else if (dx < 0)	1286	else if (dx < 0)
1139	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);
1140		1288
1141	if (dy > 0)	1289	if (dy > 0)
1142	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1143	else if (dy < 0)	1291	else if (dy < 0)
1144	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);
1145		1293
1146	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1147	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1148		1296
1149	while (self->y < 0)	1297	while (self->y < 0)
…		…
1154	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1155	}	1303	}
1156	}	1304	}
1157		1305
1158	void	1306	void
1159	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1160	CODE:	1308	CODE:
1161	{	1309	{
1162	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1310	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1163	uint8_t *data_end = (uint8_t *)SvEND (data_);	1311	uint8_t *data_end = (uint8_t *)SvEND (data_);
1164	mapcell *cell;	1312	mapcell *cell;
1165	int x, y, flags;	1313	int x, y, flags;
1166		1314
1167	while (data < data_end)	1315	while (data < data_end - 1)
1168	{	1316	{
1169	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1170		1318
1171	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
1172	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
1173		1321
1174	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1175		1323
1176	if (flags & 15)	1324	if (flags & 15)
1177	{	1325	{
1178	if (cell->darkness < 0)	1326	if (!cell->darkness)
1179	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1180	cell->darkness = 0;	1329	cell->darkness = 256;
1181	cell->face [0] = 0;
1182	cell->face [1] = 0;
1183	cell->face [2] = 0;
1184	}	1330	}
1185		1331
1186	cell->darkness = flags & 8 ? *data++ : 255;
1187
1188	//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	}
1189		1373
1190	if (flags & 4)	1374	if (flags & 4)
1191	{	1375	{
1192	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;
1193	}	1377	}
…		…
1201	{	1385	{
1202	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;
1203	}	1387	}
1204	}	1388	}
1205	else	1389	else
1206	cell->darkness = -1;	1390	cell->darkness = 0;
1207	}	1391	}
1208	}	1392	}
1209		1393
1210	SV *	1394	SV *
1211	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)
1212	CODE:	1396	CODE:
1213	{	1397	{
1214	int x1, x;	1398	int x1, x;
1215	int y1, y;	1399	int y1, y;
1216	int z;	1400	int z;
…		…
1266	}	1450	}
1267	OUTPUT:	1451	OUTPUT:
1268	RETVAL	1452	RETVAL
1269		1453
1270	void	1454	void
1271	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)
1272	PPCODE:	1456	CODE:
1273	{	1457	{
1274	int vx, vy;	1458	int vx, vy;
1275	int x, y, z;	1459	int x, y, z;
1276	int last_name;	1460	int last_name;
1277	mapface face;	1461	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		1462
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;	1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1287	vy = self->y + (self->h - sh) / 2 - shift_y;	1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1288		1465
1289	/*	1466	/*
1290	int vx = self->vx = self->w >= sw	1467	int vx = self->vx = self->w >= sw
1291	? self->x + (self->w - sw) / 2	1468	? self->x + (self->w - sw) / 2
1292	: 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));
…		…
1296	: 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));
1297	*/	1474	*/
1298		1475
1299	glColor4ub (255, 255, 255, 255);	1476	glColor4ub (255, 255, 255, 255);
1300		1477
		1478	glEnable (GL_BLEND);
1301	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1302	glEnable (GL_BLEND);
1303	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
1304	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1481	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1305		1482
1306	glBegin (GL_QUADS);	1483	glBegin (GL_QUADS);
1307		1484
…		…
1316	for (x = 0; x < sw; x++)	1493	for (x = 0; x < sw; x++)
1317	if (row->c0 <= x + vx && x + vx < row->c1)	1494	if (row->c0 <= x + vx && x + vx < row->c1)
1318	{	1495	{
1319	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1320		1497
1321	darkness[y * sw4 + x] = cell->darkness < 0
1322	? 255 - FOW_DARKNESS
1323	: 255 - cell->darkness;
1324
1325	face = cell->face [z];	1498	face = cell->face [z];
1326		1499
1327	if (face)	1500	if (face && face < self->texs)
1328	{	1501	{
1329	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1330
1331	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1332	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1333		1505
1334	if (last_name != tex.name)	1506	if (last_name != tex.name)
1335	{	1507	{
1336	glEnd ();	1508	glEnd ();
1337	last_name = tex.name;
1338	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1339	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1340	}	1511	}
1341		1512
1342	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1343	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1344	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);
1345	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1346	}	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	}
1347	}	1537	}
1348	}	1538	}
1349		1539
1350	glEnd ();	1540	glEnd ();
1351		1541
1352	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1353	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	}
1354		1669
1355	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1356	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1357	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1358	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1359	}	1674	}
1360		1675
1361	SV *	1676	SV *
1362	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)
1363	CODE:	1678	CODE:
1364	{	1679	{
1365	int x, y, x1, y1;	1680	int x, y, x1, y1;
1366	SV *data_sv = newSV (w * h * 7 + 5);	1681	SV *data_sv = newSV (w * h * 7 + 5);
1367	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1682	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1429	}	1744	}
1430	OUTPUT:	1745	OUTPUT:
1431	RETVAL	1746	RETVAL
1432		1747
1433	void	1748	void
1434	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)
1435	PPCODE:	1750	PPCODE:
1436	{	1751	{
1437	int x, y, z;	1752	int x, y, z;
1438	int w, h;	1753	int w, h;
1439	int x1, y1;	1754	int x1, y1;
…		…
1471		1786
1472	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1787	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1473	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1788	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1474	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1789	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1475		1790
1476	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1477	{	1792	{
1478	cell->darkness = -1;	1793	cell->darkness = 0;
1479		1794
1480	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1481	{	1796	{
1482	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1483		1798
…		…
1488	}	1803	}
1489	}	1804	}
1490	}	1805	}
1491	}	1806	}
1492		1807
1493	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1494		1809
1495	CFClient::MixChunk	1810	CFPlus::MixChunk
1496	new_from_file (SV *class, char *path)	1811	new_from_file (SV *class, char *path)
1497	CODE:	1812	CODE:
1498	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1499	OUTPUT:	1814	OUTPUT:
1500	RETVAL	1815	RETVAL
1501		1816
1502	void	1817	void
1503	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1504	CODE:	1819	CODE:
1505	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1506		1821
1507	int	1822	int
1508	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1509	CODE:	1824	CODE:
1510	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1511	OUTPUT:	1826	OUTPUT:
1512	RETVAL	1827	RETVAL
1513		1828
1514	int	1829	int
1515	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)
1516	CODE:	1831	CODE:
1517	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1518	OUTPUT:	1833	OUTPUT:
1519	RETVAL	1834	RETVAL
1520		1835
1521	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1522		1837
1523	int	1838	int
1524	volume (int volume = -1)	1839	volume (int volume = -1)
1525	CODE:	1840	CODE:
1526	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1527	OUTPUT:	1842	OUTPUT:
1528	RETVAL	1843	RETVAL
1529		1844
1530	CFClient::MixMusic	1845	CFPlus::MixMusic
1531	new_from_file (SV *class, char *path)	1846	new_from_file (SV *class, char *path)
1532	CODE:	1847	CODE:
1533	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1534	OUTPUT:	1849	OUTPUT:
1535	RETVAL	1850	RETVAL
1536		1851
1537	void	1852	void
1538	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1539	CODE:	1854	CODE:
1540	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1541		1856
1542	int	1857	int
1543	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1544	CODE:	1859	CODE:
1545	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1546	OUTPUT:	1861	OUTPUT:
1547	RETVAL	1862	RETVAL
1548		1863
1549	MODULE = CFClient PACKAGE = CFClient::OpenGL	1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1550		1865
1551	BOOT:	1866	BOOT:
1552	{	1867	{
1553	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1554	static const struct {	1869	static const struct {
1555	const char *name;	1870	const char *name;
1556	IV iv;	1871	IV iv;
1557	} *civ, const_iv[] = {	1872	} *civ, const_iv[] = {
1558	# define const_iv(name) { # name, (IV)name }	1873	# define const_iv(name) { # name, (IV)name }
…		…
1565	const_iv (GL_SCISSOR_TEST),	1880	const_iv (GL_SCISSOR_TEST),
1566	const_iv (GL_DEPTH_TEST),	1881	const_iv (GL_DEPTH_TEST),
1567	const_iv (GL_ALPHA_TEST),	1882	const_iv (GL_ALPHA_TEST),
1568	const_iv (GL_NORMALIZE),	1883	const_iv (GL_NORMALIZE),
1569	const_iv (GL_RESCALE_NORMAL),	1884	const_iv (GL_RESCALE_NORMAL),
		1885	const_iv (GL_FRONT),
		1886	const_iv (GL_BACK),
1570	const_iv (GL_AND),	1887	const_iv (GL_AND),
1571	const_iv (GL_ONE),	1888	const_iv (GL_ONE),
1572	const_iv (GL_ZERO),	1889	const_iv (GL_ZERO),
1573	const_iv (GL_SRC_ALPHA),	1890	const_iv (GL_SRC_ALPHA),
1574	const_iv (GL_DST_ALPHA),	1891	const_iv (GL_DST_ALPHA),
1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1892	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1576	const_iv (GL_ONE_MINUS_DST_ALPHA),	1893	const_iv (GL_ONE_MINUS_DST_ALPHA),
1577	const_iv (GL_SRC_ALPHA_SATURATE),	1894	const_iv (GL_SRC_ALPHA_SATURATE),
1578	const_iv (GL_RGB),	1895	const_iv (GL_RGB),
1579	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),
1580	const_iv (GL_UNSIGNED_BYTE),	1900	const_iv (GL_UNSIGNED_BYTE),
1581	const_iv (GL_UNSIGNED_SHORT),	1901	const_iv (GL_UNSIGNED_SHORT),
1582	const_iv (GL_UNSIGNED_INT),	1902	const_iv (GL_UNSIGNED_INT),
1583	const_iv (GL_ALPHA),	1903	const_iv (GL_ALPHA),
1584	const_iv (GL_INTENSITY),	1904	const_iv (GL_INTENSITY),
…		…
1616	const_iv (GL_SEPARABLE_2D),	1936	const_iv (GL_SEPARABLE_2D),
1617	const_iv (GL_CONVOLUTION_2D),	1937	const_iv (GL_CONVOLUTION_2D),
1618	const_iv (GL_CONVOLUTION_BORDER_MODE),	1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
1619	const_iv (GL_CONSTANT_BORDER),	1939	const_iv (GL_CONSTANT_BORDER),
1620	const_iv (GL_LINES),	1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
1621	const_iv (GL_LINE_LOOP),	1942	const_iv (GL_LINE_LOOP),
1622	const_iv (GL_QUADS),	1943	const_iv (GL_QUADS),
1623	const_iv (GL_QUAD_STRIP),	1944	const_iv (GL_QUAD_STRIP),
1624	const_iv (GL_TRIANGLES),	1945	const_iv (GL_TRIANGLES),
1625	const_iv (GL_TRIANGLE_STRIP),	1946	const_iv (GL_TRIANGLE_STRIP),
…		…
1658	OUTPUT:	1979	OUTPUT:
1659	RETVAL	1980	RETVAL
1660		1981
1661	int glGetError ()	1982	int glGetError ()
1662		1983
		1984	void glFinish ()
		1985
1663	void glClear (int mask)	1986	void glClear (int mask)
1664		1987
1665	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)
1666	PROTOTYPE: @	1989	PROTOTYPE: @
1667		1990
…		…
1690	void glPushMatrix ()	2013	void glPushMatrix ()
1691		2014
1692	void glPopMatrix ()	2015	void glPopMatrix ()
1693		2016
1694	void glLoadIdentity ()	2017	void glLoadIdentity ()
		2018
		2019	void glDrawBuffer (int buffer)
		2020
		2021	void glReadBuffer (int buffer)
1695		2022
1696	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# 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_)	2024	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1698		2025
1699	# near_ and far_ are due to microsofts buggy "c" compiler	2026	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1729	r *= a;	2056	r *= a;
1730	g *= a;	2057	g *= a;
1731	b *= a;	2058	b *= a;
1732	}	2059	}
1733	// microsoft visual "c" rounds instead of truncating...	2060	// microsoft visual "c" rounds instead of truncating...
1734	glColor4ub (MIN ((int)(r * 256.f), 255),	2061	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		2062
1739	void glInterleavedArrays (int format, int stride, char *data)	2063	void glInterleavedArrays (int format, int stride, char *data)
1740		2064
1741	void glDrawElements (int mode, int count, int type, char *indices)	2065	void glDrawElements (int mode, int count, int type, char *indices)
1742		2066
…		…
1819		2143
1820	void glEndList ()	2144	void glEndList ()
1821		2145
1822	void glCallList (int list)	2146	void glCallList (int list)
1823		2147
1824

Diff Legend

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