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.115 by root, Wed Jun 14 18:59:30 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 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
…		…
319	n |= n >> 16;	359	n |= n >> 16;
320		360
321	return n + 1;	361	return n + 1;
322	}	362	}
323		363
324	MODULE = CFClient PACKAGE = CFClient	364	MODULE = CFPlus PACKAGE = CFPlus
325		365
326	PROTOTYPES: ENABLE	366	PROTOTYPES: ENABLE
327		367
328	BOOT:	368	BOOT:
329	{	369	{
330	HV *stash = gv_stashpv ("CFClient", 1);	370	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	371	static const struct {
332	const char *name;	372	const char *name;
333	IV iv;	373	IV iv;
334	} *civ, const_iv[] = {	374	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	375	# define const_iv(name) { # name, (IV)name }
…		…
436		476
437	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; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	479	}
440		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
441	void	492	void
442	pango_init ()	493	pango_init ()
443	CODE:	494	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	495	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	496	opengl_fontmap = pango_opengl_font_map_new ();
448	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);
449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450	}
451	{
452	cairo_font_options_t *fopt = cairo_font_options_create ();
453	cairo_fontmap = pango_cairo_font_map_get_default ();
454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455	#ifdef _WIN32
456	// cairo looks like shit eaten twice on windows
457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458	#else
459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460	#endif
461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463	pango_cairo_context_set_font_options (cairo_context, fopt);
464	cairo_font_options_destroy (fopt);
465	}
466	}	499	}
467		500
468	int	501	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470		503
471	void	504	void
472	SDL_Quit ()	505	SDL_Quit ()
473		506
474	void	507	void
…		…
489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492		525
493	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
494		531
495	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497		534
498	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
585	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587	break;	624	break;
588	}	625	}
589		626
590	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591	}	628	}
592	}	629	}
593		630
594	int	631	int
595	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)
…		…
609	#ifndef _WIN32	646	#ifndef _WIN32
610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
611	#endif	648	#endif
612		649
613	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
614	add_font (char *file)	680	add_font (char *file)
615	CODE:	681	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617	#ifdef _WIN32
618	// cairo... sigh... requires win2000
619	AddFontResourceEx (file, FR_PRIVATE, 0);
620	#endif
621		683
622	void	684	void
623	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
624	ALIAS:	686	ALIAS:
625	load_image_file = 1	687	load_image_file = 1
…		…
667		729
668	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669		731
670	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
671		733
		734	SDL_LockSurface (surface2);
672	EXTEND (SP, 5);	735	EXTEND (SP, 6);
673	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
674	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
675	SDL_LockSurface (surface2);
676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677	SDL_UnlockSurface (surface2);
678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA8 : GL_RGB8)));	739	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
681		743
682	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
683	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
684	}	746	}
685		747
…		…
724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
725	#endif	787	#endif
726	_exit (1);	788	_exit (1);
727		789
728	void	790	void
729	_exit (int retval)	791	_exit (int retval = 0)
730	CODE:	792	CODE:
		793	#ifdef WIN32
		794	ExitThread (retval); // unclean, please beam me up
		795	#else
731	_exit (retval);	796	_exit (retval);
		797	#endif
732		798
733	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
734		800
735	CFClient::Font	801	CFPlus::Font
736	new_from_file (SV *class, char *path, int id = 0)	802	new_from_file (SV *class, char *path, int id = 0)
737	CODE:	803	CODE:
738	{	804	{
739	int count;	805	int count;
740	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	806	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
743	}	809	}
744	OUTPUT:	810	OUTPUT:
745	RETVAL	811	RETVAL
746		812
747	void	813	void
748	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
749	CODE:	815	CODE:
750	pango_font_description_free (self);	816	pango_font_description_free (self);
751		817
752	void	818	void
753	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
754	CODE:	820	CODE:
755	default_font = self;	821	default_font = self;
756		822
757	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
758		824
759	CFClient::Layout	825	void
760	new (SV *class, int rgba = 0)	826	reset_glyph_cache ()
		827	CODE:
		828	tc_clear ();
		829
		830	CFPlus::Layout
		831	new (SV *class)
761	CODE:	832	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
763		834
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	836	RETVAL->r = 1.;
767	RETVAL->g = 1.;	837	RETVAL->g = 1.;
768	RETVAL->b = 1.;	838	RETVAL->b = 1.;
769	RETVAL->a = 1.;	839	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
774	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
775	OUTPUT:	845	OUTPUT:
776	RETVAL	846	RETVAL
777		847
778	void	848	void
779	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
780	CODE:	850	CODE:
781	g_object_unref (self->pl);	851	g_object_unref (self->pl);
782	Safefree (self);	852	Safefree (self);
783		853
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	854	void
792	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
793	CODE:	856	CODE:
794	{	857	{
795	STRLEN textlen;	858	STRLEN textlen;
796	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
797		860
798	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
799	}	862	}
800		863
801	void	864	void
802	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
803	CODE:	866	CODE:
804	{	867	{
805	STRLEN textlen;	868	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
807		870
808	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
809	}	872	}
810		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
811	SV *	959	SV *
812	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
813	CODE:	961	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815	sv_utf8_decode (RETVAL);	963	sv_utf8_decode (RETVAL);
816	OUTPUT:	964	OUTPUT:
817	RETVAL	965	RETVAL
818		966
819	void	967	void
820	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.)
821	CODE:	969	CODE:
822	self->r = r;	970	self->r = r;
823	self->g = g;	971	self->g = g;
824	self->b = b;	972	self->b = b;
825	self->a = a;	973	self->a = a;
826		974
827	void	975	void
828	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829	CODE:	977	CODE:
830	if (self->font != font)	978	if (self->font != font)
831	{	979	{
832	self->font = font;	980	self->font = font;
833	layout_update_font (self);	981	layout_update_font (self);
834	}	982	}
835		983
836	void	984	void
837	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
838	CODE:	986	CODE:
839	if (self->base_height != base_height)	987	if (self->base_height != base_height)
840	{	988	{
841	self->base_height = base_height;	989	self->base_height = base_height;
842	layout_update_font (self);	990	layout_update_font (self);
843	}	991	}
844		992
845	void	993	void
846	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
847	CODE:	995	CODE:
848	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);
849		997
850	void	998	void
851	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
852	CODE:	1000	CODE:
853	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854		1002
855	void	1003	void
856	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
857	CODE:	1005	CODE:
858	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859		1007
860	void	1008	void
861	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
862	CODE:	1010	CODE:
863	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
864	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
865	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
867	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
868	);	1016	);
869		1017
870	void	1018	void
871	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
872	CODE:	1020	CODE:
873	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874		1022
875	void	1023	void
876	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
877	PPCODE:	1025	PPCODE:
878	{	1026	{
879	int w, h;	1027	int w, h;
880		1028
881	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
886	}	1034	}
887		1035
888	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
889	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
890	CODE:	1050	CODE:
891	{	1051	{
892	int index, trailing;	1052	int index, trailing;
893	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);
894	RETVAL = index;	1054	RETVAL = index + trailing;
895	}	1055	}
896	OUTPUT:	1056	OUTPUT:
897	RETVAL	1057	RETVAL
898		1058
899	void	1059	void
900	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
901	PPCODE:	1061	PPCODE:
902	{	1062	{
903	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
904	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905		1065
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1070	}
911		1071
912	void	1072	void
913	render (CFClient::Layout self)	1073	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
914	PPCODE:	1074	PPCODE:
915	{	1075	{
916	SV *retval;	1076	int line, x;
917	int w, h;
918		1077
919	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 */
920		1080
921	if (self->rgba)
922	{
923	cairo_surface_t *surface;
924	cairo_t *cairo;
925
926	retval = newSV (w * h * 4);
927	SvPOK_only (retval);
928	SvCUR_set (retval, w * h * 4);
929
930	memset (SvPVX (retval), 0, w * h * 4);
931
932	surface = cairo_image_surface_create_for_data (
933	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934	cairo = cairo_create (surface);
935	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937	pango_cairo_show_layout (cairo, self->pl);
938
939	cairo_destroy (cairo);
940	cairo_surface_destroy (surface);
941
942	// what a mess, and its premultiplied, too :(
943	{
944	uint32_t *p = (uint32_t *)SvPVX (retval);
945	uint32_t *e = p + w * h;
946
947	while (p < e)
948	{
949	uint32_t rgba = *p;
950	rgba = (rgba >> 24) | (rgba << 8);
951	#if 0
952	#ifdef _WIN32
953	{//D
954	uint8_t r = rgba >> 24;
955	uint8_t g = rgba >> 16;
956	uint8_t b = rgba >> 8;
957	uint8_t a = rgba >> 0;
958
959	rgba = (rgba & 0xffffff00) | a;
960	}
961	#endif
962	#endif
963	rgba = SDL_SwapBE32 (rgba);
964	*p++ = rgba;
965	}
966	}
967
968	EXTEND (SP, 5);	1081	EXTEND (SP, 2);
969	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	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1100
		1101	EXTEND (SP, 2);
		1102	if (GIMME_V == G_SCALAR)
970	PUSHs (sv_2mortal (newSViv (h)));	1103	PUSHs (sv_2mortal (newSViv (index + trailing)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_RGBA8)));
973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974	}
975	else	1104	else
976	{	1105	{
977	FT_Bitmap bitmap;
978
979	retval = newSV (w * h);
980	SvPOK_only (retval);
981	SvCUR_set (retval, w * h);
982
983	bitmap.rows = h;
984	bitmap.width = w;
985	bitmap.pitch = w;
986	bitmap.buffer = (unsigned char*)SvPVX (retval);
987	bitmap.num_grays = 256;
988	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990	memset (bitmap.buffer, 0, w * h);
991
992	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994	EXTEND (SP, 5);
995	PUSHs (sv_2mortal (newSViv (w)));	1106	PUSHs (sv_2mortal (newSViv (index)));
996	PUSHs (sv_2mortal (newSViv (h)));	1107	PUSHs (sv_2mortal (newSViv (trailing)));
997	PUSHs (sv_2mortal (retval));
998	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000	}	1108	}
1001	}	1109	}
1002		1110
		1111	void
		1112	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1113	PPCODE:
		1114	pango_opengl_render_layout_subpixel (
		1115	self->pl,
		1116	x * PANGO_SCALE, y * PANGO_SCALE,
		1117	self->r, self->g, self->b, self->a,
		1118	flags
		1119	);
		1120
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1121	MODULE = CFPlus PACKAGE = CFPlus::Texture
1004		1122
1005	void	1123	void
1006	pad2pot (SV *data_, SV *w_, SV *h_)	1124	pad2pot (SV *data_, SV *w_, SV *h_)
1007	CODE:	1125	CODE:
1008	{	1126	{
…		…
1086	glDisable (GL_ALPHA_TEST);	1204	glDisable (GL_ALPHA_TEST);
1087	glDisable (GL_BLEND);	1205	glDisable (GL_BLEND);
1088	}	1206	}
1089	}	1207	}
1090		1208
1091	MODULE = CFClient PACKAGE = CFClient::Map	1209	MODULE = CFPlus PACKAGE = CFPlus::Map
1092		1210
1093	CFClient::Map	1211	CFPlus::Map
1094	new (SV *class, int map_width, int map_height)	1212	new (SV *class)
1095	CODE:	1213	CODE:
1096	New (0, RETVAL, 1, struct map);	1214	New (0, RETVAL, 1, struct map);
1097	RETVAL->x = 0;	1215	RETVAL->x = 0;
1098	RETVAL->y = 0;	1216	RETVAL->y = 0;
1099	RETVAL->w = map_width;	1217	RETVAL->w = 0;
1100	RETVAL->h = map_height;	1218	RETVAL->h = 0;
1101	RETVAL->ox = 0;	1219	RETVAL->ox = 0;
1102	RETVAL->oy = 0;	1220	RETVAL->oy = 0;
1103	RETVAL->faces = 8192;	1221	RETVAL->faces = 8192;
1104	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1222	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1105	RETVAL->texs = 8192;	1223	RETVAL->texs = 8192;
…		…
1108	RETVAL->row = 0;	1226	RETVAL->row = 0;
1109	OUTPUT:	1227	OUTPUT:
1110	RETVAL	1228	RETVAL
1111		1229
1112	void	1230	void
1113	DESTROY (CFClient::Map self)	1231	DESTROY (CFPlus::Map self)
1114	CODE:	1232	CODE:
1115	{	1233	{
1116	map_clear (self);	1234	map_clear (self);
1117	Safefree (self->face);	1235	Safefree (self->face);
1118	Safefree (self->tex);	1236	Safefree (self->tex);
1119	Safefree (self);	1237	Safefree (self);
1120	}	1238	}
1121		1239
1122	void	1240	void
		1241	resize (CFPlus::Map self, int map_width, int map_height)
		1242	CODE:
		1243	self->w = map_width;
		1244	self->h = map_height;
		1245
		1246	void
1123	clear (CFClient::Map self)	1247	clear (CFPlus::Map self)
1124	CODE:	1248	CODE:
1125	map_clear (self);	1249	map_clear (self);
1126		1250
1127	void	1251	void
1128	set_face (CFClient::Map self, int face, int texid)	1252	set_face (CFPlus::Map self, int face, int texid)
1129	CODE:	1253	CODE:
1130	{	1254	{
1131	while (self->faces <= face)	1255	while (self->faces <= face)
1132	{	1256	{
1133	Append (mapface, self->face, self->faces, self->faces);	1257	Append (mapface, self->face, self->faces, self->faces);
…		…
1136		1260
1137	self->face [face] = texid;	1261	self->face [face] = texid;
1138	}	1262	}
1139		1263
1140	void	1264	void
1141	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)	1265	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)
1142	CODE:	1266	CODE:
1143	{	1267	{
1144	while (self->texs <= texid)	1268	while (self->texs <= texid)
1145	{	1269	{
1146	Append (maptex, self->tex, self->texs, self->texs);	1270	Append (maptex, self->tex, self->texs, self->texs);
…		…
1170	// from transparent color bleeding and ugly wrapping effects.	1294	// from transparent color bleeding and ugly wrapping effects.
1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1295	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172	}	1296	}
1173		1297
1174	int	1298	int
1175	ox (CFClient::Map self)	1299	ox (CFPlus::Map self)
1176	ALIAS:	1300	ALIAS:
1177	oy = 1	1301	oy = 1
1178	x = 2	1302	x = 2
1179	y = 3	1303	y = 3
1180	w = 4	1304	w = 4
…		…
1191	}	1315	}
1192	OUTPUT:	1316	OUTPUT:
1193	RETVAL	1317	RETVAL
1194		1318
1195	void	1319	void
1196	scroll (CFClient::Map self, int dx, int dy)	1320	scroll (CFPlus::Map self, int dx, int dy)
1197	CODE:	1321	CODE:
1198	{	1322	{
1199	if (dx > 0)	1323	if (dx > 0)
1200	map_blank (self, self->x, self->y, dx - 1, self->h);	1324	map_blank (self, self->x, self->y, dx, self->h);
1201	else if (dx < 0)	1325	else if (dx < 0)
1202	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1326	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1203		1327
1204	if (dy > 0)	1328	if (dy > 0)
1205	map_blank (self, self->x, self->y, self->w, dy - 1);	1329	map_blank (self, self->x, self->y, self->w, dy);
1206	else if (dy < 0)	1330	else if (dy < 0)
1207	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1331	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1208		1332
1209	self->ox += dx; self->x += dx;	1333	self->ox += dx; self->x += dx;
1210	self->oy += dy; self->y += dy;	1334	self->oy += dy; self->y += dy;
1211		1335
1212	while (self->y < 0)	1336	while (self->y < 0)
…		…
1217	self->y += MAP_EXTEND_Y;	1341	self->y += MAP_EXTEND_Y;
1218	}	1342	}
1219	}	1343	}
1220		1344
1221	void	1345	void
1222	map1a_update (CFClient::Map self, SV *data_)	1346	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223	CODE:	1347	CODE:
1224	{	1348	{
1225	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1349	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226	uint8_t *data_end = (uint8_t *)SvEND (data_);	1350	uint8_t *data_end = (uint8_t *)SvEND (data_);
1227	mapcell *cell;	1351	mapcell *cell;
1228	int x, y, flags;	1352	int x, y, flags;
1229		1353
1230	while (data < data_end)	1354	while (data < data_end - 1)
1231	{	1355	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1356	flags = (data [0] << 8) + data [1]; data += 2;
1233		1357
1234	x = ((flags >> 10) & 63) + self->x;	1358	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1359	y = self->y + ((flags >> 4) & 63);
1236		1360
1237	cell = map_get_cell (self, x, y);	1361	cell = map_get_cell (self, x, y);
1238		1362
1239	if (flags & 15)	1363	if (flags & 15)
1240	{	1364	{
1241	if (cell->darkness < 0)	1365	if (!cell->darkness)
1242	{	1366	{
		1367	memset (cell, 0, sizeof (*cell));
1243	cell->darkness = 0;	1368	cell->darkness = 256;
1244	cell->face [0] = 0;
1245	cell->face [1] = 0;
1246	cell->face [2] = 0;
1247	}	1369	}
1248		1370
1249	cell->darkness = flags & 8 ? *data++ : 255;
1250
1251	//TODO: don't trust server data to be in-range(!)	1371	//TODO: don't trust server data to be in-range(!)
		1372
		1373	if (flags & 8)
		1374	{
		1375	if (extmap)
		1376	{
		1377	uint8_t ext, cmd;
		1378
		1379	do
		1380	{
		1381	ext = *data++;
		1382	cmd = ext & 0x3f;
		1383
		1384	if (cmd < 4)
		1385	cell->darkness = 255 - ext * 64 + 1;
		1386	else if (cmd == 5) // health
		1387	{
		1388	cell->stat_width = 1;
		1389	cell->stat_hp = *data++;
		1390	}
		1391	else if (cmd == 6) // monster width
		1392	cell->stat_width = *data++ + 1;
		1393	else if (cmd == 0x47) // monster width
		1394	{
		1395	if (*data == 4)
		1396	; // decode player tag
		1397
		1398	data += *data + 1;
		1399	}
		1400	else if (cmd == 8) // cell flags
		1401	cell->flags = *data++;
		1402	else if (ext & 0x40) // unknown, multibyte => skip
		1403	data += *data + 1;
		1404	else
		1405	data++;
		1406	}
		1407	while (ext & 0x80);
		1408	}
		1409	else
		1410	cell->darkness = *data++ + 1;
		1411	}
1252		1412
1253	if (flags & 4)	1413	if (flags & 4)
1254	{	1414	{
1255	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1415	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1256	}	1416	}
…		…
1264	{	1424	{
1265	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1425	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1266	}	1426	}
1267	}	1427	}
1268	else	1428	else
1269	cell->darkness = -1;	1429	cell->darkness = 0;
1270	}	1430	}
1271	}	1431	}
1272		1432
1273	SV *	1433	SV *
1274	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1434	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275	CODE:	1435	CODE:
1276	{	1436	{
1277	int x1, x;	1437	int x1, x;
1278	int y1, y;	1438	int y1, y;
1279	int z;	1439	int z;
…		…
1329	}	1489	}
1330	OUTPUT:	1490	OUTPUT:
1331	RETVAL	1491	RETVAL
1332		1492
1333	void	1493	void
1334	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1494	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1335	PPCODE:	1495	CODE:
1336	{	1496	{
1337	int vx, vy;
1338	int x, y, z;	1497	int x, y, z;
1339	int last_name;	1498	int last_name;
1340	mapface face;	1499	mapface face;
1341	int sw4 = (sw + 3) & ~3;
1342	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344
1345	memset (darkness, 255, sw4 * sh);
1346	SvPOK_only (darkness_sv);
1347	SvCUR_set (darkness_sv, sw4 * sh);
1348
1349	vx = self->x + (self->w - sw) / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;
1351
1352	/*
1353	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2
1355	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1356
1357	int vy = self->vy = self->h >= sh
1358	? self->y + (self->h - sh) / 2
1359	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360	*/
1361		1500
1362	glColor4ub (255, 255, 255, 255);	1501	glColor4ub (255, 255, 255, 255);
1363		1502
		1503	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1505	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1506	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1507
1369	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1370		1509
1371	last_name = 0;	1510	last_name = 0;
1372		1511
		1512	mx += self->x;
		1513	my += self->y;
		1514
1373	for (z = 0; z < 3; z++)	1515	for (z = 0; z < 3; z++)
1374	for (y = 0; y < sh; y++)	1516	for (y = 0; y < sh; y++)
1375	if (0 <= y + vy && y + vy < self->rows)	1517	if (0 <= y + my && y + my < self->rows)
1376	{	1518	{
1377	maprow *row = self->row + (y + vy);	1519	maprow *row = self->row + (y + my);
1378		1520
1379	for (x = 0; x < sw; x++)	1521	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1522	if (row->c0 <= x + mx && x + mx < row->c1)
1381	{	1523	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1524	mapcell *cell = row->col + (x + mx - row->c0);
1383
1384	darkness[y * sw4 + x] = cell->darkness < 0
1385	? 255 - FOW_DARKNESS
1386	: 255 - cell->darkness;
1387		1525
1388	face = cell->face [z];	1526	face = cell->face [z];
1389		1527
1390	if (face)	1528	if (face && face < self->texs)
1391	{	1529	{
1392	maptex tex = self->tex [face];	1530	maptex tex = self->tex [face];
1393
1394	int px = (x + 1) * 32 - tex.w;	1531	int px = (x + 1) * 32 - tex.w;
1395	int py = (y + 1) * 32 - tex.h;	1532	int py = (y + 1) * 32 - tex.h;
1396		1533
1397	if (last_name != tex.name)	1534	if (last_name != tex.name)
1398	{	1535	{
1399	glEnd ();	1536	glEnd ();
1400	last_name = tex.name;
1401	glBindTexture (GL_TEXTURE_2D, last_name);	1537	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1402	glBegin (GL_QUADS);	1538	glBegin (GL_QUADS);
1403	}	1539	}
1404		1540
1405	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1541	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1542	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1543	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1408	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1544	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409	}	1545	}
		1546
		1547	if (cell->flags && z == 2)
		1548	{
		1549	if (cell->flags & 1)
		1550	{
		1551	maptex tex = self->tex [1];
		1552	int px = (x + 1) * 32 - tex.w + 2;
		1553	int py = (y + 1) * 32 - tex.h - 6;
		1554
		1555	glEnd ();
		1556	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1557	glBegin (GL_QUADS);
		1558
		1559	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1560	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1561	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1562	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1563	}
		1564	}
1410	}	1565	}
1411	}	1566	}
1412		1567
1413	glEnd ();	1568	glEnd ();
1414		1569
1415	glDisable (GL_TEXTURE_2D);	1570	glDisable (GL_TEXTURE_2D);
1416	glDisable (GL_BLEND);	1571	glDisable (GL_BLEND);
		1572
		1573	// top layer: overlays such as the health bar
		1574	for (y = 0; y < sh; y++)
		1575	if (0 <= y + my && y + my < self->rows)
		1576	{
		1577	maprow *row = self->row + (y + my);
		1578
		1579	for (x = 0; x < sw; x++)
		1580	if (row->c0 <= x + mx && x + mx < row->c1)
		1581	{
		1582	mapcell *cell = row->col + (x + mx - row->c0);
		1583
		1584	int px = x * 32;
		1585	int py = y * 32;
		1586
		1587	if (cell->stat_hp)
		1588	{
		1589	int width = cell->stat_width * 32;
		1590	int thick = sh / 28 + 1 + cell->stat_width;
		1591
		1592	glColor3ub (0, 0, 0);
		1593	glRectf (px + 1, py - thick - 2,
		1594	px + width - 1, py);
		1595
		1596	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1597	glRectf (px + 2,
		1598	py - thick - 1,
		1599	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1600	}
		1601	}
		1602	}
		1603	}
		1604
		1605	void
		1606	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1607	CODE:
		1608	{
		1609	static float color[16][3] = {
		1610	{ 0.00F, 0.00F, 0.00F },
		1611	{ 1.00F, 1.00F, 1.00F },
		1612	{ 0.00F, 0.00F, 0.55F },
		1613	{ 1.00F, 0.00F, 0.00F },
		1614
		1615	{ 1.00F, 0.54F, 0.00F },
		1616	{ 0.11F, 0.56F, 1.00F },
		1617	{ 0.93F, 0.46F, 0.00F },
		1618	{ 0.18F, 0.54F, 0.34F },
		1619
		1620	{ 0.56F, 0.73F, 0.56F },
		1621	{ 0.80F, 0.80F, 0.80F },
		1622	{ 0.55F, 0.41F, 0.13F },
		1623	{ 0.99F, 0.77F, 0.26F },
		1624
		1625	{ 0.74F, 0.65F, 0.41F },
		1626
		1627	{ 0.00F, 1.00F, 1.00F },
		1628	{ 1.00F, 0.00F, 1.00F },
		1629	{ 1.00F, 1.00F, 0.00F },
		1630	};
		1631
		1632	int x, y;
		1633
		1634	glEnable (GL_TEXTURE_2D);
		1635	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1636	glEnable (GL_BLEND);
		1637	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1638	glBegin (GL_QUADS);
		1639
		1640	for (y = 0; y < h; y++)
		1641	for (x = 0; x < w; x++)
		1642	{
		1643	unsigned char m = data [x + y * w];
		1644
		1645	if (m)
		1646	{
		1647	float *c = color [m & 15];
		1648
		1649	float tx1 = m & 0x40 ? 0.5 : 0.;
		1650	float tx2 = tx1 + 0.5;
		1651
		1652	glColor4f (c[0], c[1], c[2], 0.75);
		1653	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1654	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1655	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1656	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1657	}
		1658	}
		1659
		1660	glEnd ();
		1661	glDisable (GL_BLEND);
		1662	glDisable (GL_TEXTURE_2D);
		1663	}
		1664
		1665	void
		1666	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1667	PPCODE:
		1668	{
		1669	int x, y;
		1670	int sw4 = (sw + 3) & ~3;
		1671	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1672	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1673
		1674	memset (darkness, 255, sw4 * sh);
		1675	SvPOK_only (darkness_sv);
		1676	SvCUR_set (darkness_sv, sw4 * sh);
		1677
		1678	mx += self->x;
		1679	my += self->y;
		1680
		1681	for (y = 0; y < sh; y++)
		1682	if (0 <= y + my && y + my < self->rows)
		1683	{
		1684	maprow *row = self->row + (y + my);
		1685
		1686	for (x = 0; x < sw; x++)
		1687	if (row->c0 <= x + mx && x + mx < row->c1)
		1688	{
		1689	mapcell *cell = row->col + (x + mx - row->c0);
		1690
		1691	darkness[y * sw4 + x] = cell->darkness
		1692	? 255 - (cell->darkness - 1)
		1693	: 255 - FOW_DARKNESS;
		1694	}
		1695	}
1417		1696
1418	EXTEND (SP, 3);	1697	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1698	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1699	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1700	PUSHs (darkness_sv);
1422	}	1701	}
1423		1702
1424	SV *	1703	SV *
1425	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1704	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426	CODE:	1705	CODE:
1427	{	1706	{
1428	int x, y, x1, y1;	1707	int x, y, x1, y1;
1429	SV *data_sv = newSV (w * h * 7 + 5);	1708	SV *data_sv = newSV (w * h * 7 + 5);
1430	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1709	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1492	}	1771	}
1493	OUTPUT:	1772	OUTPUT:
1494	RETVAL	1773	RETVAL
1495		1774
1496	void	1775	void
1497	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1776	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498	PPCODE:	1777	PPCODE:
1499	{	1778	{
1500	int x, y, z;	1779	int x, y, z;
1501	int w, h;	1780	int w, h;
1502	int x1, y1;	1781	int x1, y1;
…		…
1534		1813
1535	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1814	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1536	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1815	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1537	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1816	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1538		1817
1539	if (cell->darkness <= 0)	1818	if (cell->darkness == 0)
1540	{	1819	{
1541	cell->darkness = -1;	1820	cell->darkness = 0;
1542		1821
1543	for (z = 0; z <= 2; z++)	1822	for (z = 0; z <= 2; z++)
1544	{	1823	{
1545	cell->face[z] = face[z];	1824	cell->face[z] = face[z];
1546		1825
…		…
1551	}	1830	}
1552	}	1831	}
1553	}	1832	}
1554	}	1833	}
1555		1834
1556	MODULE = CFClient PACKAGE = CFClient::MixChunk	1835	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557		1836
1558	CFClient::MixChunk	1837	CFPlus::MixChunk
1559	new_from_file (SV *class, char *path)	1838	new_from_file (SV *class, char *path)
1560	CODE:	1839	CODE:
1561	RETVAL = Mix_LoadWAV (path);	1840	RETVAL = Mix_LoadWAV (path);
1562	OUTPUT:	1841	OUTPUT:
1563	RETVAL	1842	RETVAL
1564		1843
1565	void	1844	void
1566	DESTROY (CFClient::MixChunk self)	1845	DESTROY (CFPlus::MixChunk self)
1567	CODE:	1846	CODE:
1568	Mix_FreeChunk (self);	1847	Mix_FreeChunk (self);
1569		1848
1570	int	1849	int
1571	volume (CFClient::MixChunk self, int volume = -1)	1850	volume (CFPlus::MixChunk self, int volume = -1)
1572	CODE:	1851	CODE:
1573	RETVAL = Mix_VolumeChunk (self, volume);	1852	RETVAL = Mix_VolumeChunk (self, volume);
1574	OUTPUT:	1853	OUTPUT:
1575	RETVAL	1854	RETVAL
1576		1855
1577	int	1856	int
1578	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1857	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579	CODE:	1858	CODE:
1580	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1859	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581	OUTPUT:	1860	OUTPUT:
1582	RETVAL	1861	RETVAL
1583		1862
1584	MODULE = CFClient PACKAGE = CFClient::MixMusic	1863	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585		1864
1586	int	1865	int
1587	volume (int volume = -1)	1866	volume (int volume = -1)
1588	CODE:	1867	CODE:
1589	RETVAL = Mix_VolumeMusic (volume);	1868	RETVAL = Mix_VolumeMusic (volume);
1590	OUTPUT:	1869	OUTPUT:
1591	RETVAL	1870	RETVAL
1592		1871
1593	CFClient::MixMusic	1872	CFPlus::MixMusic
1594	new_from_file (SV *class, char *path)	1873	new_from_file (SV *class, char *path)
1595	CODE:	1874	CODE:
1596	RETVAL = Mix_LoadMUS (path);	1875	RETVAL = Mix_LoadMUS (path);
1597	OUTPUT:	1876	OUTPUT:
1598	RETVAL	1877	RETVAL
1599		1878
1600	void	1879	void
1601	DESTROY (CFClient::MixMusic self)	1880	DESTROY (CFPlus::MixMusic self)
1602	CODE:	1881	CODE:
1603	Mix_FreeMusic (self);	1882	Mix_FreeMusic (self);
1604		1883
1605	int	1884	int
1606	play (CFClient::MixMusic self, int loops = -1)	1885	play (CFPlus::MixMusic self, int loops = -1)
1607	CODE:	1886	CODE:
1608	RETVAL = Mix_PlayMusic (self, loops);	1887	RETVAL = Mix_PlayMusic (self, loops);
1609	OUTPUT:	1888	OUTPUT:
1610	RETVAL	1889	RETVAL
1611		1890
1612	MODULE = CFClient PACKAGE = CFClient::OpenGL	1891	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613		1892
1614	BOOT:	1893	BOOT:
1615	{	1894	{
1616	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1895	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617	static const struct {	1896	static const struct {
1618	const char *name;	1897	const char *name;
1619	IV iv;	1898	IV iv;
1620	} *civ, const_iv[] = {	1899	} *civ, const_iv[] = {
1621	# define const_iv(name) { # name, (IV)name }	1900	# define const_iv(name) { # name, (IV)name }
…		…
1628	const_iv (GL_SCISSOR_TEST),	1907	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1908	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1909	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1910	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1911	const_iv (GL_RESCALE_NORMAL),
		1912	const_iv (GL_FRONT),
		1913	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1914	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1915	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1916	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1917	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1918	const_iv (GL_DST_ALPHA),
…		…
1682	const_iv (GL_SEPARABLE_2D),	1963	const_iv (GL_SEPARABLE_2D),
1683	const_iv (GL_CONVOLUTION_2D),	1964	const_iv (GL_CONVOLUTION_2D),
1684	const_iv (GL_CONVOLUTION_BORDER_MODE),	1965	const_iv (GL_CONVOLUTION_BORDER_MODE),
1685	const_iv (GL_CONSTANT_BORDER),	1966	const_iv (GL_CONSTANT_BORDER),
1686	const_iv (GL_LINES),	1967	const_iv (GL_LINES),
		1968	const_iv (GL_LINE_STRIP),
1687	const_iv (GL_LINE_LOOP),	1969	const_iv (GL_LINE_LOOP),
1688	const_iv (GL_QUADS),	1970	const_iv (GL_QUADS),
1689	const_iv (GL_QUAD_STRIP),	1971	const_iv (GL_QUAD_STRIP),
1690	const_iv (GL_TRIANGLES),	1972	const_iv (GL_TRIANGLES),
1691	const_iv (GL_TRIANGLE_STRIP),	1973	const_iv (GL_TRIANGLE_STRIP),
…		…
1759		2041
1760	void glPopMatrix ()	2042	void glPopMatrix ()
1761		2043
1762	void glLoadIdentity ()	2044	void glLoadIdentity ()
1763		2045
		2046	void glDrawBuffer (int buffer)
		2047
		2048	void glReadBuffer (int buffer)
		2049
1764	# near_ and far_ are due to microsofts buggy "c" compiler	2050	# near_ and far_ are due to microsofts buggy "c" compiler
1765	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2051	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1766		2052
1767	# near_ and far_ are due to microsofts buggy "c" compiler	2053	# near_ and far_ are due to microsofts buggy "c" compiler
1768	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2054	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
…		…
1797	r *= a;	2083	r *= a;
1798	g *= a;	2084	g *= a;
1799	b *= a;	2085	b *= a;
1800	}	2086	}
1801	// microsoft visual "c" rounds instead of truncating...	2087	// microsoft visual "c" rounds instead of truncating...
1802	glColor4ub (MIN ((int)(r * 256.f), 255),	2088	glColor4f (r, g, b, a);
1803	MIN ((int)(g * 256.f), 255),
1804	MIN ((int)(b * 256.f), 255),
1805	MIN ((int)(a * 256.f), 255));
1806		2089
1807	void glInterleavedArrays (int format, int stride, char *data)	2090	void glInterleavedArrays (int format, int stride, char *data)
1808		2091
1809	void glDrawElements (int mode, int count, int type, char *indices)	2092	void glDrawElements (int mode, int count, int type, char *indices)
1810		2093
…		…
1887		2170
1888	void glEndList ()	2171	void glEndList ()
1889		2172
1890	void glCallList (int list)	2173	void glCallList (int list)
1891		2174
1892

Diff Legend

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