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.59 by root, Sun Apr 23 04:41:33 2006 UTC vs.
Revision 1.73 by root, Fri May 5 19:30:14 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 8 * PANGO_SCALE 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 }
46 61
47typedef Mix_Chunk *CFClient__MixChunk; 62typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 63typedef Mix_Music *CFClient__MixMusic;
49 64
50static PangoContext *context; 65typedef PangoFontDescription *CFClient__Font;
51static PangoFontMap *fontmap;
52 66
53typedef struct cf_layout { 67typedef struct cf_layout {
54 PangoLayout *pl; 68 PangoLayout *pl;
55 int base_height; 69 int base_height;
70 CFClient__Font font;
56} *CFClient__Layout; 71} *CFClient__Layout;
72
73static CFClient__Font default_font;
74static PangoContext *context;
75static PangoFontMap *fontmap;
57 76
58static void 77static void
59substitute_func (FcPattern *pattern, gpointer data) 78substitute_func (FcPattern *pattern, gpointer data)
60{ 79{
61 FcPatternAddBool (pattern, FC_HINTING , 1); 80 FcPatternAddBool (pattern, FC_HINTING , 1);
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 81 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63} 82}
64 83
65static void 84static void
66layout_update (CFClient__Layout self) 85layout_update_font (CFClient__Layout self)
67{ 86{
68 /* 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
69 * reasonably well with bitstream vera 88 * reasonably well with bitstream vera
70 */ 89 */
71 PangoFontDescription *font = pango_layout_get_font_description (self->pl); 90 PangoFontDescription *font = self->font ? self->font : default_font;
72 91
73 int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75 if (height < MIN_FONT_HEIGHT)
76 height = MIN_FONT_HEIGHT;
77
78 if (pango_font_description_get_size (font) != height)
79 {
80 font = pango_font_description_copy (font);
81 pango_font_description_set_absolute_size (font, height); 92 pango_font_description_set_absolute_size (font,
93 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
94
82 pango_layout_set_font_description (self->pl, font); 95 pango_layout_set_font_description (self->pl, font);
83 }
84} 96}
85 97
86static void 98static void
87layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 99layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
88{ 100{
89 layout_update (self);
90
91 pango_layout_get_pixel_size (self->pl, w, h); 101 pango_layout_get_pixel_size (self->pl, w, h);
92 102
93 *w = (*w + 3) & ~3; 103 *w = (*w + 3) & ~3;
94 if (!*w) *w = 1; 104 if (!*w) *w = 1;
95 if (!*h) *h = 1; 105 if (!*h) *h = 1;
… …
255 SDL_UserEvent ev; 265 SDL_UserEvent ev;
256 266
257 ev.type = SDL_USEREVENT; 267 ev.type = SDL_USEREVENT;
258 ev.code = 0; 268 ev.code = 0;
259 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 *)channel;
260 ev.data2 = 0; 283 ev.data2 = 0;
261 284
262 SDL_PushEvent ((SDL_Event *)&ev); 285 SDL_PushEvent ((SDL_Event *)&ev);
263} 286}
264 287
… …
447 470
448 while (SDL_PollEvent (&ev)) 471 while (SDL_PollEvent (&ev))
449 { 472 {
450 HV *hv = newHV (); 473 HV *hv = newHV ();
451 hv_store (hv, "type", 4, newSViv (ev.type), 0); 474 hv_store (hv, "type", 4, newSViv (ev.type), 0);
475
452 switch (ev.type) 476 switch (ev.type)
453 { 477 {
454 case SDL_KEYDOWN: 478 case SDL_KEYDOWN:
455 case SDL_KEYUP: 479 case SDL_KEYUP:
456 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 480 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
… …
476 case SDL_MOUSEBUTTONUP: 500 case SDL_MOUSEBUTTONUP:
477 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 501 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
478 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 502 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
479 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 503 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
480 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;
481 } 512 }
482 513
483 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 514 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
484 } 515 }
485} 516}
486 517
487int 518int
488Mix_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)
489 POSTCALL: 520 POSTCALL:
490 Mix_HookMusicFinished (music_finished); 521 Mix_HookMusicFinished (music_finished);
522 Mix_ChannelFinished (channel_finished);
491 523
492void 524void
493Mix_CloseAudio () 525Mix_CloseAudio ()
494 526
495int 527int
… …
518 550
519void 551void
520add_font (char *file) 552add_font (char *file)
521 CODE: 553 CODE:
522 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 554 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
523
524void
525set_font (char *file)
526 CODE:
527{
528 int count;
529 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
530 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
531 FcPatternDestroy (pattern);
532 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
533 pango_context_set_font_description (context, font);
534}
535 555
536void 556void
537load_image_inline (SV *image_) 557load_image_inline (SV *image_)
538 ALIAS: 558 ALIAS:
539 load_image_file = 1 559 load_image_file = 1
… …
621 PUSHs (sv_2mortal (newSViv (b / y))); 641 PUSHs (sv_2mortal (newSViv (b / y)));
622 PUSHs (sv_2mortal (newSViv (a / y))); 642 PUSHs (sv_2mortal (newSViv (a / y)));
623} 643}
624 644
625void 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
626fatal (char *message) 655fatal (char *message)
627 CODE: 656 CODE:
628#ifdef _WIN32 657#ifdef _WIN32
629 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);
630#else 659#else
631 fprintf (stderr, "FATAL: %s\n", message); 660 fprintf (stderr, "FATAL: %s\n", message);
632#endif 661#endif
633 exit (1); 662 exit (1);
634 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
635MODULE = CFClient PACKAGE = CFClient::Layout 688MODULE = CFClient PACKAGE = CFClient::Layout
636 689
637CFClient::Layout 690CFClient::Layout
638new (SV *class, int base_height = 10) 691new (SV *class, int base_height = MIN_FONT_HEIGHT)
639 CODE: 692 CODE:
640 New (0, RETVAL, 1, struct cf_layout); 693 New (0, RETVAL, 1, struct cf_layout);
694 RETVAL->pl = pango_layout_new (context);
641 RETVAL->base_height = base_height; 695 RETVAL->base_height = base_height;
642 RETVAL->pl = pango_layout_new (context); 696 RETVAL->font = 0;
643 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 697 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644 pango_layout_set_font_description (RETVAL->pl, 698 pango_layout_set_font_description (RETVAL->pl, default_font);
645 pango_font_description_copy (
646 pango_context_get_font_description (context)));
647 OUTPUT: 699 OUTPUT:
648 RETVAL 700 RETVAL
649 701
650void 702void
651DESTROY (CFClient::Layout self) 703DESTROY (CFClient::Layout self)
… …
680 SvUTF8_on (RETVAL); 732 SvUTF8_on (RETVAL);
681 OUTPUT: 733 OUTPUT:
682 RETVAL 734 RETVAL
683 735
684void 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
685set_height (CFClient::Layout self, int base_height) 746set_height (CFClient::Layout self, int base_height)
686 CODE: 747 CODE:
748 if (self->base_height != base_height)
749 {
687 self->base_height = base_height; 750 self->base_height = base_height;
751 layout_update_font (self);
752 }
688 753
689void 754void
690set_width (CFClient::Layout self, int max_width = -1) 755set_width (CFClient::Layout self, int max_width = -1)
691 CODE: 756 CODE:
692 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);
… …
695size (CFClient::Layout self) 760size (CFClient::Layout self)
696 PPCODE: 761 PPCODE:
697{ 762{
698 int w, h; 763 int w, h;
699 764
700 layout_update (self);
701 layout_get_pixel_size (self, &w, &h); 765 layout_get_pixel_size (self, &w, &h);
702 766
703 EXTEND (SP, 2); 767 EXTEND (SP, 2);
704 PUSHs (sv_2mortal (newSViv (w))); 768 PUSHs (sv_2mortal (newSViv (w)));
705 PUSHs (sv_2mortal (newSViv (h))); 769 PUSHs (sv_2mortal (newSViv (h)));
… …
708int 772int
709xy_to_index (CFClient::Layout self, int x, int y) 773xy_to_index (CFClient::Layout self, int x, int y)
710 CODE: 774 CODE:
711{ 775{
712 int index, trailing; 776 int index, trailing;
713
714 layout_update (self);
715 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);
716
717 RETVAL = index; 778 RETVAL = index;
718} 779}
719 OUTPUT: 780 OUTPUT:
720 RETVAL 781 RETVAL
721 782
722void 783void
723cursor_pos (CFClient::Layout self, int index) 784cursor_pos (CFClient::Layout self, int index)
724 PPCODE: 785 PPCODE:
725{ 786{
726 PangoRectangle strong_pos; 787 PangoRectangle strong_pos;
727 layout_update (self);
728 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 788 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729 789
730 EXTEND (SP, 3); 790 EXTEND (SP, 3);
731 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 791 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 792 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
739{ 799{
740 SV *retval; 800 SV *retval;
741 int w, h; 801 int w, h;
742 FT_Bitmap bitmap; 802 FT_Bitmap bitmap;
743 803
744 layout_update (self);
745 layout_get_pixel_size (self, &w, &h); 804 layout_get_pixel_size (self, &w, &h);
746 805
747 retval = newSV (w * h); 806 retval = newSV (w * h);
748 SvPOK_only (retval); 807 SvPOK_only (retval);
749 SvCUR_set (retval, w * h); 808 SvCUR_set (retval, w * h);
… …
1311 } *civ, const_iv[] = { 1370 } *civ, const_iv[] = {
1312# define const_iv(name) { # name, (IV)name } 1371# define const_iv(name) { # name, (IV)name }
1313 const_iv (GL_COLOR_MATERIAL), 1372 const_iv (GL_COLOR_MATERIAL),
1314 const_iv (GL_SMOOTH), 1373 const_iv (GL_SMOOTH),
1315 const_iv (GL_FLAT), 1374 const_iv (GL_FLAT),
1375 const_iv (GL_DITHER),
1316 const_iv (GL_BLEND), 1376 const_iv (GL_BLEND),
1377 const_iv (GL_SCISSOR_TEST),
1317 const_iv (GL_AND), 1378 const_iv (GL_AND),
1379 const_iv (GL_ONE),
1380 const_iv (GL_ZERO),
1318 const_iv (GL_SRC_ALPHA), 1381 const_iv (GL_SRC_ALPHA),
1382 const_iv (GL_SRC_ALPHA_SATURATE),
1319 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1383 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1384 const_iv (GL_ONE_MINUS_DST_ALPHA),
1320 const_iv (GL_RGB), 1385 const_iv (GL_RGB),
1321 const_iv (GL_RGBA), 1386 const_iv (GL_RGBA),
1322 const_iv (GL_UNSIGNED_BYTE), 1387 const_iv (GL_UNSIGNED_BYTE),
1323 const_iv (GL_ALPHA4),
1324 const_iv (GL_ALPHA), 1388 const_iv (GL_ALPHA),
1325 const_iv (GL_FLOAT), 1389 const_iv (GL_FLOAT),
1326 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1390 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1327 const_iv (GL_COMPILE), 1391 const_iv (GL_COMPILE),
1328 const_iv (GL_TEXTURE_1D), 1392 const_iv (GL_TEXTURE_1D),
… …
1340 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1404 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1341 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1405 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1342 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1406 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1343 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1407 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1344 const_iv (GL_GENERATE_MIPMAP), 1408 const_iv (GL_GENERATE_MIPMAP),
1345 const_iv (GL_LINEAR),
1346 const_iv (GL_MODULATE), 1409 const_iv (GL_MODULATE),
1410 const_iv (GL_DECAL),
1347 const_iv (GL_REPLACE), 1411 const_iv (GL_REPLACE),
1348 const_iv (GL_COLOR_BUFFER_BIT), 1412 const_iv (GL_COLOR_BUFFER_BIT),
1349 const_iv (GL_PROJECTION), 1413 const_iv (GL_PROJECTION),
1350 const_iv (GL_MODELVIEW), 1414 const_iv (GL_MODELVIEW),
1351 const_iv (GL_COLOR_LOGIC_OP), 1415 const_iv (GL_COLOR_LOGIC_OP),
1416 const_iv (GL_SEPARABLE_2D),
1352 const_iv (GL_CONVOLUTION_2D), 1417 const_iv (GL_CONVOLUTION_2D),
1353 const_iv (GL_CONVOLUTION_BORDER_MODE), 1418 const_iv (GL_CONVOLUTION_BORDER_MODE),
1354 const_iv (GL_CONSTANT_BORDER), 1419 const_iv (GL_CONSTANT_BORDER),
1355 const_iv (GL_LINES), 1420 const_iv (GL_LINES),
1356 const_iv (GL_QUADS), 1421 const_iv (GL_QUADS),
… …
1381 1446
1382void glBlendFunc (int sfactor, int dfactor) 1447void glBlendFunc (int sfactor, int dfactor)
1383 1448
1384void glLogicOp (int opcode) 1449void glLogicOp (int opcode)
1385 1450
1451void glColorMask (int red, int green, int blue, int alpha)
1452
1386void glMatrixMode (int mode) 1453void glMatrixMode (int mode)
1387 1454
1388void glPushMatrix () 1455void glPushMatrix ()
1389 1456
1390void glPopMatrix () 1457void glPopMatrix ()
1391 1458
1392void glLoadIdentity () 1459void glLoadIdentity ()
1393 1460
1461# near and far are due to microsofts buggy c compiler
1394void 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_)
1395 1463
1396void 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)
1397 1467
1398void glTranslate (float x, float y, float z = 0.) 1468void glTranslate (float x, float y, float z = 0.)
1399 CODE: 1469 CODE:
1400 glTranslatef (x, y, z); 1470 glTranslatef (x, y, z);
1401 1471
1402void glScale (float x, float y, float z) 1472void glScale (float x, float y, float z = 1.)
1403 CODE: 1473 CODE:
1404 glScalef (x, y, z); 1474 glScalef (x, y, z);
1405 1475
1406void glRotate (float angle, float x, float y, float z) 1476void glRotate (float angle, float x, float y, float z)
1407 CODE: 1477 CODE:
… …
1412void glEnd () 1482void glEnd ()
1413 1483
1414void glColor (float r, float g, float b, float a = 1.0) 1484void glColor (float r, float g, float b, float a = 1.0)
1415 PROTOTYPE: @ 1485 PROTOTYPE: @
1416 CODE: 1486 CODE:
1417 glColor4f (r, g, b, a); 1487 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1418 1488
1419void glVertex (float x, float y, float z = 0.) 1489void glVertex (float x, float y, float z = 0.)
1420 CODE: 1490 CODE:
1421 glVertex3f (x, y, z); 1491 glVertex3f (x, y, z);
1422 1492
… …
1434 1504
1435void glBindTexture (int target, int name) 1505void glBindTexture (int target, int name)
1436 1506
1437void glConvolutionParameter (int target, int pname, float params) 1507void glConvolutionParameter (int target, int pname, float params)
1438 CODE: 1508 CODE:
1439 glConvolutionParameterf (target, pname, params); 1509 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1440 1510
1441void 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));
1442 1520
1443void 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)
1444 1522
1445void 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)
1446 1530
1447int glGenTexture () 1531int glGenTexture ()
1448 CODE: 1532 CODE:
1449{ 1533{
1450 GLuint name; 1534 GLuint name;

Diff Legend

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