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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines