ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# include <malloc.h> 2# include <malloc.h>
3# pragma warning(disable:4244)
3#endif 4#endif
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
… …
42#define MAP_EXTEND_X 32 43#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 44#define MAP_EXTEND_Y 512
44 45
45#define MIN_FONT_HEIGHT 10 46#define MIN_FONT_HEIGHT 10
46 47
48#define GL_CALL(type,func,args) \
49 { \
50 static int init_; \
51 static type fptr_; \
52 \
53 if (!init_) \
54 { \
55 init_ = 1; \
56 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
57 } \
58 \
59 if (fptr_) \
60 fptr_ args; \
61 }
62
47typedef Mix_Chunk *CFClient__MixChunk; 63typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 64typedef Mix_Music *CFClient__MixMusic;
49 65
50typedef PangoFontDescription *CFClient__Font; 66typedef PangoFontDescription *CFClient__Font;
51 67
… …
243 } 259 }
244 } 260 }
245} 261}
246 262
247static void 263static void
248music_finished () 264music_finished (void)
249{ 265{
250 SDL_UserEvent ev; 266 SDL_UserEvent ev;
251 267
252 ev.type = SDL_USEREVENT; 268 ev.type = SDL_USEREVENT;
253 ev.code = 0; 269 ev.code = 0;
254 ev.data1 = 0; 270 ev.data1 = 0;
271 ev.data2 = 0;
272
273 SDL_PushEvent ((SDL_Event *)&ev);
274}
275
276static void
277channel_finished (int channel)
278{
279 SDL_UserEvent ev;
280
281 ev.type = SDL_USEREVENT;
282 ev.code = 1;
283 ev.data1 = (void *)(long)channel;
255 ev.data2 = 0; 284 ev.data2 = 0;
256 285
257 SDL_PushEvent ((SDL_Event *)&ev); 286 SDL_PushEvent ((SDL_Event *)&ev);
258} 287}
259 288
… …
442 471
443 while (SDL_PollEvent (&ev)) 472 while (SDL_PollEvent (&ev))
444 { 473 {
445 HV *hv = newHV (); 474 HV *hv = newHV ();
446 hv_store (hv, "type", 4, newSViv (ev.type), 0); 475 hv_store (hv, "type", 4, newSViv (ev.type), 0);
476
447 switch (ev.type) 477 switch (ev.type)
448 { 478 {
449 case SDL_KEYDOWN: 479 case SDL_KEYDOWN:
450 case SDL_KEYUP: 480 case SDL_KEYUP:
451 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 481 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
… …
471 case SDL_MOUSEBUTTONUP: 501 case SDL_MOUSEBUTTONUP:
472 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 502 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 503 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 504 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 505 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506 break;
507
508 case SDL_USEREVENT:
509 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
510 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512 break;
476 } 513 }
477 514
478 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 515 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479 } 516 }
480} 517}
481 518
482int 519int
483Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 520Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
484 POSTCALL: 521 POSTCALL:
485 Mix_HookMusicFinished (music_finished); 522 Mix_HookMusicFinished (music_finished);
523 Mix_ChannelFinished (channel_finished);
486 524
487void 525void
488Mix_CloseAudio () 526Mix_CloseAudio ()
489 527
490int 528int
… …
604 PUSHs (sv_2mortal (newSViv (b / y))); 642 PUSHs (sv_2mortal (newSViv (b / y)));
605 PUSHs (sv_2mortal (newSViv (a / y))); 643 PUSHs (sv_2mortal (newSViv (a / y)));
606} 644}
607 645
608void 646void
647error (char *message)
648 CODE:
649#ifdef _WIN32
650 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
651#else
652 fprintf (stderr, "ERROR: %s\n", message);
653#endif
654
655void
609fatal (char *message) 656fatal (char *message)
610 CODE: 657 CODE:
611#ifdef _WIN32 658#ifdef _WIN32
612 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 659 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
613#else 660#else
… …
616 exit (1); 663 exit (1);
617 664
618MODULE = CFClient PACKAGE = CFClient::Font 665MODULE = CFClient PACKAGE = CFClient::Font
619 666
620CFClient::Font 667CFClient::Font
621new_from_file (SV *class, char *path) 668new_from_file (SV *class, char *path, int id = 0)
622 CODE: 669 CODE:
623{ 670{
624 int count; 671 int count;
625 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 672 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
626 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 673 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627 FcPatternDestroy (pattern); 674 FcPatternDestroy (pattern);
628} 675}
629 OUTPUT: 676 OUTPUT:
630 RETVAL 677 RETVAL
… …
1324 } *civ, const_iv[] = { 1371 } *civ, const_iv[] = {
1325# define const_iv(name) { # name, (IV)name } 1372# define const_iv(name) { # name, (IV)name }
1326 const_iv (GL_COLOR_MATERIAL), 1373 const_iv (GL_COLOR_MATERIAL),
1327 const_iv (GL_SMOOTH), 1374 const_iv (GL_SMOOTH),
1328 const_iv (GL_FLAT), 1375 const_iv (GL_FLAT),
1376 const_iv (GL_DITHER),
1329 const_iv (GL_BLEND), 1377 const_iv (GL_BLEND),
1378 const_iv (GL_SCISSOR_TEST),
1330 const_iv (GL_AND), 1379 const_iv (GL_AND),
1380 const_iv (GL_ONE),
1381 const_iv (GL_ZERO),
1331 const_iv (GL_SRC_ALPHA), 1382 const_iv (GL_SRC_ALPHA),
1383 const_iv (GL_SRC_ALPHA_SATURATE),
1332 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1384 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385 const_iv (GL_ONE_MINUS_DST_ALPHA),
1333 const_iv (GL_RGB), 1386 const_iv (GL_RGB),
1334 const_iv (GL_RGBA), 1387 const_iv (GL_RGBA),
1335 const_iv (GL_UNSIGNED_BYTE), 1388 const_iv (GL_UNSIGNED_BYTE),
1336 const_iv (GL_ALPHA4),
1337 const_iv (GL_ALPHA), 1389 const_iv (GL_ALPHA),
1338 const_iv (GL_FLOAT), 1390 const_iv (GL_FLOAT),
1339 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1391 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340 const_iv (GL_COMPILE), 1392 const_iv (GL_COMPILE),
1341 const_iv (GL_TEXTURE_1D), 1393 const_iv (GL_TEXTURE_1D),
… …
1353 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1405 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1406 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1407 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1408 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357 const_iv (GL_GENERATE_MIPMAP), 1409 const_iv (GL_GENERATE_MIPMAP),
1358 const_iv (GL_LINEAR),
1359 const_iv (GL_MODULATE), 1410 const_iv (GL_MODULATE),
1411 const_iv (GL_DECAL),
1360 const_iv (GL_REPLACE), 1412 const_iv (GL_REPLACE),
1361 const_iv (GL_COLOR_BUFFER_BIT), 1413 const_iv (GL_COLOR_BUFFER_BIT),
1362 const_iv (GL_PROJECTION), 1414 const_iv (GL_PROJECTION),
1363 const_iv (GL_MODELVIEW), 1415 const_iv (GL_MODELVIEW),
1364 const_iv (GL_COLOR_LOGIC_OP), 1416 const_iv (GL_COLOR_LOGIC_OP),
1417 const_iv (GL_SEPARABLE_2D),
1365 const_iv (GL_CONVOLUTION_2D), 1418 const_iv (GL_CONVOLUTION_2D),
1366 const_iv (GL_CONVOLUTION_BORDER_MODE), 1419 const_iv (GL_CONVOLUTION_BORDER_MODE),
1367 const_iv (GL_CONSTANT_BORDER), 1420 const_iv (GL_CONSTANT_BORDER),
1368 const_iv (GL_LINES), 1421 const_iv (GL_LINES),
1369 const_iv (GL_QUADS), 1422 const_iv (GL_QUADS),
… …
1394 1447
1395void glBlendFunc (int sfactor, int dfactor) 1448void glBlendFunc (int sfactor, int dfactor)
1396 1449
1397void glLogicOp (int opcode) 1450void glLogicOp (int opcode)
1398 1451
1452void glColorMask (int red, int green, int blue, int alpha)
1453
1399void glMatrixMode (int mode) 1454void glMatrixMode (int mode)
1400 1455
1401void glPushMatrix () 1456void glPushMatrix ()
1402 1457
1403void glPopMatrix () 1458void glPopMatrix ()
1404 1459
1405void glLoadIdentity () 1460void glLoadIdentity ()
1406 1461
1462# near and far are due to microsofts buggy c compiler
1407void glOrtho (double left, double right, double bottom, double top, double near, double far) 1463void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408 1464
1409void glViewport (int x, int y, int width, int height) 1465void glViewport (int x, int y, int width, int height)
1466
1467void glScissor (int x, int y, int width, int height)
1410 1468
1411void glTranslate (float x, float y, float z = 0.) 1469void glTranslate (float x, float y, float z = 0.)
1412 CODE: 1470 CODE:
1413 glTranslatef (x, y, z); 1471 glTranslatef (x, y, z);
1414 1472
… …
1425void glEnd () 1483void glEnd ()
1426 1484
1427void glColor (float r, float g, float b, float a = 1.0) 1485void glColor (float r, float g, float b, float a = 1.0)
1428 PROTOTYPE: @ 1486 PROTOTYPE: @
1429 CODE: 1487 CODE:
1430 glColor4f (r, g, b, a); 1488 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1431 1489
1432void glVertex (float x, float y, float z = 0.) 1490void glVertex (float x, float y, float z = 0.)
1433 CODE: 1491 CODE:
1434 glVertex3f (x, y, z); 1492 glVertex3f (x, y, z);
1435 1493
… …
1447 1505
1448void glBindTexture (int target, int name) 1506void glBindTexture (int target, int name)
1449 1507
1450void glConvolutionParameter (int target, int pname, float params) 1508void glConvolutionParameter (int target, int pname, float params)
1451 CODE: 1509 CODE:
1452 glConvolutionParameterf (target, pname, params); 1510 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453 1511
1454void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1512void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1513 CODE:
1514 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1515 (target, internalformat, width, height, format, type, data));
1516
1517void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1518 CODE:
1519 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1520 (target, internalformat, width, height, format, type, row, column));
1455 1521
1456void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1522void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457 1523
1458void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1524void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525
1526void glRasterPos (int x, int y)
1527 CODE:
1528 glRasterPos2i (x, y);
1529
1530void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459 1531
1460int glGenTexture () 1532int glGenTexture ()
1461 CODE: 1533 CODE:
1462{ 1534{
1463 GLuint name; 1535 GLuint name;

Diff Legend

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