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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC

… …
84 84
85static void 85static void
86substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
87{ 87{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifndef _WIN32 89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif 93#endif
92} 94}
93 95
94static void 96static void
… …
439 SDL_Rect **m; 441 SDL_Rect **m;
440 442
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
445 450
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 455
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454 457
455 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 460
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
667} 670}
668 671
669void 672void
670error (char *message) 673error (char *message)
671 CODE: 674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 676#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 678#endif
677 679
678void 680void
679fatal (char *message) 681fatal (char *message)
680 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 684#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 686#endif
686 exit (1); 687 exit (1);
687 688
688MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
689 690
… …
712MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
713 714
714CFClient::Layout 715CFClient::Layout
715new (SV *class, int rgba = 0) 716new (SV *class, int rgba = 0)
716 CODE: 717 CODE:
718#if _WIN32
719 rgba = 0;//D
720#endif
717 New (0, RETVAL, 1, struct cf_layout); 721 New (0, RETVAL, 1, struct cf_layout);
718 722
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 724 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 725 RETVAL->r = 1.;
… …
801set_width (CFClient::Layout self, int max_width = -1) 805set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 806 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 807 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 808
805void 809void
810set_indent (CFClient::Layout self, int indent)
811 CODE:
812 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813
814void
815set_spacing (CFClient::Layout self, int spacing)
816 CODE:
817 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818
819void
820set_ellipsise (CFClient::Layout self, int ellipsise)
821 CODE:
822 pango_layout_set_ellipsize (self->pl,
823 ellipsise == 1 ? PANGO_ELLIPSIZE_START
824 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
826 : PANGO_ELLIPSIZE_NONE
827 );
828
829void
830set_single_paragraph_mode (CFClient::Layout self, int spm)
831 CODE:
832 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833
834void
806size (CFClient::Layout self) 835size (CFClient::Layout self)
807 PPCODE: 836 PPCODE:
808{ 837{
809 int w, h; 838 int w, h;
810 839
… …
876 905
877 while (p < e) 906 while (p < e)
878 { 907 {
879 uint32_t rgba = *p; 908 uint32_t rgba = *p;
880 rgba = (rgba >> 24) | (rgba << 8); 909 rgba = (rgba >> 24) | (rgba << 8);
910#if 0
911#ifdef _WIN32
912 {//D
913 uint8_t r = rgba >> 24;
914 uint8_t g = rgba >> 16;
915 uint8_t b = rgba >> 8;
916 uint8_t a = rgba >> 0;
917
918 rgba = (rgba & 0xffffff00) | a;
919 }
920#endif
921#endif
881 rgba = SDL_SwapBE32 (rgba); 922 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 923 *p++ = rgba;
883 } 924 }
884 } 925 }
885 926
… …
942 983
943 if (ix) 984 if (ix)
944 { 985 {
945 glEnable (GL_BLEND); 986 glEnable (GL_BLEND);
946 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 987 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
988 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f);
947 } 990 }
948 991
949 glBindTexture (GL_TEXTURE_2D, name); 992 glBindTexture (GL_TEXTURE_2D, name);
950 993
951 if (wrap_mode) 994 if (wrap_mode)
… …
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1004 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1005 glEnd ();
963 1006
964 if (ix) 1007 if (ix)
1008 {
1009 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1010 glDisable (GL_BLEND);
1011 }
966} 1012}
967 1013
968MODULE = CFClient PACKAGE = CFClient::Map 1014MODULE = CFClient PACKAGE = CFClient::Map
969 1015
970CFClient::Map 1016CFClient::Map
… …
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1539 const_iv (GL_ONE_MINUS_DST_ALPHA),
1494 const_iv (GL_RGB), 1540 const_iv (GL_RGB),
1495 const_iv (GL_RGBA), 1541 const_iv (GL_RGBA),
1496 const_iv (GL_UNSIGNED_BYTE), 1542 const_iv (GL_UNSIGNED_BYTE),
1497 const_iv (GL_ALPHA), 1543 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1545 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1547 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1548 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1549 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1550 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1551 const_iv (GL_TEXTURE_2D),

Diff Legend

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