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

Diff Legend

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