[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC

…		…
40	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
41		41
42	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
44		44
		45	#define MIN_FONT_HEIGHT 10
		46
		47	#define GL_CALL(type,func,args) \
		48	{ \
		49	static int init_; \
		50	static type fptr_; \
		51	\
		52	if (!init_) \
		53	{ \
		54	init_ = 1; \
		55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		56	} \
		57	\
		58	if (fptr_) \
		59	fptr_ args; \
		60	}
		61
45	typedef Mix_Chunk *CFClient__MixChunk;	62	typedef Mix_Chunk *CFClient__MixChunk;
46	typedef Mix_Music *CFClient__MixMusic;	63	typedef Mix_Music *CFClient__MixMusic;
47		64
48	static PangoContext *context;	65	typedef PangoFontDescription *CFClient__Font;
49	static PangoFontMap *fontmap;
50		66
51	typedef struct cf_layout {	67	typedef struct cf_layout {
52	PangoLayout *pl;	68	PangoLayout *pl;
53	int base_height;	69	int base_height;
		70	CFClient__Font font;
54	} *CFClient__Layout;	71	} *CFClient__Layout;
		72
		73	static CFClient__Font default_font;
		74	static PangoContext *context;
		75	static PangoFontMap *fontmap;
55		76
56	static void	77	static void
57	substitute_func (FcPattern *pattern, gpointer data)	78	substitute_func (FcPattern *pattern, gpointer data)
58	{	79	{
59	FcPatternAddBool (pattern, FC_HINTING , 1);	80	FcPatternAddBool (pattern, FC_HINTING , 1);
60	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
61	}	82	}
62		83
63	static void	84	static void
64	layout_update (CFClient__Layout self)	85	layout_update_font (CFClient__Layout self)
65	{	86	{
66	/* use a random scale factor to account for unknown descenders, 0.8 works	87	/* use a random scale factor to account for unknown descenders, 0.8 works
67	* reasonably well with bitstream vera	88	* reasonably well with bitstream vera
68	*/	89	*/
69	PangoFontDescription *font = pango_context_get_font_description (context);	90	PangoFontDescription *font = self->font ? self->font : default_font;
70		91
71	int height = self->base_height * (PANGO_SCALE * 8 / 10);
72
73	if (pango_font_description_get_size (font) != height)
74	{
75	pango_font_description_set_absolute_size (font, height);	92	pango_font_description_set_absolute_size (font,
76	pango_layout_context_changed (self->pl);	93	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77	}	94
		95	pango_layout_set_font_description (self->pl, font);
78	}	96	}
79		97
80	static void	98	static void
81	layout_get_pixel_size (CFClient__Layout self, int w, int h)	99	layout_get_pixel_size (CFClient__Layout self, int w, int h)
82	{	100	{
83	layout_update (self);
84
85	pango_layout_get_pixel_size (self->pl, w, h);	101	pango_layout_get_pixel_size (self->pl, w, h);
86		102
87	w = (w + 3) & ~3;	103	w = (w + 3) & ~3;
88	if (!w) w = 1;	104	if (!w) w = 1;
89	if (!h) h = 1;	105	if (!h) h = 1;
…		…
249	SDL_UserEvent ev;	265	SDL_UserEvent ev;
250		266
251	ev.type = SDL_USEREVENT;	267	ev.type = SDL_USEREVENT;
252	ev.code = 0;	268	ev.code = 0;
253	ev.data1 = 0;	269	ev.data1 = 0;
		270	ev.data2 = 0;
		271
		272	SDL_PushEvent ((SDL_Event *)&ev);
		273	}
		274
		275	static void
		276	channel_finished (int channel)
		277	{
		278	SDL_UserEvent ev;
		279
		280	ev.type = SDL_USEREVENT;
		281	ev.code = 1;
		282	ev.data1 = (void *)channel;
254	ev.data2 = 0;	283	ev.data2 = 0;
255		284
256	SDL_PushEvent ((SDL_Event *)&ev);	285	SDL_PushEvent ((SDL_Event *)&ev);
257	}	286	}
258		287
…		…
441		470
442	while (SDL_PollEvent (&ev))	471	while (SDL_PollEvent (&ev))
443	{	472	{
444	HV *hv = newHV ();	473	HV *hv = newHV ();
445	hv_store (hv, "type", 4, newSViv (ev.type), 0);	474	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		475
446	switch (ev.type)	476	switch (ev.type)
447	{	477	{
448	case SDL_KEYDOWN:	478	case SDL_KEYDOWN:
449	case SDL_KEYUP:	479	case SDL_KEYUP:
450	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	480	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
470	case SDL_MOUSEBUTTONUP:	500	case SDL_MOUSEBUTTONUP:
471	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		505	break;
		506
		507	case SDL_USEREVENT:
		508	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		509	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		510	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		511	break;
475	}	512	}
476		513
477	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	514	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
478	}	515	}
479	}	516	}
480		517
481	int	518	int
482	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	519	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
483	POSTCALL:	520	POSTCALL:
484	Mix_HookMusicFinished (music_finished);	521	Mix_HookMusicFinished (music_finished);
		522	Mix_ChannelFinished (channel_finished);
485		523
486	void	524	void
487	Mix_CloseAudio ()	525	Mix_CloseAudio ()
488		526
489	int	527	int
…		…
512		550
513	void	551	void
514	add_font (char *file)	552	add_font (char *file)
515	CODE:	553	CODE:
516	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	554	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
517
518	void
519	set_font (char *file)
520	CODE:
521	{
522	int count;
523	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
524	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
525	FcPatternDestroy (pattern);
526	pango_context_set_font_description (context, font);
527	}
528		555
529	void	556	void
530	load_image_inline (SV *image_)	557	load_image_inline (SV *image_)
531	ALIAS:	558	ALIAS:
532	load_image_file = 1	559	load_image_file = 1
…		…
614	PUSHs (sv_2mortal (newSViv (b / y)));	641	PUSHs (sv_2mortal (newSViv (b / y)));
615	PUSHs (sv_2mortal (newSViv (a / y)));	642	PUSHs (sv_2mortal (newSViv (a / y)));
616	}	643	}
617		644
618	void	645	void
		646	error (char *message)
		647	CODE:
		648	#ifdef _WIN32
		649	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		650	#else
		651	fprintf (stderr, "ERROR: %s\n", message);
		652	#endif
		653
		654	void
619	fatal (char *message)	655	fatal (char *message)
620	CODE:	656	CODE:
621	#ifdef _WIN32	657	#ifdef _WIN32
622	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	658	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
623	#else	659	#else
624	fprintf (stderr, "FATAL: %s\n", message);	660	fprintf (stderr, "FATAL: %s\n", message);
625	#endif	661	#endif
626	exit (1);	662	exit (1);
627		663
		664	MODULE = CFClient PACKAGE = CFClient::Font
		665
		666	CFClient::Font
		667	new_from_file (SV class, char path, int id = 0)
		668	CODE:
		669	{
		670	int count;
		671	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		672	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		673	FcPatternDestroy (pattern);
		674	}
		675	OUTPUT:
		676	RETVAL
		677
		678	void
		679	DESTROY (CFClient::Font self)
		680	CODE:
		681	pango_font_description_free (self);
		682
		683	void
		684	make_default (CFClient::Font self)
		685	CODE:
		686	default_font = self;
		687
628	MODULE = CFClient PACKAGE = CFClient::Layout	688	MODULE = CFClient PACKAGE = CFClient::Layout
629		689
630	CFClient::Layout	690	CFClient::Layout
631	new (SV *class, int base_height = 10)	691	new (SV *class, int base_height = MIN_FONT_HEIGHT)
632	CODE:	692	CODE:
633	New (0, RETVAL, 1, struct cf_layout);	693	New (0, RETVAL, 1, struct cf_layout);
		694	RETVAL->pl = pango_layout_new (context);
634	RETVAL->base_height = base_height;	695	RETVAL->base_height = base_height;
635	RETVAL->pl = pango_layout_new (context);	696	RETVAL->font = 0;
636	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	697	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		698	pango_layout_set_font_description (RETVAL->pl, default_font);
637	OUTPUT:	699	OUTPUT:
638	RETVAL	700	RETVAL
639		701
640	void	702	void
641	DESTROY (CFClient::Layout self)	703	DESTROY (CFClient::Layout self)
…		…
670	SvUTF8_on (RETVAL);	732	SvUTF8_on (RETVAL);
671	OUTPUT:	733	OUTPUT:
672	RETVAL	734	RETVAL
673		735
674	void	736	void
		737	set_font (CFClient::Layout self, CFClient::Font font = 0)
		738	CODE:
		739	if (self->font != font)
		740	{
		741	self->font = font;
		742	layout_update_font (self);
		743	}
		744
		745	void
675	set_height (CFClient::Layout self, int base_height)	746	set_height (CFClient::Layout self, int base_height)
676	CODE:	747	CODE:
		748	if (self->base_height != base_height)
		749	{
677	self->base_height = base_height;	750	self->base_height = base_height;
		751	layout_update_font (self);
		752	}
678		753
679	void	754	void
680	set_width (CFClient::Layout self, int max_width = -1)	755	set_width (CFClient::Layout self, int max_width = -1)
681	CODE:	756	CODE:
682	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	757	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
685	size (CFClient::Layout self)	760	size (CFClient::Layout self)
686	PPCODE:	761	PPCODE:
687	{	762	{
688	int w, h;	763	int w, h;
689		764
690	layout_update (self);
691	layout_get_pixel_size (self, &w, &h);	765	layout_get_pixel_size (self, &w, &h);
692		766
693	EXTEND (SP, 2);	767	EXTEND (SP, 2);
694	PUSHs (sv_2mortal (newSViv (w)));	768	PUSHs (sv_2mortal (newSViv (w)));
695	PUSHs (sv_2mortal (newSViv (h)));	769	PUSHs (sv_2mortal (newSViv (h)));
…		…
698	int	772	int
699	xy_to_index (CFClient::Layout self, int x, int y)	773	xy_to_index (CFClient::Layout self, int x, int y)
700	CODE:	774	CODE:
701	{	775	{
702	int index, trailing;	776	int index, trailing;
703
704	layout_update (self);
705	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	777	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
706
707	RETVAL = index;	778	RETVAL = index;
708	}	779	}
709	OUTPUT:	780	OUTPUT:
710	RETVAL	781	RETVAL
711		782
712	void	783	void
713	cursor_pos (CFClient::Layout self, int index)	784	cursor_pos (CFClient::Layout self, int index)
714	PPCODE:	785	PPCODE:
715	{	786	{
716	PangoRectangle strong_pos;	787	PangoRectangle strong_pos;
717	layout_update (self);
718	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	788	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719		789
720	EXTEND (SP, 3);	790	EXTEND (SP, 3);
721	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	791	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	792	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
729	{	799	{
730	SV *retval;	800	SV *retval;
731	int w, h;	801	int w, h;
732	FT_Bitmap bitmap;	802	FT_Bitmap bitmap;
733		803
734	layout_update (self);
735	layout_get_pixel_size (self, &w, &h);	804	layout_get_pixel_size (self, &w, &h);
736		805
737	retval = newSV (w * h);	806	retval = newSV (w * h);
738	SvPOK_only (retval);	807	SvPOK_only (retval);
739	SvCUR_set (retval, w * h);	808	SvCUR_set (retval, w * h);
…		…
1301	} *civ, const_iv[] = {	1370	} *civ, const_iv[] = {
1302	# define const_iv(name) { # name, (IV)name }	1371	# define const_iv(name) { # name, (IV)name }
1303	const_iv (GL_COLOR_MATERIAL),	1372	const_iv (GL_COLOR_MATERIAL),
1304	const_iv (GL_SMOOTH),	1373	const_iv (GL_SMOOTH),
1305	const_iv (GL_FLAT),	1374	const_iv (GL_FLAT),
		1375	const_iv (GL_DITHER),
1306	const_iv (GL_BLEND),	1376	const_iv (GL_BLEND),
		1377	const_iv (GL_SCISSOR_TEST),
1307	const_iv (GL_AND),	1378	const_iv (GL_AND),
		1379	const_iv (GL_ONE),
		1380	const_iv (GL_ZERO),
1308	const_iv (GL_SRC_ALPHA),	1381	const_iv (GL_SRC_ALPHA),
		1382	const_iv (GL_SRC_ALPHA_SATURATE),
1309	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1383	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1384	const_iv (GL_ONE_MINUS_DST_ALPHA),
1310	const_iv (GL_RGB),	1385	const_iv (GL_RGB),
1311	const_iv (GL_RGBA),	1386	const_iv (GL_RGBA),
1312	const_iv (GL_UNSIGNED_BYTE),	1387	const_iv (GL_UNSIGNED_BYTE),
1313	const_iv (GL_ALPHA4),
1314	const_iv (GL_ALPHA),	1388	const_iv (GL_ALPHA),
1315	const_iv (GL_FLOAT),	1389	const_iv (GL_FLOAT),
1316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1390	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317	const_iv (GL_COMPILE),	1391	const_iv (GL_COMPILE),
1318	const_iv (GL_TEXTURE_1D),	1392	const_iv (GL_TEXTURE_1D),
…		…
1330	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1404	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1405	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1406	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1407	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334	const_iv (GL_GENERATE_MIPMAP),	1408	const_iv (GL_GENERATE_MIPMAP),
1335	const_iv (GL_LINEAR),
1336	const_iv (GL_MODULATE),	1409	const_iv (GL_MODULATE),
		1410	const_iv (GL_DECAL),
1337	const_iv (GL_REPLACE),	1411	const_iv (GL_REPLACE),
1338	const_iv (GL_COLOR_BUFFER_BIT),	1412	const_iv (GL_COLOR_BUFFER_BIT),
1339	const_iv (GL_PROJECTION),	1413	const_iv (GL_PROJECTION),
1340	const_iv (GL_MODELVIEW),	1414	const_iv (GL_MODELVIEW),
1341	const_iv (GL_COLOR_LOGIC_OP),	1415	const_iv (GL_COLOR_LOGIC_OP),
		1416	const_iv (GL_SEPARABLE_2D),
1342	const_iv (GL_CONVOLUTION_2D),	1417	const_iv (GL_CONVOLUTION_2D),
1343	const_iv (GL_CONVOLUTION_BORDER_MODE),	1418	const_iv (GL_CONVOLUTION_BORDER_MODE),
1344	const_iv (GL_CONSTANT_BORDER),	1419	const_iv (GL_CONSTANT_BORDER),
1345	const_iv (GL_LINES),	1420	const_iv (GL_LINES),
1346	const_iv (GL_QUADS),	1421	const_iv (GL_QUADS),
…		…
1371		1446
1372	void glBlendFunc (int sfactor, int dfactor)	1447	void glBlendFunc (int sfactor, int dfactor)
1373		1448
1374	void glLogicOp (int opcode)	1449	void glLogicOp (int opcode)
1375		1450
		1451	void glColorMask (int red, int green, int blue, int alpha)
		1452
1376	void glMatrixMode (int mode)	1453	void glMatrixMode (int mode)
1377		1454
1378	void glPushMatrix ()	1455	void glPushMatrix ()
1379		1456
1380	void glPopMatrix ()	1457	void glPopMatrix ()
1381		1458
1382	void glLoadIdentity ()	1459	void glLoadIdentity ()
1383		1460
		1461	# near and far are due to microsofts buggy c compiler
1384	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1462	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385		1463
1386	void glViewport (int x, int y, int width, int height)	1464	void glViewport (int x, int y, int width, int height)
		1465
		1466	void glScissor (int x, int y, int width, int height)
1387		1467
1388	void glTranslate (float x, float y, float z = 0.)	1468	void glTranslate (float x, float y, float z = 0.)
1389	CODE:	1469	CODE:
1390	glTranslatef (x, y, z);	1470	glTranslatef (x, y, z);
1391		1471
1392	void glScale (float x, float y, float z)	1472	void glScale (float x, float y, float z = 1.)
1393	CODE:	1473	CODE:
1394	glScalef (x, y, z);	1474	glScalef (x, y, z);
1395		1475
1396	void glRotate (float angle, float x, float y, float z)	1476	void glRotate (float angle, float x, float y, float z)
1397	CODE:	1477	CODE:
…		…
1402	void glEnd ()	1482	void glEnd ()
1403		1483
1404	void glColor (float r, float g, float b, float a = 1.0)	1484	void glColor (float r, float g, float b, float a = 1.0)
1405	PROTOTYPE: @	1485	PROTOTYPE: @
1406	CODE:	1486	CODE:
1407	glColor4f (r, g, b, a);	1487	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1408		1488
1409	void glVertex (float x, float y, float z = 0.)	1489	void glVertex (float x, float y, float z = 0.)
1410	CODE:	1490	CODE:
1411	glVertex3f (x, y, z);	1491	glVertex3f (x, y, z);
1412		1492
…		…
1424		1504
1425	void glBindTexture (int target, int name)	1505	void glBindTexture (int target, int name)
1426		1506
1427	void glConvolutionParameter (int target, int pname, float params)	1507	void glConvolutionParameter (int target, int pname, float params)
1428	CODE:	1508	CODE:
1429	glConvolutionParameterf (target, pname, params);	1509	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1430		1510
1431	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1511	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1512	CODE:
		1513	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1514	(target, internalformat, width, height, format, type, data));
		1515
		1516	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1517	CODE:
		1518	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1519	(target, internalformat, width, height, format, type, row, column));
1432		1520
1433	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1521	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1434		1522
1435	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1523	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1524
		1525	void glRasterPos (int x, int y)
		1526	CODE:
		1527	glRasterPos2i (x, y);
		1528
		1529	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1436		1530
1437	int glGenTexture ()	1531	int glGenTexture ()
1438	CODE:	1532	CODE:
1439	{	1533	{
1440	GLuint name;	1534	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs. Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC