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.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.74 by root, Sat May 6 20:14:57 2006 UTC

33 typedef signed char int8_t; 33 typedef signed char int8_t;
34 typedef signed short int16_t; 34 typedef signed short int16_t;
35 typedef signed int int32_t; 35 typedef signed int int32_t;
36#endif 36#endif
37 37
38#include "glext.h"
39
38#define FOW_DARKNESS 32 40#define FOW_DARKNESS 32
39 41
40#define MAP_EXTEND_X 32 42#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 43#define MAP_EXTEND_Y 512
42 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
43typedef Mix_Chunk *CFClient__MixChunk; 62typedef Mix_Chunk *CFClient__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 63typedef Mix_Music *CFClient__MixMusic;
45 64
46static PangoContext *context; 65typedef PangoFontDescription *CFClient__Font;
47static PangoFontMap *fontmap;
48 66
49typedef struct cf_layout { 67typedef struct cf_layout {
50 PangoLayout *pl; 68 PangoLayout *pl;
51 int base_height; 69 int base_height;
70 CFClient__Font font;
52} *CFClient__Layout; 71} *CFClient__Layout;
72
73static CFClient__Font default_font;
74static PangoContext *context;
75static PangoFontMap *fontmap;
53 76
54static void 77static void
55substitute_func (FcPattern *pattern, gpointer data) 78substitute_func (FcPattern *pattern, gpointer data)
56{ 79{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 80 FcPatternAddBool (pattern, FC_HINTING , 1);
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 81 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59} 82}
60 83
61static void 84static void
62layout_update (CFClient__Layout self) 85layout_update_font (CFClient__Layout self)
63{ 86{
64 /* 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
65 * reasonably well with bitstream vera 88 * reasonably well with bitstream vera
66 */ 89 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 90 PangoFontDescription *font = self->font ? self->font : default_font;
68 91
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 92 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 93 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 94
95 pango_layout_set_font_description (self->pl, font);
76} 96}
77 97
78static void 98static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 99layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
80{ 100{
81 layout_update (self);
82
83 pango_layout_get_pixel_size (self->pl, w, h); 101 pango_layout_get_pixel_size (self->pl, w, h);
84 102
85 *w = (*w + 3) & ~3; 103 *w = (*w + 3) & ~3;
86 if (!*w) *w = 1; 104 if (!*w) *w = 1;
87 if (!*h) *h = 1; 105 if (!*h) *h = 1;
249 ev.type = SDL_USEREVENT; 267 ev.type = SDL_USEREVENT;
250 ev.code = 0; 268 ev.code = 0;
251 ev.data1 = 0; 269 ev.data1 = 0;
252 ev.data2 = 0; 270 ev.data2 = 0;
253 271
272 SDL_PushEvent ((SDL_Event *)&ev);
273}
274
275static void
276channel_finished (int channel)
277{
254 SDL_PushEvent (&ev); 278 SDL_UserEvent ev;
279
280 ev.type = SDL_USEREVENT;
281 ev.code = 1;
282 ev.data1 = (void *)(long)channel;
283 ev.data2 = 0;
284
285 SDL_PushEvent ((SDL_Event *)&ev);
255} 286}
256 287
257MODULE = CFClient PACKAGE = CFClient 288MODULE = CFClient PACKAGE = CFClient
258 289
259PROTOTYPES: ENABLE 290PROTOTYPES: ENABLE
439 470
440 while (SDL_PollEvent (&ev)) 471 while (SDL_PollEvent (&ev))
441 { 472 {
442 HV *hv = newHV (); 473 HV *hv = newHV ();
443 hv_store (hv, "type", 4, newSViv (ev.type), 0); 474 hv_store (hv, "type", 4, newSViv (ev.type), 0);
475
444 switch (ev.type) 476 switch (ev.type)
445 { 477 {
446 case SDL_KEYDOWN: 478 case SDL_KEYDOWN:
447 case SDL_KEYUP: 479 case SDL_KEYUP:
448 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 480 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
468 case SDL_MOUSEBUTTONUP: 500 case SDL_MOUSEBUTTONUP:
469 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 501 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
470 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 502 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
471 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 503 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
472 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;
473 } 512 }
474 513
475 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 514 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
476 } 515 }
477} 516}
478 517
479int 518int
480Mix_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)
481 POSTCALL: 520 POSTCALL:
482 Mix_HookMusicFinished (music_finished); 521 Mix_HookMusicFinished (music_finished);
522 Mix_ChannelFinished (channel_finished);
483 523
484void 524void
485Mix_CloseAudio () 525Mix_CloseAudio ()
486 526
487int 527int
510 550
511void 551void
512add_font (char *file) 552add_font (char *file)
513 CODE: 553 CODE:
514 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 554 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
515
516void
517set_font (char *file)
518 CODE:
519{
520 int count;
521 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
522 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523 FcPatternDestroy (pattern);
524 pango_context_set_font_description (context, font);
525}
526 555
527void 556void
528load_image_inline (SV *image_) 557load_image_inline (SV *image_)
529 ALIAS: 558 ALIAS:
530 load_image_file = 1 559 load_image_file = 1
612 PUSHs (sv_2mortal (newSViv (b / y))); 641 PUSHs (sv_2mortal (newSViv (b / y)));
613 PUSHs (sv_2mortal (newSViv (a / y))); 642 PUSHs (sv_2mortal (newSViv (a / y)));
614} 643}
615 644
616void 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
617fatal (char *message) 655fatal (char *message)
618 CODE: 656 CODE:
619#ifdef _WIN32 657#ifdef _WIN32
620 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);
621#else 659#else
622 fprintf (stderr, "FATAL: %s\n", message); 660 fprintf (stderr, "FATAL: %s\n", message);
623#endif 661#endif
624 exit (1); 662 exit (1);
625 663
664MODULE = CFClient PACKAGE = CFClient::Font
665
666CFClient::Font
667new_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
678void
679DESTROY (CFClient::Font self)
680 CODE:
681 pango_font_description_free (self);
682
683void
684make_default (CFClient::Font self)
685 CODE:
686 default_font = self;
687
626MODULE = CFClient PACKAGE = CFClient::Layout 688MODULE = CFClient PACKAGE = CFClient::Layout
627 689
628CFClient::Layout 690CFClient::Layout
629new (SV *class, int base_height = 10) 691new (SV *class, int base_height = MIN_FONT_HEIGHT)
630 CODE: 692 CODE:
631 New (0, RETVAL, 1, struct cf_layout); 693 New (0, RETVAL, 1, struct cf_layout);
694 RETVAL->pl = pango_layout_new (context);
632 RETVAL->base_height = base_height; 695 RETVAL->base_height = base_height;
633 RETVAL->pl = pango_layout_new (context); 696 RETVAL->font = 0;
634 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);
635 OUTPUT: 699 OUTPUT:
636 RETVAL 700 RETVAL
637 701
638void 702void
639DESTROY (CFClient::Layout self) 703DESTROY (CFClient::Layout self)
668 SvUTF8_on (RETVAL); 732 SvUTF8_on (RETVAL);
669 OUTPUT: 733 OUTPUT:
670 RETVAL 734 RETVAL
671 735
672void 736void
737set_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
745void
673set_height (CFClient::Layout self, int base_height) 746set_height (CFClient::Layout self, int base_height)
674 CODE: 747 CODE:
748 if (self->base_height != base_height)
749 {
675 self->base_height = base_height; 750 self->base_height = base_height;
751 layout_update_font (self);
752 }
676 753
677void 754void
678set_width (CFClient::Layout self, int max_width = -1) 755set_width (CFClient::Layout self, int max_width = -1)
679 CODE: 756 CODE:
680 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);
683size (CFClient::Layout self) 760size (CFClient::Layout self)
684 PPCODE: 761 PPCODE:
685{ 762{
686 int w, h; 763 int w, h;
687 764
688 layout_update (self);
689 layout_get_pixel_size (self, &w, &h); 765 layout_get_pixel_size (self, &w, &h);
690 766
691 EXTEND (SP, 2); 767 EXTEND (SP, 2);
692 PUSHs (sv_2mortal (newSViv (w))); 768 PUSHs (sv_2mortal (newSViv (w)));
693 PUSHs (sv_2mortal (newSViv (h))); 769 PUSHs (sv_2mortal (newSViv (h)));
696int 772int
697xy_to_index (CFClient::Layout self, int x, int y) 773xy_to_index (CFClient::Layout self, int x, int y)
698 CODE: 774 CODE:
699{ 775{
700 int index, trailing; 776 int index, trailing;
701
702 layout_update (self);
703 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);
704
705 RETVAL = index; 778 RETVAL = index;
706} 779}
707 OUTPUT: 780 OUTPUT:
708 RETVAL 781 RETVAL
709 782
710void 783void
711cursor_pos (CFClient::Layout self, int index) 784cursor_pos (CFClient::Layout self, int index)
712 PPCODE: 785 PPCODE:
713{ 786{
714 PangoRectangle strong_pos; 787 PangoRectangle strong_pos;
715 layout_update (self);
716 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 788 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
717 789
718 EXTEND (SP, 3); 790 EXTEND (SP, 3);
719 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 791 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
720 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 792 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
727{ 799{
728 SV *retval; 800 SV *retval;
729 int w, h; 801 int w, h;
730 FT_Bitmap bitmap; 802 FT_Bitmap bitmap;
731 803
732 layout_update (self);
733 layout_get_pixel_size (self, &w, &h); 804 layout_get_pixel_size (self, &w, &h);
734 805
735 retval = newSV (w * h); 806 retval = newSV (w * h);
736 SvPOK_only (retval); 807 SvPOK_only (retval);
737 SvCUR_set (retval, w * h); 808 SvCUR_set (retval, w * h);
1299 } *civ, const_iv[] = { 1370 } *civ, const_iv[] = {
1300# define const_iv(name) { # name, (IV)name } 1371# define const_iv(name) { # name, (IV)name }
1301 const_iv (GL_COLOR_MATERIAL), 1372 const_iv (GL_COLOR_MATERIAL),
1302 const_iv (GL_SMOOTH), 1373 const_iv (GL_SMOOTH),
1303 const_iv (GL_FLAT), 1374 const_iv (GL_FLAT),
1375 const_iv (GL_DITHER),
1304 const_iv (GL_BLEND), 1376 const_iv (GL_BLEND),
1377 const_iv (GL_SCISSOR_TEST),
1305 const_iv (GL_AND), 1378 const_iv (GL_AND),
1379 const_iv (GL_ONE),
1380 const_iv (GL_ZERO),
1306 const_iv (GL_SRC_ALPHA), 1381 const_iv (GL_SRC_ALPHA),
1382 const_iv (GL_SRC_ALPHA_SATURATE),
1307 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1383 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1384 const_iv (GL_ONE_MINUS_DST_ALPHA),
1308 const_iv (GL_RGB), 1385 const_iv (GL_RGB),
1309 const_iv (GL_RGBA), 1386 const_iv (GL_RGBA),
1310 const_iv (GL_UNSIGNED_BYTE), 1387 const_iv (GL_UNSIGNED_BYTE),
1311 const_iv (GL_ALPHA4),
1312 const_iv (GL_ALPHA), 1388 const_iv (GL_ALPHA),
1313 const_iv (GL_FLOAT), 1389 const_iv (GL_FLOAT),
1314 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1390 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1315 const_iv (GL_COMPILE), 1391 const_iv (GL_COMPILE),
1316 const_iv (GL_TEXTURE_1D), 1392 const_iv (GL_TEXTURE_1D),
1323 const_iv (GL_TEXTURE_WRAP_T), 1399 const_iv (GL_TEXTURE_WRAP_T),
1324 const_iv (GL_CLAMP), 1400 const_iv (GL_CLAMP),
1325 const_iv (GL_REPEAT), 1401 const_iv (GL_REPEAT),
1326 const_iv (GL_NEAREST), 1402 const_iv (GL_NEAREST),
1327 const_iv (GL_LINEAR), 1403 const_iv (GL_LINEAR),
1404 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1405 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1406 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1407 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1408 const_iv (GL_GENERATE_MIPMAP),
1328 const_iv (GL_MODULATE), 1409 const_iv (GL_MODULATE),
1410 const_iv (GL_DECAL),
1329 const_iv (GL_REPLACE), 1411 const_iv (GL_REPLACE),
1330 const_iv (GL_COLOR_BUFFER_BIT), 1412 const_iv (GL_COLOR_BUFFER_BIT),
1331 const_iv (GL_PROJECTION), 1413 const_iv (GL_PROJECTION),
1332 const_iv (GL_MODELVIEW), 1414 const_iv (GL_MODELVIEW),
1333 const_iv (GL_COLOR_LOGIC_OP), 1415 const_iv (GL_COLOR_LOGIC_OP),
1416 const_iv (GL_SEPARABLE_2D),
1334 const_iv (GL_CONVOLUTION_2D), 1417 const_iv (GL_CONVOLUTION_2D),
1335 const_iv (GL_CONVOLUTION_BORDER_MODE), 1418 const_iv (GL_CONVOLUTION_BORDER_MODE),
1336 const_iv (GL_CONSTANT_BORDER), 1419 const_iv (GL_CONSTANT_BORDER),
1337 const_iv (GL_LINES), 1420 const_iv (GL_LINES),
1338 const_iv (GL_QUADS), 1421 const_iv (GL_QUADS),
1363 1446
1364void glBlendFunc (int sfactor, int dfactor) 1447void glBlendFunc (int sfactor, int dfactor)
1365 1448
1366void glLogicOp (int opcode) 1449void glLogicOp (int opcode)
1367 1450
1451void glColorMask (int red, int green, int blue, int alpha)
1452
1368void glMatrixMode (int mode) 1453void glMatrixMode (int mode)
1369 1454
1370void glPushMatrix () 1455void glPushMatrix ()
1371 1456
1372void glPopMatrix () 1457void glPopMatrix ()
1373 1458
1374void glLoadIdentity () 1459void glLoadIdentity ()
1375 1460
1461# near and far are due to microsofts buggy c compiler
1376void 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_)
1377 1463
1378void 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)
1379 1467
1380void glTranslate (float x, float y, float z = 0.) 1468void glTranslate (float x, float y, float z = 0.)
1381 CODE: 1469 CODE:
1382 glTranslatef (x, y, z); 1470 glTranslatef (x, y, z);
1383 1471
1384void glScale (float x, float y, float z) 1472void glScale (float x, float y, float z = 1.)
1385 CODE: 1473 CODE:
1386 glScalef (x, y, z); 1474 glScalef (x, y, z);
1387 1475
1388void glRotate (float angle, float x, float y, float z) 1476void glRotate (float angle, float x, float y, float z)
1389 CODE: 1477 CODE:
1394void glEnd () 1482void glEnd ()
1395 1483
1396void glColor (float r, float g, float b, float a = 1.0) 1484void glColor (float r, float g, float b, float a = 1.0)
1397 PROTOTYPE: @ 1485 PROTOTYPE: @
1398 CODE: 1486 CODE:
1399 glColor4f (r, g, b, a); 1487 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1400 1488
1401void glVertex (float x, float y, float z = 0.) 1489void glVertex (float x, float y, float z = 0.)
1402 CODE: 1490 CODE:
1403 glVertex3f (x, y, z); 1491 glVertex3f (x, y, z);
1404 1492
1416 1504
1417void glBindTexture (int target, int name) 1505void glBindTexture (int target, int name)
1418 1506
1419void glConvolutionParameter (int target, int pname, float params) 1507void glConvolutionParameter (int target, int pname, float params)
1420 CODE: 1508 CODE:
1421 glConvolutionParameterf (target, pname, params); 1509 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1422 1510
1423void 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));
1424 1520
1425void 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)
1426 1522
1427void 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)
1428 1530
1429int glGenTexture () 1531int glGenTexture ()
1430 CODE: 1532 CODE:
1431{ 1533{
1432 GLuint name; 1534 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines