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.226 by root, Sat Aug 11 13:05:58 2007 UTC vs.
Revision 1.252 by root, Fri Dec 28 17:30:33 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;
155 rc_t *rc; 162 rc_t *rc;
156} *CFPlus__Layout; 163} *DC__Layout;
157 164
158static CFPlus__Font default_font; 165static DC__Font default_font;
159static PangoContext *opengl_context; 166static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 167static PangoFontMap *opengl_fontmap;
161 168
162static void 169static void
163substitute_func (FcPattern *pattern, gpointer data) 170substitute_func (FcPattern *pattern, gpointer data)
168#endif 175#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 176 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 177}
171 178
172static void 179static void
173layout_update_font (CFPlus__Layout self) 180layout_update_font (DC__Layout self)
174{ 181{
175 /* 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
176 * reasonably well with bitstream vera 183 * reasonably well with bitstream vera
177 */ 184 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 185 PangoFontDescription *font = self->font ? self->font : default_font;
182 189
183 pango_layout_set_font_description (self->pl, font); 190 pango_layout_set_font_description (self->pl, font);
184} 191}
185 192
186static void 193static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 194layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 195{
189 PangoRectangle rect; 196 PangoRectangle rect;
190 197
191 // get_pixel_* wrongly rounds down 198 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 199 pango_layout_get_extents (self->pl, 0, &rect);
203 210
204typedef uint16_t tileid; 211typedef uint16_t tileid;
205typedef uint16_t faceid; 212typedef uint16_t faceid;
206 213
207typedef struct { 214typedef struct {
208 int name; 215 GLuint name;
209 int w, h; 216 int w, h;
210 float s, t; 217 float s, t;
211 uint8_t r, g, b, a; 218 uint8_t r, g, b, a;
212 tileid smoothtile; 219 tileid smoothtile;
213 uint8_t smoothlevel; 220 uint8_t smoothlevel;
231 int faces; tileid *face2tile; // [faceid] 238 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 239 int texs; maptex *tex; // [tileid]
233 240
234 int32_t rows; 241 int32_t rows;
235 maprow *row; 242 maprow *row;
236} *CFPlus__Map; 243} *DC__Map;
237 244
238static char * 245static char *
239prepend (char *ptr, int sze, int inc) 246prepend (char *ptr, int sze, int inc)
240{ 247{
241 char *p; 248 char *p;
279 self->texs *= 2; 286 self->texs *= 2;
280 } 287 }
281} 288}
282 289
283static maprow * 290static maprow *
284map_get_row (CFPlus__Map self, int y) 291map_get_row (DC__Map self, int y)
285{ 292{
286 if (0 > y) 293 if (0 > y)
287 { 294 {
288 int extend = - y + MAP_EXTEND_Y; 295 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 296 Prepend (maprow, self->row, self->rows, extend);
327 334
328 return row->col + (x - row->c0); 335 return row->col + (x - row->c0);
329} 336}
330 337
331static mapcell * 338static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 339map_get_cell (DC__Map self, int x, int y)
333{ 340{
334 return row_get_cell (map_get_row (self, y), x); 341 return row_get_cell (map_get_row (self, y), x);
335} 342}
336 343
337static void 344static void
338map_clear (CFPlus__Map self) 345map_clear (DC__Map self)
339{ 346{
340 int r; 347 int r;
341 348
342 for (r = 0; r < self->rows; r++) 349 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 350 Safefree (self->row[r].col);
351 self->row = 0; 358 self->row = 0;
352 self->rows = 0; 359 self->rows = 0;
353} 360}
354 361
355static void 362static void
356map_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)
357{ 364{
358 int x, y; 365 int x, y;
359 maprow *row; 366 maprow *row;
360 mapcell *cell; 367 mapcell *cell;
361 368
440 n |= n >> 16; 447 n |= n >> 16;
441 448
442 return n + 1; 449 return n + 1;
443} 450}
444 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
445/* SDL should provide this, really. */ 463/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 464#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 465#define SDLK_MODIFIER_MAX 314
448 466
449/******************************************************************************/ 467/******************************************************************************/
487 return 0; 505 return 0;
488 506
489 return 1; 507 return 1;
490} 508}
491 509
492MODULE = CFPlus PACKAGE = CFPlus 510MODULE = Deliantra::Client PACKAGE = DC
493 511
494PROTOTYPES: ENABLE 512PROTOTYPES: ENABLE
495 513
496BOOT: 514BOOT:
497{ 515{
498 HV *stash = gv_stashpv ("CFPlus", 1); 516 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 517 static const struct {
500 const char *name; 518 const char *name;
501 IV iv; 519 IV iv;
502 } *civ, const_iv[] = { 520 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 521# define const_iv(name) { # name, (IV)name }
525 543
526 const_iv (SDL_APPINPUTFOCUS), 544 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 545 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 546 const_iv (SDL_APPACTIVE),
529 547
548 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 550 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 551 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 552 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 553 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 554 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 626 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 627 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 628 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 629 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 630 const_iv (KMOD_MODE),
631
632 const_iv (MIX_DEFAULT_FORMAT),
611# undef const_iv 633# undef const_iv
612 }; 634 };
613 635
614 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; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 655
634NV floor (NV x) 656NV floor (NV x)
635 657
636NV ceil (NV x) 658NV ceil (NV x)
637 659
660IV minpot (UV n)
661
662IV popcount (UV n)
663
638void 664void
639pango_init () 665pango_init ()
640 CODE: 666 CODE:
641{ 667{
642 opengl_fontmap = pango_opengl_font_map_new (); 668 opengl_fontmap = pango_opengl_font_map_new ();
643 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);
644 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
645} 675}
646 676
647char * 677char *
648SDL_GetError () 678SDL_GetError ()
649 679
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 712
683 if (m && m != (SDL_Rect **)-1) 713 if (m && m != (SDL_Rect **)-1)
684 while (*m) 714 while (*m)
685 { 715 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 716 if ((*m)->w >= 800 && (*m)->h >= 480)
687 { 717 {
688 AV *av = newAV (); 718 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 719 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 720 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 721 av_push (av, newSViv (rgb));
715 745
716 if (RETVAL) 746 if (RETVAL)
717 { 747 {
718 av_clear (texture_av); 748 av_clear (texture_av);
719 749
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#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);
722#include "glfunc.h" 752#include "glfunc.h"
723#undef GL_FUNC 753#undef GL_FUNC
724 } 754 }
725} 755}
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 836 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 837 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 838 break;
809 } 839 }
810 840
811 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))));
812 } 842 }
813} 843}
814 844
815int 845int
816Mix_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)
817 POSTCALL: 847 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 848 Mix_HookMusicFinished (music_finished);
819 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}
820 866
821void 867void
822Mix_CloseAudio () 868Mix_CloseAudio ()
823 869
824int 870int
958void 1004void
959error (char *message) 1005error (char *message)
960 CODE: 1006 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1007 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1008#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1009 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1010#endif
965 1011
966void 1012void
967fatal (char *message) 1013fatal (char *message)
968 CODE: 1014 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1015 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1016#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1017 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1018#endif
973 _exit (1); 1019 _exit (1);
974 1020
975void 1021void
976_exit (int retval = 0) 1022_exit (int retval = 0)
988#if DEBUG 1034#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1035 VALGRIND_DO_LEAK_CHECK;
990#endif 1036#endif
991} 1037}
992 1038
993MODULE = CFPlus PACKAGE = CFPlus::Font 1039MODULE = Deliantra::Client PACKAGE = DC::Font
994 1040
995PROTOTYPES: DISABLE 1041PROTOTYPES: DISABLE
996 1042
997CFPlus::Font 1043DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1044new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1045 CODE:
1000{ 1046{
1001 int count; 1047 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1051}
1006 OUTPUT: 1052 OUTPUT:
1007 RETVAL 1053 RETVAL
1008 1054
1009void 1055void
1010DESTROY (CFPlus::Font self) 1056DESTROY (DC::Font self)
1011 CODE: 1057 CODE:
1012 pango_font_description_free (self); 1058 pango_font_description_free (self);
1013 1059
1014void 1060void
1015make_default (CFPlus::Font self) 1061make_default (DC::Font self)
1016 PROTOTYPE: $ 1062 PROTOTYPE: $
1017 CODE: 1063 CODE:
1018 default_font = self; 1064 default_font = self;
1019 1065
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1066MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1067
1022PROTOTYPES: DISABLE 1068PROTOTYPES: DISABLE
1023 1069
1024void 1070void
1025reset_glyph_cache () 1071glyph_cache_backup ()
1026 PROTOTYPE: 1072 PROTOTYPE:
1027 CODE: 1073 CODE:
1074 tc_backup ();
1075
1076void
1077glyph_cache_restore ()
1078 PROTOTYPE:
1079 CODE:
1028 tc_clear (); 1080 tc_restore ();
1029 1081
1030CFPlus::Layout 1082DC::Layout
1031new (SV *class) 1083new (SV *class)
1032 CODE: 1084 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1085 New (0, RETVAL, 1, struct cf_layout);
1034 1086
1035 RETVAL->pl = pango_layout_new (opengl_context); 1087 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1097 layout_update_font (RETVAL);
1046 OUTPUT: 1098 OUTPUT:
1047 RETVAL 1099 RETVAL
1048 1100
1049void 1101void
1050DESTROY (CFPlus::Layout self) 1102DESTROY (DC::Layout self)
1051 CODE: 1103 CODE:
1052 g_object_unref (self->pl); 1104 g_object_unref (self->pl);
1053 rc_free (self->rc); 1105 rc_free (self->rc);
1054 Safefree (self); 1106 Safefree (self);
1055 1107
1056void 1108void
1057set_text (CFPlus::Layout self, SV *text_) 1109set_text (DC::Layout self, SV *text_)
1058 CODE: 1110 CODE:
1059{ 1111{
1060 STRLEN textlen; 1112 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1113 char *text = SvPVutf8 (text_, textlen);
1062 1114
1063 pango_layout_set_text (self->pl, text, textlen); 1115 pango_layout_set_text (self->pl, text, textlen);
1064} 1116}
1065 1117
1066void 1118void
1067set_markup (CFPlus::Layout self, SV *text_) 1119set_markup (DC::Layout self, SV *text_)
1068 CODE: 1120 CODE:
1069{ 1121{
1070 STRLEN textlen; 1122 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1072 1124
1073 pango_layout_set_markup (self->pl, text, textlen); 1125 pango_layout_set_markup (self->pl, text, textlen);
1074} 1126}
1075 1127
1076void 1128void
1077set_shapes (CFPlus::Layout self, ...) 1129set_shapes (DC::Layout self, ...)
1078 CODE: 1130 CODE:
1079{ 1131{
1080 PangoAttrList *attrs = 0; 1132 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1133 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1134 const char *pos = text;
1117 if (attrs) 1169 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1170 pango_layout_set_attributes (self->pl, attrs);
1119} 1171}
1120 1172
1121void 1173void
1122get_shapes (CFPlus::Layout self) 1174get_shapes (DC::Layout self)
1123 PPCODE: 1175 PPCODE:
1124{ 1176{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1177 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1178
1127 do 1179 do
1128 { 1180 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1181 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1182
1131 if (run && shape_attr_p (run)) 1183 if (run && shape_attr_p (run))
1132 { 1184 {
1133 PangoRectangle extents; 1185 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1186 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1194
1143 pango_layout_iter_free (iter); 1195 pango_layout_iter_free (iter);
1144} 1196}
1145 1197
1146int 1198int
1147has_wrapped (CFPlus::Layout self) 1199has_wrapped (DC::Layout self)
1148 CODE: 1200 CODE:
1149{ 1201{
1150 int lines = 1; 1202 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1203 const char *text = pango_layout_get_text (self->pl);
1152 1204
1157} 1209}
1158 OUTPUT: 1210 OUTPUT:
1159 RETVAL 1211 RETVAL
1160 1212
1161SV * 1213SV *
1162get_text (CFPlus::Layout self) 1214get_text (DC::Layout self)
1163 CODE: 1215 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1216 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1217 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1218 OUTPUT:
1167 RETVAL 1219 RETVAL
1168 1220
1169void 1221void
1170set_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.)
1171 CODE: 1223 CODE:
1172 self->r = r; 1224 self->r = r;
1173 self->g = g; 1225 self->g = g;
1174 self->b = b; 1226 self->b = b;
1175 self->a = a; 1227 self->a = a;
1176 1228
1177void 1229void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1230set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1231 CODE:
1180 if (self->font != font) 1232 if (self->font != font)
1181 { 1233 {
1182 self->font = font; 1234 self->font = font;
1183 layout_update_font (self); 1235 layout_update_font (self);
1184 } 1236 }
1185 1237
1186void 1238void
1187set_height (CFPlus::Layout self, int base_height) 1239set_height (DC::Layout self, int base_height)
1188 CODE: 1240 CODE:
1189 if (self->base_height != base_height) 1241 if (self->base_height != base_height)
1190 { 1242 {
1191 self->base_height = base_height; 1243 self->base_height = base_height;
1192 layout_update_font (self); 1244 layout_update_font (self);
1193 } 1245 }
1194 1246
1195void 1247void
1196set_width (CFPlus::Layout self, int max_width = -1) 1248set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1249 CODE:
1198 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);
1199 1251
1200void 1252void
1201set_indent (CFPlus::Layout self, int indent) 1253set_indent (DC::Layout self, int indent)
1202 CODE: 1254 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1255 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1256
1205void 1257void
1206set_spacing (CFPlus::Layout self, int spacing) 1258set_spacing (DC::Layout self, int spacing)
1207 CODE: 1259 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1260 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1261
1210void 1262void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1263set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1264 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1265 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1266 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1267 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1268 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1269 : PANGO_ELLIPSIZE_NONE
1218 ); 1270 );
1219 1271
1220void 1272void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1273set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1274 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1275 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1276
1225void 1277void
1226size (CFPlus::Layout self) 1278size (DC::Layout self)
1227 PPCODE: 1279 PPCODE:
1228{ 1280{
1229 int w, h; 1281 int w, h;
1230 1282
1231 layout_get_pixel_size (self, &w, &h); 1283 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1286 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1287 PUSHs (sv_2mortal (newSViv (h)));
1236} 1288}
1237 1289
1238int 1290int
1239descent (CFPlus::Layout self) 1291descent (DC::Layout self)
1240 CODE: 1292 CODE:
1241{ 1293{
1242 PangoRectangle rect; 1294 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1295 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1296 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1297 RETVAL = PANGO_DESCENT (rect);
1246} 1298}
1247 OUTPUT: 1299 OUTPUT:
1248 RETVAL 1300 RETVAL
1249 1301
1250int 1302int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1303xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1304 CODE:
1253{ 1305{
1254 int index, trailing; 1306 int index, trailing;
1255 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);
1256 RETVAL = index + trailing; 1308 RETVAL = index + trailing;
1257} 1309}
1258 OUTPUT: 1310 OUTPUT:
1259 RETVAL 1311 RETVAL
1260 1312
1261void 1313void
1262cursor_pos (CFPlus::Layout self, int index) 1314cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1315 PPCODE:
1264{ 1316{
1265 PangoRectangle strong_pos; 1317 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1318 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1319
1268 EXTEND (SP, 3); 1320 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1324}
1273 1325
1274void 1326void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1327index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1328 PPCODE:
1277{ 1329{
1278 int line, x; 1330 int line, x;
1279 1331
1280 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))
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1335 --line;
1336#endif
1283 EXTEND (SP, 2); 1337 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1338 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1339 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1340}
1287 1341
1288void 1342void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1343line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1344 PPCODE:
1291{ 1345{
1292 PangoLayoutLine *lp; 1346 PangoLayoutLine *lp;
1293 int index, trailing; 1347 int index, trailing;
1294 1348
1295 if (line < 0) 1349 if (line < 0)
1296 XSRETURN_EMPTY; 1350 XSRETURN_EMPTY;
1297 1351
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1352 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1353 XSRETURN_EMPTY; /* do better */
1300 1354
1301 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);
1302 1356
1303 EXTEND (SP, 2); 1357 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1363 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1364 }
1311} 1365}
1312 1366
1313void 1367void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1368render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1369 CODE:
1316 rc_clear (self->rc); 1370 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1371 pango_opengl_render_layout_subpixel (
1318 self->pl, 1372 self->pl,
1319 self->rc, 1373 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1378 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1379 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1380 pango_layout_context_changed (self->pl);
1327 1381
1328void 1382void
1329draw (CFPlus::Layout self) 1383draw (DC::Layout self)
1330 CODE: 1384 CODE:
1331{ 1385{
1332 glEnable (GL_TEXTURE_2D); 1386 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1387 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1388 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1396 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1397 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1398 glDisable (GL_TEXTURE_2D);
1345} 1399}
1346 1400
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1401MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1402
1349PROTOTYPES: ENABLE 1403PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1404
1353void 1405void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1406pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1407 CODE:
1356{ 1408{
1433 RETVAL = width > 0; 1485 RETVAL = width > 0;
1434} 1486}
1435 OUTPUT: 1487 OUTPUT:
1436 RETVAL 1488 RETVAL
1437 1489
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1490MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1491
1440PROTOTYPES: DISABLE 1492PROTOTYPES: DISABLE
1441 1493
1442CFPlus::Map 1494DC::Map
1443new (SV *class) 1495new (SV *class)
1444 CODE: 1496 CODE:
1445 New (0, RETVAL, 1, struct map); 1497 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1498 RETVAL->x = 0;
1447 RETVAL->y = 0; 1499 RETVAL->y = 0;
1455 RETVAL->row = 0; 1507 RETVAL->row = 0;
1456 OUTPUT: 1508 OUTPUT:
1457 RETVAL 1509 RETVAL
1458 1510
1459void 1511void
1460DESTROY (CFPlus::Map self) 1512DESTROY (DC::Map self)
1461 CODE: 1513 CODE:
1462{ 1514{
1463 map_clear (self); 1515 map_clear (self);
1464 Safefree (self->face2tile); 1516 Safefree (self->face2tile);
1465 Safefree (self->tex); 1517 Safefree (self->tex);
1466 Safefree (self); 1518 Safefree (self);
1467} 1519}
1468 1520
1469void 1521void
1470resize (CFPlus::Map self, int map_width, int map_height) 1522resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1523 CODE:
1472 self->w = map_width; 1524 self->w = map_width;
1473 self->h = map_height; 1525 self->h = map_height;
1474 1526
1475void 1527void
1476clear (CFPlus::Map self) 1528clear (DC::Map self)
1477 CODE: 1529 CODE:
1478 map_clear (self); 1530 map_clear (self);
1479 1531
1480void 1532void
1481set_tileid (CFPlus::Map self, int face, int tile) 1533set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1534 CODE:
1483{ 1535{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1536 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1537 need_texid (self, tile);
1486} 1538}
1487 1539
1488void 1540void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1541set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1542 CODE:
1491{ 1543{
1492 tileid texid; 1544 tileid texid;
1493 maptex *tex; 1545 maptex *tex;
1494 1546
1507 tex->smoothtile = self->face2tile [smooth]; 1559 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1560 tex->smoothlevel = level;
1509} 1561}
1510 1562
1511void 1563void
1512set_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)
1513 CODE: 1565 CODE:
1514{ 1566{
1515 need_texid (self, texid); 1567 need_texid (self, texid);
1516 1568
1517 { 1569 {
1537 // from transparent color bleeding and ugly wrapping effects. 1589 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1591}
1540 1592
1541int 1593int
1542ox (CFPlus::Map self) 1594ox (DC::Map self)
1543 ALIAS: 1595 ALIAS:
1544 oy = 1 1596 oy = 1
1545 x = 2 1597 x = 2
1546 y = 3 1598 y = 3
1547 w = 4 1599 w = 4
1558 } 1610 }
1559 OUTPUT: 1611 OUTPUT:
1560 RETVAL 1612 RETVAL
1561 1613
1562void 1614void
1563scroll (CFPlus::Map self, int dx, int dy) 1615scroll (DC::Map self, int dx, int dy)
1564 CODE: 1616 CODE:
1565{ 1617{
1566 if (dx > 0) 1618 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1619 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1620 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1636 self->y += MAP_EXTEND_Y;
1585 } 1637 }
1586} 1638}
1587 1639
1588SV * 1640SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1641map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1642 CODE:
1591{ 1643{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1645 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1646 mapcell *cell;
1683} 1735}
1684 OUTPUT: 1736 OUTPUT:
1685 RETVAL 1737 RETVAL
1686 1738
1687SV * 1739SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1740mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1741 CODE:
1690{ 1742{
1691 int x1, x; 1743 int x1, x;
1692 int y1, y; 1744 int y1, y;
1693 int z; 1745 int z;
1738} 1790}
1739 OUTPUT: 1791 OUTPUT:
1740 RETVAL 1792 RETVAL
1741 1793
1742void 1794void
1743draw (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)
1744 CODE: 1796 CODE:
1745{ 1797{
1746 int x, y, z; 1798 int x, y, z;
1747 1799
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2019 } 2071 }
2020 } 2072 }
2021} 2073}
2022 2074
2023void 2075void
2024draw_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)
2025 CODE: 2077 CODE:
2026{ 2078{
2027 static float color[16][3] = { 2079 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2080 { 0.00F, 0.00F, 0.00F },
2029 { 1.00F, 1.00F, 1.00F }, 2081 { 1.00F, 1.00F, 1.00F },
2079 glDisable (GL_BLEND); 2131 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2132 glDisable (GL_TEXTURE_2D);
2081} 2133}
2082 2134
2083void 2135void
2084fow_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)
2085 PPCODE: 2137 PPCODE:
2086{ 2138{
2087 int x, y; 2139 int x, y;
2088 int sw1 = sw + 2; 2140 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2141 int sh1 = sh + 2;
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2212 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2213 PUSHs (darkness3_sv);
2162} 2214}
2163 2215
2164SV * 2216SV *
2165get_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)
2166 CODE: 2218 CODE:
2167{ 2219{
2168 int x, y, x1, y1; 2220 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2221 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2222 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2235} 2287}
2236 OUTPUT: 2288 OUTPUT:
2237 RETVAL 2289 RETVAL
2238 2290
2239void 2291void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2292set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2241 PPCODE: 2293 PPCODE:
2242{ 2294{
2243 int x, y, z; 2295 int x, y, z;
2244 int w, h; 2296 int w, h;
2245 int x1, y1; 2297 int x1, y1;
2246 2298
2247 if (*data++ != 0) 2299 if (*data++ != 0)
2248 return; /* version mismatch */ 2300 XSRETURN_EMPTY; /* version mismatch */
2249 2301
2250 w = *data++ << 8; w |= *data++; 2302 w = *data++ << 8; w |= *data++;
2251 h = *data++ << 8; h |= *data++; 2303 h = *data++ << 8; h |= *data++;
2252 2304
2253 // 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
2298 } 2350 }
2299 } 2351 }
2300 } 2352 }
2301} 2353}
2302 2354
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2355MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2356
2305CFPlus::RW 2357DC::RW
2306new (SV *class, SV *data_sv) 2358new (SV *class, SV *data_sv)
2307 CODE: 2359 CODE:
2308{ 2360{
2309 STRLEN datalen; 2361 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2362 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2364 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2365}
2314 OUTPUT: 2366 OUTPUT:
2315 RETVAL 2367 RETVAL
2316 2368
2317CFPlus::RW 2369DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2370new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2371 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2372 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2373 OUTPUT:
2322 RETVAL 2374 RETVAL
2323 2375
2324# fails on win32: 2376# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2377# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2378#void
2327#close (CFPlus::RW self) 2379#close (DC::RW self)
2328# CODE: 2380# CODE:
2329# (self->(close)) (self); 2381# (self->(close)) (self);
2330 2382
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2383MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2384
2333PROTOTYPES: DISABLE 2385PROTOTYPES: DISABLE
2334 2386
2335CFPlus::Channel 2387DC::Channel
2336find () 2388find ()
2337 CODE: 2389 CODE:
2338{ 2390{
2339 RETVAL = Mix_GroupAvailable (-1); 2391 RETVAL = Mix_GroupAvailable (-1);
2340 2392
2353} 2405}
2354 OUTPUT: 2406 OUTPUT:
2355 RETVAL 2407 RETVAL
2356 2408
2357void 2409void
2358halt (CFPlus::Channel self) 2410halt (DC::Channel self)
2359 CODE: 2411 CODE:
2360 Mix_HaltChannel (self); 2412 Mix_HaltChannel (self);
2361 2413
2362void 2414void
2363expire (CFPlus::Channel self, int ticks = -1) 2415expire (DC::Channel self, int ticks = -1)
2364 CODE: 2416 CODE:
2365 Mix_ExpireChannel (self, ticks); 2417 Mix_ExpireChannel (self, ticks);
2366 2418
2367void 2419void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2420fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2421 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2422 Mix_FadeOutChannel (self, ticks);
2371 2423
2372int 2424int
2373volume (CFPlus::Channel self, int volume) 2425volume (DC::Channel self, int volume)
2374 CODE: 2426 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2427 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2428 OUTPUT:
2377 RETVAL 2429 RETVAL
2378 2430
2379void 2431void
2380unregister_all_effects (CFPlus::Channel self) 2432unregister_all_effects (DC::Channel self)
2381 CODE: 2433 CODE:
2382 Mix_UnregisterAllEffects (self); 2434 Mix_UnregisterAllEffects (self);
2383 2435
2384void 2436void
2385set_panning (CFPlus::Channel self, int left, int right) 2437set_panning (DC::Channel self, int left, int right)
2386 CODE: 2438 CODE:
2387 left = CLAMP (left , 0, 255); 2439 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2440 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2441 Mix_SetPanning (self, left, right);
2390 2442
2391void 2443void
2392set_distance (CFPlus::Channel self, int distance) 2444set_distance (DC::Channel self, int distance)
2393 CODE: 2445 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2446 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2447
2396void 2448void
2397set_position (CFPlus::Channel self, int angle, int distance) 2449set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2450 CODE:
2399 2451
2400void 2452void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2454 CODE:
2403{ 2455{
2404 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));
2405 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);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2459}
2408 2460
2409void 2461void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2462set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2463 CODE:
2412 Mix_SetReverseStereo (self, flip); 2464 Mix_SetReverseStereo (self, flip);
2413 2465
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2467
2416PROTOTYPES: DISABLE 2468PROTOTYPES: DISABLE
2417 2469
2418CFPlus::MixChunk 2470DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2471new (SV *class, DC::RW rwops)
2420 CODE: 2472 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2473 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2474 OUTPUT:
2423 RETVAL 2475 RETVAL
2424 2476
2425void 2477void
2426DESTROY (CFPlus::MixChunk self) 2478DESTROY (DC::MixChunk self)
2427 CODE: 2479 CODE:
2428 Mix_FreeChunk (self); 2480 Mix_FreeChunk (self);
2429 2481
2430int 2482int
2431volume (CFPlus::MixChunk self, int volume = -1) 2483volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2484 CODE:
2433 if (items > 1) 2485 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2486 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2487 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2488 OUTPUT:
2437 RETVAL 2489 RETVAL
2438 2490
2439CFPlus::Channel 2491DC::Channel
2440play (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)
2441 CODE: 2493 CODE:
2442{ 2494{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2496
2445 if (RETVAL < 0) 2497 if (RETVAL < 0)
2452 } 2504 }
2453} 2505}
2454 OUTPUT: 2506 OUTPUT:
2455 RETVAL 2507 RETVAL
2456 2508
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2510
2459int 2511int
2460volume (int volume = -1) 2512volume (int volume = -1)
2461 PROTOTYPE: ;$ 2513 PROTOTYPE: ;$
2462 CODE: 2514 CODE:
2474void 2526void
2475halt () 2527halt ()
2476 CODE: 2528 CODE:
2477 Mix_HaltMusic (); 2529 Mix_HaltMusic ();
2478 2530
2479CFPlus::MixMusic 2531DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2532new (SV *class, DC::RW rwops)
2481 CODE: 2533 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2534 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2535 OUTPUT:
2484 RETVAL 2536 RETVAL
2485 2537
2486void 2538void
2487DESTROY (CFPlus::MixMusic self) 2539DESTROY (DC::MixMusic self)
2488 CODE: 2540 CODE:
2489 Mix_FreeMusic (self); 2541 Mix_FreeMusic (self);
2490 2542
2491int 2543int
2492play (CFPlus::MixMusic self, int loops = -1) 2544play (DC::MixMusic self, int loops = -1)
2493 CODE: 2545 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2546 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2547 OUTPUT:
2496 RETVAL 2548 RETVAL
2497 2549
2498void 2550void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2551fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2552 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2553 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2554
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2555MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2556
2505PROTOTYPES: ENABLE 2557PROTOTYPES: ENABLE
2506 2558
2507BOOT: 2559BOOT:
2508{ 2560{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2561 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2562 static const struct {
2511 const char *name; 2563 const char *name;
2512 IV iv; 2564 IV iv;
2513 } *civ, const_iv[] = { 2565 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2566# define const_iv(name) { # name, (IV)name }
2549 const_iv (GL_INTENSITY), 2601 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 2602 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 2603 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 2604 const_iv (GL_FLOAT),
2553 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),
2554 const_iv (GL_COMPILE), 2612 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 2613 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 2614 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 2615 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 2616 const_iv (GL_TEXTURE_2D),
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2655 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 2656 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 2657 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 2658 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 2659 const_iv (GL_GENERATE_MIPMAP_HINT),
2660 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 2661 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 2662 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 2663 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 2664 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 2665 const_iv (GL_V3F),
2614 2673
2615 texture_av = newAV (); 2674 texture_av = newAV ();
2616 AvREAL_off (texture_av); 2675 AvREAL_off (texture_av);
2617} 2676}
2618 2677
2678void
2679disable_GL_EXT_blend_func_separate ()
2680 CODE:
2681 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0;
2683
2619char * 2684char *
2620gl_vendor () 2685gl_vendor ()
2621 CODE: 2686 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 2687 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 2688 OUTPUT:
2744 2809
2745void glRect (float x1, float y1, float x2, float y2) 2810void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 2811 CODE:
2747 glRectf (x1, y1, x2, y2); 2812 glRectf (x1, y1, x2, y2);
2748 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
2749PROTOTYPES: ENABLE 2823PROTOTYPES: ENABLE
2750 2824
2751void glBegin (int mode) 2825void glBegin (int mode)
2752 2826
2753void glEnd () 2827void glEnd ()
2785void 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)
2786 CODE: 2860 CODE:
2787 if (gl.SeparableFilter2D) 2861 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2862 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 2863
2790void 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)
2791 2865
2792void 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)
2793 2867
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 2868void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 2869
2821 2895
2822void glEndList () 2896void glEndList ()
2823 2897
2824void glCallList (int list) 2898void glCallList (int list)
2825 2899
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827 2901
2828PROTOTYPES: DISABLE 2902PROTOTYPES: DISABLE
2829 2903
2830void 2904void
2831find_widget (SV *self, NV x, NV y) 2905find_widget (SV *self, NV x, NV y)
2835 XPUSHs (self); 2909 XPUSHs (self);
2836} 2910}
2837 2911
2838BOOT: 2912BOOT:
2839{ 2913{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2914 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 2915
2842 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);
2843 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);
2844 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);
2845 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);
2846} 2920}
2847 2921
2848void 2922void
2849draw (SV *self) 2923draw (SV *self)
2850 CODE: 2924 CODE:
2854 NV x, y, w, h; 2928 NV x, y, w, h;
2855 SV *draw_x_sv = GvSV (draw_x_gv); 2929 SV *draw_x_sv = GvSV (draw_x_gv);
2856 SV *draw_y_sv = GvSV (draw_y_gv); 2930 SV *draw_y_sv = GvSV (draw_y_gv);
2857 SV *draw_w_sv = GvSV (draw_w_gv); 2931 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 2932 SV *draw_h_sv = GvSV (draw_h_gv);
2859 SV *hover;
2860 double draw_x, draw_y, draw_w, draw_h; 2933 double draw_x, draw_y;
2861 2934
2862 if (!SvROK (self)) 2935 if (!SvROK (self))
2863 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2936 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2864 2937
2865 hv = (HV *)SvRV (self); 2938 hv = (HV *)SvRV (self);
2866 2939
2867 if (SvTYPE (hv) != SVt_PVHV) 2940 if (SvTYPE (hv) != SVt_PVHV)
2868 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2941 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2869 2942
2870 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.;
2871 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.;
2872 2945
2873 if (!h || !w) 2946 if (!h || !w)
2893 { 2966 {
2894 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2967 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2895 2968
2896 if (svp && SvTRUE (*svp)) 2969 if (svp && SvTRUE (*svp))
2897 { 2970 {
2898 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);
2899 glEnable (GL_BLEND); 2972 glEnable (GL_BLEND);
2900 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2973 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2901 glBegin (GL_QUADS); 2974 glBegin (GL_QUADS);
2902 glVertex2f (0, 0); 2975 glVertex2f (0, 0);
2903 glVertex2f (w, 0); 2976 glVertex2f (w, 0);
2906 glEnd (); 2979 glEnd ();
2907 glDisable (GL_BLEND); 2980 glDisable (GL_BLEND);
2908 } 2981 }
2909 } 2982 }
2910#if 0 2983#if 0
2911 if ($ENV{CFPLUS_DEBUG} & 1) { 2984 // draw borders, for debugging
2912 glPushMatrix; 2985 glPushMatrix ();
2913 glColor 1, 1, 0, 1; 2986 glColor4f (1., 1., 0., 1.);
2914 glTranslate 0.375, 0.375; 2987 glTranslatef (.5, .5, 0.);
2915 glBegin GL_LINE_LOOP; 2988 glBegin (GL_LINE_LOOP);
2916 glVertex 0 , 0; 2989 glVertex2f (0 , 0);
2917 glVertex $self->{w} - 1, 0; 2990 glVertex2f (w - 1, 0);
2918 glVertex $self->{w} - 1, $self->{h} - 1; 2991 glVertex2f (w - 1, h - 1);
2919 glVertex 0 , $self->{h} - 1; 2992 glVertex2f (0 , h - 1);
2920 glEnd; 2993 glEnd ();
2921 glPopMatrix; 2994 glPopMatrix ();
2922 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2923 }
2924#endif 2995#endif
2925 PUSHMARK (SP); 2996 PUSHMARK (SP);
2926 XPUSHs (self); 2997 XPUSHs (self);
2927 PUTBACK; 2998 PUTBACK;
2928 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