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.60 by root, Sun Apr 23 04:47:02 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 = (PangoFontDescription *) 90 PangoFontDescription *font = self->font ? self->font : default_font;
72 pango_layout_get_font_description (self->pl);
73 91
74 int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76 if (height < MIN_FONT_HEIGHT)
77 height = MIN_FONT_HEIGHT;
78
79 if (pango_font_description_get_size (font) != height)
80 {
81 font = pango_font_description_copy (font);
82 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
83 pango_layout_set_font_description (self->pl, font); 95 pango_layout_set_font_description (self->pl, font);
84 }
85} 96}
86 97
87static void 98static void
88layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 99layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
89{ 100{
90 layout_update (self);
91
92 pango_layout_get_pixel_size (self->pl, w, h); 101 pango_layout_get_pixel_size (self->pl, w, h);
93 102
94 *w = (*w + 3) & ~3; 103 *w = (*w + 3) & ~3;
95 if (!*w) *w = 1; 104 if (!*w) *w = 1;
96 if (!*h) *h = 1; 105 if (!*h) *h = 1;
… …
256 SDL_UserEvent ev; 265 SDL_UserEvent ev;
257 266
258 ev.type = SDL_USEREVENT; 267 ev.type = SDL_USEREVENT;
259 ev.code = 0; 268 ev.code = 0;
260 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;
261 ev.data2 = 0; 283 ev.data2 = 0;
262 284
263 SDL_PushEvent ((SDL_Event *)&ev); 285 SDL_PushEvent ((SDL_Event *)&ev);
264} 286}
265 287
… …
448 470
449 while (SDL_PollEvent (&ev)) 471 while (SDL_PollEvent (&ev))
450 { 472 {
451 HV *hv = newHV (); 473 HV *hv = newHV ();
452 hv_store (hv, "type", 4, newSViv (ev.type), 0); 474 hv_store (hv, "type", 4, newSViv (ev.type), 0);
475
453 switch (ev.type) 476 switch (ev.type)
454 { 477 {
455 case SDL_KEYDOWN: 478 case SDL_KEYDOWN:
456 case SDL_KEYUP: 479 case SDL_KEYUP:
457 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 480 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
… …
477 case SDL_MOUSEBUTTONUP: 500 case SDL_MOUSEBUTTONUP:
478 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 501 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 502 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 503 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 504 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505 break;
482 } 506 }
483 507
484 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 508 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
485 } 509 }
486} 510}
487 511
488int 512int
489Mix_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)
490 POSTCALL: 514 POSTCALL:
491 Mix_HookMusicFinished (music_finished); 515 Mix_HookMusicFinished (music_finished);
516 Mix_ChannelFinished (channel_finished);
492 517
493void 518void
494Mix_CloseAudio () 519Mix_CloseAudio ()
495 520
496int 521int
… …
519 544
520void 545void
521add_font (char *file) 546add_font (char *file)
522 CODE: 547 CODE:
523 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 548 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
524
525void
526set_font (char *file)
527 CODE:
528{
529 int count;
530 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
531 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532 FcPatternDestroy (pattern);
533 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534 pango_context_set_font_description (context, font);
535}
536 549
537void 550void
538load_image_inline (SV *image_) 551load_image_inline (SV *image_)
539 ALIAS: 552 ALIAS:
540 load_image_file = 1 553 load_image_file = 1
… …
622 PUSHs (sv_2mortal (newSViv (b / y))); 635 PUSHs (sv_2mortal (newSViv (b / y)));
623 PUSHs (sv_2mortal (newSViv (a / y))); 636 PUSHs (sv_2mortal (newSViv (a / y)));
624} 637}
625 638
626void 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
627fatal (char *message) 649fatal (char *message)
628 CODE: 650 CODE:
629#ifdef _WIN32 651#ifdef _WIN32
630 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);
631#else 653#else
632 fprintf (stderr, "FATAL: %s\n", message); 654 fprintf (stderr, "FATAL: %s\n", message);
633#endif 655#endif
634 exit (1); 656 exit (1);
635 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
636MODULE = CFClient PACKAGE = CFClient::Layout 682MODULE = CFClient PACKAGE = CFClient::Layout
637 683
638CFClient::Layout 684CFClient::Layout
639new (SV *class, int base_height = 10) 685new (SV *class, int base_height = MIN_FONT_HEIGHT)
640 CODE: 686 CODE:
641 New (0, RETVAL, 1, struct cf_layout); 687 New (0, RETVAL, 1, struct cf_layout);
688 RETVAL->pl = pango_layout_new (context);
642 RETVAL->base_height = base_height; 689 RETVAL->base_height = base_height;
643 RETVAL->pl = pango_layout_new (context); 690 RETVAL->font = 0;
644 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 691 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645 pango_layout_set_font_description (RETVAL->pl, 692 pango_layout_set_font_description (RETVAL->pl, default_font);
646 pango_font_description_copy (
647 pango_context_get_font_description (context)));
648 OUTPUT: 693 OUTPUT:
649 RETVAL 694 RETVAL
650 695
651void 696void
652DESTROY (CFClient::Layout self) 697DESTROY (CFClient::Layout self)
… …
681 SvUTF8_on (RETVAL); 726 SvUTF8_on (RETVAL);
682 OUTPUT: 727 OUTPUT:
683 RETVAL 728 RETVAL
684 729
685void 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
686set_height (CFClient::Layout self, int base_height) 740set_height (CFClient::Layout self, int base_height)
687 CODE: 741 CODE:
742 if (self->base_height != base_height)
743 {
688 self->base_height = base_height; 744 self->base_height = base_height;
745 layout_update_font (self);
746 }
689 747
690void 748void
691set_width (CFClient::Layout self, int max_width = -1) 749set_width (CFClient::Layout self, int max_width = -1)
692 CODE: 750 CODE:
693 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);
… …
696size (CFClient::Layout self) 754size (CFClient::Layout self)
697 PPCODE: 755 PPCODE:
698{ 756{
699 int w, h; 757 int w, h;
700 758
701 layout_update (self);
702 layout_get_pixel_size (self, &w, &h); 759 layout_get_pixel_size (self, &w, &h);
703 760
704 EXTEND (SP, 2); 761 EXTEND (SP, 2);
705 PUSHs (sv_2mortal (newSViv (w))); 762 PUSHs (sv_2mortal (newSViv (w)));
706 PUSHs (sv_2mortal (newSViv (h))); 763 PUSHs (sv_2mortal (newSViv (h)));
… …
709int 766int
710xy_to_index (CFClient::Layout self, int x, int y) 767xy_to_index (CFClient::Layout self, int x, int y)
711 CODE: 768 CODE:
712{ 769{
713 int index, trailing; 770 int index, trailing;
714
715 layout_update (self);
716 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);
717
718 RETVAL = index; 772 RETVAL = index;
719} 773}
720 OUTPUT: 774 OUTPUT:
721 RETVAL 775 RETVAL
722 776
723void 777void
724cursor_pos (CFClient::Layout self, int index) 778cursor_pos (CFClient::Layout self, int index)
725 PPCODE: 779 PPCODE:
726{ 780{
727 PangoRectangle strong_pos; 781 PangoRectangle strong_pos;
728 layout_update (self);
729 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 782 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730 783
731 EXTEND (SP, 3); 784 EXTEND (SP, 3);
732 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 785 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 786 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
740{ 793{
741 SV *retval; 794 SV *retval;
742 int w, h; 795 int w, h;
743 FT_Bitmap bitmap; 796 FT_Bitmap bitmap;
744 797
745 layout_update (self);
746 layout_get_pixel_size (self, &w, &h); 798 layout_get_pixel_size (self, &w, &h);
747 799
748 retval = newSV (w * h); 800 retval = newSV (w * h);
749 SvPOK_only (retval); 801 SvPOK_only (retval);
750 SvCUR_set (retval, w * h); 802 SvCUR_set (retval, w * h);
… …
1312 } *civ, const_iv[] = { 1364 } *civ, const_iv[] = {
1313# define const_iv(name) { # name, (IV)name } 1365# define const_iv(name) { # name, (IV)name }
1314 const_iv (GL_COLOR_MATERIAL), 1366 const_iv (GL_COLOR_MATERIAL),
1315 const_iv (GL_SMOOTH), 1367 const_iv (GL_SMOOTH),
1316 const_iv (GL_FLAT), 1368 const_iv (GL_FLAT),
1369 const_iv (GL_DITHER),
1317 const_iv (GL_BLEND), 1370 const_iv (GL_BLEND),
1371 const_iv (GL_SCISSOR_TEST),
1318 const_iv (GL_AND), 1372 const_iv (GL_AND),
1373 const_iv (GL_ONE),
1374 const_iv (GL_ZERO),
1319 const_iv (GL_SRC_ALPHA), 1375 const_iv (GL_SRC_ALPHA),
1376 const_iv (GL_SRC_ALPHA_SATURATE),
1320 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1377 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1378 const_iv (GL_ONE_MINUS_DST_ALPHA),
1321 const_iv (GL_RGB), 1379 const_iv (GL_RGB),
1322 const_iv (GL_RGBA), 1380 const_iv (GL_RGBA),
1323 const_iv (GL_UNSIGNED_BYTE), 1381 const_iv (GL_UNSIGNED_BYTE),
1324 const_iv (GL_ALPHA4),
1325 const_iv (GL_ALPHA), 1382 const_iv (GL_ALPHA),
1326 const_iv (GL_FLOAT), 1383 const_iv (GL_FLOAT),
1327 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1384 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328 const_iv (GL_COMPILE), 1385 const_iv (GL_COMPILE),
1329 const_iv (GL_TEXTURE_1D), 1386 const_iv (GL_TEXTURE_1D),
… …
1341 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1398 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1399 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1400 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1401 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345 const_iv (GL_GENERATE_MIPMAP), 1402 const_iv (GL_GENERATE_MIPMAP),
1346 const_iv (GL_LINEAR),
1347 const_iv (GL_MODULATE), 1403 const_iv (GL_MODULATE),
1404 const_iv (GL_DECAL),
1348 const_iv (GL_REPLACE), 1405 const_iv (GL_REPLACE),
1349 const_iv (GL_COLOR_BUFFER_BIT), 1406 const_iv (GL_COLOR_BUFFER_BIT),
1350 const_iv (GL_PROJECTION), 1407 const_iv (GL_PROJECTION),
1351 const_iv (GL_MODELVIEW), 1408 const_iv (GL_MODELVIEW),
1352 const_iv (GL_COLOR_LOGIC_OP), 1409 const_iv (GL_COLOR_LOGIC_OP),
1410 const_iv (GL_SEPARABLE_2D),
1353 const_iv (GL_CONVOLUTION_2D), 1411 const_iv (GL_CONVOLUTION_2D),
1354 const_iv (GL_CONVOLUTION_BORDER_MODE), 1412 const_iv (GL_CONVOLUTION_BORDER_MODE),
1355 const_iv (GL_CONSTANT_BORDER), 1413 const_iv (GL_CONSTANT_BORDER),
1356 const_iv (GL_LINES), 1414 const_iv (GL_LINES),
1357 const_iv (GL_QUADS), 1415 const_iv (GL_QUADS),
… …
1382 1440
1383void glBlendFunc (int sfactor, int dfactor) 1441void glBlendFunc (int sfactor, int dfactor)
1384 1442
1385void glLogicOp (int opcode) 1443void glLogicOp (int opcode)
1386 1444
1445void glColorMask (int red, int green, int blue, int alpha)
1446
1387void glMatrixMode (int mode) 1447void glMatrixMode (int mode)
1388 1448
1389void glPushMatrix () 1449void glPushMatrix ()
1390 1450
1391void glPopMatrix () 1451void glPopMatrix ()
1392 1452
1393void glLoadIdentity () 1453void glLoadIdentity ()
1394 1454
1455# near and far are due to microsofts buggy c compiler
1395void 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_)
1396 1457
1397void 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)
1398 1461
1399void glTranslate (float x, float y, float z = 0.) 1462void glTranslate (float x, float y, float z = 0.)
1400 CODE: 1463 CODE:
1401 glTranslatef (x, y, z); 1464 glTranslatef (x, y, z);
1402 1465
1403void glScale (float x, float y, float z) 1466void glScale (float x, float y, float z = 1.)
1404 CODE: 1467 CODE:
1405 glScalef (x, y, z); 1468 glScalef (x, y, z);
1406 1469
1407void glRotate (float angle, float x, float y, float z) 1470void glRotate (float angle, float x, float y, float z)
1408 CODE: 1471 CODE:
… …
1413void glEnd () 1476void glEnd ()
1414 1477
1415void glColor (float r, float g, float b, float a = 1.0) 1478void glColor (float r, float g, float b, float a = 1.0)
1416 PROTOTYPE: @ 1479 PROTOTYPE: @
1417 CODE: 1480 CODE:
1418 glColor4f (r, g, b, a); 1481 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1419 1482
1420void glVertex (float x, float y, float z = 0.) 1483void glVertex (float x, float y, float z = 0.)
1421 CODE: 1484 CODE:
1422 glVertex3f (x, y, z); 1485 glVertex3f (x, y, z);
1423 1486
… …
1435 1498
1436void glBindTexture (int target, int name) 1499void glBindTexture (int target, int name)
1437 1500
1438void glConvolutionParameter (int target, int pname, float params) 1501void glConvolutionParameter (int target, int pname, float params)
1439 CODE: 1502 CODE:
1440 glConvolutionParameterf (target, pname, params); 1503 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1441 1504
1442void 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));
1443 1514
1444void 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)
1445 1516
1446void 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)
1447 1524
1448int glGenTexture () 1525int glGenTexture ()
1449 CODE: 1526 CODE:
1450{ 1527{
1451 GLuint name; 1528 GLuint name;

Diff Legend

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