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.74 by root, Sat May 6 20:14:57 2006 UTC

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

Diff Legend

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