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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.251 by root, Fri Dec 28 17:28:01 2007 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
56#endif
57
51#ifndef _WIN32 58#ifndef _WIN32
52# include <sys/types.h> 59# include <sys/types.h>
53# include <sys/socket.h> 60# include <sys/socket.h>
54# include <netinet/in.h> 61# include <netinet/in.h>
55# include <netinet/tcp.h> 62# include <netinet/tcp.h>
120 127
121#include "pango-font.c" 128#include "pango-font.c"
122#include "pango-fontmap.c" 129#include "pango-fontmap.c"
123#include "pango-render.c" 130#include "pango-render.c"
124 131
125typedef IV CFPlus__Channel; 132typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 133typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 134typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 135typedef Mix_Music *DC__MixMusic;
129 136
130typedef PangoFontDescription *CFPlus__Font; 137typedef PangoFontDescription *DC__Font;
131 138
132static int 139static int
133shape_attr_p (PangoLayoutRun *run) 140shape_attr_p (PangoLayoutRun *run)
134{ 141{
135 GSList *attrs = run->item->analysis.extra_attrs; 142 GSList *attrs = run->item->analysis.extra_attrs;
149 156
150typedef struct cf_layout { 157typedef struct cf_layout {
151 PangoLayout *pl; 158 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 159 float r, g, b, a; // default color for rgba mode
153 int base_height; 160 int base_height;
154 CFPlus__Font font; 161 DC__Font font;
162 rc_t *rc;
155} *CFPlus__Layout; 163} *DC__Layout;
156 164
157static CFPlus__Font default_font; 165static DC__Font default_font;
158static PangoContext *opengl_context; 166static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 167static PangoFontMap *opengl_fontmap;
160 168
161static void 169static void
162substitute_func (FcPattern *pattern, gpointer data) 170substitute_func (FcPattern *pattern, gpointer data)
167#endif 175#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 176 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 177}
170 178
171static void 179static void
172layout_update_font (CFPlus__Layout self) 180layout_update_font (DC__Layout self)
173{ 181{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 182 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 183 * reasonably well with bitstream vera
176 */ 184 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 185 PangoFontDescription *font = self->font ? self->font : default_font;
181 189
182 pango_layout_set_font_description (self->pl, font); 190 pango_layout_set_font_description (self->pl, font);
183} 191}
184 192
185static void 193static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 194layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 195{
188 PangoRectangle rect; 196 PangoRectangle rect;
189 197
190 // get_pixel_* wrongly rounds down 198 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 199 pango_layout_get_extents (self->pl, 0, &rect);
202 210
203typedef uint16_t tileid; 211typedef uint16_t tileid;
204typedef uint16_t faceid; 212typedef uint16_t faceid;
205 213
206typedef struct { 214typedef struct {
207 int name; 215 GLuint name;
208 int w, h; 216 int w, h;
209 float s, t; 217 float s, t;
210 uint8_t r, g, b, a; 218 uint8_t r, g, b, a;
211 tileid smoothtile; 219 tileid smoothtile;
212 uint8_t smoothlevel; 220 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 238 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 239 int texs; maptex *tex; // [tileid]
232 240
233 int32_t rows; 241 int32_t rows;
234 maprow *row; 242 maprow *row;
235} *CFPlus__Map; 243} *DC__Map;
236 244
237static char * 245static char *
238prepend (char *ptr, int sze, int inc) 246prepend (char *ptr, int sze, int inc)
239{ 247{
240 char *p; 248 char *p;
278 self->texs *= 2; 286 self->texs *= 2;
279 } 287 }
280} 288}
281 289
282static maprow * 290static maprow *
283map_get_row (CFPlus__Map self, int y) 291map_get_row (DC__Map self, int y)
284{ 292{
285 if (0 > y) 293 if (0 > y)
286 { 294 {
287 int extend = - y + MAP_EXTEND_Y; 295 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 296 Prepend (maprow, self->row, self->rows, extend);
326 334
327 return row->col + (x - row->c0); 335 return row->col + (x - row->c0);
328} 336}
329 337
330static mapcell * 338static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 339map_get_cell (DC__Map self, int x, int y)
332{ 340{
333 return row_get_cell (map_get_row (self, y), x); 341 return row_get_cell (map_get_row (self, y), x);
334} 342}
335 343
336static void 344static void
337map_clear (CFPlus__Map self) 345map_clear (DC__Map self)
338{ 346{
339 int r; 347 int r;
340 348
341 for (r = 0; r < self->rows; r++) 349 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 350 Safefree (self->row[r].col);
350 self->row = 0; 358 self->row = 0;
351 self->rows = 0; 359 self->rows = 0;
352} 360}
353 361
354static void 362static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 363map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 364{
357 int x, y; 365 int x, y;
358 maprow *row; 366 maprow *row;
359 mapcell *cell; 367 mapcell *cell;
360 368
439 n |= n >> 16; 447 n |= n >> 16;
440 448
441 return n + 1; 449 return n + 1;
442} 450}
443 451
452static unsigned int
453popcount (unsigned int n)
454{
455 n -= (n >> 1) & 0x55555555U;
456 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
457 n = ((n >> 4) + n) & 0x0f0f0f0fU;
458 n *= 0x01010101U;
459
460 return n >> 24;
461}
462
444/* SDL should provide this, really. */ 463/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 464#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 465#define SDLK_MODIFIER_MAX 314
447 466
448/******************************************************************************/ 467/******************************************************************************/
486 return 0; 505 return 0;
487 506
488 return 1; 507 return 1;
489} 508}
490 509
491MODULE = CFPlus PACKAGE = CFPlus 510MODULE = Deliantra::Client PACKAGE = DC
492 511
493PROTOTYPES: ENABLE 512PROTOTYPES: ENABLE
494 513
495BOOT: 514BOOT:
496{ 515{
497 HV *stash = gv_stashpv ("CFPlus", 1); 516 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 517 static const struct {
499 const char *name; 518 const char *name;
500 IV iv; 519 IV iv;
501 } *civ, const_iv[] = { 520 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 521# define const_iv(name) { # name, (IV)name }
524 543
525 const_iv (SDL_APPINPUTFOCUS), 544 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 545 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 546 const_iv (SDL_APPACTIVE),
528 547
548 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 550 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 551 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 552 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 553 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 554 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 626 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 627 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 628 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 629 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 630 const_iv (KMOD_MODE),
631
632 const_iv (MIX_DEFAULT_FORMAT),
610# undef const_iv 633# undef const_iv
611 }; 634 };
612 635
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 655
633NV floor (NV x) 656NV floor (NV x)
634 657
635NV ceil (NV x) 658NV ceil (NV x)
636 659
660IV minpot (UV n)
661
662IV popcount (UV n)
663
637void 664void
638pango_init () 665pango_init ()
639 CODE: 666 CODE:
640{ 667{
641 opengl_fontmap = pango_opengl_font_map_new (); 668 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif
644} 675}
645 676
646char * 677char *
647SDL_GetError () 678SDL_GetError ()
648 679
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 712
682 if (m && m != (SDL_Rect **)-1) 713 if (m && m != (SDL_Rect **)-1)
683 while (*m) 714 while (*m)
684 { 715 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 716 if ((*m)->w >= 800 && (*m)->h >= 480)
686 { 717 {
687 AV *av = newAV (); 718 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 719 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 720 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 721 av_push (av, newSViv (rgb));
714 745
715 if (RETVAL) 746 if (RETVAL)
716 { 747 {
717 av_clear (texture_av); 748 av_clear (texture_av);
718 749
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 751#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 752#include "glfunc.h"
722#undef GL_FUNC 753#undef GL_FUNC
723 } 754 }
724} 755}
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 836 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 837 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 838 break;
808 } 839 }
809 840
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 841 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 842 }
812} 843}
813 844
814int 845int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 847 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 848 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 849 Mix_ChannelFinished (channel_finished);
850
851void
852Mix_QuerySpec ()
853 PPCODE:
854{
855 int freq, channels;
856 Uint16 format;
857
858 if (Mix_QuerySpec (&freq, &format, &channels))
859 {
860 EXTEND (SP, 3);
861 PUSHs (sv_2mortal (newSViv (freq)));
862 PUSHs (sv_2mortal (newSViv (format)));
863 PUSHs (sv_2mortal (newSViv (channels)));
864 }
865}
819 866
820void 867void
821Mix_CloseAudio () 868Mix_CloseAudio ()
822 869
823int 870int
957void 1004void
958error (char *message) 1005error (char *message)
959 CODE: 1006 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1007 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1008#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1009 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1010#endif
964 1011
965void 1012void
966fatal (char *message) 1013fatal (char *message)
967 CODE: 1014 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1015 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1016#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1017 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1018#endif
972 _exit (1); 1019 _exit (1);
973 1020
974void 1021void
975_exit (int retval = 0) 1022_exit (int retval = 0)
987#if DEBUG 1034#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1035 VALGRIND_DO_LEAK_CHECK;
989#endif 1036#endif
990} 1037}
991 1038
992MODULE = CFPlus PACKAGE = CFPlus::Font 1039MODULE = Deliantra::Client PACKAGE = DC::Font
993 1040
994PROTOTYPES: DISABLE 1041PROTOTYPES: DISABLE
995 1042
996CFPlus::Font 1043DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1044new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1045 CODE:
999{ 1046{
1000 int count; 1047 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1051}
1005 OUTPUT: 1052 OUTPUT:
1006 RETVAL 1053 RETVAL
1007 1054
1008void 1055void
1009DESTROY (CFPlus::Font self) 1056DESTROY (DC::Font self)
1010 CODE: 1057 CODE:
1011 pango_font_description_free (self); 1058 pango_font_description_free (self);
1012 1059
1013void 1060void
1014make_default (CFPlus::Font self) 1061make_default (DC::Font self)
1015 PROTOTYPE: $ 1062 PROTOTYPE: $
1016 CODE: 1063 CODE:
1017 default_font = self; 1064 default_font = self;
1018 1065
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1066MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1067
1021PROTOTYPES: DISABLE 1068PROTOTYPES: DISABLE
1022 1069
1023void 1070void
1024reset_glyph_cache () 1071glyph_cache_backup ()
1025 PROTOTYPE: 1072 PROTOTYPE:
1026 CODE: 1073 CODE:
1074 tc_backup ();
1075
1076void
1077glyph_cache_restore ()
1078 PROTOTYPE:
1079 CODE:
1027 tc_clear (); 1080 tc_restore ();
1028 1081
1029CFPlus::Layout 1082DC::Layout
1030new (SV *class) 1083new (SV *class)
1031 CODE: 1084 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1085 New (0, RETVAL, 1, struct cf_layout);
1033 1086
1034 RETVAL->pl = pango_layout_new (opengl_context); 1087 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1089 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1090 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1091 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1092 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1093 RETVAL->font = 0;
1094 RETVAL->rc = rc_alloc ();
1041 1095
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1096 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1097 layout_update_font (RETVAL);
1044 OUTPUT: 1098 OUTPUT:
1045 RETVAL 1099 RETVAL
1046 1100
1047void 1101void
1048DESTROY (CFPlus::Layout self) 1102DESTROY (DC::Layout self)
1049 CODE: 1103 CODE:
1050 g_object_unref (self->pl); 1104 g_object_unref (self->pl);
1105 rc_free (self->rc);
1051 Safefree (self); 1106 Safefree (self);
1052 1107
1053void 1108void
1054set_text (CFPlus::Layout self, SV *text_) 1109set_text (DC::Layout self, SV *text_)
1055 CODE: 1110 CODE:
1056{ 1111{
1057 STRLEN textlen; 1112 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1113 char *text = SvPVutf8 (text_, textlen);
1059 1114
1060 pango_layout_set_text (self->pl, text, textlen); 1115 pango_layout_set_text (self->pl, text, textlen);
1061} 1116}
1062 1117
1063void 1118void
1064set_markup (CFPlus::Layout self, SV *text_) 1119set_markup (DC::Layout self, SV *text_)
1065 CODE: 1120 CODE:
1066{ 1121{
1067 STRLEN textlen; 1122 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1069 1124
1070 pango_layout_set_markup (self->pl, text, textlen); 1125 pango_layout_set_markup (self->pl, text, textlen);
1071} 1126}
1072 1127
1073void 1128void
1074set_shapes (CFPlus::Layout self, ...) 1129set_shapes (DC::Layout self, ...)
1075 CODE: 1130 CODE:
1076{ 1131{
1077 PangoAttrList *attrs = 0; 1132 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1133 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1134 const char *pos = text;
1114 if (attrs) 1169 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1170 pango_layout_set_attributes (self->pl, attrs);
1116} 1171}
1117 1172
1118void 1173void
1119get_shapes (CFPlus::Layout self) 1174get_shapes (DC::Layout self)
1120 PPCODE: 1175 PPCODE:
1121{ 1176{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1177 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1178
1124 do 1179 do
1125 { 1180 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1181 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1182
1128 if (run && shape_attr_p (run)) 1183 if (run && shape_attr_p (run))
1129 { 1184 {
1130 PangoRectangle extents; 1185 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1186 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1194
1140 pango_layout_iter_free (iter); 1195 pango_layout_iter_free (iter);
1141} 1196}
1142 1197
1143int 1198int
1144has_wrapped (CFPlus::Layout self) 1199has_wrapped (DC::Layout self)
1145 CODE: 1200 CODE:
1146{ 1201{
1147 int lines = 1; 1202 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1203 const char *text = pango_layout_get_text (self->pl);
1149 1204
1154} 1209}
1155 OUTPUT: 1210 OUTPUT:
1156 RETVAL 1211 RETVAL
1157 1212
1158SV * 1213SV *
1159get_text (CFPlus::Layout self) 1214get_text (DC::Layout self)
1160 CODE: 1215 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1216 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1217 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1218 OUTPUT:
1164 RETVAL 1219 RETVAL
1165 1220
1166void 1221void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1222set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1223 CODE:
1169 self->r = r; 1224 self->r = r;
1170 self->g = g; 1225 self->g = g;
1171 self->b = b; 1226 self->b = b;
1172 self->a = a; 1227 self->a = a;
1173 1228
1174void 1229void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1230set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1231 CODE:
1177 if (self->font != font) 1232 if (self->font != font)
1178 { 1233 {
1179 self->font = font; 1234 self->font = font;
1180 layout_update_font (self); 1235 layout_update_font (self);
1181 } 1236 }
1182 1237
1183void 1238void
1184set_height (CFPlus::Layout self, int base_height) 1239set_height (DC::Layout self, int base_height)
1185 CODE: 1240 CODE:
1186 if (self->base_height != base_height) 1241 if (self->base_height != base_height)
1187 { 1242 {
1188 self->base_height = base_height; 1243 self->base_height = base_height;
1189 layout_update_font (self); 1244 layout_update_font (self);
1190 } 1245 }
1191 1246
1192void 1247void
1193set_width (CFPlus::Layout self, int max_width = -1) 1248set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1249 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1250 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1251
1197void 1252void
1198set_indent (CFPlus::Layout self, int indent) 1253set_indent (DC::Layout self, int indent)
1199 CODE: 1254 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1255 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1256
1202void 1257void
1203set_spacing (CFPlus::Layout self, int spacing) 1258set_spacing (DC::Layout self, int spacing)
1204 CODE: 1259 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1260 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1261
1207void 1262void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1263set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1264 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1265 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1266 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1267 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1268 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1269 : PANGO_ELLIPSIZE_NONE
1215 ); 1270 );
1216 1271
1217void 1272void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1273set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1274 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1275 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1276
1222void 1277void
1223size (CFPlus::Layout self) 1278size (DC::Layout self)
1224 PPCODE: 1279 PPCODE:
1225{ 1280{
1226 int w, h; 1281 int w, h;
1227 1282
1228 layout_get_pixel_size (self, &w, &h); 1283 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1286 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1287 PUSHs (sv_2mortal (newSViv (h)));
1233} 1288}
1234 1289
1235int 1290int
1236descent (CFPlus::Layout self) 1291descent (DC::Layout self)
1237 CODE: 1292 CODE:
1238{ 1293{
1239 PangoRectangle rect; 1294 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1295 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1296 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1297 RETVAL = PANGO_DESCENT (rect);
1243} 1298}
1244 OUTPUT: 1299 OUTPUT:
1245 RETVAL 1300 RETVAL
1246 1301
1247int 1302int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1303xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1304 CODE:
1250{ 1305{
1251 int index, trailing; 1306 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1307 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1308 RETVAL = index + trailing;
1254} 1309}
1255 OUTPUT: 1310 OUTPUT:
1256 RETVAL 1311 RETVAL
1257 1312
1258void 1313void
1259cursor_pos (CFPlus::Layout self, int index) 1314cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1315 PPCODE:
1261{ 1316{
1262 PangoRectangle strong_pos; 1317 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1318 pango_layout_get_cursor_pos (self->pl, index, 0, &pos);
1264 1319
1265 EXTEND (SP, 3); 1320 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1324}
1270 1325
1271void 1326void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1327index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1328 PPCODE:
1274{ 1329{
1275 int line, x; 1330 int line, x;
1276 1331
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1335 --line;
1336#endif
1280 EXTEND (SP, 2); 1337 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1338 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1339 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1340}
1284 1341
1285void 1342void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1343line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1344 PPCODE:
1288{ 1345{
1289 PangoLayoutLine *lp; 1346 PangoLayoutLine *lp;
1290 int index, trailing; 1347 int index, trailing;
1291 1348
1292 if (line < 0) 1349 if (line < 0)
1293 XSRETURN_EMPTY; 1350 XSRETURN_EMPTY;
1294 1351
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1352 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1353 XSRETURN_EMPTY; /* do better */
1297 1354
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1355 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1356
1300 EXTEND (SP, 2); 1357 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1363 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1364 }
1308} 1365}
1309 1366
1310void 1367void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1368render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1369 CODE:
1370 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1371 pango_opengl_render_layout_subpixel (
1314 self->pl, 1372 self->pl,
1373 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1374 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1375 self->r, self->g, self->b, self->a,
1317 flags 1376 flags
1318 ); 1377 );
1378 // we assume that context_change actually clears/frees stuff
1379 // and does not do any recomputation...
1380 pango_layout_context_changed (self->pl);
1319 1381
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1382void
1383draw (DC::Layout self)
1384 CODE:
1385{
1386 glEnable (GL_TEXTURE_2D);
1387 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1388 glEnable (GL_BLEND);
1389 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1390 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1391 glEnable (GL_ALPHA_TEST);
1392 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1393
1394 rc_draw (self->rc);
1395
1396 glDisable (GL_ALPHA_TEST);
1397 glDisable (GL_BLEND);
1398 glDisable (GL_TEXTURE_2D);
1399}
1400
1401MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1402
1322PROTOTYPES: ENABLE 1403PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1404
1326void 1405void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1406pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1407 CODE:
1329{ 1408{
1406 RETVAL = width > 0; 1485 RETVAL = width > 0;
1407} 1486}
1408 OUTPUT: 1487 OUTPUT:
1409 RETVAL 1488 RETVAL
1410 1489
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1490MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1491
1413PROTOTYPES: DISABLE 1492PROTOTYPES: DISABLE
1414 1493
1415CFPlus::Map 1494DC::Map
1416new (SV *class) 1495new (SV *class)
1417 CODE: 1496 CODE:
1418 New (0, RETVAL, 1, struct map); 1497 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1498 RETVAL->x = 0;
1420 RETVAL->y = 0; 1499 RETVAL->y = 0;
1428 RETVAL->row = 0; 1507 RETVAL->row = 0;
1429 OUTPUT: 1508 OUTPUT:
1430 RETVAL 1509 RETVAL
1431 1510
1432void 1511void
1433DESTROY (CFPlus::Map self) 1512DESTROY (DC::Map self)
1434 CODE: 1513 CODE:
1435{ 1514{
1436 map_clear (self); 1515 map_clear (self);
1437 Safefree (self->face2tile); 1516 Safefree (self->face2tile);
1438 Safefree (self->tex); 1517 Safefree (self->tex);
1439 Safefree (self); 1518 Safefree (self);
1440} 1519}
1441 1520
1442void 1521void
1443resize (CFPlus::Map self, int map_width, int map_height) 1522resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1523 CODE:
1445 self->w = map_width; 1524 self->w = map_width;
1446 self->h = map_height; 1525 self->h = map_height;
1447 1526
1448void 1527void
1449clear (CFPlus::Map self) 1528clear (DC::Map self)
1450 CODE: 1529 CODE:
1451 map_clear (self); 1530 map_clear (self);
1452 1531
1453void 1532void
1454set_tileid (CFPlus::Map self, int face, int tile) 1533set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1534 CODE:
1456{ 1535{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1536 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1537 need_texid (self, tile);
1459} 1538}
1460 1539
1461void 1540void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1541set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1542 CODE:
1464{ 1543{
1465 tileid texid; 1544 tileid texid;
1466 maptex *tex; 1545 maptex *tex;
1467 1546
1480 tex->smoothtile = self->face2tile [smooth]; 1559 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1560 tex->smoothlevel = level;
1482} 1561}
1483 1562
1484void 1563void
1485set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1564set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1565 CODE:
1487{ 1566{
1488 need_texid (self, texid); 1567 need_texid (self, texid);
1489 1568
1490 { 1569 {
1510 // from transparent color bleeding and ugly wrapping effects. 1589 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1591}
1513 1592
1514int 1593int
1515ox (CFPlus::Map self) 1594ox (DC::Map self)
1516 ALIAS: 1595 ALIAS:
1517 oy = 1 1596 oy = 1
1518 x = 2 1597 x = 2
1519 y = 3 1598 y = 3
1520 w = 4 1599 w = 4
1531 } 1610 }
1532 OUTPUT: 1611 OUTPUT:
1533 RETVAL 1612 RETVAL
1534 1613
1535void 1614void
1536scroll (CFPlus::Map self, int dx, int dy) 1615scroll (DC::Map self, int dx, int dy)
1537 CODE: 1616 CODE:
1538{ 1617{
1539 if (dx > 0) 1618 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1619 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1620 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1636 self->y += MAP_EXTEND_Y;
1558 } 1637 }
1559} 1638}
1560 1639
1561SV * 1640SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1641map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1642 CODE:
1564{ 1643{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1645 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1646 mapcell *cell;
1656} 1735}
1657 OUTPUT: 1736 OUTPUT:
1658 RETVAL 1737 RETVAL
1659 1738
1660SV * 1739SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1740mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1741 CODE:
1663{ 1742{
1664 int x1, x; 1743 int x1, x;
1665 int y1, y; 1744 int y1, y;
1666 int z; 1745 int z;
1711} 1790}
1712 OUTPUT: 1791 OUTPUT:
1713 RETVAL 1792 RETVAL
1714 1793
1715void 1794void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1795draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1717 CODE: 1796 CODE:
1718{ 1797{
1719 int x, y, z; 1798 int x, y, z;
1720 1799
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1802 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1803 smooth_key skey;
1725 1804
1726 rc_t *rc = rc_alloc (); 1805 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1806 rc_key_t key;
1728 rc_array_t *arr; 1807 rc_array_t *arr;
1790 if (tile) 1869 if (tile)
1791 { 1870 {
1792 maptex tex = self->tex [tile]; 1871 maptex tex = self->tex [tile];
1793 int px, py; 1872 int px, py;
1794 1873
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1874 if (key.texname != tex.name)
1798 { 1875 {
1799 if (!tex.name) 1876 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1877 tex = self->tex [2]; /* missing, replace by noface */
1801 1878
1884 // go through all smoothlevels, lowest to highest, then draw. 1961 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 1962 // this is basically counting sort
1886 { 1963 {
1887 int w, b; 1964 int w, b;
1888 1965
1966 glEnable (GL_TEXTURE_2D);
1967 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 1968 for (w = 0; w < 256 / 32; ++w)
1890 { 1969 {
1891 uint32_t smask = smooth_level [w]; 1970 uint32_t smask = smooth_level [w];
1892 if (smask) 1971 if (smask)
1893 for (b = 0; b < 32; ++b) 1972 for (b = 0; b < 32; ++b)
1918 { 1997 {
1919 // this time avoiding texture state changes 1998 // this time avoiding texture state changes
1920 // save gobs of state changes. 1999 // save gobs of state changes.
1921 if (key.texname != tex.name) 2000 if (key.texname != tex.name)
1922 { 2001 {
2002 glEnd ();
1923 key.texname = tex.name; 2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2004 glBegin (GL_QUADS);
1925 } 2005 }
1926 2006
1927 if (border) 2007 if (border)
1928 { 2008 {
1929 float ox = border * dx; 2009 float ox = border * dx;
1930 2010
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2015 }
1936 2016
1937 if (corner) 2017 if (corner)
1938 { 2018 {
1939 float ox = corner * dx; 2019 float ox = corner * dx;
1940 2020
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2021 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2025 }
1946 } 2026 }
1947 } 2027 }
1948 } 2028 }
1949 } 2029 }
1950 } 2030 }
2031
2032 glEnd ();
2033 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1;
1951 } 2035 }
1952 2036
1953 hv_clear (smooth); 2037 hv_clear (smooth);
1954 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2038 }
1957 2039
1958 glDisable (GL_BLEND); 2040 glDisable (GL_BLEND);
1959 rc_free (rc); 2041 rc_free (rc);
1960 2042
1989 } 2071 }
1990 } 2072 }
1991} 2073}
1992 2074
1993void 2075void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2076draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995 CODE: 2077 CODE:
1996{ 2078{
1997 static float color[16][3] = { 2079 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2080 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2081 { 1.00F, 1.00F, 1.00F },
2049 glDisable (GL_BLEND); 2131 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2132 glDisable (GL_TEXTURE_2D);
2051} 2133}
2052 2134
2053void 2135void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2136fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2137 PPCODE:
2056{ 2138{
2057 int x, y; 2139 int x, y;
2058 int sw1 = sw + 2; 2140 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2141 int sh1 = sh + 2;
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2212 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2213 PUSHs (darkness3_sv);
2132} 2214}
2133 2215
2134SV * 2216SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2217get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2218 CODE:
2137{ 2219{
2138 int x, y, x1, y1; 2220 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2221 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2222 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2205} 2287}
2206 OUTPUT: 2288 OUTPUT:
2207 RETVAL 2289 RETVAL
2208 2290
2209void 2291void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2292set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2211 PPCODE: 2293 PPCODE:
2212{ 2294{
2213 int x, y, z; 2295 int x, y, z;
2214 int w, h; 2296 int w, h;
2215 int x1, y1; 2297 int x1, y1;
2216 2298
2217 if (*data++ != 0) 2299 if (*data++ != 0)
2218 return; /* version mismatch */ 2300 XSRETURN_EMPTY; /* version mismatch */
2219 2301
2220 w = *data++ << 8; w |= *data++; 2302 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2303 h = *data++ << 8; h |= *data++;
2222 2304
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2305 // we need to do this 'cause we don't keep an absolute coord system for rows
2268 } 2350 }
2269 } 2351 }
2270 } 2352 }
2271} 2353}
2272 2354
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2355MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2356
2275CFPlus::RW 2357DC::RW
2276new (SV *class, SV *data_sv) 2358new (SV *class, SV *data_sv)
2277 CODE: 2359 CODE:
2278{ 2360{
2279 STRLEN datalen; 2361 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2362 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2364 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2365}
2284 OUTPUT: 2366 OUTPUT:
2285 RETVAL 2367 RETVAL
2286 2368
2287CFPlus::RW 2369DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2370new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2371 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2372 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2373 OUTPUT:
2292 RETVAL 2374 RETVAL
2293 2375
2294# fails on win32: 2376# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2377# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2378#void
2297#close (CFPlus::RW self) 2379#close (DC::RW self)
2298# CODE: 2380# CODE:
2299# (self->(close)) (self); 2381# (self->(close)) (self);
2300 2382
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2383MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2384
2303PROTOTYPES: DISABLE 2385PROTOTYPES: DISABLE
2304 2386
2305CFPlus::Channel 2387DC::Channel
2306find () 2388find ()
2307 CODE: 2389 CODE:
2308{ 2390{
2309 RETVAL = Mix_GroupAvailable (-1); 2391 RETVAL = Mix_GroupAvailable (-1);
2310 2392
2323} 2405}
2324 OUTPUT: 2406 OUTPUT:
2325 RETVAL 2407 RETVAL
2326 2408
2327void 2409void
2328halt (CFPlus::Channel self) 2410halt (DC::Channel self)
2329 CODE: 2411 CODE:
2330 Mix_HaltChannel (self); 2412 Mix_HaltChannel (self);
2331 2413
2332void 2414void
2333expire (CFPlus::Channel self, int ticks = -1) 2415expire (DC::Channel self, int ticks = -1)
2334 CODE: 2416 CODE:
2335 Mix_ExpireChannel (self, ticks); 2417 Mix_ExpireChannel (self, ticks);
2336 2418
2337void 2419void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2420fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2421 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2422 Mix_FadeOutChannel (self, ticks);
2341 2423
2342int 2424int
2343volume (CFPlus::Channel self, int volume) 2425volume (DC::Channel self, int volume)
2344 CODE: 2426 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2427 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2428 OUTPUT:
2347 RETVAL 2429 RETVAL
2348 2430
2349void 2431void
2350unregister_all_effects (CFPlus::Channel self) 2432unregister_all_effects (DC::Channel self)
2351 CODE: 2433 CODE:
2352 Mix_UnregisterAllEffects (self); 2434 Mix_UnregisterAllEffects (self);
2353 2435
2354void 2436void
2355set_panning (CFPlus::Channel self, int left, int right) 2437set_panning (DC::Channel self, int left, int right)
2356 CODE: 2438 CODE:
2357 left = CLAMP (left , 0, 255); 2439 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2440 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2441 Mix_SetPanning (self, left, right);
2360 2442
2361void 2443void
2362set_distance (CFPlus::Channel self, int distance) 2444set_distance (DC::Channel self, int distance)
2363 CODE: 2445 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2446 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2447
2366void 2448void
2367set_position (CFPlus::Channel self, int angle, int distance) 2449set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2450 CODE:
2369 2451
2370void 2452void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2454 CODE:
2373{ 2455{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2456 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2457 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2459}
2378 2460
2379void 2461void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2462set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2463 CODE:
2382 Mix_SetReverseStereo (self, flip); 2464 Mix_SetReverseStereo (self, flip);
2383 2465
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2467
2386PROTOTYPES: DISABLE 2468PROTOTYPES: DISABLE
2387 2469
2388CFPlus::MixChunk 2470DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2471new (SV *class, DC::RW rwops)
2390 CODE: 2472 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2473 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2474 OUTPUT:
2393 RETVAL 2475 RETVAL
2394 2476
2395void 2477void
2396DESTROY (CFPlus::MixChunk self) 2478DESTROY (DC::MixChunk self)
2397 CODE: 2479 CODE:
2398 Mix_FreeChunk (self); 2480 Mix_FreeChunk (self);
2399 2481
2400int 2482int
2401volume (CFPlus::MixChunk self, int volume = -1) 2483volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2484 CODE:
2403 if (items > 1) 2485 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2486 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2487 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2488 OUTPUT:
2407 RETVAL 2489 RETVAL
2408 2490
2409CFPlus::Channel 2491DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2492play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2493 CODE:
2412{ 2494{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2496
2415 if (RETVAL < 0) 2497 if (RETVAL < 0)
2422 } 2504 }
2423} 2505}
2424 OUTPUT: 2506 OUTPUT:
2425 RETVAL 2507 RETVAL
2426 2508
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2510
2429int 2511int
2430volume (int volume = -1) 2512volume (int volume = -1)
2431 PROTOTYPE: ;$ 2513 PROTOTYPE: ;$
2432 CODE: 2514 CODE:
2444void 2526void
2445halt () 2527halt ()
2446 CODE: 2528 CODE:
2447 Mix_HaltMusic (); 2529 Mix_HaltMusic ();
2448 2530
2449CFPlus::MixMusic 2531DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2532new (SV *class, DC::RW rwops)
2451 CODE: 2533 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2534 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2535 OUTPUT:
2454 RETVAL 2536 RETVAL
2455 2537
2456void 2538void
2457DESTROY (CFPlus::MixMusic self) 2539DESTROY (DC::MixMusic self)
2458 CODE: 2540 CODE:
2459 Mix_FreeMusic (self); 2541 Mix_FreeMusic (self);
2460 2542
2461int 2543int
2462play (CFPlus::MixMusic self, int loops = -1) 2544play (DC::MixMusic self, int loops = -1)
2463 CODE: 2545 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2546 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2547 OUTPUT:
2466 RETVAL 2548 RETVAL
2467 2549
2468void 2550void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2551fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2552 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2553 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2554
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2555MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2556
2475PROTOTYPES: ENABLE 2557PROTOTYPES: ENABLE
2476 2558
2477BOOT: 2559BOOT:
2478{ 2560{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2561 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2562 static const struct {
2481 const char *name; 2563 const char *name;
2482 IV iv; 2564 IV iv;
2483 } *civ, const_iv[] = { 2565 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2566# define const_iv(name) { # name, (IV)name }
2519 const_iv (GL_INTENSITY), 2601 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2602 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2603 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2604 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2605 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2606 const_iv (GL_COMPRESSED_ALPHA_ARB),
2607 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2608 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2609 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2610 const_iv (GL_COMPRESSED_RGB_ARB),
2611 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 2612 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2613 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2614 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2615 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2616 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2655 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2656 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2657 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2658 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2659 const_iv (GL_GENERATE_MIPMAP_HINT),
2660 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2661 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2662 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2663 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2664 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2665 const_iv (GL_V3F),
2584 2673
2585 texture_av = newAV (); 2674 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2675 AvREAL_off (texture_av);
2587} 2676}
2588 2677
2678void
2679disable_GL_EXT_blend_func_separate ()
2680 CODE:
2681 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0;
2683
2589char * 2684char *
2590gl_vendor () 2685gl_vendor ()
2591 CODE: 2686 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2687 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2688 OUTPUT:
2714 2809
2715void glRect (float x1, float y1, float x2, float y2) 2810void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2811 CODE:
2717 glRectf (x1, y1, x2, y2); 2812 glRectf (x1, y1, x2, y2);
2718 2813
2814void glRect_lineloop (float x1, float y1, float x2, float y2)
2815 CODE:
2816 glBegin (GL_LINE_LOOP);
2817 glVertex2f (x1, y1);
2818 glVertex2f (x2, y1);
2819 glVertex2f (x2, y2);
2820 glVertex2f (x1, y2);
2821 glEnd ();
2822
2719PROTOTYPES: ENABLE 2823PROTOTYPES: ENABLE
2720 2824
2721void glBegin (int mode) 2825void glBegin (int mode)
2722 2826
2723void glEnd () 2827void glEnd ()
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2859void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 2860 CODE:
2757 if (gl.SeparableFilter2D) 2861 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2862 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 2863
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2864void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 2865
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2866void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 2867
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 2868void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 2869
2791 2895
2792void glEndList () 2896void glEndList ()
2793 2897
2794void glCallList (int list) 2898void glCallList (int list)
2795 2899
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 2901
2798PROTOTYPES: DISABLE 2902PROTOTYPES: DISABLE
2799 2903
2800void 2904void
2801find_widget (SV *self, NV x, NV y) 2905find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 2909 XPUSHs (self);
2806} 2910}
2807 2911
2808BOOT: 2912BOOT:
2809{ 2913{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2914 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 2915
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2916 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2917 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2918 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2919 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 2920}
2817 2921
2818void 2922void
2819draw (SV *self) 2923draw (SV *self)
2820 CODE: 2924 CODE:
2824 NV x, y, w, h; 2928 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 2929 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 2930 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 2931 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 2932 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 2933 double draw_x, draw_y;
2831 2934
2832 if (!SvROK (self)) 2935 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2936 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 2937
2835 hv = (HV *)SvRV (self); 2938 hv = (HV *)SvRV (self);
2836 2939
2837 if (SvTYPE (hv) != SVt_PVHV) 2940 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2941 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 2942
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2943 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2944 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 2945
2843 if (!h || !w) 2946 if (!h || !w)
2863 { 2966 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2967 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 2968
2866 if (svp && SvTRUE (*svp)) 2969 if (svp && SvTRUE (*svp))
2867 { 2970 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2971 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 2972 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2973 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 2974 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 2975 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 2976 glVertex2f (w, 0);
2876 glEnd (); 2979 glEnd ();
2877 glDisable (GL_BLEND); 2980 glDisable (GL_BLEND);
2878 } 2981 }
2879 } 2982 }
2880#if 0 2983#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 2984 // draw borders, for debugging
2882 glPushMatrix; 2985 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 2986 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 2987 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 2988 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 2989 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 2990 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 2991 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 2992 glVertex2f (0 , h - 1);
2890 glEnd; 2993 glEnd ();
2891 glPopMatrix; 2994 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 2995#endif
2895 PUSHMARK (SP); 2996 PUSHMARK (SP);
2896 XPUSHs (self); 2997 XPUSHs (self);
2897 PUTBACK; 2998 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 2999 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines