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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.88 by root, Fri May 19 23:18:40 2006 UTC

… …
7 7
8#include "EXTERN.h" 8#include "EXTERN.h"
9#include "perl.h" 9#include "perl.h"
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h>
12#include <string.h> 13#include <string.h>
13#include <stdio.h> 14#include <stdio.h>
14 15
15#include <SDL.h> 16#include <SDL.h>
16#include <SDL_endian.h> 17#include <SDL_endian.h>
… …
83 84
84static void 85static void
85substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
86{ 87{
87 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
88 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
89} 94}
90 95
91static void 96static void
92layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
93{ 98{
… …
438 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450
443 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447 455
448 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
451 457
452 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 460
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
463 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
464 470
465 ++m; 471 ++m;
466 } 472 }
467} 473}
474
475char *
476SDL_GetError ()
468 477
469int 478int
470SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
471 CODE: 480 CODE:
472 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
664} 673}
665 674
666void 675void
667error (char *message) 676error (char *message)
668 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 679#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif 681#endif
674 682
675void 683void
676fatal (char *message) 684fatal (char *message)
677 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
678#ifdef _WIN32 687#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif 689#endif
683 exit (1); 690 exit (1);
684 691
685MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
686 693
… …
709MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
710 717
711CFClient::Layout 718CFClient::Layout
712new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
713 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
714 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
715 725
716 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
717 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
718 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
798set_width (CFClient::Layout self, int max_width = -1) 808set_width (CFClient::Layout self, int max_width = -1)
799 CODE: 809 CODE:
800 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 810 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
801 811
802void 812void
813set_indent (CFClient::Layout self, int indent)
814 CODE:
815 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816
817void
818set_spacing (CFClient::Layout self, int spacing)
819 CODE:
820 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821
822void
823set_ellipsise (CFClient::Layout self, int ellipsise)
824 CODE:
825 pango_layout_set_ellipsize (self->pl,
826 ellipsise == 1 ? PANGO_ELLIPSIZE_START
827 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
829 : PANGO_ELLIPSIZE_NONE
830 );
831
832void
833set_single_paragraph_mode (CFClient::Layout self, int spm)
834 CODE:
835 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836
837void
803size (CFClient::Layout self) 838size (CFClient::Layout self)
804 PPCODE: 839 PPCODE:
805{ 840{
806 int w, h; 841 int w, h;
807 842
… …
873 908
874 while (p < e) 909 while (p < e)
875 { 910 {
876 uint32_t rgba = *p; 911 uint32_t rgba = *p;
877 rgba = (rgba >> 24) | (rgba << 8); 912 rgba = (rgba >> 24) | (rgba << 8);
913#if 0
914#ifdef _WIN32
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920
921 rgba = (rgba & 0xffffff00) | a;
922 }
923#endif
924#endif
878 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
879 *p++ = rgba; 926 *p++ = rgba;
880 } 927 }
881 } 928 }
882 929
… …
939 986
940 if (ix) 987 if (ix)
941 { 988 {
942 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
943 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
991 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f);
944 } 993 }
945 994
946 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
947 996
948 if (wrap_mode) 997 if (wrap_mode)
… …
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 1008 glEnd ();
960 1009
961 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
963} 1015}
964 1016
965MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
966 1018
967CFClient::Map 1019CFClient::Map
… …
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1542 const_iv (GL_ONE_MINUS_DST_ALPHA),
1491 const_iv (GL_RGB), 1543 const_iv (GL_RGB),
1492 const_iv (GL_RGBA), 1544 const_iv (GL_RGBA),
1493 const_iv (GL_UNSIGNED_BYTE), 1545 const_iv (GL_UNSIGNED_BYTE),
1494 const_iv (GL_ALPHA), 1546 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1548 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1550 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1551 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1552 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1553 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1554 const_iv (GL_TEXTURE_2D),
… …
1589void glEnd () 1643void glEnd ()
1590 1644
1591void glColor (float r, float g, float b, float a = 1.0) 1645void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 1646 PROTOTYPE: @
1593 CODE: 1647 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 1648 glColor4ub (MIN ((int)(r * 255.f), 255),
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1649 MIN ((int)(g * 255.f), 255),
1650 MIN ((int)(b * 255.f), 255),
1651 MIN ((int)(a * 255.f), 255));
1596 1652
1597void glVertex (float x, float y, float z = 0.) 1653void glVertex (float x, float y, float z = 0.)
1598 CODE: 1654 CODE:
1599 glVertex3f (x, y, z); 1655 glVertex3f (x, y, z);
1600 1656

Diff Legend

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