ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.79 by root, Thu Dec 14 05:09:32 2006 UTC vs.
Revision 1.92 by elmex, Wed Dec 20 12:13:47 2006 UTC

… …
136inline SV *to_sv (unsigned long v) { return newSVuv (v); } 136inline SV *to_sv (unsigned long v) { return newSVuv (v); }
137inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 137inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
138inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 138inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
139inline SV *to_sv (float v) { return newSVnv (v); } 139inline SV *to_sv (float v) { return newSVnv (v); }
140inline SV *to_sv (double v) { return newSVnv (v); } 140inline SV *to_sv (double v) { return newSVnv (v); }
141inline SV *to_sv (client_socket *v) { return newSVattachable (v, "cf::client_socket::wrap"); } 141inline SV *to_sv (client * v) { return newSVattachable (v, "cf::client::wrap"); }
142inline SV *to_sv (player * v) { return newSVattachable (v, "cf::player::wrap"); } 142inline SV *to_sv (player * v) { return newSVattachable (v, "cf::player::wrap"); }
143inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); } 143inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); }
144inline SV *to_sv (maptile * v) { return newSVattachable (v, "cf::map::wrap"); } 144inline SV *to_sv (maptile * v) { return newSVattachable (v, "cf::map::wrap"); }
145inline SV *to_sv (archetype * v) { return newSVptr (v, "cf::arch::wrap"); } 145inline SV *to_sv (archetype * v) { return newSVptr (v, "cf::arch::wrap"); }
146inline SV *to_sv (partylist * v) { return newSVptr (v, "cf::party::wrap"); } 146inline SV *to_sv (partylist * v) { return newSVptr (v, "cf::party::wrap"); }
… …
174inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 174inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
175inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 175inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
176inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 176inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
177inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 177inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
178inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 178inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
179inline void sv_to (SV *sv, client_socket *&v) { v = (client_socket *)SvPTR_ornull (sv, "cf::client_socket"); } 179inline void sv_to (SV *sv, client * &v) { v = (client *)SvPTR_ornull (sv, "cf::client"); }
180inline void sv_to (SV *sv, player * &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); } 180inline void sv_to (SV *sv, player * &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); }
181inline void sv_to (SV *sv, object * &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); } 181inline void sv_to (SV *sv, object * &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); }
182inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); } 182inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); }
183inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); } 183inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); }
184inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 184inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
… …
243 case DT_MAP: 243 case DT_MAP:
244 // va_arg (object *) when void * is passed is an XSI extension 244 // va_arg (object *) when void * is passed is an XSI extension
245 sv = to_sv (va_arg (ap, maptile *)); 245 sv = to_sv (va_arg (ap, maptile *));
246 break; 246 break;
247 247
248 case DT_SOCKET: 248 case DT_CLIENT:
249 sv = to_sv (va_arg (ap, client_socket *)); 249 sv = to_sv (va_arg (ap, client *));
250 break; 250 break;
251 251
252 case DT_PLAYER: 252 case DT_PLAYER:
253 sv = to_sv (va_arg (ap, player *)); 253 sv = to_sv (va_arg (ap, player *));
254 break; 254 break;
… …
834 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 834 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
835 835
836 char *argv[] = { 836 char *argv[] = {
837 "", 837 "",
838 "-e" 838 "-e"
839 "cf->bootstrap;" 839 "use Event;" // required for bootstrap
840 "cf->bootstrap;" // required for datadir :*>
840 "unshift @INC, cf::datadir ();" 841 "unshift @INC, cf::datadir ();"
841 "require cf;" 842 "require cf;"
842 }; 843 };
843 844
844 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl)) 845 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
… …
1055cfperl_result_DOUBLE (int idx) 1056cfperl_result_DOUBLE (int idx)
1056{ 1057{
1057 return SvNV (cfperl_result (idx)); 1058 return SvNV (cfperl_result (idx));
1058} 1059}
1059 1060
1061/////////////////////////////////////////////////////////////////////////////
1062
1063struct EventAPI *watcher_base::GEventAPI;
1064
1065static void iw_dispatch (pe_event *ev)
1066{
1067 iw *w = (iw *)ev->ext_data;
1068 w->call (*w);
1069}
1070
1071void
1072iw::alloc ()
1073{
1074 pe = GEventAPI->new_idle (0, 0);
1075
1076 pe->base.callback = (void *)iw_dispatch;
1077 pe->base.ext_data = (void *)this;
1078}
1079
1080static void iow_dispatch (pe_event *ev)
1081{
1082 iow *w = (iow *)ev->ext_data;
1083 w->call (*w, ((pe_ioevent *)ev)->got);
1084}
1085
1086void
1087iow::alloc ()
1088{
1089 pe = GEventAPI->new_io (0, 0);
1090
1091 pe->base.callback = (void *)iow_dispatch;
1092 pe->base.ext_data = (void *)this;
1093
1094 pe->fd = -1;
1095 pe->poll = 0;
1096}
1097
1098void
1099iow::fd (int fd)
1100{
1101 pe->fd = fd;
1102}
1103
1104int
1105iow::poll ()
1106{
1107 return pe->poll;
1108}
1109
1110void
1111iow::poll (int events)
1112{
1113 if (pe->poll != events)
1114 {
1115 if (pe->poll) stop ();
1116 pe->poll = events;
1117 if (pe->poll) start ();
1118 }
1119}
1120
1060MODULE = cf PACKAGE = cf PREFIX = cf_ 1121MODULE = cf PACKAGE = cf PREFIX = cf_
1061 1122
1062BOOT: 1123BOOT:
1063{ 1124{
1064 HV *stash = gv_stashpv ("cf", 1); 1125 HV *stash = gv_stashpv ("cf", 1);
1126
1127 I_EVENT_API (PACKAGE);
1128 watcher_base::GEventAPI = GEventAPI;
1065 1129
1066 newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1130 newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1067 1131
1068 static const struct { 1132 static const struct {
1069 const char *name; 1133 const char *name;
… …
1083 const_iv (POTION) 1147 const_iv (POTION)
1084 const_iv (FOOD) 1148 const_iv (FOOD)
1085 const_iv (POISON) 1149 const_iv (POISON)
1086 const_iv (BOOK) 1150 const_iv (BOOK)
1087 const_iv (CLOCK) 1151 const_iv (CLOCK)
1088 const_iv (LIGHTNING)
1089 const_iv (ARROW) 1152 const_iv (ARROW)
1090 const_iv (BOW) 1153 const_iv (BOW)
1091 const_iv (WEAPON) 1154 const_iv (WEAPON)
1092 const_iv (ARMOUR) 1155 const_iv (ARMOUR)
1093 const_iv (PEDESTAL) 1156 const_iv (PEDESTAL)
… …
1113 const_iv (AMULET) 1176 const_iv (AMULET)
1114 const_iv (PLAYERMOVER) 1177 const_iv (PLAYERMOVER)
1115 const_iv (TELEPORTER) 1178 const_iv (TELEPORTER)
1116 const_iv (CREATOR) 1179 const_iv (CREATOR)
1117 const_iv (SKILL) 1180 const_iv (SKILL)
1118 const_iv (EXPERIENCE)
1119 const_iv (EARTHWALL) 1181 const_iv (EARTHWALL)
1120 const_iv (GOLEM) 1182 const_iv (GOLEM)
1121 const_iv (THROWN_OBJ) 1183 const_iv (THROWN_OBJ)
1122 const_iv (BLINDNESS) 1184 const_iv (BLINDNESS)
1123 const_iv (GOD) 1185 const_iv (GOD)
… …
1143 const_iv (FLOOR) 1205 const_iv (FLOOR)
1144 const_iv (FLESH) 1206 const_iv (FLESH)
1145 const_iv (INORGANIC) 1207 const_iv (INORGANIC)
1146 const_iv (SKILL_TOOL) 1208 const_iv (SKILL_TOOL)
1147 const_iv (LIGHTER) 1209 const_iv (LIGHTER)
1148 const_iv (TRAP_PART)
1149 const_iv (WALL) 1210 const_iv (BUILDABLE_WALL)
1150 const_iv (LIGHT_SOURCE) 1211 const_iv (LIGHT_SOURCE)
1151 const_iv (MISC_OBJECT) 1212 const_iv (MISC_OBJECT)
1152 const_iv (MONSTER) 1213 const_iv (MONSTER)
1153 const_iv (SPAWN_GENERATOR) 1214 const_iv (SPAWN_GENERATOR)
1154 const_iv (LAMP) 1215 const_iv (LAMP)
… …
1196 const_iv (DISEASE) 1257 const_iv (DISEASE)
1197 const_iv (SYMPTOM) 1258 const_iv (SYMPTOM)
1198 const_iv (BUILDER) 1259 const_iv (BUILDER)
1199 const_iv (MATERIAL) 1260 const_iv (MATERIAL)
1200 const_iv (ITEM_TRANSFORMER) 1261 const_iv (ITEM_TRANSFORMER)
1201 const_iv (QUEST)
1202 1262
1203 const_iv (NUM_SUBTYPES) 1263 const_iv (NUM_SUBTYPES)
1204 1264
1205 const_iv (ST_BD_BUILD) 1265 const_iv (ST_BD_BUILD)
1206 const_iv (ST_BD_REMOVE) 1266 const_iv (ST_BD_REMOVE)
… …
1259 const_iv (FLAG_MONSTER) 1319 const_iv (FLAG_MONSTER)
1260 const_iv (FLAG_FRIENDLY) 1320 const_iv (FLAG_FRIENDLY)
1261 const_iv (FLAG_GENERATOR) 1321 const_iv (FLAG_GENERATOR)
1262 const_iv (FLAG_IS_THROWN) 1322 const_iv (FLAG_IS_THROWN)
1263 const_iv (FLAG_AUTO_APPLY) 1323 const_iv (FLAG_AUTO_APPLY)
1264 const_iv (FLAG_TREASURE)
1265 const_iv (FLAG_PLAYER_SOLD) 1324 const_iv (FLAG_PLAYER_SOLD)
1266 const_iv (FLAG_SEE_INVISIBLE) 1325 const_iv (FLAG_SEE_INVISIBLE)
1267 const_iv (FLAG_CAN_ROLL) 1326 const_iv (FLAG_CAN_ROLL)
1268 const_iv (FLAG_OVERLAY_FLOOR) 1327 const_iv (FLAG_OVERLAY_FLOOR)
1269 const_iv (FLAG_IS_TURNABLE) 1328 const_iv (FLAG_IS_TURNABLE)
… …
1392 const_iv (F_BUY) 1451 const_iv (F_BUY)
1393 const_iv (F_SHOP) 1452 const_iv (F_SHOP)
1394 const_iv (F_SELL) 1453 const_iv (F_SELL)
1395 1454
1396 const_iv (P_BLOCKSVIEW) 1455 const_iv (P_BLOCKSVIEW)
1456 const_iv (P_PLAYER)
1397 const_iv (P_NO_MAGIC) 1457 const_iv (P_NO_MAGIC)
1398 const_iv (P_IS_ALIVE) 1458 const_iv (P_IS_ALIVE)
1399 const_iv (P_NO_CLERIC) 1459 const_iv (P_NO_CLERIC)
1400 const_iv (P_NEED_UPDATE) 1460 const_iv (P_NEED_UPDATE)
1401 const_iv (P_NO_ERROR)
1402 const_iv (P_OUT_OF_MAP) 1461 const_iv (P_OUT_OF_MAP)
1403 const_iv (P_NEW_MAP) 1462 const_iv (P_NEW_MAP)
1404 1463
1405 const_iv (UP_OBJ_INSERT) 1464 const_iv (UP_OBJ_INSERT)
1406 const_iv (UP_OBJ_REMOVE) 1465 const_iv (UP_OBJ_REMOVE)
… …
1580 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1639 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1581 av_push (event, newSViv (eiv->klass)); 1640 av_push (event, newSViv (eiv->klass));
1582 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1641 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1583 newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv)); 1642 newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv));
1584 } 1643 }
1585
1586 //I_EVENT_API (PACKAGE);
1587} 1644}
1588 1645
1589void _init_vars () 1646void _init_vars ()
1590 CODE: 1647 CODE:
1591 cb_global = get_av ("cf::CB_GLOBAL", 1); 1648 cb_global = get_av ("cf::CB_GLOBAL", 1);
… …
1607 for (object *op = object::first; op; op = op->next) 1664 for (object *op = object::first; op; op = op->next)
1608 reattach (op); 1665 reattach (op);
1609} 1666}
1610 1667
1611bool 1668bool
1612add_client_socket (int fd, const char *peername) 1669add_client (int fd, const char *peername)
1613 1670
1614NV floor (NV x) 1671NV floor (NV x)
1615 1672
1616NV ceil (NV x) 1673NV ceil (NV x)
1617 1674
… …
1826 1883
1827void remove (object *op) 1884void remove (object *op)
1828 CODE: 1885 CODE:
1829 op->remove (); 1886 op->remove ();
1830 1887
1831void destroy (object *op, int recursive = 0) 1888void
1832 CODE: 1889object::destroy (int recursive = 0)
1833 op->destroy (recursive);
1834 1890
1835object *cf_object_present_archname_inside (object *op, char *whatstr) 1891object *cf_object_present_archname_inside (object *op, char *whatstr)
1836 1892
1837int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0) 1893int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
1838 1894
… …
1990base_name (object *op, int plural = op->nrof > 1) 2046base_name (object *op, int plural = op->nrof > 1)
1991 CODE: 2047 CODE:
1992 RETVAL = query_base_name (op, plural); 2048 RETVAL = query_base_name (op, plural);
1993 OUTPUT: RETVAL 2049 OUTPUT: RETVAL
1994 2050
2051object *decrease_ob_nr (object *op, unsigned long i)
2052
1995MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 2053MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1996 2054
1997player *player (object *op) 2055player *player (object *op)
1998 CODE: 2056 CODE:
1999 RETVAL = op->contr; 2057 RETVAL = op->contr;
… …
2037 2095
2038 2096
2039MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2097MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2040 2098
2041INCLUDE: $PERL genacc player ../include/player.h | 2099INCLUDE: $PERL genacc player ../include/player.h |
2042
2043char *
2044client (player *pl)
2045 CODE:
2046 RETVAL = pl->socket->client;
2047 OUTPUT:
2048 RETVAL
2049
2050char *
2051host (player *pl)
2052 CODE:
2053 RETVAL = pl->socket->host;
2054 OUTPUT:
2055 RETVAL
2056 2100
2057int invoke (player *pl, int event, ...) 2101int invoke (player *pl, int event, ...)
2058 CODE: 2102 CODE:
2059 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2103 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2060 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2104 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2086 CODE: 2130 CODE:
2087 RETVAL = FABS (dx) <= pl->socket->mapx / 2 && FABS (dy) <= pl->socket->mapy / 2 2131 RETVAL = FABS (dx) <= pl->socket->mapx / 2 && FABS (dy) <= pl->socket->mapy / 2
2088 && !pl->blocked_los [dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]; 2132 && !pl->blocked_los [dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2];
2089 OUTPUT: 2133 OUTPUT:
2090 RETVAL 2134 RETVAL
2091
2092void
2093buggy_mapscroll (player *pl, int value = 1)
2094 CODE:
2095 pl->socket->buggy_mapscroll = value;
2096 2135
2097void 2136void
2098send (player *pl, SV *packet) 2137send (player *pl, SV *packet)
2099 CODE: 2138 CODE:
2100{ 2139{
… …
2390 2429
2391MODULE = cf PACKAGE = cf::settings 2430MODULE = cf PACKAGE = cf::settings
2392 2431
2393INCLUDE: $PERL genacc Settings ../include/global.h | 2432INCLUDE: $PERL genacc Settings ../include/global.h |
2394 2433
2395MODULE = cf PACKAGE = cf::client_socket 2434MODULE = cf PACKAGE = cf::client
2396 2435
2397INCLUDE: $PERL genacc client_socket ../include/newserver.h | 2436INCLUDE: $PERL genacc client ../include/client.h |
2398 2437
2399int invoke (client_socket *ns, int event, ...) 2438int invoke (client *ns, int event, ...)
2400 CODE: 2439 CODE:
2401 if (KLASS_OF (event) != KLASS_SOCKET) croak ("event class must be SOCKET"); 2440 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2402 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2441 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2403 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i))); 2442 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2404 RETVAL = INVOKE_((event_type)event, ARG_SOCKET (ns), ARG_AV (av)); 2443 RETVAL = INVOKE_((event_type)event, ARG_CLIENT (ns), ARG_AV (av));
2405 OUTPUT: RETVAL 2444 OUTPUT: RETVAL
2406 2445
2407SV *registry (client_socket *ns) 2446SV *registry (client *ns)
2408 2447
2448void
2449client::destroy ()
2450

Diff Legend

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