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.192 by root, Fri Apr 27 21:27:51 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

…		…
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
16	# undef pipe	21	# undef pipe
		22	// microsoft vs. C
		23	# define sqrtf(x) sqrt(x)
		24	# define atan2f(x,y) atan2(x,y)
		25	# define M_PI 3.14159265f
17	#endif	26	#endif
18		27
19	#include <assert.h>	28	#include <assert.h>
20	#include <math.h>	29	#include <math.h>
21	#include <string.h>	30	#include <string.h>
22	#include <stdio.h>	31	#include <stdio.h>
23	#include <stdlib.h>	32	#include <stdlib.h>
24		33
		34	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
		35
25	#include <SDL.h>	36	#include <SDL.h>
		37	#include <SDL_thread.h>
26	#include <SDL_endian.h>	38	#include <SDL_endian.h>
27	#include <SDL_image.h>	39	#include <SDL_image.h>
28	#include <SDL_mixer.h>	40	#include <SDL_mixer.h>
29	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
30		42
		43	/* work around os x broken headers */
		44	#ifdef __MACOSX__
		45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
		48	#endif
		49
31	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
32	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
33		52
34	#include <glib/gmacros.h>	53	#include <glib/gmacros.h>
35		54
36	#include <pango/pango.h>	55	#include <pango/pango.h>
		56
		57	#ifndef PANGO_VERSION_CHECK
		58	# define PANGO_VERSION_CHECK(a,b,c) 0
		59	#endif
		60
		61	#if !PANGO_VERSION_CHECK (1, 15, 2)
		62	# define pango_layout_get_line_readonly pango_layout_get_line
		63	# define pango_layout_get_lines_readonly pango_layout_get_lines
		64	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		65	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		66	#endif
37		67
38	#ifndef _WIN32	68	#ifndef _WIN32
39	# include <sys/types.h>	69	# include <sys/types.h>
40	# include <sys/socket.h>	70	# include <sys/socket.h>
41	# include <netinet/in.h>	71	# include <netinet/in.h>
42	# include <netinet/tcp.h>	72	# include <netinet/tcp.h>
43	# include <inttypes.h>	73	# include <inttypes.h>
44	#endif	74	#endif
45		75
		76	#if __GNUC__ >= 4
		77	# define expect(expr,value) __builtin_expect ((expr),(value))
		78	#else
		79	# define expect(expr,value) (expr)
		80	#endif
		81
		82	#define expect_false(expr) expect ((expr) != 0, 0)
		83	#define expect_true(expr) expect ((expr) != 0, 1)
		84
46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
48	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
49		91
50	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
51	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
52		94
53	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
54		96
55	#if 0	97	/* mask out modifiers we are not interested in */
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	98	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57	#else	99
58	# define PARACHUTE 0	100	#define KMOD_LRAM 0x10000 // our extension
59	#endif	101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
60		104
61	static AV *texture_av;	105	static AV *texture_av;
62		106
63	static struct	107	static struct
64	{	108	{
…		…
101	av_push (texture_av, (SV *)(size_t)name);	145	av_push (texture_av, (SV *)(size_t)name);
102	glDeleteTextures (1, &name);	146	glDeleteTextures (1, &name);
103	}	147	}
104		148
105	#include "texcache.c"	149	#include "texcache.c"
		150	#include "rendercache.c"
106		151
107	#include "pango-font.c"	152	#include "pango-font.c"
108	#include "pango-fontmap.c"	153	#include "pango-fontmap.c"
109	#include "pango-render.c"	154	#include "pango-render.c"
110		155
		156	typedef IV DC__Channel;
		157	typedef SDL_RWops *DC__RW;
111	typedef Mix_Chunk *CFPlus__MixChunk;	158	typedef Mix_Chunk *DC__MixChunk;
112	typedef Mix_Music *CFPlus__MixMusic;	159	typedef Mix_Music *DC__MixMusic;
113		160
114	typedef PangoFontDescription *CFPlus__Font;	161	typedef PangoFontDescription *DC__Font;
115		162
116	static int	163	static int
117	shape_attr_p (PangoLayoutRun *run)	164	shape_attr_p (PangoLayoutRun *run)
118	{	165	{
119	GSList *attrs = run->item->analysis.extra_attrs;	166	GSList *attrs = run->item->analysis.extra_attrs;
…		…
133		180
134	typedef struct cf_layout {	181	typedef struct cf_layout {
135	PangoLayout *pl;	182	PangoLayout *pl;
136	float r, g, b, a; // default color for rgba mode	183	float r, g, b, a; // default color for rgba mode
137	int base_height;	184	int base_height;
138	CFPlus__Font font;	185	DC__Font font;
		186	rc_t *rc;
139	} *CFPlus__Layout;	187	} *DC__Layout;
140		188
141	static CFPlus__Font default_font;	189	static DC__Font default_font;
142	static PangoContext *opengl_context;	190	static PangoContext *opengl_context;
143	static PangoFontMap *opengl_fontmap;	191	static PangoFontMap *opengl_fontmap;
144		192
145	static void	193	static void
146	substitute_func (FcPattern *pattern, gpointer data)	194	substitute_func (FcPattern *pattern, gpointer data)
…		…
151	#endif	199	#endif
152	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	200	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
153	}	201	}
154		202
155	static void	203	static void
156	layout_update_font (CFPlus__Layout self)	204	layout_update_font (DC__Layout self)
157	{	205	{
158	/* use a random scale factor to account for unknown descenders, 0.8 works	206	/* use a random scale factor to account for unknown descenders, 0.8 works
159	* reasonably well with bitstream vera	207	* reasonably well with dejavu/bistream fonts
160	*/	208	*/
161	PangoFontDescription *font = self->font ? self->font : default_font;	209	PangoFontDescription *font = self->font ? self->font : default_font;
162		210
163	pango_font_description_set_absolute_size (font,	211	pango_font_description_set_absolute_size (font,
164	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	212	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
165		213
166	pango_layout_set_font_description (self->pl, font);	214	pango_layout_set_font_description (self->pl, font);
167	}	215	}
168		216
169	static void	217	static void
170	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	218	layout_get_pixel_size (DC__Layout self, int *w, int *h)
171	{	219	{
172	PangoRectangle rect;	220	PangoRectangle rect;
173		221
174	// get_pixel_* wrongly rounds down	222	// get_pixel_* wrongly rounds down
175	pango_layout_get_extents (self->pl, 0, &rect);	223	pango_layout_get_extents (self->pl, 0, &rect);
…		…
186		234
187	typedef uint16_t tileid;	235	typedef uint16_t tileid;
188	typedef uint16_t faceid;	236	typedef uint16_t faceid;
189		237
190	typedef struct {	238	typedef struct {
191	int name;	239	GLuint name;
192	int w, h;	240	int w, h;
193	float s, t;	241	float s, t;
194	uint8_t r, g, b, a;	242	uint8_t r, g, b, a;
195	tileid smoothtile;	243	tileid smoothtile;
196	uint8_t smoothlevel;	244	uint8_t smoothlevel;
		245	uint8_t unused; /* set to zero on use */
197	} maptex;	246	} maptex;
198		247
199	typedef struct {	248	typedef struct {
200	uint32_t player;	249	uint32_t player;
201	tileid tile[3];	250	tileid tile[3];
…		…
214	int faces; tileid *face2tile; // [faceid]	263	int faces; tileid *face2tile; // [faceid]
215	int texs; maptex *tex; // [tileid]	264	int texs; maptex *tex; // [tileid]
216		265
217	int32_t rows;	266	int32_t rows;
218	maprow *row;	267	maprow *row;
219	} *CFPlus__Map;	268	} *DC__Map;
220		269
221	static char *	270	static char *
222	prepend (char *ptr, int sze, int inc)	271	prepend (char *ptr, int sze, int inc)
223	{	272	{
224	char *p;	273	char *p;
…		…
262	self->texs *= 2;	311	self->texs *= 2;
263	}	312	}
264	}	313	}
265		314
266	static maprow *	315	static maprow *
267	map_get_row (CFPlus__Map self, int y)	316	map_get_row (DC__Map self, int y)
268	{	317	{
269	if (0 > y)	318	if (0 > y)
270	{	319	{
271	int extend = - y + MAP_EXTEND_Y;	320	int extend = - y + MAP_EXTEND_Y;
272	Prepend (maprow, self->row, self->rows, extend);	321	Prepend (maprow, self->row, self->rows, extend);
…		…
310		359
311	return row->col + (x - row->c0);	360	return row->col + (x - row->c0);
312	}	361	}
313		362
314	static mapcell *	363	static mapcell *
315	map_get_cell (CFPlus__Map self, int x, int y)	364	map_get_cell (DC__Map self, int x, int y)
316	{	365	{
317	return row_get_cell (map_get_row (self, y), x);	366	return row_get_cell (map_get_row (self, y), x);
318	}	367	}
319		368
320	static void	369	static void
321	map_clear (CFPlus__Map self)	370	map_clear (DC__Map self)
322	{	371	{
323	int r;	372	int r;
324		373
325	for (r = 0; r < self->rows; r++)	374	for (r = 0; r < self->rows; r++)
326	Safefree (self->row[r].col);	375	Safefree (self->row[r].col);
…		…
333	self->oy = 0;	382	self->oy = 0;
334	self->row = 0;	383	self->row = 0;
335	self->rows = 0;	384	self->rows = 0;
336	}	385	}
337		386
		387	#define CELL_CLEAR(cell) \
		388	do { \
		389	if ((cell)->player) \
		390	(cell)->tile [2] = 0; \
		391	(cell)->darkness = 0; \
		392	(cell)->stat_hp = 0; \
		393	(cell)->flags = 0; \
		394	(cell)->player = 0; \
		395	} while (0)
		396
338	static void	397	static void
339	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	398	map_blank (DC__Map self, int x0, int y0, int w, int h)
340	{	399	{
341	int x, y;	400	int x, y;
342	maprow *row;	401	maprow *row;
343	mapcell *cell;	402	mapcell *cell;
344		403
…		…
356	if (x >= row->c1)	415	if (x >= row->c1)
357	break;	416	break;
358		417
359	cell = row->col + x - row->c0;	418	cell = row->col + x - row->c0;
360		419
361	cell->darkness = 0;	420	CELL_CLEAR (cell);
362	cell->stat_hp = 0;
363	cell->flags = 0;
364	cell->player = 0;
365	}	421	}
366	}	422	}
367	}	423	}
368		424
369	typedef struct {	425	typedef struct {
…		…
423	n |= n >> 16;	479	n |= n >> 16;
424		480
425	return n + 1;	481	return n + 1;
426	}	482	}
427		483
		484	static unsigned int
		485	popcount (unsigned int n)
		486	{
		487	n -= (n >> 1) & 0x55555555U;
		488	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		489	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		490	n *= 0x01010101U;
		491
		492	return n >> 24;
		493	}
		494
428	/* SDL should provide this, really. */	495	/* SDL should provide this, really. */
429	#define SDLK_MODIFIER_MIN 300	496	#define SDLK_MODIFIER_MIN 300
430	#define SDLK_MODIFIER_MAX 314	497	#define SDLK_MODIFIER_MAX 314
431		498
432	MODULE = CFPlus PACKAGE = CFPlus	499	/******************************************************************************/
		500
		501	static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
		502	static GV *hover_gv;
		503
		504	static int
		505	within_widget (SV *widget, NV x, NV y)
		506	{
		507	HV *self;
		508	SV **svp;
		509	NV wx, ww, wy, wh;
		510
		511	if (!SvROK (widget))
		512	return 0;
		513
		514	self = (HV *)SvRV (widget);
		515
		516	if (SvTYPE (self) != SVt_PVHV)
		517	return 0;
		518
		519	svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
		520	if (y < wy)
		521	return 0;
		522
		523	svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
		524	if (y >= wy + wh)
		525	return 0;
		526
		527	svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
		528	if (x < wx)
		529	return 0;
		530
		531	svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
		532	if (x >= wx + ww)
		533	return 0;
		534
		535	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
		536	if (!svp || !SvTRUE (*svp))
		537	return 0;
		538
		539	return 1;
		540	}
		541
		542	/******************************************************************************/
		543
		544	/* process keyboard modifiers */
		545	static int
		546	mod_munge (int mod)
		547	{
		548	mod &= MOD_MASK;
		549
		550	if (mod & (KMOD_META | KMOD_ALT))
		551	mod |= KMOD_LRAM;
		552
		553	return mod;
		554	}
		555
		556	static void
		557	deliantra_main ()
		558	{
		559	char *argv[] = { 0 };
		560	call_argv ("::main", G_DISCARD | G_VOID, argv);
		561	}
		562
		563	#ifdef __MACOSX__
		564	/* to due surprising braindamage on the side of SDL design, we
		565	* do some mind-boggling hack here: SDL requires a custom main()
		566	* on OS X, so... we provide one and call the original main(), which,
		567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		568	* and which calls our main (== SDL_main) back.
		569	*/
		570	extern C_LINKAGE int
		571	main (int argc, char *argv[])
		572	{
		573	deliantra_main ();
		574	}
		575
		576	#undef main
		577
		578	extern C_LINKAGE int main (int argc, char *argv[]);
		579
		580	static void
		581	SDL_braino (void)
		582	{
		583	char *argv[] = { "deliantra client", 0 };
		584	(main) (1, argv);
		585	}
		586	#else
		587	static void
		588	SDL_braino (void)
		589	{
		590	deliantra_main ();
		591	}
		592	#endif
		593
		594	MODULE = Deliantra::Client PACKAGE = DC
433		595
434	PROTOTYPES: ENABLE	596	PROTOTYPES: ENABLE
435		597
436	BOOT:	598	BOOT:
437	{	599	{
438	HV *stash = gv_stashpv ("CFPlus", 1);	600	HV *stash = gv_stashpv ("DC", 1);
439	static const struct {	601	static const struct {
440	const char *name;	602	const char *name;
441	IV iv;	603	IV iv;
442	} *civ, const_iv[] = {	604	} *civ, const_iv[] = {
443	# define const_iv(name) { # name, (IV)name }	605	# define const_iv(name) { # name, (IV)name }
…		…
465		627
466	const_iv (SDL_APPINPUTFOCUS),	628	const_iv (SDL_APPINPUTFOCUS),
467	const_iv (SDL_APPMOUSEFOCUS),	629	const_iv (SDL_APPMOUSEFOCUS),
468	const_iv (SDL_APPACTIVE),	630	const_iv (SDL_APPACTIVE),
469		631
		632
		633	const_iv (SDLK_UNKNOWN),
		634	const_iv (SDLK_FIRST),
		635	const_iv (SDLK_BACKSPACE),
		636	const_iv (SDLK_TAB),
		637	const_iv (SDLK_CLEAR),
		638	const_iv (SDLK_RETURN),
		639	const_iv (SDLK_PAUSE),
		640	const_iv (SDLK_ESCAPE),
		641	const_iv (SDLK_SPACE),
		642	const_iv (SDLK_EXCLAIM),
		643	const_iv (SDLK_QUOTEDBL),
		644	const_iv (SDLK_HASH),
		645	const_iv (SDLK_DOLLAR),
		646	const_iv (SDLK_AMPERSAND),
		647	const_iv (SDLK_QUOTE),
		648	const_iv (SDLK_LEFTPAREN),
		649	const_iv (SDLK_RIGHTPAREN),
		650	const_iv (SDLK_ASTERISK),
		651	const_iv (SDLK_PLUS),
		652	const_iv (SDLK_COMMA),
		653	const_iv (SDLK_MINUS),
		654	const_iv (SDLK_PERIOD),
		655	const_iv (SDLK_SLASH),
		656	const_iv (SDLK_0),
		657	const_iv (SDLK_1),
		658	const_iv (SDLK_2),
		659	const_iv (SDLK_3),
		660	const_iv (SDLK_4),
		661	const_iv (SDLK_5),
		662	const_iv (SDLK_6),
		663	const_iv (SDLK_7),
		664	const_iv (SDLK_8),
		665	const_iv (SDLK_9),
		666	const_iv (SDLK_COLON),
		667	const_iv (SDLK_SEMICOLON),
		668	const_iv (SDLK_LESS),
		669	const_iv (SDLK_EQUALS),
		670	const_iv (SDLK_GREATER),
		671	const_iv (SDLK_QUESTION),
		672	const_iv (SDLK_AT),
		673
		674	const_iv (SDLK_LEFTBRACKET),
		675	const_iv (SDLK_BACKSLASH),
		676	const_iv (SDLK_RIGHTBRACKET),
		677	const_iv (SDLK_CARET),
		678	const_iv (SDLK_UNDERSCORE),
		679	const_iv (SDLK_BACKQUOTE),
		680	const_iv (SDLK_DELETE),
		681
		682	const_iv (SDLK_FIRST),
		683	const_iv (SDLK_LAST),
470	const_iv (SDLK_KP0),	684	const_iv (SDLK_KP0),
471	const_iv (SDLK_KP1),	685	const_iv (SDLK_KP1),
472	const_iv (SDLK_KP2),	686	const_iv (SDLK_KP2),
473	const_iv (SDLK_KP3),	687	const_iv (SDLK_KP3),
474	const_iv (SDLK_KP4),	688	const_iv (SDLK_KP4),
…		…
546	const_iv (KMOD_LMETA),	760	const_iv (KMOD_LMETA),
547	const_iv (KMOD_RMETA),	761	const_iv (KMOD_RMETA),
548	const_iv (KMOD_NUM),	762	const_iv (KMOD_NUM),
549	const_iv (KMOD_CAPS),	763	const_iv (KMOD_CAPS),
550	const_iv (KMOD_MODE),	764	const_iv (KMOD_MODE),
		765
		766	const_iv (KMOD_LRAM),
		767
		768	const_iv (MIX_DEFAULT_FORMAT),
		769
		770	const_iv (SDL_INIT_TIMER),
		771	const_iv (SDL_INIT_AUDIO),
		772	const_iv (SDL_INIT_VIDEO),
		773	const_iv (SDL_INIT_CDROM),
		774	const_iv (SDL_INIT_JOYSTICK),
		775	const_iv (SDL_INIT_EVERYTHING),
		776	const_iv (SDL_INIT_NOPARACHUTE),
		777	const_iv (SDL_INIT_EVENTTHREAD),
		778
		779	const_iv (SDL_GL_RED_SIZE),
		780	const_iv (SDL_GL_GREEN_SIZE),
		781	const_iv (SDL_GL_BLUE_SIZE),
		782	const_iv (SDL_GL_ALPHA_SIZE),
		783	const_iv (SDL_GL_DOUBLEBUFFER),
		784	const_iv (SDL_GL_BUFFER_SIZE),
		785	const_iv (SDL_GL_DEPTH_SIZE),
		786	const_iv (SDL_GL_STENCIL_SIZE),
		787	const_iv (SDL_GL_ACCUM_RED_SIZE),
		788	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		789	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		790	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		791	const_iv (SDL_GL_STEREO),
		792	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		793	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		794	const_iv (SDL_GL_ACCELERATED_VISUAL),
		795	const_iv (SDL_GL_SWAP_CONTROL),
		796
		797	const_iv (FOW_DARKNESS)
551	# undef const_iv	798	# undef const_iv
552	};	799	};
553		800
554	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
555	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
573		820
574	NV floor (NV x)	821	NV floor (NV x)
575		822
576	NV ceil (NV x)	823	NV ceil (NV x)
577		824
		825	IV minpot (UV n)
		826
		827	IV popcount (UV n)
		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
578	void	835	void
579	pango_init ()	836	pango_init ()
580	CODE:	837	CODE:
581	{	838	{
582	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
583	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	840	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
584	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	841	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		842	/*pango_context_set_font_description (opengl_context, default_font);*/
		843	#if PANGO_VERSION_CHECK (1, 15, 2)
		844	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		845	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		846	#endif
585	}	847	}
586		848
587	int	849	char *SDL_GetError ()
588	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
589		850
590	void	851	void SDL_braino ()
		852
		853	int SDL_Init (U32 flags)
		854
		855	int SDL_InitSubSystem (U32 flags)
		856
		857	void SDL_QuitSubSystem (U32 flags)
		858
591	SDL_Quit ()	859	void SDL_Quit ()
592		860
		861	int SDL_GL_SetAttribute (int attr, int value)
		862
		863	int SDL_GL_GetAttribute (int attr)
		864	CODE:
		865	if (SDL_GL_GetAttribute (attr, &RETVAL))
		866	XSRETURN_UNDEF;
		867	OUTPUT:
		868	RETVAL
		869
593	void	870	void
594	SDL_ListModes ()	871	SDL_ListModes (int rgb, int alpha)
595	PPCODE:	872	PPCODE:
596	{	873	{
597	SDL_Rect **m;	874	SDL_Rect **m;
598		875
599	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	876	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
600	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	877	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
601	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	878	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
602	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	879	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
603		880
604	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	881	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
605	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	882	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
606		883
607	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	884	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
608	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	885	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
609	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	886	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
610	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	887	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
611		888
612	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	889	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
613	#if SDL_VERSION_ATLEAST(1,2,10)
614	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
615	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	890	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
616	#endif
617
618	SDL_EnableUNICODE (1);
619	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
620		891
621	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	892	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
622		893
623	if (m && m != (SDL_Rect **)-1)	894	if (m && m != (SDL_Rect **)-1)
624	while (*m)	895	while (*m)
625	{	896	{
		897	if ((*m)->w >= 400 && (*m)->h >= 300)
		898	{
626	AV *av = newAV ();	899	AV *av = newAV ();
627	av_push (av, newSViv ((*m)->w));	900	av_push (av, newSViv ((*m)->w));
628	av_push (av, newSViv ((*m)->h));	901	av_push (av, newSViv ((*m)->h));
		902	av_push (av, newSViv (rgb));
		903	av_push (av, newSViv (alpha));
629	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	904	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		905	}
630		906
631	++m;	907	++m;
632	}	908	}
633	}	909	}
634		910
635	char *
636	SDL_GetError ()
637
638	int	911	int
639	SDL_SetVideoMode (int w, int h, int fullscreen)	912	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
640	CODE:	913	CODE:
		914	{
		915	SDL_EnableUNICODE (1);
		916	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		917
		918	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		919	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		920	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		921	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		922
641	RETVAL = !!SDL_SetVideoMode (	923	RETVAL = !!SDL_SetVideoMode (
642	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	924	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
643	);	925	);
		926
644	if (RETVAL)	927	if (RETVAL)
645	{	928	{
646	av_clear (texture_av);	929	av_clear (texture_av);
647		930
648	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
649	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
650	# include "glfunc.h"	933	#include "glfunc.h"
651	# undef GL_FUNC	934	#undef GL_FUNC
652		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
653	}	938	}
		939	}
654	OUTPUT:	940	OUTPUT:
655	RETVAL	941	RETVAL
656		942
657	void	943	void
658	SDL_GL_SwapBuffers ()	944	SDL_GL_SwapBuffers ()
659		945
660	char *	946	char *
661	SDL_GetKeyName (int sym)	947	SDL_GetKeyName (int sym)
662		948
		949	int
		950	SDL_GetAppState ()
		951
		952	int
		953	SDL_GetModState ()
		954
663	void	955	void
664	SDL_PollEvent ()	956	poll_events ()
665	PPCODE:	957	PPCODE:
666	{	958	{
667	SDL_Event ev;	959	SDL_Event ev;
668		960
669	while (SDL_PollEvent (&ev))	961	SDL_PumpEvents ();
		962	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
670	{	963	{
671	HV *hv = newHV ();	964	HV *hv = newHV ();
672	hv_store (hv, "type", 4, newSViv (ev.type), 0);	965	hv_store (hv, "type", 4, newSViv (ev.type), 0);
673		966
674	switch (ev.type)	967	switch (ev.type)
675	{	968	{
676	case SDL_KEYDOWN:	969	case SDL_KEYDOWN:
677	case SDL_KEYUP:	970	case SDL_KEYUP:
678	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	971	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
679	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	972	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
680	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	973	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
681	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	974	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
682	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	975	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
683	break;	976	break;
684		977
685	case SDL_ACTIVEEVENT:	978	case SDL_ACTIVEEVENT:
686	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	979	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
687	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	980	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
688	break;	981	break;
689		982
690	case SDL_MOUSEMOTION:	983	case SDL_MOUSEMOTION:
		984	{
		985	int state = ev.motion.state;
		986	int x = ev.motion.x;
		987	int y = ev.motion.y;
		988	int xrel = ev.motion.xrel;
		989	int yrel = ev.motion.yrel;
		990
		991	/* do simplistic event compression */
		992	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		993	&& state == ev.motion.state)
		994	{
		995	xrel += ev.motion.xrel;
		996	yrel += ev.motion.yrel;
		997	x = ev.motion.x;
		998	y = ev.motion.y;
		999	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		1000	}
		1001
691	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1002	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
692
693	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	1003	hv_store (hv, "state", 5, newSViv (state), 0);
694	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	1004	hv_store (hv, "x", 1, newSViv (x), 0);
695	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	1005	hv_store (hv, "y", 1, newSViv (y), 0);
696	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	1006	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
697	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	1007	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		1008	}
698	break;	1009	break;
699		1010
700	case SDL_MOUSEBUTTONDOWN:	1011	case SDL_MOUSEBUTTONDOWN:
701	case SDL_MOUSEBUTTONUP:	1012	case SDL_MOUSEBUTTONUP:
702	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1013	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
703		1014
704	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1015	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
705	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1016	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
706	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1017	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
707	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1018	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
712	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1023	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
713	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1024	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
714	break;	1025	break;
715	}	1026	}
716		1027
717	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
718	}	1029	}
719	}	1030	}
720		1031
		1032	char *
		1033	SDL_AudioDriverName ()
		1034	CODE:
		1035	{
		1036	char buf [256];
		1037	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1038	XSRETURN_UNDEF;
		1039
		1040	RETVAL = buf;
		1041	}
		1042	OUTPUT:
		1043	RETVAL
		1044
721	int	1045	int
722	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
723	POSTCALL:	1047	POSTCALL:
724	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
725	Mix_ChannelFinished (channel_finished);	1049	Mix_ChannelFinished (channel_finished);
726		1050
727	void	1051	void
		1052	Mix_QuerySpec ()
		1053	PPCODE:
		1054	{
		1055	int freq, channels;
		1056	Uint16 format;
		1057
		1058	if (Mix_QuerySpec (&freq, &format, &channels))
		1059	{
		1060	EXTEND (SP, 3);
		1061	PUSHs (sv_2mortal (newSViv (freq)));
		1062	PUSHs (sv_2mortal (newSViv (format)));
		1063	PUSHs (sv_2mortal (newSViv (channels)));
		1064	}
		1065	}
		1066
		1067	void
728	Mix_CloseAudio ()	1068	Mix_CloseAudio ()
729		1069
730	int	1070	int
731	Mix_AllocateChannels (int numchans = -1)	1071	Mix_AllocateChannels (int numchans = -1)
		1072
		1073	const char *
		1074	Mix_GetError ()
732		1075
733	void	1076	void
734	lowdelay (int fd, int val = 1)	1077	lowdelay (int fd, int val = 1)
735	CODE:	1078	CODE:
736	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	1079	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
762	}	1105	}
763	}	1106	}
764	#endif	1107	#endif
765	}	1108	}
766		1109
767	void	1110	int
768	add_font (char *file)	1111	add_font (char *file)
769	CODE:	1112	CODE:
770	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1114	OUTPUT:
		1115	RETVAL
771		1116
772	void	1117	void
773	load_image_inline (SV *image_)	1118	load_image_inline (SV *image_)
774	ALIAS:	1119	ALIAS:
775	load_image_file = 1	1120	load_image_file = 1
…		…
778	STRLEN image_len;	1123	STRLEN image_len;
779	char *image = (char *)SvPVbyte (image_, image_len);	1124	char *image = (char *)SvPVbyte (image_, image_len);
780	SDL_Surface *surface, *surface2;	1125	SDL_Surface *surface, *surface2;
781	SDL_PixelFormat fmt;	1126	SDL_PixelFormat fmt;
782	SDL_RWops *rw = ix	1127	SDL_RWops *rw = ix
783	? SDL_RWFromFile (image, "r")	1128	? SDL_RWFromFile (image, "rb")
784	: SDL_RWFromConstMem (image, image_len);	1129	: SDL_RWFromConstMem (image, image_len);
785		1130
786	if (!rw)	1131	if (!rw)
787	croak ("load_image: %s", SDL_GetError ());	1132	croak ("load_image: %s", SDL_GetError ());
788		1133
…		…
861	void	1206	void
862	error (char *message)	1207	error (char *message)
863	CODE:	1208	CODE:
864	fprintf (stderr, "ERROR: %s\n", message);	1209	fprintf (stderr, "ERROR: %s\n", message);
865	#ifdef _WIN32	1210	#ifdef _WIN32
866	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1211	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
867	#endif	1212	#endif
868		1213
869	void	1214	void
870	fatal (char *message)	1215	fatal (char *message)
871	CODE:	1216	CODE:
872	fprintf (stderr, "FATAL: %s\n", message);	1217	fprintf (stderr, "FATAL: %s\n", message);
873	#ifdef _WIN32	1218	#ifdef _WIN32
874	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1219	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
875	#endif	1220	#endif
876	_exit (1);	1221	_exit (1);
877		1222
878	void	1223	void
879	_exit (int retval = 0)	1224	_exit (int retval = 0)
…		…
882	ExitThread (retval); // unclean, please beam me up	1227	ExitThread (retval); // unclean, please beam me up
883	#else	1228	#else
884	_exit (retval);	1229	_exit (retval);
885	#endif	1230	#endif
886		1231
887	MODULE = CFPlus PACKAGE = CFPlus::Font	1232	void
		1233	debug ()
		1234	CODE:
		1235	{
		1236	#if DEBUG
		1237	VALGRIND_DO_LEAK_CHECK;
		1238	#endif
		1239	}
888		1240
889	CFPlus::Font	1241	int
		1242	SvREFCNT (SV *sv)
		1243	CODE:
		1244	RETVAL = SvREFCNT (sv);
		1245	OUTPUT:
		1246	RETVAL
		1247
		1248	MODULE = Deliantra::Client PACKAGE = DC::Font
		1249
		1250	PROTOTYPES: DISABLE
		1251
		1252	DC::Font
890	new_from_file (SV *class, char *path, int id = 0)	1253	new_from_file (SV *class, char *path, int id = 0)
891	CODE:	1254	CODE:
892	{	1255	{
893	int count;	1256	int count;
894	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1257	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
897	}	1260	}
898	OUTPUT:	1261	OUTPUT:
899	RETVAL	1262	RETVAL
900		1263
901	void	1264	void
902	DESTROY (CFPlus::Font self)	1265	DESTROY (DC::Font self)
903	CODE:	1266	CODE:
904	pango_font_description_free (self);	1267	pango_font_description_free (self);
905		1268
906	void	1269	void
907	make_default (CFPlus::Font self)	1270	make_default (DC::Font self)
		1271	PROTOTYPE: $
908	CODE:	1272	CODE:
909	default_font = self;	1273	default_font = self;
910		1274
911	MODULE = CFPlus PACKAGE = CFPlus::Layout	1275	MODULE = Deliantra::Client PACKAGE = DC::Layout
912		1276
		1277	PROTOTYPES: DISABLE
		1278
913	void	1279	void
914	reset_glyph_cache ()	1280	glyph_cache_backup ()
		1281	PROTOTYPE:
915	CODE:	1282	CODE:
		1283	tc_backup ();
		1284
		1285	void
		1286	glyph_cache_restore ()
		1287	PROTOTYPE:
		1288	CODE:
916	tc_clear ();	1289	tc_restore ();
917		1290
918	CFPlus::Layout	1291	DC::Layout
919	new (SV *class)	1292	new (SV *class)
920	CODE:	1293	CODE:
921	New (0, RETVAL, 1, struct cf_layout);	1294	New (0, RETVAL, 1, struct cf_layout);
922		1295
923	RETVAL->pl = pango_layout_new (opengl_context);	1296	RETVAL->pl = pango_layout_new (opengl_context);
…		…
925	RETVAL->g = 1.;	1298	RETVAL->g = 1.;
926	RETVAL->b = 1.;	1299	RETVAL->b = 1.;
927	RETVAL->a = 1.;	1300	RETVAL->a = 1.;
928	RETVAL->base_height = MIN_FONT_HEIGHT;	1301	RETVAL->base_height = MIN_FONT_HEIGHT;
929	RETVAL->font = 0;	1302	RETVAL->font = 0;
		1303	RETVAL->rc = rc_alloc ();
930		1304
931	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1305	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
932	layout_update_font (RETVAL);	1306	layout_update_font (RETVAL);
933	OUTPUT:	1307	OUTPUT:
934	RETVAL	1308	RETVAL
935		1309
936	void	1310	void
937	DESTROY (CFPlus::Layout self)	1311	DESTROY (DC::Layout self)
938	CODE:	1312	CODE:
939	g_object_unref (self->pl);	1313	g_object_unref (self->pl);
		1314	rc_free (self->rc);
940	Safefree (self);	1315	Safefree (self);
941		1316
942	void	1317	void
943	set_text (CFPlus::Layout self, SV *text_)	1318	set_text (DC::Layout self, SV *text_)
944	CODE:	1319	CODE:
945	{	1320	{
946	STRLEN textlen;	1321	STRLEN textlen;
947	char *text = SvPVutf8 (text_, textlen);	1322	char *text = SvPVutf8 (text_, textlen);
948		1323
949	pango_layout_set_text (self->pl, text, textlen);	1324	pango_layout_set_text (self->pl, text, textlen);
950	}	1325	}
951		1326
952	void	1327	void
953	set_markup (CFPlus::Layout self, SV *text_)	1328	set_markup (DC::Layout self, SV *text_)
954	CODE:	1329	CODE:
955	{	1330	{
956	STRLEN textlen;	1331	STRLEN textlen;
957	char *text = SvPVutf8 (text_, textlen);	1332	char *text = SvPVutf8 (text_, textlen);
958		1333
959	pango_layout_set_markup (self->pl, text, textlen);	1334	pango_layout_set_markup (self->pl, text, textlen);
960	}	1335	}
961		1336
962	void	1337	void
963	set_shapes (CFPlus::Layout self, ...)	1338	set_shapes (DC::Layout self, ...)
964	CODE:	1339	CODE:
965	{	1340	{
966	PangoAttrList *attrs = 0;	1341	PangoAttrList *attrs = 0;
967	const char *text = pango_layout_get_text (self->pl);	1342	const char *text = pango_layout_get_text (self->pl);
968	const char *pos = text;	1343	const char *pos = text;
…		…
1003	if (attrs)	1378	if (attrs)
1004	pango_layout_set_attributes (self->pl, attrs);	1379	pango_layout_set_attributes (self->pl, attrs);
1005	}	1380	}
1006		1381
1007	void	1382	void
1008	get_shapes (CFPlus::Layout self)	1383	get_shapes (DC::Layout self)
1009	PPCODE:	1384	PPCODE:
1010	{	1385	{
1011	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1386	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1012		1387
1013	do	1388	do
1014	{	1389	{
1015	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1390	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1016		1391
1017	if (run && shape_attr_p (run))	1392	if (run && shape_attr_p (run))
1018	{	1393	{
1019	PangoRectangle extents;	1394	PangoRectangle extents;
1020	pango_layout_iter_get_run_extents (iter, 0, &extents);	1395	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1028		1403
1029	pango_layout_iter_free (iter);	1404	pango_layout_iter_free (iter);
1030	}	1405	}
1031		1406
1032	int	1407	int
1033	has_wrapped (CFPlus::Layout self)	1408	has_wrapped (DC::Layout self)
1034	CODE:	1409	CODE:
1035	{	1410	{
1036	int lines = 1;	1411	int lines = 1;
1037	const char *text = pango_layout_get_text (self->pl);	1412	const char *text = pango_layout_get_text (self->pl);
1038		1413
…		…
1043	}	1418	}
1044	OUTPUT:	1419	OUTPUT:
1045	RETVAL	1420	RETVAL
1046		1421
1047	SV *	1422	SV *
1048	get_text (CFPlus::Layout self)	1423	get_text (DC::Layout self)
1049	CODE:	1424	CODE:
1050	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1425	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1051	sv_utf8_decode (RETVAL);	1426	sv_utf8_decode (RETVAL);
1052	OUTPUT:	1427	OUTPUT:
1053	RETVAL	1428	RETVAL
1054		1429
1055	void	1430	void
1056	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1431	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1057	CODE:	1432	CODE:
1058	self->r = r;	1433	self->r = r;
1059	self->g = g;	1434	self->g = g;
1060	self->b = b;	1435	self->b = b;
1061	self->a = a;	1436	self->a = a;
1062		1437
1063	void	1438	void
1064	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1439	set_font (DC::Layout self, DC::Font font = 0)
1065	CODE:	1440	CODE:
1066	if (self->font != font)	1441	if (self->font != font)
1067	{	1442	{
1068	self->font = font;	1443	self->font = font;
1069	layout_update_font (self);	1444	layout_update_font (self);
1070	}	1445	}
1071		1446
1072	void	1447	void
1073	set_height (CFPlus::Layout self, int base_height)	1448	set_height (DC::Layout self, int base_height)
1074	CODE:	1449	CODE:
1075	if (self->base_height != base_height)	1450	if (self->base_height != base_height)
1076	{	1451	{
1077	self->base_height = base_height;	1452	self->base_height = base_height;
1078	layout_update_font (self);	1453	layout_update_font (self);
1079	}	1454	}
1080		1455
1081	void	1456	void
1082	set_width (CFPlus::Layout self, int max_width = -1)	1457	set_width (DC::Layout self, int max_width = -1)
1083	CODE:	1458	CODE:
1084	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1459	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1085		1460
1086	void	1461	void
1087	set_indent (CFPlus::Layout self, int indent)	1462	set_indent (DC::Layout self, int indent)
1088	CODE:	1463	CODE:
1089	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1464	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1090		1465
1091	void	1466	void
1092	set_spacing (CFPlus::Layout self, int spacing)	1467	set_spacing (DC::Layout self, int spacing)
1093	CODE:	1468	CODE:
1094	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1469	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1095		1470
1096	void	1471	void
1097	set_ellipsise (CFPlus::Layout self, int ellipsise)	1472	set_ellipsise (DC::Layout self, int ellipsise)
1098	CODE:	1473	CODE:
1099	pango_layout_set_ellipsize (self->pl,	1474	pango_layout_set_ellipsize (self->pl,
1100	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1475	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1101	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1476	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1102	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1477	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1103	: PANGO_ELLIPSIZE_NONE	1478	: PANGO_ELLIPSIZE_NONE
1104	);	1479	);
1105		1480
1106	void	1481	void
1107	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1482	set_single_paragraph_mode (DC::Layout self, int spm)
1108	CODE:	1483	CODE:
1109	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1484	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1110		1485
1111	void	1486	void
1112	size (CFPlus::Layout self)	1487	size (DC::Layout self)
1113	PPCODE:	1488	PPCODE:
1114	{	1489	{
1115	int w, h;	1490	int w, h;
1116		1491
1117	layout_get_pixel_size (self, &w, &h);	1492	layout_get_pixel_size (self, &w, &h);
…		…
1120	PUSHs (sv_2mortal (newSViv (w)));	1495	PUSHs (sv_2mortal (newSViv (w)));
1121	PUSHs (sv_2mortal (newSViv (h)));	1496	PUSHs (sv_2mortal (newSViv (h)));
1122	}	1497	}
1123		1498
1124	int	1499	int
1125	descent (CFPlus::Layout self)	1500	descent (DC::Layout self)
1126	CODE:	1501	CODE:
1127	{	1502	{
1128	PangoRectangle rect;	1503	PangoRectangle rect;
1129	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1504	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1130	pango_layout_line_get_pixel_extents (line, 0, &rect);	1505	pango_layout_line_get_pixel_extents (line, 0, &rect);
1131	RETVAL = PANGO_DESCENT (rect);	1506	RETVAL = PANGO_DESCENT (rect);
1132	}	1507	}
1133	OUTPUT:	1508	OUTPUT:
1134	RETVAL	1509	RETVAL
1135		1510
1136	int	1511	int
1137	xy_to_index (CFPlus::Layout self, int x, int y)	1512	xy_to_index (DC::Layout self, int x, int y)
1138	CODE:	1513	CODE:
1139	{	1514	{
1140	int index, trailing;	1515	int index, trailing;
1141	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1516	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1142	RETVAL = index + trailing;	1517	RETVAL = index + trailing;
1143	}	1518	}
1144	OUTPUT:	1519	OUTPUT:
1145	RETVAL	1520	RETVAL
1146		1521
1147	void	1522	void
1148	cursor_pos (CFPlus::Layout self, int index)	1523	cursor_pos (DC::Layout self, int index)
1149	PPCODE:	1524	PPCODE:
1150	{	1525	{
1151	PangoRectangle strong_pos;	1526	PangoRectangle pos;
1152	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1527	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1153		1528
1154	EXTEND (SP, 3);	1529	EXTEND (SP, 3);
1155	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1530	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1156	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1531	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1157	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1532	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1158	}	1533	}
1159		1534
1160	void	1535	void
1161	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1536	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1162	PPCODE:	1537	PPCODE:
1163	{	1538	{
1164	int line, x;	1539	int line, x;
1165		1540
1166	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1541	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1542	#if !PANGO_VERSION_CHECK (1, 17, 3)
1167	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1543	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1168		1544	--line;
		1545	#endif
1169	EXTEND (SP, 2);	1546	EXTEND (SP, 2);
1170	PUSHs (sv_2mortal (newSViv (line - 1)));	1547	PUSHs (sv_2mortal (newSViv (line)));
1171	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1548	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1172	}	1549	}
1173		1550
1174	void	1551	void
1175	line_x_to_index (CFPlus::Layout self, int line, int x)	1552	line_x_to_index (DC::Layout self, int line, int x)
1176	PPCODE:	1553	PPCODE:
1177	{	1554	{
1178	PangoLayoutLine *lp;	1555	PangoLayoutLine *lp;
1179	int index, trailing;	1556	int index, trailing;
1180		1557
1181	if (line < 0)	1558	if (line < 0)
1182	XSRETURN_EMPTY;	1559	XSRETURN_EMPTY;
1183		1560
1184	if (!(lp = pango_layout_get_line (self->pl, line)))	1561	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1185	XSRETURN_EMPTY; /* do better */	1562	XSRETURN_EMPTY; /* do better */
1186		1563
1187	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1564	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1188		1565
1189	EXTEND (SP, 2);	1566	EXTEND (SP, 2);
…		…
1195	PUSHs (sv_2mortal (newSViv (trailing)));	1572	PUSHs (sv_2mortal (newSViv (trailing)));
1196	}	1573	}
1197	}	1574	}
1198		1575
1199	void	1576	void
1200	render (CFPlus::Layout self, float x, float y, int flags = 0)	1577	render (DC::Layout self, float x, float y, int flags = 0)
1201	PPCODE:	1578	CODE:
		1579	rc_clear (self->rc);
1202	pango_opengl_render_layout_subpixel (	1580	pango_opengl_render_layout_subpixel (
1203	self->pl,	1581	self->pl,
		1582	self->rc,
1204	x * PANGO_SCALE, y * PANGO_SCALE,	1583	x * PANGO_SCALE, y * PANGO_SCALE,
1205	self->r, self->g, self->b, self->a,	1584	self->r, self->g, self->b, self->a,
1206	flags	1585	flags
1207	);	1586	);
		1587	// we assume that context_change actually clears/frees stuff
		1588	// and does not do any recomputation...
		1589	pango_layout_context_changed (self->pl);
1208		1590
1209	MODULE = CFPlus PACKAGE = CFPlus::Texture
1210
1211	void	1591	void
1212	pad2pot (SV *data_, SV *w_, SV *h_)	1592	draw (DC::Layout self)
1213	CODE:	1593	CODE:
1214	{	1594	{
1215	int ow = SvIV (w_);	1595	glEnable (GL_TEXTURE_2D);
1216	int oh = SvIV (h_);	1596	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1597	glEnable (GL_BLEND);
		1598	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1599	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1600	glEnable (GL_ALPHA_TEST);
		1601	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1217		1602
1218	if (ow && oh)	1603	rc_draw (self->rc);
		1604
		1605	glDisable (GL_ALPHA_TEST);
		1606	glDisable (GL_BLEND);
		1607	glDisable (GL_TEXTURE_2D);
		1608	}
		1609
		1610	MODULE = Deliantra::Client PACKAGE = DC::Texture
		1611
		1612	PROTOTYPES: ENABLE
		1613
		1614	void
		1615	pad (SV *data_, int ow, int oh, int nw, int nh)
		1616	CODE:
		1617	{
		1618	if ((nw != ow || nh != oh) && SvOK (data_))
1219	{	1619	{
1220	int nw = minpot (ow);
1221	int nh = minpot (oh);
1222
1223	if (nw != ow || nh != oh)
1224	{
1225	if (SvOK (data_))
1226	{
1227	STRLEN datalen;	1620	STRLEN datalen;
1228	char *data = SvPVbyte (data_, datalen);	1621	char *data = SvPVbyte (data_, datalen);
1229	int bpp = datalen / (ow * oh);	1622	int bpp = datalen / (ow * oh);
1230	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));	1623	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1231		1624
1232	SvPOK_only (result_);	1625	SvPOK_only (result_);
1233	SvCUR_set (result_, nw * nh * bpp);	1626	SvCUR_set (result_, nw * nh * bpp);
1234		1627
1235	memset (SvPVX (result_), 0, nw * nh * bpp);	1628	memset (SvPVX (result_), 0, nw * nh * bpp);
1236	while (oh--)	1629	while (oh--)
1237	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1630	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1238		1631
1239	sv_setsv (data_, result_);	1632	sv_setsv (data_, result_);
1240	}
1241
1242	sv_setiv (w_, nw);
1243	sv_setiv (h_, nh);
1244	}
1245	}	1633	}
1246	}	1634	}
1247		1635
1248	void	1636	void
1249	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1637	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1255	{	1643	{
1256	HV *hv = (HV *)SvRV (self);	1644	HV *hv = (HV *)SvRV (self);
1257	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1645	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1258	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1646	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1259	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1647	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
		1648
		1649	if (name <= 0)
		1650	XSRETURN_EMPTY;
1260		1651
1261	if (items < 5)	1652	if (items < 5)
1262	{	1653	{
1263	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1654	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1264	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1655	h = SvNV (*hv_fetch (hv, "h", 1, 1));
…		…
1292	glDisable (GL_ALPHA_TEST);	1683	glDisable (GL_ALPHA_TEST);
1293	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1294	}	1685	}
1295	}	1686	}
1296		1687
1297	MODULE = CFPlus PACKAGE = CFPlus::Map	1688	void
		1689	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
		1690	PROTOTYPE: @
		1691	CODE:
		1692	{
		1693	glEnable (GL_BLEND);
		1694	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1695	glEnable (GL_TEXTURE_2D);
		1696	glBindTexture (GL_TEXTURE_2D, name1);
1298		1697
1299	CFPlus::Map	1698	glColor3f (intensity, intensity, intensity);
		1699	glPushMatrix ();
		1700	glScalef (1./3, 1./3, 1.);
		1701
		1702	if (blend > 0.f)
		1703	{
		1704	float dx3 = dx * -3.f / w;
		1705	float dy3 = dy * -3.f / h;
		1706	GLfloat env_color[4] = { 0., 0., 0., blend };
		1707
		1708	/* interpolate the two shadow textures */
		1709	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1710	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1711
		1712	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1713	gl.ActiveTexture (GL_TEXTURE1);
		1714	glEnable (GL_TEXTURE_2D);
		1715	glBindTexture (GL_TEXTURE_2D, name2);
		1716	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1717
		1718	/* rgb == rgb(glcolor) */
		1719	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1720	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1721	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1722
		1723	/* alpha = interpolate t0, t1 by env_alpha */
		1724	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1725
		1726	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1727	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1728	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1729
		1730	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1731	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1732
		1733	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1734	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1735
		1736	glBegin (GL_QUADS);
		1737	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1738	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1739	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1740	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1741	glEnd ();
		1742
		1743	glDisable (GL_TEXTURE_2D);
		1744	gl.ActiveTexture (GL_TEXTURE0);
		1745	}
		1746	else
		1747	{
		1748	/* simple blending of one texture, also opengl <1.3 path */
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1750
		1751	glBegin (GL_QUADS);
		1752	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1753	glTexCoord2f (0, t); glVertex2f (0, h);
		1754	glTexCoord2f (s, t); glVertex2f (w, h);
		1755	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1756	glEnd ();
		1757	}
		1758
		1759	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1760	{
		1761	int x, y;
		1762	int dx3 = dx * 3;
		1763	int dy3 = dy * 3;
		1764
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1766	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1767	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1768	glTranslatef (-1., -1., 0);
		1769	glBegin (GL_QUADS);
		1770
		1771	for (y = 1; y < h; y += 3)
		1772	{
		1773	int y1 = y - dy3;
		1774	int y1valid = y1 >= 0 && y1 < h;
		1775
		1776	for (x = 1; x < w; x += 3)
		1777	{
		1778	int x1 = x - dx3;
		1779	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1780	uint8_t h2;
		1781
		1782	if (y1valid && x1 >= 0 && x1 < w)
		1783	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1784	else
		1785	h2 = 1; /* out of range == invisible */
		1786
		1787	if (h1 || h2)
		1788	{
		1789	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1790	glColor4f (1., 1., 1., alpha);
		1791
		1792	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1793	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1794	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1795	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1796	}
		1797	}
		1798	}
		1799	}
		1800
		1801	glEnd ();
		1802
		1803	glPopMatrix ();
		1804
		1805	glDisable (GL_TEXTURE_2D);
		1806	glDisable (GL_BLEND);
		1807	}
		1808
		1809	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1810	CODE:
		1811	{
		1812	GLint width;
		1813	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1814	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1815	RETVAL = width > 0;
		1816	}
		1817	OUTPUT:
		1818	RETVAL
		1819
		1820	MODULE = Deliantra::Client PACKAGE = DC::Map
		1821
		1822	PROTOTYPES: DISABLE
		1823
		1824	DC::Map
1300	new (SV *class)	1825	new (SV *class)
1301	CODE:	1826	CODE:
1302	New (0, RETVAL, 1, struct map);	1827	New (0, RETVAL, 1, struct map);
1303	RETVAL->x = 0;	1828	RETVAL->x = 0;
1304	RETVAL->y = 0;	1829	RETVAL->y = 0;
…		…
1312	RETVAL->row = 0;	1837	RETVAL->row = 0;
1313	OUTPUT:	1838	OUTPUT:
1314	RETVAL	1839	RETVAL
1315		1840
1316	void	1841	void
1317	DESTROY (CFPlus::Map self)	1842	DESTROY (DC::Map self)
1318	CODE:	1843	CODE:
1319	{	1844	{
1320	map_clear (self);	1845	map_clear (self);
1321	Safefree (self->face2tile);	1846	Safefree (self->face2tile);
1322	Safefree (self->tex);	1847	Safefree (self->tex);
1323	Safefree (self);	1848	Safefree (self);
1324	}	1849	}
1325		1850
1326	void	1851	void
1327	resize (CFPlus::Map self, int map_width, int map_height)	1852	resize (DC::Map self, int map_width, int map_height)
1328	CODE:	1853	CODE:
1329	self->w = map_width;	1854	self->w = map_width;
1330	self->h = map_height;	1855	self->h = map_height;
1331		1856
1332	void	1857	void
1333	clear (CFPlus::Map self)	1858	clear (DC::Map self)
1334	CODE:	1859	CODE:
1335	map_clear (self);	1860	map_clear (self);
1336		1861
1337	void	1862	void
1338	set_tileid (CFPlus::Map self, int face, int tile)	1863	set_tileid (DC::Map self, int face, int tile)
1339	CODE:	1864	CODE:
1340	{	1865	{
1341	need_facenum (self, face); self->face2tile [face] = tile;	1866	need_facenum (self, face); self->face2tile [face] = tile;
1342	need_texid (self, tile);	1867	need_texid (self, tile);
1343	}	1868	}
1344		1869
1345	void	1870	void
1346	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1871	set_smooth (DC::Map self, int face, int smooth, int level)
1347	CODE:	1872	CODE:
1348	{	1873	{
1349	tileid texid;	1874	tileid texid;
1350	maptex *tex;	1875	maptex *tex;
1351		1876
…		…
1364	tex->smoothtile = self->face2tile [smooth];	1889	tex->smoothtile = self->face2tile [smooth];
1365	tex->smoothlevel = level;	1890	tex->smoothlevel = level;
1366	}	1891	}
1367		1892
1368	void	1893	void
1369	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)	1894	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1370	CODE:	1895	CODE:
1371	{	1896	{
1372	need_texid (self, texid);	1897	need_texid (self, texid);
1373		1898
1374	{	1899	{
…		…
1393	// use uglier nearest interpolation because linear suffers	1918	// use uglier nearest interpolation because linear suffers
1394	// from transparent color bleeding and ugly wrapping effects.	1919	// from transparent color bleeding and ugly wrapping effects.
1395	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1920	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1396	}	1921	}
1397		1922
		1923	void
		1924	expire_textures (DC::Map self, int texid, int count)
		1925	PPCODE:
		1926	for (; texid < self->texs && count; ++texid, --count)
		1927	{
		1928	maptex *tex = self->tex + texid;
		1929
		1930	if (tex->name)
		1931	{
		1932	if (tex->unused)
		1933	{
		1934	tex->name = 0;
		1935	tex->unused = 0;
		1936	XPUSHs (sv_2mortal (newSViv (texid)));
		1937	}
		1938	else
		1939	tex->unused = 1;
		1940	}
		1941	}
		1942
1398	int	1943	int
1399	ox (CFPlus::Map self)	1944	ox (DC::Map self)
1400	ALIAS:	1945	ALIAS:
1401	oy = 1	1946	oy = 1
1402	x = 2	1947	x = 2
1403	y = 3	1948	y = 3
1404	w = 4	1949	w = 4
…		…
1415	}	1960	}
1416	OUTPUT:	1961	OUTPUT:
1417	RETVAL	1962	RETVAL
1418		1963
1419	void	1964	void
1420	scroll (CFPlus::Map self, int dx, int dy)	1965	scroll (DC::Map self, int dx, int dy)
1421	CODE:	1966	CODE:
1422	{	1967	{
1423	if (dx > 0)	1968	if (dx > 0)
1424	map_blank (self, self->x, self->y, dx, self->h);	1969	map_blank (self, self->x, self->y, dx, self->h);
1425	else if (dx < 0)	1970	else if (dx < 0)
…		…
1440	self->rows += MAP_EXTEND_Y;	1985	self->rows += MAP_EXTEND_Y;
1441	self->y += MAP_EXTEND_Y;	1986	self->y += MAP_EXTEND_Y;
1442	}	1987	}
1443	}	1988	}
1444		1989
1445	void	1990	SV *
1446	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1991	map1a_update (DC::Map self, SV *data_, int extmap)
1447	CODE:	1992	CODE:
1448	{	1993	{
1449	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1994	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1450	uint8_t *data_end = (uint8_t *)SvEND (data_);	1995	uint8_t *data_end = (uint8_t *)SvEND (data_);
1451	mapcell *cell;	1996	mapcell *cell;
1452	int x, y, flags;	1997	int x, y, z, flags;
		1998	AV *missing = newAV ();
		1999	RETVAL = newRV_noinc ((SV *)missing);
1453		2000
1454	while (data < data_end - 1)	2001	while (data < data_end - 1)
1455	{	2002	{
1456	flags = (data [0] << 8) + data [1]; data += 2;	2003	flags = (data [0] << 8) + data [1]; data += 2;
1457		2004
…		…
1477	uint8_t ext, cmd;	2024	uint8_t ext, cmd;
1478		2025
1479	do	2026	do
1480	{	2027	{
1481	ext = *data++;	2028	ext = *data++;
1482	cmd = ext & 0x3f;	2029	cmd = ext & 0x7f;
1483		2030
1484	if (cmd < 4)	2031	if (cmd < 4)
1485	cell->darkness = 255 - ext * 64 + 1;	2032	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1486	else if (cmd == 5) // health	2033	else if (cmd == 5) // health
1487	{	2034	{
1488	cell->stat_width = 1;	2035	cell->stat_width = 1;
1489	cell->stat_hp = *data++;	2036	cell->stat_hp = *data++;
1490	}	2037	}
1491	else if (cmd == 6) // monster width	2038	else if (cmd == 6) // monster width
1492	cell->stat_width = *data++ + 1;	2039	cell->stat_width = *data++ + 1;
1493	else if (cmd == 0x47)	2040	else if (cmd == 0x47)
1494	{	2041	{
1495	if (*data == 4)	2042	if (*data == 1) cell->player = data [1];
1496	; // decode player count	2043	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2044	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2045	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1497		2046
1498	data += *data + 1;	2047	data += *data + 1;
1499	}	2048	}
1500	else if (cmd == 8) // cell flags	2049	else if (cmd == 8) // cell flags
1501	cell->flags = *data++;	2050	cell->flags = *data++;
…		…
1508	}	2057	}
1509	else	2058	else
1510	cell->darkness = *data++ + 1;	2059	cell->darkness = *data++ + 1;
1511	}	2060	}
1512		2061
		2062	for (z = 0; z <= 2; ++z)
1513	if (flags & 4)	2063	if (flags & (4 >> z))
1514	{	2064	{
1515	faceid face = (data [0] << 8) + data [1]; data += 2;	2065	faceid face = (data [0] << 8) + data [1]; data += 2;
1516	need_facenum (self, face);	2066	need_facenum (self, face);
1517	cell->tile [0] = self->face2tile [face];	2067	cell->tile [z] = self->face2tile [face];
		2068
		2069	if (cell->tile [z])
		2070	{
		2071	maptex *tex = self->tex + cell->tile [z];
		2072	tex->unused = 0;
		2073	if (!tex->name)
		2074	av_push (missing, newSViv (cell->tile [z]));
		2075
		2076	if (tex->smoothtile)
		2077	{
		2078	maptex *smooth = self->tex + tex->smoothtile;
		2079	smooth->unused = 0;
		2080	if (!smooth->name)
		2081	av_push (missing, newSViv (tex->smoothtile));
		2082	}
		2083	}
1518	}	2084	}
1519
1520	if (flags & 2)
1521	{
1522	faceid face = (data [0] << 8) + data [1]; data += 2;
1523	need_facenum (self, face);
1524	cell->tile [1] = self->face2tile [face];
1525	}
1526
1527	if (flags & 1)
1528	{
1529	faceid face = (data [0] << 8) + data [1]; data += 2;
1530	need_facenum (self, face);
1531	cell->tile [2] = self->face2tile [face];
1532	}
1533	}	2085	}
1534	else	2086	else
1535	cell->darkness = 0;	2087	CELL_CLEAR (cell);
1536	}	2088	}
1537	}	2089	}
		2090	OUTPUT:
		2091	RETVAL
1538		2092
1539	SV *	2093	SV *
1540	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	2094	mapmap (DC::Map self, int x0, int y0, int w, int h)
1541	CODE:	2095	CODE:
1542	{	2096	{
1543	int x1, x;	2097	int x1, x;
1544	int y1, y;	2098	int y1, y;
1545	int z;	2099	int z;
…		…
1590	}	2144	}
1591	OUTPUT:	2145	OUTPUT:
1592	RETVAL	2146	RETVAL
1593		2147
1594	void	2148	void
1595	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	2149	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1596	CODE:	2150	CODE:
1597	{	2151	{
		2152	int x, y, z;
		2153
1598	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2154	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1599	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2155	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1600	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	2156	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1601	smooth_key skey;	2157	smooth_key skey;
1602	int x, y, z;	2158	int pl_x, pl_y;
1603	int last_name;	2159	maptex pl_tex;
		2160	rc_t *rc = rc_alloc ();
		2161	rc_t *rc_ov = rc_alloc ();
		2162	rc_key_t key;
		2163	rc_array_t *arr;
1604		2164
		2165	pl_tex.name = 0;
		2166
1605	// thats current max. sorry.	2167	// that's current max. sorry.
1606	if (sw > 255) sw = 255;	2168	if (sw > 255) sw = 255;
1607	if (sh > 255) sh = 255;	2169	if (sh > 255) sh = 255;
1608		2170
1609	// clear key, in case of extra padding	2171	// clear key, in case of extra padding
1610	memset (&skey, 0, sizeof (skey));	2172	memset (&skey, 0, sizeof (skey));
1611		2173
1612	glColor4ub (255, 255, 255, 255);	2174	memset (&key, 0, sizeof (key));
1613		2175	key.r = 255;
1614	glEnable (GL_BLEND);	2176	key.g = 255;
1615	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2177	key.b = 255;
1616	glEnable (GL_TEXTURE_2D);	2178	key.a = 255;
1617	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2179	key.mode = GL_QUADS;
1618		2180	key.format = GL_T2F_V3F;
1619	glBegin (GL_QUADS);
1620
1621	last_name = 0;
1622		2181
1623	mx += self->x;	2182	mx += self->x;
1624	my += self->y;	2183	my += self->y;
1625		2184
1626	// first pass: determine smooth_max	2185	// first pass: determine smooth_max
…		…
1643	MAX (self->tex [cell->tile [1]].smoothlevel,	2202	MAX (self->tex [cell->tile [1]].smoothlevel,
1644	self->tex [cell->tile [2]].smoothlevel));	2203	self->tex [cell->tile [2]].smoothlevel));
1645	}	2204	}
1646	}	2205	}
1647		2206
		2207	glEnable (GL_BLEND);
		2208	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		2209	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		2210
1648	for (z = 0; z <= 2; z++)	2211	for (z = 0; z <= 2; z++)
1649	{	2212	{
1650	memset (smooth_level, 0, sizeof (smooth_level));	2213	memset (smooth_level, 0, sizeof (smooth_level));
		2214	key.texname = -1;
1651		2215
1652	for (y = 0; y < sh; y++)	2216	for (y = 0; y < sh; y++)
1653	if (0 <= y + my && y + my < self->rows)	2217	if (0 <= y + my && y + my < self->rows)
1654	{	2218	{
1655	maprow *row = self->row + (y + my);	2219	maprow *row = self->row + (y + my);
…		…
1661	tileid tile = cell->tile [z];	2225	tileid tile = cell->tile [z];
1662		2226
1663	if (tile)	2227	if (tile)
1664	{	2228	{
1665	maptex tex = self->tex [tile];	2229	maptex tex = self->tex [tile];
1666	int px = (x + 1) * T - tex.w;	2230	int px, py;
1667	int py = (y + 1) * T - tex.h;
1668		2231
1669	// suppressing texture state switches here
1670	// is only moderately effective, but worth the extra effort
1671	if (last_name != tex.name)	2232	if (key.texname != tex.name)
1672	{	2233	{
		2234	self->tex [tile].unused = 0;
		2235
1673	if (!tex.name)	2236	if (!tex.name)
1674	tex = self->tex [2]; /* missing, replace by noface */	2237	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1675		2238
1676	glEnd ();	2239	key.texname = tex.name;
1677	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2240	arr = rc_array (rc, &key);
1678	glBegin (GL_QUADS);
1679	}	2241	}
1680		2242
1681	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	2243	px = (x + 1) * T - tex.w;
1682	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	2244	py = (y + 1) * T - tex.h;
1683	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1684	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1685		2245
1686	if (cell->flags && z == 2)	2246	if (expect_false (cell->player == player) && expect_false (z == 2))
1687	{	2247	{
1688	if (cell->flags & 1)	2248	pl_x = px;
		2249	pl_y = py;
		2250	pl_tex = tex;
1689	{	2251	continue;
1690	maptex tex = self->tex [1];
1691	int px = x * T + T * 2 / 32;
1692	int py = y * T - T * 6 / 32;
1693
1694	glEnd ();
1695	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1696	glBegin (GL_QUADS);
1697
1698	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1699	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1700	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1701	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1702	}
1703	}	2252	}
		2253
		2254	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2255	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2256	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2257	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1704		2258
1705	// update smooth hash	2259	// update smooth hash
1706	if (tex.smoothtile)	2260	if (tex.smoothtile)
1707	{	2261	{
1708	skey.tile = tex.smoothtile;	2262	skey.tile = tex.smoothtile;
…		…
1739	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2293	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1740	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2294	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1741	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2295	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1742	}	2296	}
1743	}	2297	}
		2298
		2299	if (expect_false (z == 2) && expect_false (cell->flags))
		2300	{
		2301	// overlays such as the speech bubble, probably more to come
		2302	if (cell->flags & 1)
		2303	{
		2304	rc_key_t key_ov = key;
		2305	maptex tex = self->tex [TEXID_SPEECH];
		2306	rc_array_t *arr;
		2307	int px = x * T + T * 2 / 32;
		2308	int py = y * T - T * 6 / 32;
		2309
		2310	key_ov.texname = tex.name;
		2311	arr = rc_array (rc_ov, &key_ov);
		2312
		2313	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2314	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2315	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2316	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
		2317	}
		2318	}
1744	}	2319	}
1745	}	2320	}
		2321
		2322	rc_draw (rc);
		2323	rc_clear (rc);
1746		2324
1747	// go through all smoothlevels, lowest to highest, then draw.	2325	// go through all smoothlevels, lowest to highest, then draw.
1748	// this is basically counting sort	2326	// this is basically counting sort
1749	{	2327	{
1750	int w, b;	2328	int w, b;
1751		2329
		2330	glEnable (GL_TEXTURE_2D);
		2331	glBegin (GL_QUADS);
1752	for (w = 0; w < 256 / 32; ++w)	2332	for (w = 0; w < 256 / 32; ++w)
1753	{	2333	{
1754	uint32_t smask = smooth_level [w];	2334	uint32_t smask = smooth_level [w];
1755	if (smask)	2335	if (smask)
1756	for (b = 0; b < 32; ++b)	2336	for (b = 0; b < 32; ++b)
…		…
1775	int border = bits & 15;	2355	int border = bits & 15;
1776	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2356	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1777	float dx = tex.s * .0625f; // 16 images/row	2357	float dx = tex.s * .0625f; // 16 images/row
1778	float dy = tex.t * .5f ; // 2 images/column	2358	float dy = tex.t * .5f ; // 2 images/column
1779		2359
1780	// this time naively avoiding texture state changes
1781	// save gobs of state changes.
1782	if (last_name != tex.name)	2360	if (tex.name)
1783	{	2361	{
		2362	// this time avoiding texture state changes
		2363	// save gobs of state changes.
1784	if (!tex.name)	2364	if (key.texname != tex.name)
1785	continue; // smoothing not yet available	2365	{
		2366	self->tex [skey->tile].unused = 0;
1786		2367
1787	glEnd ();	2368	glEnd ();
1788	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2369	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1789	glBegin (GL_QUADS);	2370	glBegin (GL_QUADS);
1790	}	2371	}
1791		2372
1792	if (border)	2373	if (border)
1793	{	2374	{
1794	float ox = border * dx;	2375	float ox = border * dx;
1795		2376
1796	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2377	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1797	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2378	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1798	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2379	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1799	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2380	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1800	}	2381	}
1801		2382
1802	if (corner)	2383	if (corner)
1803	{	2384	{
1804	float ox = corner * dx;	2385	float ox = corner * dx;
1805		2386
1806	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2387	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1807	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2388	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1808	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2389	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1809	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2390	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2391	}
1810	}	2392	}
1811	}	2393	}
1812	}	2394	}
1813	}	2395	}
1814	}	2396	}
		2397
		2398	glEnd ();
		2399	glDisable (GL_TEXTURE_2D);
		2400	key.texname = -1;
1815	}	2401	}
1816		2402
1817	hv_clear (smooth);	2403	hv_clear (smooth);
1818	}	2404	}
1819		2405
1820	glEnd ();	2406	if (pl_tex.name)
		2407	{
		2408	maptex tex = pl_tex;
		2409	int px = pl_x + sdx;
		2410	int py = pl_y + sdy;
1821		2411
1822	glDisable (GL_TEXTURE_2D);	2412	key.texname = tex.name;
		2413	arr = rc_array (rc, &key);
		2414
		2415	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2416	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2417	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2418	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2419
		2420	rc_draw (rc);
		2421	}
		2422
		2423	rc_draw (rc_ov);
		2424	rc_clear (rc_ov);
		2425
1823	glDisable (GL_BLEND);	2426	glDisable (GL_BLEND);
		2427	rc_free (rc);
		2428	rc_free (rc_ov);
1824		2429
1825	// top layer: overlays such as the health bar	2430	// top layer: overlays such as the health bar
1826	for (y = 0; y < sh; y++)	2431	for (y = 0; y < sh; y++)
1827	if (0 <= y + my && y + my < self->rows)	2432	if (0 <= y + my && y + my < self->rows)
1828	{	2433	{
…		…
1833	{	2438	{
1834	mapcell *cell = row->col + (x + mx - row->c0);	2439	mapcell *cell = row->col + (x + mx - row->c0);
1835		2440
1836	int px = x * T;	2441	int px = x * T;
1837	int py = y * T;	2442	int py = y * T;
		2443
		2444	if (expect_false (cell->player == player))
		2445	{
		2446	px += sdx;
		2447	py += sdy;
		2448	}
1838		2449
1839	if (cell->stat_hp)	2450	if (cell->stat_hp)
1840	{	2451	{
1841	int width = cell->stat_width * T;	2452	int width = cell->stat_width * T;
1842	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2453	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
1853	}	2464	}
1854	}	2465	}
1855	}	2466	}
1856		2467
1857	void	2468	void
1858	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2469	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1859	CODE:	2470	CODE:
1860	{	2471	{
1861	static float color[16][3] = {	2472	static float color[16][3] = {
1862	{ 0.00F, 0.00F, 0.00F },	2473	{ 0.00f, 0.00f, 0.00f },
1863	{ 1.00F, 1.00F, 1.00F },	2474	{ 1.00f, 1.00f, 1.00f },
1864	{ 0.00F, 0.00F, 0.55F },	2475	{ 0.00f, 0.00f, 0.55f },
1865	{ 1.00F, 0.00F, 0.00F },	2476	{ 1.00f, 0.00f, 0.00f },
1866		2477
1867	{ 1.00F, 0.54F, 0.00F },	2478	{ 1.00f, 0.54f, 0.00f },
1868	{ 0.11F, 0.56F, 1.00F },	2479	{ 0.11f, 0.56f, 1.00f },
1869	{ 0.93F, 0.46F, 0.00F },	2480	{ 0.93f, 0.46f, 0.00f },
1870	{ 0.18F, 0.54F, 0.34F },	2481	{ 0.18f, 0.54f, 0.34f },
1871		2482
1872	{ 0.56F, 0.73F, 0.56F },	2483	{ 0.56f, 0.73f, 0.56f },
1873	{ 0.80F, 0.80F, 0.80F },	2484	{ 0.80f, 0.80f, 0.80f },
1874	{ 0.55F, 0.41F, 0.13F },	2485	{ 0.55f, 0.41f, 0.13f },
1875	{ 0.99F, 0.77F, 0.26F },	2486	{ 0.99f, 0.77f, 0.26f },
1876		2487
1877	{ 0.74F, 0.65F, 0.41F },	2488	{ 0.74f, 0.65f, 0.41f },
1878		2489
1879	{ 0.00F, 1.00F, 1.00F },	2490	{ 0.00f, 1.00f, 1.00f },
1880	{ 1.00F, 0.00F, 1.00F },	2491	{ 1.00f, 0.00f, 1.00f },
1881	{ 1.00F, 1.00F, 0.00F },	2492	{ 1.00f, 1.00f, 0.00f },
1882	};	2493	};
1883		2494
1884	int x, y;	2495	int x, y;
1885		2496
1886	glEnable (GL_TEXTURE_2D);	2497	glEnable (GL_TEXTURE_2D);
		2498	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2499	* but the nvidia driver (185.18.14) mishandles alpha textures
		2500	* and takes the colour from god knows where instead of using
		2501	* Cp. MODULATE results in the same colour, but slightly different
		2502	* alpha, but atcually gives us the correct colour with nvidia.
		2503	*/
1887	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2504	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1888	glEnable (GL_BLEND);	2505	glEnable (GL_BLEND);
1889	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2506	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1890	glBegin (GL_QUADS);	2507	glBegin (GL_QUADS);
1891		2508
1892	for (y = 0; y < h; y++)	2509	for (y = 0; y < h; y++)
…		…
1896		2513
1897	if (m)	2514	if (m)
1898	{	2515	{
1899	float *c = color [m & 15];	2516	float *c = color [m & 15];
1900		2517
1901	float tx1 = m & 0x40 ? 0.5 : 0.;	2518	float tx1 = m & 0x40 ? 0.5f : 0.f;
1902	float tx2 = tx1 + 0.5;	2519	float tx2 = tx1 + 0.5f;
1903		2520
1904	glColor4f (c[0], c[1], c[2], 0.75);	2521	glColor4f (c[0], c[1], c[2], 1);
1905	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2522	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1906	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2523	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1907	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2524	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1908	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2525	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1909	}	2526	}
…		…
1913	glDisable (GL_BLEND);	2530	glDisable (GL_BLEND);
1914	glDisable (GL_TEXTURE_2D);	2531	glDisable (GL_TEXTURE_2D);
1915	}	2532	}
1916		2533
1917	void	2534	void
1918	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2535	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1919	PPCODE:	2536	PPCODE:
1920	{	2537	{
1921	int x, y;	2538	int x, y;
1922	int sw4 = (sw + 3) & ~3;	2539	int sw1 = sw + 2;
		2540	int sh1 = sh + 2;
		2541	int sh3 = sh * 3;
		2542	int sw3 = sw * 3;
		2543	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1923	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	2544	SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1924	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	2545	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1925		2546
1926	memset (darkness, 255, sw4 * sh);
1927	SvPOK_only (darkness_sv);	2547	SvPOK_only (darkness3_sv);
1928	SvCUR_set (darkness_sv, sw4 * sh);	2548	SvCUR_set (darkness3_sv, sw3 * sh3);
1929		2549
1930	mx += self->x;	2550	mx += self->x - 1;
1931	my += self->y;	2551	my += self->y - 1;
1932		2552
1933	for (y = 0; y < sh; y++)	2553	for (y = 0; y < sh1; y++)
1934	if (0 <= y + my && y + my < self->rows)	2554	if (0 <= y + my && y + my < self->rows)
1935	{	2555	{
1936	maprow *row = self->row + (y + my);	2556	maprow *row = self->row + (y + my);
1937		2557
1938	for (x = 0; x < sw; x++)	2558	for (x = 0; x < sw1; x++)
1939	if (row->c0 <= x + mx && x + mx < row->c1)	2559	if (row->c0 <= x + mx && x + mx < row->c1)
1940	{	2560	{
1941	mapcell *cell = row->col + (x + mx - row->c0);	2561	mapcell *cell = row->col + (x + mx - row->c0);
1942		2562
1943	darkness[y * sw4 + x] = cell->darkness	2563	darkness1 [y * sw1 + x] = cell->darkness
1944	? 255 - (cell->darkness - 1)	2564	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1945	: 255 - FOW_DARKNESS;	2565	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
1946	}	2566	}
1947	}	2567	}
1948		2568
		2569	for (y = 0; y < sh; ++y)
		2570	for (x = 0; x < sw; ++x)
		2571	{
		2572	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2573	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2574	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2575	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2576	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2577	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2578	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2579	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2580	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2581
		2582	uint8_t r11 = (d11 + d21 + d12) / 3;
		2583	uint8_t r21 = d21;
		2584	uint8_t r31 = (d21 + d31 + d32) / 3;
		2585
		2586	uint8_t r12 = d12;
		2587	uint8_t r22 = d22;
		2588	uint8_t r32 = d32;
		2589
		2590	uint8_t r13 = (d13 + d23 + d12) / 3;
		2591	uint8_t r23 = d23;
		2592	uint8_t r33 = (d23 + d33 + d32) / 3;
		2593
		2594	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
		2595	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
		2596	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
		2597	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
		2598	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
		2599	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
		2600	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
		2601	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
		2602	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
		2603	}
		2604
		2605	free (darkness1);
		2606
1949	EXTEND (SP, 3);	2607	EXTEND (SP, 3);
1950	PUSHs (sv_2mortal (newSViv (sw4)));	2608	PUSHs (sv_2mortal (newSViv (sw3)));
1951	PUSHs (sv_2mortal (newSViv (sh)));	2609	PUSHs (sv_2mortal (newSViv (sh3)));
1952	PUSHs (darkness_sv);	2610	PUSHs (darkness3_sv);
1953	}	2611	}
1954		2612
1955	SV *	2613	SV *
1956	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2614	get_rect (DC::Map self, int x0, int y0, int w, int h)
1957	CODE:	2615	CODE:
1958	{	2616	{
1959	int x, y, x1, y1;	2617	int x, y, x1, y1;
1960	SV *data_sv = newSV (w * h * 7 + 5);	2618	SV *data_sv = newSV (w * h * 7 + 5);
1961	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2619	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2018	else	2676	else
2019	*data++ = 0;	2677	*data++ = 0;
2020	}	2678	}
2021	}	2679	}
2022		2680
		2681	/* if size is w*h + 5 then no data has been found */
		2682	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2683	{
2023	SvPOK_only (data_sv);	2684	SvPOK_only (data_sv);
2024	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2685	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2686	}
		2687
2025	RETVAL = data_sv;	2688	RETVAL = data_sv;
2026	}	2689	}
2027	OUTPUT:	2690	OUTPUT:
2028	RETVAL	2691	RETVAL
2029		2692
2030	void	2693	void
2031	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2694	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2032	PPCODE:	2695	PPCODE:
2033	{	2696	{
2034	int x, y, z;	2697	int x, y, z;
2035	int w, h;	2698	int w, h;
2036	int x1, y1;	2699	int x1, y1;
		2700	STRLEN len;
		2701	uint8_t *data, *end;
		2702
		2703	len = SvLEN (data_sv);
		2704	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2705	data = SvPVbyte_nolen (data_sv);
		2706	end = data + len + 8;
		2707
		2708	if (len < 5)
		2709	XSRETURN_EMPTY;
2037		2710
2038	if (*data++ != 0)	2711	if (*data++ != 0)
2039	return; /* version mismatch */	2712	XSRETURN_EMPTY; /* version mismatch */
2040		2713
2041	w = *data++ << 8; w |= *data++;	2714	w = *data++ << 8; w |= *data++;
2042	h = *data++ << 8; h |= *data++;	2715	h = *data++ << 8; h |= *data++;
2043		2716
2044	// we need to do this 'cause we don't keep an absolute coord system for rows	2717	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2056	{	2729	{
2057	maprow *row = map_get_row (self, y);	2730	maprow *row = map_get_row (self, y);
2058		2731
2059	for (x = x0; x < x1; x++)	2732	for (x = x0; x < x1; x++)
2060	{	2733	{
		2734	uint8_t flags;
		2735
		2736	if (data + 7 >= end)
		2737	XSRETURN_EMPTY;
		2738
2061	uint8_t flags = *data++;	2739	flags = *data++;
2062		2740
2063	if (flags)	2741	if (flags)
2064	{	2742	{
2065	mapcell *cell = row_get_cell (row, x);	2743	mapcell *cell = row_get_cell (row, x);
2066	tileid tile[3] = { 0, 0, 0 };	2744	tileid tile[3] = { 0, 0, 0 };
…		…
2069	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2747	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2070	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2748	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2071		2749
2072	if (cell->darkness == 0)	2750	if (cell->darkness == 0)
2073	{	2751	{
2074	cell->darkness = 0;	2752	/*cell->darkness = 0;*/
		2753	EXTEND (SP, 3);
2075		2754
2076	for (z = 0; z <= 2; z++)	2755	for (z = 0; z <= 2; z++)
2077	{	2756	{
2078	tileid t = tile [z];	2757	tileid t = tile [z];
2079		2758
2080	if (t >= self->texs || (t && !self->tex [t].name))	2759	if (t >= self->texs || (t && !self->tex [t].name))
2081	{	2760	{
2082	XPUSHs (sv_2mortal (newSViv (t)));	2761	PUSHs (sv_2mortal (newSViv (t)));
2083	need_texid (self, t);	2762	need_texid (self, t);
2084	}	2763	}
2085		2764
2086	cell->tile [z] = t;	2765	cell->tile [z] = t;
2087	}	2766	}
…		…
2089	}	2768	}
2090	}	2769	}
2091	}	2770	}
2092	}	2771	}
2093		2772
2094	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2773	MODULE = Deliantra::Client PACKAGE = DC::RW
2095		2774
2096	CFPlus::MixChunk	2775	DC::RW
2097	new_from_file (SV *class, char *path)	2776	new (SV *class, SV *data_sv)
2098	CODE:	2777	CODE:
2099	RETVAL = Mix_LoadWAV (path);	2778	{
		2779	STRLEN datalen;
		2780	char *data = SvPVbyte (data_sv, datalen);
		2781
		2782	RETVAL = SDL_RWFromConstMem (data, datalen);
		2783	}
2100	OUTPUT:	2784	OUTPUT:
2101	RETVAL	2785	RETVAL
2102		2786
		2787	DC::RW
		2788	new_from_file (SV *class, const char *path, const char *mode = "rb")
		2789	CODE:
		2790	RETVAL = SDL_RWFromFile (path, mode);
		2791	OUTPUT:
		2792	RETVAL
		2793
		2794	# fails on win32:
		2795	# dc.xs(2268) : error C2059: syntax error : '('
2103	void	2796	#void
		2797	#close (DC::RW self)
		2798	# CODE:
		2799	# (self->(close)) (self);
		2800
		2801	MODULE = Deliantra::Client PACKAGE = DC::Channel
		2802
		2803	PROTOTYPES: DISABLE
		2804
		2805	DC::Channel
		2806	find ()
		2807	CODE:
		2808	{
		2809	RETVAL = Mix_GroupAvailable (-1);
		2810
		2811	if (RETVAL < 0)
		2812	{
		2813	RETVAL = Mix_GroupOldest (-1);
		2814
		2815	if (RETVAL < 0)
		2816	{
		2817	// happens sometimes, maybe it just stopped playing(?)
		2818	RETVAL = Mix_GroupAvailable (-1);
		2819
		2820	if (RETVAL < 0)
		2821	XSRETURN_UNDEF;
		2822	}
		2823	else
		2824	Mix_HaltChannel (RETVAL);
		2825	}
		2826
		2827	Mix_UnregisterAllEffects (RETVAL);
		2828	Mix_Volume (RETVAL, 128);
		2829	}
		2830	OUTPUT:
		2831	RETVAL
		2832
		2833	void
		2834	halt (DC::Channel self)
		2835	CODE:
		2836	Mix_HaltChannel (self);
		2837
		2838	void
		2839	expire (DC::Channel self, int ticks = -1)
		2840	CODE:
		2841	Mix_ExpireChannel (self, ticks);
		2842
		2843	void
		2844	fade_out (DC::Channel self, int ticks = -1)
		2845	CODE:
		2846	Mix_FadeOutChannel (self, ticks);
		2847
		2848	int
		2849	volume (DC::Channel self, int volume)
		2850	CODE:
		2851	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
		2852	OUTPUT:
		2853	RETVAL
		2854
		2855	void
		2856	unregister_all_effects (DC::Channel self)
		2857	CODE:
		2858	Mix_UnregisterAllEffects (self);
		2859
		2860	void
		2861	set_panning (DC::Channel self, int left, int right)
		2862	CODE:
		2863	left = CLAMP (left , 0, 255);
		2864	right = CLAMP (right, 0, 255);
		2865	Mix_SetPanning (self, left, right);
		2866
		2867	void
		2868	set_distance (DC::Channel self, int distance)
		2869	CODE:
		2870	Mix_SetDistance (self, CLAMP (distance, 0, 255));
		2871
		2872	void
		2873	set_position (DC::Channel self, int angle, int distance)
		2874	CODE:
		2875
		2876	void
		2877	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2878	CODE:
		2879	{
		2880	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2881	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
		2882	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2883	}
		2884
		2885	void
		2886	set_reverse_stereo (DC::Channel self, int flip)
		2887	CODE:
		2888	Mix_SetReverseStereo (self, flip);
		2889
		2890	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
		2891
		2892	PROTOTYPES: DISABLE
		2893
		2894	void
		2895	decoders ()
		2896	PPCODE:
		2897	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2898	int i, num = Mix_GetNumChunkDecoders ();
		2899	EXTEND (SP, num);
		2900	for (i = 0; i < num; ++i)
		2901	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2902	#else
		2903	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2904	#endif
		2905
		2906	DC::MixChunk
		2907	new (SV *class, DC::RW rwops)
		2908	CODE:
		2909	RETVAL = Mix_LoadWAV_RW (rwops, 1);
		2910	OUTPUT:
		2911	RETVAL
		2912
		2913	void
2104	DESTROY (CFPlus::MixChunk self)	2914	DESTROY (DC::MixChunk self)
2105	CODE:	2915	CODE:
2106	Mix_FreeChunk (self);	2916	Mix_FreeChunk (self);
2107		2917
2108	int	2918	int
2109	volume (CFPlus::MixChunk self, int volume = -1)	2919	volume (DC::MixChunk self, int volume = -1)
2110	CODE:	2920	CODE:
		2921	if (items > 1)
		2922	volume = CLAMP (volume, 0, 128);
2111	RETVAL = Mix_VolumeChunk (self, volume);	2923	RETVAL = Mix_VolumeChunk (self, volume);
2112	OUTPUT:	2924	OUTPUT:
2113	RETVAL	2925	RETVAL
2114		2926
2115	int	2927	DC::Channel
2116	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2928	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2117	CODE:	2929	CODE:
		2930	{
2118	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2931	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2932
		2933	if (RETVAL < 0)
		2934	XSRETURN_UNDEF;
		2935
		2936	if (channel < 0)
		2937	{
		2938	Mix_UnregisterAllEffects (RETVAL);
		2939	Mix_Volume (RETVAL, 128);
		2940	}
		2941	}
2119	OUTPUT:	2942	OUTPUT:
2120	RETVAL	2943	RETVAL
2121		2944
2122	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2945	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
		2946
		2947	void
		2948	decoders ()
		2949	PPCODE:
		2950	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2951	int i, num = Mix_GetNumMusicDecoders ();
		2952	EXTEND (SP, num);
		2953	for (i = 0; i < num; ++i)
		2954	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2955	#else
		2956	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2957	#endif
2123		2958
2124	int	2959	int
2125	volume (int volume = -1)	2960	volume (int volume = -1)
		2961	PROTOTYPE: ;$
2126	CODE:	2962	CODE:
		2963	if (items > 0)
		2964	volume = CLAMP (volume, 0, 128);
2127	RETVAL = Mix_VolumeMusic (volume);	2965	RETVAL = Mix_VolumeMusic (volume);
2128	OUTPUT:	2966	OUTPUT:
2129	RETVAL	2967	RETVAL
2130		2968
2131	CFPlus::MixMusic	2969	void
2132	new_from_file (SV *class, char *path)	2970	fade_out (int ms)
2133	CODE:	2971	CODE:
2134	RETVAL = Mix_LoadMUS (path);	2972	Mix_FadeOutMusic (ms);
		2973
		2974	void
		2975	halt ()
		2976	CODE:
		2977	Mix_HaltMusic ();
		2978
		2979	int
		2980	playing ()
		2981	CODE:
		2982	RETVAL = Mix_PlayingMusic ();
2135	OUTPUT:	2983	OUTPUT:
2136	RETVAL	2984	RETVAL
2137		2985
		2986	DC::MixMusic
		2987	new (SV *class, DC::RW rwops)
		2988	CODE:
		2989	RETVAL = Mix_LoadMUS_RW (rwops);
		2990	OUTPUT:
		2991	RETVAL
		2992
2138	void	2993	void
2139	DESTROY (CFPlus::MixMusic self)	2994	DESTROY (DC::MixMusic self)
2140	CODE:	2995	CODE:
2141	Mix_FreeMusic (self);	2996	Mix_FreeMusic (self);
2142		2997
2143	int	2998	int
2144	play (CFPlus::MixMusic self, int loops = -1)	2999	play (DC::MixMusic self, int loops = -1)
2145	CODE:	3000	CODE:
2146	RETVAL = Mix_PlayMusic (self, loops);	3001	RETVAL = Mix_PlayMusic (self, loops);
2147	OUTPUT:	3002	OUTPUT:
2148	RETVAL	3003	RETVAL
2149		3004
2150	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	3005	void
		3006	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
		3007	CODE:
		3008	Mix_FadeInMusicPos (self, loops, ms, position);
		3009
		3010	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
		3011
		3012	PROTOTYPES: ENABLE
2151		3013
2152	BOOT:	3014	BOOT:
2153	{	3015	{
2154	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	3016	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2155	static const struct {	3017	static const struct {
2156	const char *name;	3018	const char *name;
2157	IV iv;	3019	IV iv;
2158	} *civ, const_iv[] = {	3020	} *civ, const_iv[] = {
2159	# define const_iv(name) { # name, (IV)name }	3021	# define const_iv(name) { # name, (IV)name }
		3022	const_iv (GL_VENDOR),
		3023	const_iv (GL_VERSION),
		3024	const_iv (GL_EXTENSIONS),
		3025	const_iv (GL_MAX_TEXTURE_UNITS),
2160	const_iv (GL_COLOR_MATERIAL),	3026	const_iv (GL_COLOR_MATERIAL),
2161	const_iv (GL_SMOOTH),	3027	const_iv (GL_SMOOTH),
2162	const_iv (GL_FLAT),	3028	const_iv (GL_FLAT),
2163	const_iv (GL_DITHER),	3029	const_iv (GL_DITHER),
2164	const_iv (GL_BLEND),	3030	const_iv (GL_BLEND),
…		…
2168	const_iv (GL_ALPHA_TEST),	3034	const_iv (GL_ALPHA_TEST),
2169	const_iv (GL_NORMALIZE),	3035	const_iv (GL_NORMALIZE),
2170	const_iv (GL_RESCALE_NORMAL),	3036	const_iv (GL_RESCALE_NORMAL),
2171	const_iv (GL_FRONT),	3037	const_iv (GL_FRONT),
2172	const_iv (GL_BACK),	3038	const_iv (GL_BACK),
		3039	const_iv (GL_AUX0),
2173	const_iv (GL_AND),	3040	const_iv (GL_AND),
2174	const_iv (GL_ONE),	3041	const_iv (GL_ONE),
2175	const_iv (GL_ZERO),	3042	const_iv (GL_ZERO),
2176	const_iv (GL_SRC_ALPHA),	3043	const_iv (GL_SRC_ALPHA),
2177	const_iv (GL_DST_ALPHA),	3044	const_iv (GL_DST_ALPHA),
2178	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3045	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2179	const_iv (GL_ONE_MINUS_DST_ALPHA),	3046	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3047	const_iv (GL_SRC_COLOR),
		3048	const_iv (GL_DST_COLOR),
		3049	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3050	const_iv (GL_ONE_MINUS_DST_COLOR),
2180	const_iv (GL_SRC_ALPHA_SATURATE),	3051	const_iv (GL_SRC_ALPHA_SATURATE),
2181	const_iv (GL_RGB),	3052	const_iv (GL_RGB),
2182	const_iv (GL_RGBA),	3053	const_iv (GL_RGBA),
2183	const_iv (GL_RGBA4),	3054	const_iv (GL_RGBA4),
2184	const_iv (GL_RGBA8),	3055	const_iv (GL_RGBA8),
…		…
2190	const_iv (GL_INTENSITY),	3061	const_iv (GL_INTENSITY),
2191	const_iv (GL_LUMINANCE),	3062	const_iv (GL_LUMINANCE),
2192	const_iv (GL_LUMINANCE_ALPHA),	3063	const_iv (GL_LUMINANCE_ALPHA),
2193	const_iv (GL_FLOAT),	3064	const_iv (GL_FLOAT),
2194	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	3065	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		3066	const_iv (GL_COMPRESSED_ALPHA_ARB),
		3067	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		3068	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		3069	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		3070	const_iv (GL_COMPRESSED_RGB_ARB),
		3071	const_iv (GL_COMPRESSED_RGBA_ARB),
2195	const_iv (GL_COMPILE),	3072	const_iv (GL_COMPILE),
		3073	const_iv (GL_PROXY_TEXTURE_1D),
		3074	const_iv (GL_PROXY_TEXTURE_2D),
2196	const_iv (GL_TEXTURE_1D),	3075	const_iv (GL_TEXTURE_1D),
2197	const_iv (GL_TEXTURE_2D),	3076	const_iv (GL_TEXTURE_2D),
2198	const_iv (GL_TEXTURE_ENV),	3077	const_iv (GL_TEXTURE_ENV),
2199	const_iv (GL_TEXTURE_MAG_FILTER),	3078	const_iv (GL_TEXTURE_MAG_FILTER),
2200	const_iv (GL_TEXTURE_MIN_FILTER),	3079	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2221	const_iv (GL_COLOR_LOGIC_OP),	3100	const_iv (GL_COLOR_LOGIC_OP),
2222	const_iv (GL_SEPARABLE_2D),	3101	const_iv (GL_SEPARABLE_2D),
2223	const_iv (GL_CONVOLUTION_2D),	3102	const_iv (GL_CONVOLUTION_2D),
2224	const_iv (GL_CONVOLUTION_BORDER_MODE),	3103	const_iv (GL_CONVOLUTION_BORDER_MODE),
2225	const_iv (GL_CONSTANT_BORDER),	3104	const_iv (GL_CONSTANT_BORDER),
		3105	const_iv (GL_POINTS),
2226	const_iv (GL_LINES),	3106	const_iv (GL_LINES),
2227	const_iv (GL_LINE_STRIP),	3107	const_iv (GL_LINE_STRIP),
2228	const_iv (GL_LINE_LOOP),	3108	const_iv (GL_LINE_LOOP),
2229	const_iv (GL_QUADS),	3109	const_iv (GL_QUADS),
2230	const_iv (GL_QUAD_STRIP),	3110	const_iv (GL_QUAD_STRIP),
2231	const_iv (GL_TRIANGLES),	3111	const_iv (GL_TRIANGLES),
2232	const_iv (GL_TRIANGLE_STRIP),	3112	const_iv (GL_TRIANGLE_STRIP),
2233	const_iv (GL_TRIANGLE_FAN),	3113	const_iv (GL_TRIANGLE_FAN),
		3114	const_iv (GL_POLYGON),
2234	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	3115	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		3116	const_iv (GL_POINT_SMOOTH_HINT),
		3117	const_iv (GL_LINE_SMOOTH_HINT),
		3118	const_iv (GL_POLYGON_SMOOTH_HINT),
		3119	const_iv (GL_GENERATE_MIPMAP_HINT),
		3120	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2235	const_iv (GL_FASTEST),	3121	const_iv (GL_FASTEST),
		3122	const_iv (GL_DONT_CARE),
		3123	const_iv (GL_NICEST),
2236	const_iv (GL_V2F),	3124	const_iv (GL_V2F),
2237	const_iv (GL_V3F),	3125	const_iv (GL_V3F),
2238	const_iv (GL_T2F_V3F),	3126	const_iv (GL_T2F_V3F),
2239	const_iv (GL_T2F_N3F_V3F),	3127	const_iv (GL_T2F_N3F_V3F),
		3128	const_iv (GL_FUNC_ADD),
		3129	const_iv (GL_FUNC_SUBTRACT),
		3130	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2240	# undef const_iv	3131	# undef const_iv
2241	};	3132	};
2242		3133
2243	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3134	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2244	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3135	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2245		3136
2246	texture_av = newAV ();	3137	texture_av = newAV ();
2247	AvREAL_off (texture_av);	3138	AvREAL_off (texture_av);
2248	}	3139	}
2249		3140
		3141	void
		3142	disable_GL_EXT_blend_func_separate ()
		3143	CODE:
		3144	gl.BlendFuncSeparate = 0;
		3145	gl.BlendFuncSeparateEXT = 0;
		3146
		3147	void
		3148	apple_nvidia_bug (int enable)
		3149
2250	char *	3150	char *
2251	gl_vendor ()	3151	gl_vendor ()
2252	CODE:	3152	CODE:
2253	RETVAL = (char *)glGetString (GL_VENDOR);	3153	RETVAL = (char *)glGetString (GL_VENDOR);
2254	OUTPUT:	3154	OUTPUT:
…		…
2266	CODE:	3166	CODE:
2267	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3167	RETVAL = (char *)glGetString (GL_EXTENSIONS);
2268	OUTPUT:	3168	OUTPUT:
2269	RETVAL	3169	RETVAL
2270		3170
		3171	const char *glGetString (GLenum pname)
		3172
		3173	GLint glGetInteger (GLenum pname)
		3174	CODE:
		3175	glGetIntegerv (pname, &RETVAL);
		3176	OUTPUT:
		3177	RETVAL
		3178
		3179	GLdouble glGetDouble (GLenum pname)
		3180	CODE:
		3181	glGetDoublev (pname, &RETVAL);
		3182	OUTPUT:
		3183	RETVAL
		3184
2271	int glGetError ()	3185	int glGetError ()
2272		3186
2273	void glFinish ()	3187	void glFinish ()
		3188
		3189	void glFlush ()
2274		3190
2275	void glClear (int mask)	3191	void glClear (int mask)
2276		3192
2277	void glClearColor (float r, float g, float b, float a = 1.0)	3193	void glClearColor (float r, float g, float b, float a = 1.0)
2278	PROTOTYPE: @	3194	PROTOTYPE: @
…		…
2289		3205
2290	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3206	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2291	CODE:	3207	CODE:
2292	gl_BlendFuncSeparate (sa, da, saa, daa);	3208	gl_BlendFuncSeparate (sa, da, saa, daa);
2293		3209
		3210	# void glBlendEquation (int se)
		3211
2294	void glDepthMask (int flag)	3212	void glDepthMask (int flag)
2295		3213
2296	void glLogicOp (int opcode)	3214	void glLogicOp (int opcode)
2297		3215
2298	void glColorMask (int red, int green, int blue, int alpha)	3216	void glColorMask (int red, int green, int blue, int alpha)
…		…
2312	# near_ and far_ are due to microsofts buggy "c" compiler	3230	# near_ and far_ are due to microsofts buggy "c" compiler
2313	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	3231	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2314		3232
2315	# near_ and far_ are due to microsofts buggy "c" compiler	3233	# near_ and far_ are due to microsofts buggy "c" compiler
2316	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	3234	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
		3235
		3236	PROTOTYPES: DISABLE
2317		3237
2318	void glViewport (int x, int y, int width, int height)	3238	void glViewport (int x, int y, int width, int height)
2319		3239
2320	void glScissor (int x, int y, int width, int height)	3240	void glScissor (int x, int y, int width, int height)
2321		3241
…		…
2329		3249
2330	void glRotate (float angle, float x, float y, float z)	3250	void glRotate (float angle, float x, float y, float z)
2331	CODE:	3251	CODE:
2332	glRotatef (angle, x, y, z);	3252	glRotatef (angle, x, y, z);
2333		3253
2334	void glBegin (int mode)
2335
2336	void glEnd ()
2337
2338	void glColor (float r, float g, float b, float a = 1.0)	3254	void glColor (float r, float g, float b, float a = 1.0)
2339	PROTOTYPE: @	3255	PROTOTYPE: @
2340	ALIAS:	3256	ALIAS:
2341	glColor_premultiply = 1	3257	glColor_premultiply = 1
2342	CODE:	3258	CODE:
2343	if (ix)	3259	if (ix)
2344	{	3260	{
…		…
2347	b *= a;	3263	b *= a;
2348	}	3264	}
2349	// microsoft visual "c" rounds instead of truncating...	3265	// microsoft visual "c" rounds instead of truncating...
2350	glColor4f (r, g, b, a);	3266	glColor4f (r, g, b, a);
2351		3267
2352	void glInterleavedArrays (int format, int stride, char *data)
2353
2354	void glDrawElements (int mode, int count, int type, char *indices)
2355
2356	# 1.2 void glDrawRangeElements (int mode, int start, int end
2357
2358	void glRasterPos (float x, float y, float z = 0.)	3268	void glRasterPos (float x, float y, float z = 0.)
2359	CODE:	3269	CODE:
2360	glRasterPos3f (0, 0, z);	3270	glRasterPos3f (0, 0, z);
2361	glBitmap (0, 0, 0, 0, x, y, 0);	3271	glBitmap (0, 0, 0, 0, x, y, 0);
2362		3272
…		…
2366		3276
2367	void glTexCoord (float s, float t)	3277	void glTexCoord (float s, float t)
2368	CODE:	3278	CODE:
2369	glTexCoord2f (s, t);	3279	glTexCoord2f (s, t);
2370		3280
		3281	void glRect (float x1, float y1, float x2, float y2)
		3282	CODE:
		3283	glRectf (x1, y1, x2, y2);
		3284
		3285	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3286	CODE:
		3287	glBegin (GL_LINE_LOOP);
		3288	glVertex2f (x1, y1);
		3289	glVertex2f (x2, y1);
		3290	glVertex2f (x2, y2);
		3291	glVertex2f (x1, y2);
		3292	glEnd ();
		3293
		3294	PROTOTYPES: ENABLE
		3295
		3296	void glBegin (int mode)
		3297
		3298	void glEnd ()
		3299
		3300	void glPointSize (GLfloat size)
		3301
		3302	void glLineWidth (GLfloat width)
		3303
		3304	void glInterleavedArrays (int format, int stride, char *data)
		3305
		3306	void glDrawElements (int mode, int count, int type, char *indices)
		3307
		3308	# 1.2 void glDrawRangeElements (int mode, int start, int end
		3309
2371	void glTexEnv (int target, int pname, float param)	3310	void glTexEnv (int target, int pname, float param)
2372	CODE:	3311	CODE:
2373	glTexEnvf (target, pname, param);	3312	glTexEnvf (target, pname, param);
2374		3313
2375	void glTexParameter (int target, int pname, float param)	3314	void glTexParameter (int target, int pname, float param)
…		…
2391	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3330	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2392	CODE:	3331	CODE:
2393	if (gl.SeparableFilter2D)	3332	if (gl.SeparableFilter2D)
2394	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3333	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2395		3334
2396	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3335	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2397		3336
2398	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3337	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2399		3338
2400	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3339	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		3340
		3341	void glPixelZoom (float x, float y)
2401		3342
2402	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	3343	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2403		3344
2404	int glGenTexture ()	3345	int glGenTexture ()
2405	CODE:	3346	CODE:
…		…
2425		3366
2426	void glEndList ()	3367	void glEndList ()
2427		3368
2428	void glCallList (int list)	3369	void glCallList (int list)
2429		3370
		3371	void c_init ()
		3372	CODE:
		3373	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3374	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3375
		3376	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
		3377
		3378	PROTOTYPES: DISABLE
		3379
		3380	void
		3381	find_widget (SV *self, NV x, NV y)
		3382	PPCODE:
		3383	{
		3384	if (within_widget (self, x, y))
		3385	XPUSHs (self);
		3386	}
		3387
		3388	BOOT:
		3389	{
		3390	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
		3391
		3392	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
		3393	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
		3394	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
		3395	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
		3396	}
		3397
		3398	void
		3399	draw (SV *self)
		3400	CODE:
		3401	{
		3402	HV *hv;
		3403	SV **svp;
		3404	NV x, y, w, h;
		3405	SV *draw_x_sv = GvSV (draw_x_gv);
		3406	SV *draw_y_sv = GvSV (draw_y_gv);
		3407	SV *draw_w_sv = GvSV (draw_w_gv);
		3408	SV *draw_h_sv = GvSV (draw_h_gv);
		3409	double draw_x, draw_y;
		3410
		3411	if (!SvROK (self))
		3412	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
		3413
		3414	hv = (HV *)SvRV (self);
		3415
		3416	if (SvTYPE (hv) != SVt_PVHV)
		3417	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
		3418
		3419	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		3420	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		3421
		3422	if (!h || !w)
		3423	XSRETURN_EMPTY;
		3424
		3425	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		3426	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		3427
		3428	draw_x = SvNV (draw_x_sv) + x;
		3429	draw_y = SvNV (draw_y_sv) + y;
		3430
		3431	if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
		3432	|| draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
		3433	XSRETURN_EMPTY;
		3434
		3435	sv_setnv (draw_x_sv, draw_x);
		3436	sv_setnv (draw_y_sv, draw_y);
		3437
		3438	glPushMatrix ();
		3439	glTranslated (x, y, 0);
		3440
		3441	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		3442	{
		3443	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		3444
		3445	if (svp && SvTRUE (*svp))
		3446	{
		3447	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
		3448	glEnable (GL_BLEND);
		3449	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		3450	glBegin (GL_QUADS);
		3451	glVertex2f (0, 0);
		3452	glVertex2f (w, 0);
		3453	glVertex2f (w, h);
		3454	glVertex2f (0, h);
		3455	glEnd ();
		3456	glDisable (GL_BLEND);
		3457	}
		3458	}
		3459	#if 0
		3460	// draw borders, for debugging
		3461	glPushMatrix ();
		3462	glColor4f (1., 1., 0., 1.);
		3463	glTranslatef (.5, .5, 0.);
		3464	glBegin (GL_LINE_LOOP);
		3465	glVertex2f (0 , 0);
		3466	glVertex2f (w - 1, 0);
		3467	glVertex2f (w - 1, h - 1);
		3468	glVertex2f (0 , h - 1);
		3469	glEnd ();
		3470	glPopMatrix ();
		3471	#endif
		3472	PUSHMARK (SP);
		3473	XPUSHs (self);
		3474	PUTBACK;
		3475	call_method ("_draw", G_VOID | G_DISCARD);
		3476	SPAGAIN;
		3477
		3478	glPopMatrix ();
		3479
		3480	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		3481	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		3482	}
		3483

Diff Legend

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