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.71 by root, Fri May 5 19:05:47 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 = 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;
481 } 506 }
482 507
483 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 508 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
484 } 509 }
485} 510}
486 511
487int 512int
488Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 513Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
489 POSTCALL: 514 POSTCALL:
490 Mix_HookMusicFinished (music_finished); 515 Mix_HookMusicFinished (music_finished);
516 Mix_ChannelFinished (channel_finished);
491 517
492void 518void
493Mix_CloseAudio () 519Mix_CloseAudio ()
494 520
495int 521int
… …
518 544
519void 545void
520add_font (char *file) 546add_font (char *file)
521 CODE: 547 CODE:
522 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 548 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 549
536void 550void
537load_image_inline (SV *image_) 551load_image_inline (SV *image_)
538 ALIAS: 552 ALIAS:
539 load_image_file = 1 553 load_image_file = 1
… …
621 PUSHs (sv_2mortal (newSViv (b / y))); 635 PUSHs (sv_2mortal (newSViv (b / y)));
622 PUSHs (sv_2mortal (newSViv (a / y))); 636 PUSHs (sv_2mortal (newSViv (a / y)));
623} 637}
624 638
625void 639void
640error (char *message)
641 CODE:
642#ifdef _WIN32
643 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
644#else
645 fprintf (stderr, "ERROR: %s\n", message);
646#endif
647
648void
626fatal (char *message) 649fatal (char *message)
627 CODE: 650 CODE:
628#ifdef _WIN32 651#ifdef _WIN32
629 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 652 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
630#else 653#else
631 fprintf (stderr, "FATAL: %s\n", message); 654 fprintf (stderr, "FATAL: %s\n", message);
632#endif 655#endif
633 exit (1); 656 exit (1);
634 657
658MODULE = CFClient PACKAGE = CFClient::Font
659
660CFClient::Font
661new_from_file (SV *class, char *path, int id = 0)
662 CODE:
663{
664 int count;
665 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
666 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
667 FcPatternDestroy (pattern);
668}
669 OUTPUT:
670 RETVAL
671
672void
673DESTROY (CFClient::Font self)
674 CODE:
675 pango_font_description_free (self);
676
677void
678make_default (CFClient::Font self)
679 CODE:
680 default_font = self;
681
635MODULE = CFClient PACKAGE = CFClient::Layout 682MODULE = CFClient PACKAGE = CFClient::Layout
636 683
637CFClient::Layout 684CFClient::Layout
638new (SV *class, int base_height = 10) 685new (SV *class, int base_height = MIN_FONT_HEIGHT)
639 CODE: 686 CODE:
640 New (0, RETVAL, 1, struct cf_layout); 687 New (0, RETVAL, 1, struct cf_layout);
688 RETVAL->pl = pango_layout_new (context);
641 RETVAL->base_height = base_height; 689 RETVAL->base_height = base_height;
642 RETVAL->pl = pango_layout_new (context); 690 RETVAL->font = 0;
643 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 691 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644 pango_layout_set_font_description (RETVAL->pl, 692 pango_layout_set_font_description (RETVAL->pl, default_font);
645 pango_font_description_copy (
646 pango_context_get_font_description (context)));
647 OUTPUT: 693 OUTPUT:
648 RETVAL 694 RETVAL
649 695
650void 696void
651DESTROY (CFClient::Layout self) 697DESTROY (CFClient::Layout self)
… …
680 SvUTF8_on (RETVAL); 726 SvUTF8_on (RETVAL);
681 OUTPUT: 727 OUTPUT:
682 RETVAL 728 RETVAL
683 729
684void 730void
731set_font (CFClient::Layout self, CFClient::Font font = 0)
732 CODE:
733 if (self->font != font)
734 {
735 self->font = font;
736 layout_update_font (self);
737 }
738
739void
685set_height (CFClient::Layout self, int base_height) 740set_height (CFClient::Layout self, int base_height)
686 CODE: 741 CODE:
742 if (self->base_height != base_height)
743 {
687 self->base_height = base_height; 744 self->base_height = base_height;
745 layout_update_font (self);
746 }
688 747
689void 748void
690set_width (CFClient::Layout self, int max_width = -1) 749set_width (CFClient::Layout self, int max_width = -1)
691 CODE: 750 CODE:
692 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 751 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
… …
695size (CFClient::Layout self) 754size (CFClient::Layout self)
696 PPCODE: 755 PPCODE:
697{ 756{
698 int w, h; 757 int w, h;
699 758
700 layout_update (self);
701 layout_get_pixel_size (self, &w, &h); 759 layout_get_pixel_size (self, &w, &h);
702 760
703 EXTEND (SP, 2); 761 EXTEND (SP, 2);
704 PUSHs (sv_2mortal (newSViv (w))); 762 PUSHs (sv_2mortal (newSViv (w)));
705 PUSHs (sv_2mortal (newSViv (h))); 763 PUSHs (sv_2mortal (newSViv (h)));
… …
708int 766int
709xy_to_index (CFClient::Layout self, int x, int y) 767xy_to_index (CFClient::Layout self, int x, int y)
710 CODE: 768 CODE:
711{ 769{
712 int index, trailing; 770 int index, trailing;
713
714 layout_update (self);
715 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 771 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
716
717 RETVAL = index; 772 RETVAL = index;
718} 773}
719 OUTPUT: 774 OUTPUT:
720 RETVAL 775 RETVAL
721 776
722void 777void
723cursor_pos (CFClient::Layout self, int index) 778cursor_pos (CFClient::Layout self, int index)
724 PPCODE: 779 PPCODE:
725{ 780{
726 PangoRectangle strong_pos; 781 PangoRectangle strong_pos;
727 layout_update (self);
728 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 782 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729 783
730 EXTEND (SP, 3); 784 EXTEND (SP, 3);
731 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 785 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 786 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
739{ 793{
740 SV *retval; 794 SV *retval;
741 int w, h; 795 int w, h;
742 FT_Bitmap bitmap; 796 FT_Bitmap bitmap;
743 797
744 layout_update (self);
745 layout_get_pixel_size (self, &w, &h); 798 layout_get_pixel_size (self, &w, &h);
746 799
747 retval = newSV (w * h); 800 retval = newSV (w * h);
748 SvPOK_only (retval); 801 SvPOK_only (retval);
749 SvCUR_set (retval, w * h); 802 SvCUR_set (retval, w * h);
… …
1311 } *civ, const_iv[] = { 1364 } *civ, const_iv[] = {
1312# define const_iv(name) { # name, (IV)name } 1365# define const_iv(name) { # name, (IV)name }
1313 const_iv (GL_COLOR_MATERIAL), 1366 const_iv (GL_COLOR_MATERIAL),
1314 const_iv (GL_SMOOTH), 1367 const_iv (GL_SMOOTH),
1315 const_iv (GL_FLAT), 1368 const_iv (GL_FLAT),
1369 const_iv (GL_DITHER),
1316 const_iv (GL_BLEND), 1370 const_iv (GL_BLEND),
1371 const_iv (GL_SCISSOR_TEST),
1317 const_iv (GL_AND), 1372 const_iv (GL_AND),
1373 const_iv (GL_ONE),
1374 const_iv (GL_ZERO),
1318 const_iv (GL_SRC_ALPHA), 1375 const_iv (GL_SRC_ALPHA),
1376 const_iv (GL_SRC_ALPHA_SATURATE),
1319 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1377 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1378 const_iv (GL_ONE_MINUS_DST_ALPHA),
1320 const_iv (GL_RGB), 1379 const_iv (GL_RGB),
1321 const_iv (GL_RGBA), 1380 const_iv (GL_RGBA),
1322 const_iv (GL_UNSIGNED_BYTE), 1381 const_iv (GL_UNSIGNED_BYTE),
1323 const_iv (GL_ALPHA4),
1324 const_iv (GL_ALPHA), 1382 const_iv (GL_ALPHA),
1325 const_iv (GL_FLOAT), 1383 const_iv (GL_FLOAT),
1326 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1384 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1327 const_iv (GL_COMPILE), 1385 const_iv (GL_COMPILE),
1328 const_iv (GL_TEXTURE_1D), 1386 const_iv (GL_TEXTURE_1D),
… …
1340 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1398 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1341 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1399 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1342 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1400 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1343 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1401 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1344 const_iv (GL_GENERATE_MIPMAP), 1402 const_iv (GL_GENERATE_MIPMAP),
1345 const_iv (GL_LINEAR),
1346 const_iv (GL_MODULATE), 1403 const_iv (GL_MODULATE),
1404 const_iv (GL_DECAL),
1347 const_iv (GL_REPLACE), 1405 const_iv (GL_REPLACE),
1348 const_iv (GL_COLOR_BUFFER_BIT), 1406 const_iv (GL_COLOR_BUFFER_BIT),
1349 const_iv (GL_PROJECTION), 1407 const_iv (GL_PROJECTION),
1350 const_iv (GL_MODELVIEW), 1408 const_iv (GL_MODELVIEW),
1351 const_iv (GL_COLOR_LOGIC_OP), 1409 const_iv (GL_COLOR_LOGIC_OP),
1410 const_iv (GL_SEPARABLE_2D),
1352 const_iv (GL_CONVOLUTION_2D), 1411 const_iv (GL_CONVOLUTION_2D),
1353 const_iv (GL_CONVOLUTION_BORDER_MODE), 1412 const_iv (GL_CONVOLUTION_BORDER_MODE),
1354 const_iv (GL_CONSTANT_BORDER), 1413 const_iv (GL_CONSTANT_BORDER),
1355 const_iv (GL_LINES), 1414 const_iv (GL_LINES),
1356 const_iv (GL_QUADS), 1415 const_iv (GL_QUADS),
… …
1381 1440
1382void glBlendFunc (int sfactor, int dfactor) 1441void glBlendFunc (int sfactor, int dfactor)
1383 1442
1384void glLogicOp (int opcode) 1443void glLogicOp (int opcode)
1385 1444
1445void glColorMask (int red, int green, int blue, int alpha)
1446
1386void glMatrixMode (int mode) 1447void glMatrixMode (int mode)
1387 1448
1388void glPushMatrix () 1449void glPushMatrix ()
1389 1450
1390void glPopMatrix () 1451void glPopMatrix ()
1391 1452
1392void glLoadIdentity () 1453void glLoadIdentity ()
1393 1454
1455# near and far are due to microsofts buggy c compiler
1394void glOrtho (double left, double right, double bottom, double top, double near, double far) 1456void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1395 1457
1396void glViewport (int x, int y, int width, int height) 1458void glViewport (int x, int y, int width, int height)
1459
1460void glScissor (int x, int y, int width, int height)
1397 1461
1398void glTranslate (float x, float y, float z = 0.) 1462void glTranslate (float x, float y, float z = 0.)
1399 CODE: 1463 CODE:
1400 glTranslatef (x, y, z); 1464 glTranslatef (x, y, z);
1401 1465
1402void glScale (float x, float y, float z) 1466void glScale (float x, float y, float z = 1.)
1403 CODE: 1467 CODE:
1404 glScalef (x, y, z); 1468 glScalef (x, y, z);
1405 1469
1406void glRotate (float angle, float x, float y, float z) 1470void glRotate (float angle, float x, float y, float z)
1407 CODE: 1471 CODE:
… …
1412void glEnd () 1476void glEnd ()
1413 1477
1414void glColor (float r, float g, float b, float a = 1.0) 1478void glColor (float r, float g, float b, float a = 1.0)
1415 PROTOTYPE: @ 1479 PROTOTYPE: @
1416 CODE: 1480 CODE:
1417 glColor4f (r, g, b, a); 1481 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1418 1482
1419void glVertex (float x, float y, float z = 0.) 1483void glVertex (float x, float y, float z = 0.)
1420 CODE: 1484 CODE:
1421 glVertex3f (x, y, z); 1485 glVertex3f (x, y, z);
1422 1486
… …
1434 1498
1435void glBindTexture (int target, int name) 1499void glBindTexture (int target, int name)
1436 1500
1437void glConvolutionParameter (int target, int pname, float params) 1501void glConvolutionParameter (int target, int pname, float params)
1438 CODE: 1502 CODE:
1439 glConvolutionParameterf (target, pname, params); 1503 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1440 1504
1441void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1505void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1506 CODE:
1507 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1508 (target, internalformat, width, height, format, type, data));
1509
1510void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1511 CODE:
1512 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1513 (target, internalformat, width, height, format, type, row, column));
1442 1514
1443void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1515void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1444 1516
1445void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1517void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1518
1519void glRasterPos (int x, int y)
1520 CODE:
1521 glRasterPos2i (x, y);
1522
1523void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1446 1524
1447int glGenTexture () 1525int glGenTexture ()
1448 CODE: 1526 CODE:
1449{ 1527{
1450 GLuint name; 1528 GLuint name;

Diff Legend

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