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.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.253 by root, Fri Dec 28 20:59:14 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>
63#define MAP_EXTEND_X 32 70#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 71#define MAP_EXTEND_Y 512
65 72
66#define MIN_FONT_HEIGHT 10 73#define MIN_FONT_HEIGHT 10
67 74
75/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77
68#if 0 78#if 0
69# define PARACHUTE SDL_INIT_NOPARACHUTE 79# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 80#else
71# define PARACHUTE 0 81# define PARACHUTE 0
72#endif 82#endif
120 130
121#include "pango-font.c" 131#include "pango-font.c"
122#include "pango-fontmap.c" 132#include "pango-fontmap.c"
123#include "pango-render.c" 133#include "pango-render.c"
124 134
125typedef IV CFPlus__Channel; 135typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 136typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 137typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 138typedef Mix_Music *DC__MixMusic;
129 139
130typedef PangoFontDescription *CFPlus__Font; 140typedef PangoFontDescription *DC__Font;
131 141
132static int 142static int
133shape_attr_p (PangoLayoutRun *run) 143shape_attr_p (PangoLayoutRun *run)
134{ 144{
135 GSList *attrs = run->item->analysis.extra_attrs; 145 GSList *attrs = run->item->analysis.extra_attrs;
149 159
150typedef struct cf_layout { 160typedef struct cf_layout {
151 PangoLayout *pl; 161 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 162 float r, g, b, a; // default color for rgba mode
153 int base_height; 163 int base_height;
154 CFPlus__Font font; 164 DC__Font font;
155 rc_t *rc; 165 rc_t *rc;
156} *CFPlus__Layout; 166} *DC__Layout;
157 167
158static CFPlus__Font default_font; 168static DC__Font default_font;
159static PangoContext *opengl_context; 169static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 170static PangoFontMap *opengl_fontmap;
161 171
162static void 172static void
163substitute_func (FcPattern *pattern, gpointer data) 173substitute_func (FcPattern *pattern, gpointer data)
168#endif 178#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 179 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 180}
171 181
172static void 182static void
173layout_update_font (CFPlus__Layout self) 183layout_update_font (DC__Layout self)
174{ 184{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 185 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 186 * reasonably well with bitstream vera
177 */ 187 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 188 PangoFontDescription *font = self->font ? self->font : default_font;
182 192
183 pango_layout_set_font_description (self->pl, font); 193 pango_layout_set_font_description (self->pl, font);
184} 194}
185 195
186static void 196static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 197layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 198{
189 PangoRectangle rect; 199 PangoRectangle rect;
190 200
191 // get_pixel_* wrongly rounds down 201 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 202 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 241 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 242 int texs; maptex *tex; // [tileid]
233 243
234 int32_t rows; 244 int32_t rows;
235 maprow *row; 245 maprow *row;
236} *CFPlus__Map; 246} *DC__Map;
237 247
238static char * 248static char *
239prepend (char *ptr, int sze, int inc) 249prepend (char *ptr, int sze, int inc)
240{ 250{
241 char *p; 251 char *p;
279 self->texs *= 2; 289 self->texs *= 2;
280 } 290 }
281} 291}
282 292
283static maprow * 293static maprow *
284map_get_row (CFPlus__Map self, int y) 294map_get_row (DC__Map self, int y)
285{ 295{
286 if (0 > y) 296 if (0 > y)
287 { 297 {
288 int extend = - y + MAP_EXTEND_Y; 298 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 299 Prepend (maprow, self->row, self->rows, extend);
327 337
328 return row->col + (x - row->c0); 338 return row->col + (x - row->c0);
329} 339}
330 340
331static mapcell * 341static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 342map_get_cell (DC__Map self, int x, int y)
333{ 343{
334 return row_get_cell (map_get_row (self, y), x); 344 return row_get_cell (map_get_row (self, y), x);
335} 345}
336 346
337static void 347static void
338map_clear (CFPlus__Map self) 348map_clear (DC__Map self)
339{ 349{
340 int r; 350 int r;
341 351
342 for (r = 0; r < self->rows; r++) 352 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 353 Safefree (self->row[r].col);
351 self->row = 0; 361 self->row = 0;
352 self->rows = 0; 362 self->rows = 0;
353} 363}
354 364
355static void 365static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 366map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 367{
358 int x, y; 368 int x, y;
359 maprow *row; 369 maprow *row;
360 mapcell *cell; 370 mapcell *cell;
361 371
498 return 0; 508 return 0;
499 509
500 return 1; 510 return 1;
501} 511}
502 512
503MODULE = CFPlus PACKAGE = CFPlus 513MODULE = Deliantra::Client PACKAGE = DC
504 514
505PROTOTYPES: ENABLE 515PROTOTYPES: ENABLE
506 516
507BOOT: 517BOOT:
508{ 518{
509 HV *stash = gv_stashpv ("CFPlus", 1); 519 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 520 static const struct {
511 const char *name; 521 const char *name;
512 IV iv; 522 IV iv;
513 } *civ, const_iv[] = { 523 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 524# define const_iv(name) { # name, (IV)name }
659 CODE: 669 CODE:
660{ 670{
661 opengl_fontmap = pango_opengl_font_map_new (); 671 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif
664} 678}
665 679
666char * 680char *
667SDL_GetError () 681SDL_GetError ()
668 682
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 715
702 if (m && m != (SDL_Rect **)-1) 716 if (m && m != (SDL_Rect **)-1)
703 while (*m) 717 while (*m)
704 { 718 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 719 if ((*m)->w >= 800 && (*m)->h >= 480)
706 { 720 {
707 AV *av = newAV (); 721 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 722 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 723 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 724 av_push (av, newSViv (rgb));
770 { 784 {
771 case SDL_KEYDOWN: 785 case SDL_KEYDOWN:
772 case SDL_KEYUP: 786 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 789 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 790 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 792 break;
779 793
780 case SDL_ACTIVEEVENT: 794 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 813 x = ev.motion.x;
800 y = ev.motion.y; 814 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 816 }
803 817
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 819 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 820 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 821 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 822 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 823 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 824 }
811 break; 825 break;
812 826
813 case SDL_MOUSEBUTTONDOWN: 827 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 828 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 829 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 830
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 831 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 833 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 834 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 839 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 840 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 841 break;
828 } 842 }
829 843
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 844 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 845 }
832} 846}
833 847
834int 848int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 849Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
993void 1007void
994error (char *message) 1008error (char *message)
995 CODE: 1009 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1010 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1011#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1012 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1013#endif
1000 1014
1001void 1015void
1002fatal (char *message) 1016fatal (char *message)
1003 CODE: 1017 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1018 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1019#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1020 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1021#endif
1008 _exit (1); 1022 _exit (1);
1009 1023
1010void 1024void
1011_exit (int retval = 0) 1025_exit (int retval = 0)
1023#if DEBUG 1037#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1038 VALGRIND_DO_LEAK_CHECK;
1025#endif 1039#endif
1026} 1040}
1027 1041
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1042MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1043
1030PROTOTYPES: DISABLE 1044PROTOTYPES: DISABLE
1031 1045
1032CFPlus::Font 1046DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1047new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1048 CODE:
1035{ 1049{
1036 int count; 1050 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1054}
1041 OUTPUT: 1055 OUTPUT:
1042 RETVAL 1056 RETVAL
1043 1057
1044void 1058void
1045DESTROY (CFPlus::Font self) 1059DESTROY (DC::Font self)
1046 CODE: 1060 CODE:
1047 pango_font_description_free (self); 1061 pango_font_description_free (self);
1048 1062
1049void 1063void
1050make_default (CFPlus::Font self) 1064make_default (DC::Font self)
1051 PROTOTYPE: $ 1065 PROTOTYPE: $
1052 CODE: 1066 CODE:
1053 default_font = self; 1067 default_font = self;
1054 1068
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1069MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1070
1057PROTOTYPES: DISABLE 1071PROTOTYPES: DISABLE
1058 1072
1059void 1073void
1060glyph_cache_backup () 1074glyph_cache_backup ()
1066glyph_cache_restore () 1080glyph_cache_restore ()
1067 PROTOTYPE: 1081 PROTOTYPE:
1068 CODE: 1082 CODE:
1069 tc_restore (); 1083 tc_restore ();
1070 1084
1071CFPlus::Layout 1085DC::Layout
1072new (SV *class) 1086new (SV *class)
1073 CODE: 1087 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1088 New (0, RETVAL, 1, struct cf_layout);
1075 1089
1076 RETVAL->pl = pango_layout_new (opengl_context); 1090 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1100 layout_update_font (RETVAL);
1087 OUTPUT: 1101 OUTPUT:
1088 RETVAL 1102 RETVAL
1089 1103
1090void 1104void
1091DESTROY (CFPlus::Layout self) 1105DESTROY (DC::Layout self)
1092 CODE: 1106 CODE:
1093 g_object_unref (self->pl); 1107 g_object_unref (self->pl);
1094 rc_free (self->rc); 1108 rc_free (self->rc);
1095 Safefree (self); 1109 Safefree (self);
1096 1110
1097void 1111void
1098set_text (CFPlus::Layout self, SV *text_) 1112set_text (DC::Layout self, SV *text_)
1099 CODE: 1113 CODE:
1100{ 1114{
1101 STRLEN textlen; 1115 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1116 char *text = SvPVutf8 (text_, textlen);
1103 1117
1104 pango_layout_set_text (self->pl, text, textlen); 1118 pango_layout_set_text (self->pl, text, textlen);
1105} 1119}
1106 1120
1107void 1121void
1108set_markup (CFPlus::Layout self, SV *text_) 1122set_markup (DC::Layout self, SV *text_)
1109 CODE: 1123 CODE:
1110{ 1124{
1111 STRLEN textlen; 1125 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1113 1127
1114 pango_layout_set_markup (self->pl, text, textlen); 1128 pango_layout_set_markup (self->pl, text, textlen);
1115} 1129}
1116 1130
1117void 1131void
1118set_shapes (CFPlus::Layout self, ...) 1132set_shapes (DC::Layout self, ...)
1119 CODE: 1133 CODE:
1120{ 1134{
1121 PangoAttrList *attrs = 0; 1135 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1136 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1137 const char *pos = text;
1158 if (attrs) 1172 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1173 pango_layout_set_attributes (self->pl, attrs);
1160} 1174}
1161 1175
1162void 1176void
1163get_shapes (CFPlus::Layout self) 1177get_shapes (DC::Layout self)
1164 PPCODE: 1178 PPCODE:
1165{ 1179{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1180 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1181
1168 do 1182 do
1169 { 1183 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1184 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1185
1172 if (run && shape_attr_p (run)) 1186 if (run && shape_attr_p (run))
1173 { 1187 {
1174 PangoRectangle extents; 1188 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1189 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1197
1184 pango_layout_iter_free (iter); 1198 pango_layout_iter_free (iter);
1185} 1199}
1186 1200
1187int 1201int
1188has_wrapped (CFPlus::Layout self) 1202has_wrapped (DC::Layout self)
1189 CODE: 1203 CODE:
1190{ 1204{
1191 int lines = 1; 1205 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1206 const char *text = pango_layout_get_text (self->pl);
1193 1207
1198} 1212}
1199 OUTPUT: 1213 OUTPUT:
1200 RETVAL 1214 RETVAL
1201 1215
1202SV * 1216SV *
1203get_text (CFPlus::Layout self) 1217get_text (DC::Layout self)
1204 CODE: 1218 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1219 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1220 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1221 OUTPUT:
1208 RETVAL 1222 RETVAL
1209 1223
1210void 1224void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1225set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1226 CODE:
1213 self->r = r; 1227 self->r = r;
1214 self->g = g; 1228 self->g = g;
1215 self->b = b; 1229 self->b = b;
1216 self->a = a; 1230 self->a = a;
1217 1231
1218void 1232void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1233set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1234 CODE:
1221 if (self->font != font) 1235 if (self->font != font)
1222 { 1236 {
1223 self->font = font; 1237 self->font = font;
1224 layout_update_font (self); 1238 layout_update_font (self);
1225 } 1239 }
1226 1240
1227void 1241void
1228set_height (CFPlus::Layout self, int base_height) 1242set_height (DC::Layout self, int base_height)
1229 CODE: 1243 CODE:
1230 if (self->base_height != base_height) 1244 if (self->base_height != base_height)
1231 { 1245 {
1232 self->base_height = base_height; 1246 self->base_height = base_height;
1233 layout_update_font (self); 1247 layout_update_font (self);
1234 } 1248 }
1235 1249
1236void 1250void
1237set_width (CFPlus::Layout self, int max_width = -1) 1251set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1252 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1253 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1254
1241void 1255void
1242set_indent (CFPlus::Layout self, int indent) 1256set_indent (DC::Layout self, int indent)
1243 CODE: 1257 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1258 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1259
1246void 1260void
1247set_spacing (CFPlus::Layout self, int spacing) 1261set_spacing (DC::Layout self, int spacing)
1248 CODE: 1262 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1263 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1264
1251void 1265void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1266set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1267 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1268 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1269 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1270 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1271 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1272 : PANGO_ELLIPSIZE_NONE
1259 ); 1273 );
1260 1274
1261void 1275void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1276set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1277 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1278 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1279
1266void 1280void
1267size (CFPlus::Layout self) 1281size (DC::Layout self)
1268 PPCODE: 1282 PPCODE:
1269{ 1283{
1270 int w, h; 1284 int w, h;
1271 1285
1272 layout_get_pixel_size (self, &w, &h); 1286 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1289 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1290 PUSHs (sv_2mortal (newSViv (h)));
1277} 1291}
1278 1292
1279int 1293int
1280descent (CFPlus::Layout self) 1294descent (DC::Layout self)
1281 CODE: 1295 CODE:
1282{ 1296{
1283 PangoRectangle rect; 1297 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1298 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1299 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1300 RETVAL = PANGO_DESCENT (rect);
1287} 1301}
1288 OUTPUT: 1302 OUTPUT:
1289 RETVAL 1303 RETVAL
1290 1304
1291int 1305int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1306xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1307 CODE:
1294{ 1308{
1295 int index, trailing; 1309 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1310 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1311 RETVAL = index + trailing;
1298} 1312}
1299 OUTPUT: 1313 OUTPUT:
1300 RETVAL 1314 RETVAL
1301 1315
1302void 1316void
1303cursor_pos (CFPlus::Layout self, int index) 1317cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1318 PPCODE:
1305{ 1319{
1306 PangoRectangle strong_pos; 1320 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1321 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1322
1309 EXTEND (SP, 3); 1323 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1324 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1325 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1326 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1327}
1314 1328
1315void 1329void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1330index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1331 PPCODE:
1318{ 1332{
1319 int line, x; 1333 int line, x;
1320 1334
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1338 --line;
1339#endif
1324 EXTEND (SP, 2); 1340 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1341 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1342 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1343}
1328 1344
1329void 1345void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1346line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1347 PPCODE:
1332{ 1348{
1333 PangoLayoutLine *lp; 1349 PangoLayoutLine *lp;
1334 int index, trailing; 1350 int index, trailing;
1335 1351
1336 if (line < 0) 1352 if (line < 0)
1337 XSRETURN_EMPTY; 1353 XSRETURN_EMPTY;
1338 1354
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1355 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1356 XSRETURN_EMPTY; /* do better */
1341 1357
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1358 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1359
1344 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1366 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1367 }
1352} 1368}
1353 1369
1354void 1370void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1371render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1372 CODE:
1357 rc_clear (self->rc); 1373 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1374 pango_opengl_render_layout_subpixel (
1359 self->pl, 1375 self->pl,
1360 self->rc, 1376 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1381 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1382 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1383 pango_layout_context_changed (self->pl);
1368 1384
1369void 1385void
1370draw (CFPlus::Layout self) 1386draw (DC::Layout self)
1371 CODE: 1387 CODE:
1372{ 1388{
1373 glEnable (GL_TEXTURE_2D); 1389 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1390 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1391 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1399 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1400 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1401 glDisable (GL_TEXTURE_2D);
1386} 1402}
1387 1403
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1404MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1405
1390PROTOTYPES: ENABLE 1406PROTOTYPES: ENABLE
1391 1407
1392void 1408void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1409pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1488 RETVAL = width > 0;
1473} 1489}
1474 OUTPUT: 1490 OUTPUT:
1475 RETVAL 1491 RETVAL
1476 1492
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1493MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1494
1479PROTOTYPES: DISABLE 1495PROTOTYPES: DISABLE
1480 1496
1481CFPlus::Map 1497DC::Map
1482new (SV *class) 1498new (SV *class)
1483 CODE: 1499 CODE:
1484 New (0, RETVAL, 1, struct map); 1500 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1501 RETVAL->x = 0;
1486 RETVAL->y = 0; 1502 RETVAL->y = 0;
1494 RETVAL->row = 0; 1510 RETVAL->row = 0;
1495 OUTPUT: 1511 OUTPUT:
1496 RETVAL 1512 RETVAL
1497 1513
1498void 1514void
1499DESTROY (CFPlus::Map self) 1515DESTROY (DC::Map self)
1500 CODE: 1516 CODE:
1501{ 1517{
1502 map_clear (self); 1518 map_clear (self);
1503 Safefree (self->face2tile); 1519 Safefree (self->face2tile);
1504 Safefree (self->tex); 1520 Safefree (self->tex);
1505 Safefree (self); 1521 Safefree (self);
1506} 1522}
1507 1523
1508void 1524void
1509resize (CFPlus::Map self, int map_width, int map_height) 1525resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1526 CODE:
1511 self->w = map_width; 1527 self->w = map_width;
1512 self->h = map_height; 1528 self->h = map_height;
1513 1529
1514void 1530void
1515clear (CFPlus::Map self) 1531clear (DC::Map self)
1516 CODE: 1532 CODE:
1517 map_clear (self); 1533 map_clear (self);
1518 1534
1519void 1535void
1520set_tileid (CFPlus::Map self, int face, int tile) 1536set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1537 CODE:
1522{ 1538{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1539 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1540 need_texid (self, tile);
1525} 1541}
1526 1542
1527void 1543void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1544set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1545 CODE:
1530{ 1546{
1531 tileid texid; 1547 tileid texid;
1532 maptex *tex; 1548 maptex *tex;
1533 1549
1546 tex->smoothtile = self->face2tile [smooth]; 1562 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1563 tex->smoothlevel = level;
1548} 1564}
1549 1565
1550void 1566void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1567set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1552 CODE: 1568 CODE:
1553{ 1569{
1554 need_texid (self, texid); 1570 need_texid (self, texid);
1555 1571
1556 { 1572 {
1576 // from transparent color bleeding and ugly wrapping effects. 1592 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1594}
1579 1595
1580int 1596int
1581ox (CFPlus::Map self) 1597ox (DC::Map self)
1582 ALIAS: 1598 ALIAS:
1583 oy = 1 1599 oy = 1
1584 x = 2 1600 x = 2
1585 y = 3 1601 y = 3
1586 w = 4 1602 w = 4
1597 } 1613 }
1598 OUTPUT: 1614 OUTPUT:
1599 RETVAL 1615 RETVAL
1600 1616
1601void 1617void
1602scroll (CFPlus::Map self, int dx, int dy) 1618scroll (DC::Map self, int dx, int dy)
1603 CODE: 1619 CODE:
1604{ 1620{
1605 if (dx > 0) 1621 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1622 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1623 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1639 self->y += MAP_EXTEND_Y;
1624 } 1640 }
1625} 1641}
1626 1642
1627SV * 1643SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1644map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1645 CODE:
1630{ 1646{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1648 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1649 mapcell *cell;
1722} 1738}
1723 OUTPUT: 1739 OUTPUT:
1724 RETVAL 1740 RETVAL
1725 1741
1726SV * 1742SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1743mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1744 CODE:
1729{ 1745{
1730 int x1, x; 1746 int x1, x;
1731 int y1, y; 1747 int y1, y;
1732 int z; 1748 int z;
1777} 1793}
1778 OUTPUT: 1794 OUTPUT:
1779 RETVAL 1795 RETVAL
1780 1796
1781void 1797void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1798draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1783 CODE: 1799 CODE:
1784{ 1800{
1785 int x, y, z; 1801 int x, y, z;
1786 1802
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2058 } 2074 }
2059 } 2075 }
2060} 2076}
2061 2077
2062void 2078void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064 CODE: 2080 CODE:
2065{ 2081{
2066 static float color[16][3] = { 2082 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2083 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2084 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2134 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2135 glDisable (GL_TEXTURE_2D);
2120} 2136}
2121 2137
2122void 2138void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2139fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2140 PPCODE:
2125{ 2141{
2126 int x, y; 2142 int x, y;
2127 int sw1 = sw + 2; 2143 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2144 int sh1 = sh + 2;
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2215 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2216 PUSHs (darkness3_sv);
2201} 2217}
2202 2218
2203SV * 2219SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2220get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2221 CODE:
2206{ 2222{
2207 int x, y, x1, y1; 2223 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2224 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2225 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2274} 2290}
2275 OUTPUT: 2291 OUTPUT:
2276 RETVAL 2292 RETVAL
2277 2293
2278void 2294void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2295set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2280 PPCODE: 2296 PPCODE:
2281{ 2297{
2282 int x, y, z; 2298 int x, y, z;
2283 int w, h; 2299 int w, h;
2284 int x1, y1; 2300 int x1, y1;
2337 } 2353 }
2338 } 2354 }
2339 } 2355 }
2340} 2356}
2341 2357
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2358MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2359
2344CFPlus::RW 2360DC::RW
2345new (SV *class, SV *data_sv) 2361new (SV *class, SV *data_sv)
2346 CODE: 2362 CODE:
2347{ 2363{
2348 STRLEN datalen; 2364 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2365 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2367 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2368}
2353 OUTPUT: 2369 OUTPUT:
2354 RETVAL 2370 RETVAL
2355 2371
2356CFPlus::RW 2372DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2373new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2374 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2375 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2376 OUTPUT:
2361 RETVAL 2377 RETVAL
2362 2378
2363# fails on win32: 2379# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2380# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2381#void
2366#close (CFPlus::RW self) 2382#close (DC::RW self)
2367# CODE: 2383# CODE:
2368# (self->(close)) (self); 2384# (self->(close)) (self);
2369 2385
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2386MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2387
2372PROTOTYPES: DISABLE 2388PROTOTYPES: DISABLE
2373 2389
2374CFPlus::Channel 2390DC::Channel
2375find () 2391find ()
2376 CODE: 2392 CODE:
2377{ 2393{
2378 RETVAL = Mix_GroupAvailable (-1); 2394 RETVAL = Mix_GroupAvailable (-1);
2379 2395
2392} 2408}
2393 OUTPUT: 2409 OUTPUT:
2394 RETVAL 2410 RETVAL
2395 2411
2396void 2412void
2397halt (CFPlus::Channel self) 2413halt (DC::Channel self)
2398 CODE: 2414 CODE:
2399 Mix_HaltChannel (self); 2415 Mix_HaltChannel (self);
2400 2416
2401void 2417void
2402expire (CFPlus::Channel self, int ticks = -1) 2418expire (DC::Channel self, int ticks = -1)
2403 CODE: 2419 CODE:
2404 Mix_ExpireChannel (self, ticks); 2420 Mix_ExpireChannel (self, ticks);
2405 2421
2406void 2422void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2423fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2424 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2425 Mix_FadeOutChannel (self, ticks);
2410 2426
2411int 2427int
2412volume (CFPlus::Channel self, int volume) 2428volume (DC::Channel self, int volume)
2413 CODE: 2429 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2430 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2431 OUTPUT:
2416 RETVAL 2432 RETVAL
2417 2433
2418void 2434void
2419unregister_all_effects (CFPlus::Channel self) 2435unregister_all_effects (DC::Channel self)
2420 CODE: 2436 CODE:
2421 Mix_UnregisterAllEffects (self); 2437 Mix_UnregisterAllEffects (self);
2422 2438
2423void 2439void
2424set_panning (CFPlus::Channel self, int left, int right) 2440set_panning (DC::Channel self, int left, int right)
2425 CODE: 2441 CODE:
2426 left = CLAMP (left , 0, 255); 2442 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2443 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2444 Mix_SetPanning (self, left, right);
2429 2445
2430void 2446void
2431set_distance (CFPlus::Channel self, int distance) 2447set_distance (DC::Channel self, int distance)
2432 CODE: 2448 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2449 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2450
2435void 2451void
2436set_position (CFPlus::Channel self, int angle, int distance) 2452set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2453 CODE:
2438 2454
2439void 2455void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2457 CODE:
2442{ 2458{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2459 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2462}
2447 2463
2448void 2464void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2465set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2466 CODE:
2451 Mix_SetReverseStereo (self, flip); 2467 Mix_SetReverseStereo (self, flip);
2452 2468
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2470
2455PROTOTYPES: DISABLE 2471PROTOTYPES: DISABLE
2456 2472
2457CFPlus::MixChunk 2473DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2474new (SV *class, DC::RW rwops)
2459 CODE: 2475 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2476 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2477 OUTPUT:
2462 RETVAL 2478 RETVAL
2463 2479
2464void 2480void
2465DESTROY (CFPlus::MixChunk self) 2481DESTROY (DC::MixChunk self)
2466 CODE: 2482 CODE:
2467 Mix_FreeChunk (self); 2483 Mix_FreeChunk (self);
2468 2484
2469int 2485int
2470volume (CFPlus::MixChunk self, int volume = -1) 2486volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2487 CODE:
2472 if (items > 1) 2488 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2489 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2490 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2491 OUTPUT:
2476 RETVAL 2492 RETVAL
2477 2493
2478CFPlus::Channel 2494DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2495play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2496 CODE:
2481{ 2497{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2498 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2499
2484 if (RETVAL < 0) 2500 if (RETVAL < 0)
2491 } 2507 }
2492} 2508}
2493 OUTPUT: 2509 OUTPUT:
2494 RETVAL 2510 RETVAL
2495 2511
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2513
2498int 2514int
2499volume (int volume = -1) 2515volume (int volume = -1)
2500 PROTOTYPE: ;$ 2516 PROTOTYPE: ;$
2501 CODE: 2517 CODE:
2513void 2529void
2514halt () 2530halt ()
2515 CODE: 2531 CODE:
2516 Mix_HaltMusic (); 2532 Mix_HaltMusic ();
2517 2533
2518CFPlus::MixMusic 2534DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2535new (SV *class, DC::RW rwops)
2520 CODE: 2536 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2537 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2538 OUTPUT:
2523 RETVAL 2539 RETVAL
2524 2540
2525void 2541void
2526DESTROY (CFPlus::MixMusic self) 2542DESTROY (DC::MixMusic self)
2527 CODE: 2543 CODE:
2528 Mix_FreeMusic (self); 2544 Mix_FreeMusic (self);
2529 2545
2530int 2546int
2531play (CFPlus::MixMusic self, int loops = -1) 2547play (DC::MixMusic self, int loops = -1)
2532 CODE: 2548 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2549 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2550 OUTPUT:
2535 RETVAL 2551 RETVAL
2536 2552
2537void 2553void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2554fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2555 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2556 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2557
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2558MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2559
2544PROTOTYPES: ENABLE 2560PROTOTYPES: ENABLE
2545 2561
2546BOOT: 2562BOOT:
2547{ 2563{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2564 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2565 static const struct {
2550 const char *name; 2566 const char *name;
2551 IV iv; 2567 IV iv;
2552 } *civ, const_iv[] = { 2568 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2569# define const_iv(name) { # name, (IV)name }
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2862void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 2863 CODE:
2848 if (gl.SeparableFilter2D) 2864 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2865 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2866
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2867void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 2868
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2869void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 2870
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2871void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2872
2882 2898
2883void glEndList () 2899void glEndList ()
2884 2900
2885void glCallList (int list) 2901void glCallList (int list)
2886 2902
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 2904
2889PROTOTYPES: DISABLE 2905PROTOTYPES: DISABLE
2890 2906
2891void 2907void
2892find_widget (SV *self, NV x, NV y) 2908find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 2912 XPUSHs (self);
2897} 2913}
2898 2914
2899BOOT: 2915BOOT:
2900{ 2916{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2917 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 2918
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2919 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2920 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2921 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2922 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 2923}
2908 2924
2909void 2925void
2910draw (SV *self) 2926draw (SV *self)
2911 CODE: 2927 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 2934 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 2935 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 2936 double draw_x, draw_y;
2921 2937
2922 if (!SvROK (self)) 2938 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2939 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 2940
2925 hv = (HV *)SvRV (self); 2941 hv = (HV *)SvRV (self);
2926 2942
2927 if (SvTYPE (hv) != SVt_PVHV) 2943 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2944 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 2945
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2946 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2947 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 2948
2933 if (!h || !w) 2949 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines