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.137 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
7#endif 8#endif
8 9
9#include "EXTERN.h" 10#include "EXTERN.h"
10#include "perl.h" 11#include "perl.h"
… …
144} 145}
145 146
146static void 147static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 149{
150 PangoRectangle rect;
151
152 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 153 pango_layout_get_extents (self->pl, 0, &rect);
150 154
151 if (!*w) *w = 1; 155 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 156 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 157
154 *w = (*w + 3) & ~3; 158 if (!rect.width) rect.width = 1;
159 if (!rect.height) rect.height = 1;
160
161 *w = rect.width;
162 *h = rect.height;
155} 163}
156 164
157typedef uint16_t mapface; 165typedef uint16_t mapface;
158 166
159typedef struct { 167typedef struct {
… …
162 float s, t; 170 float s, t;
163 uint8_t r, g, b, a; 171 uint8_t r, g, b, a;
164} maptex; 172} maptex;
165 173
166typedef struct { 174typedef struct {
167 int16_t darkness; 175 uint32_t player;
168 mapface face[3]; 176 mapface face[3];
177 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags;
169} mapcell; 179} mapcell;
170 180
171typedef struct { 181typedef struct {
172 int32_t c0, c1; 182 int32_t c0, c1;
173 mapcell *col; 183 mapcell *col;
… …
286static void 296static void
287map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 297map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 298{
289 int x, y; 299 int x, y;
290 maprow *row; 300 maprow *row;
301 mapcell *cell;
291 302
292 for (y = y0; y < y0 + h; y++) 303 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 304 if (y >= 0)
294 { 305 {
295 if (y >= self->rows) 306 if (y >= self->rows)
… …
301 if (x >= row->c0) 312 if (x >= row->c0)
302 { 313 {
303 if (x >= row->c1) 314 if (x >= row->c1)
304 break; 315 break;
305 316
306 row->col[x - row->c0].darkness = -1; 317 cell = row->col + x - row->c0;
318
319 cell->darkness = 0;
320 cell->stat_hp = 0;
321 cell->flags = 0;
322 cell->player = 0;
307 } 323 }
308 } 324 }
309} 325}
310 326
311static void 327static void
… …
636#ifndef _WIN32 652#ifndef _WIN32
637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
638#endif 654#endif
639 655
640void 656void
657win32_proxy_info ()
658 PPCODE:
659{
660#ifdef _WIN32
661 INTERNET_PROXY_INFO proxyinfo;
662 char buffer[2048];
663 DWORD buflen;
664
665 EXTEND (SP, 3);
666
667 buflen = sizeof (buffer);
668 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
669 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
670 {
671 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
672
673 buflen = sizeof (buffer);
674 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
675 {
676 PUSHs (newSVpv (buffer, 0));
677
678 buflen = sizeof (buffer);
679 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
680 PUSHs (newSVpv (buffer, 0));
681 }
682 }
683#endif
684}
685
686void
641add_font (char *file) 687add_font (char *file)
642 CODE: 688 CODE:
643 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 689 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
644 690
645void 691void
… …
747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 793 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
748#endif 794#endif
749 _exit (1); 795 _exit (1);
750 796
751void 797void
752_exit (int retval) 798_exit (int retval = 0)
753 CODE: 799 CODE:
754 _exit (retval); 800 _exit (retval);
755 801
756MODULE = CFPlus PACKAGE = CFPlus::Font 802MODULE = CFPlus PACKAGE = CFPlus::Font
757 803
… …
1231void 1277void
1232scroll (CFPlus::Map self, int dx, int dy) 1278scroll (CFPlus::Map self, int dx, int dy)
1233 CODE: 1279 CODE:
1234{ 1280{
1235 if (dx > 0) 1281 if (dx > 0)
1236 map_blank (self, self->x, self->y, dx - 1, self->h); 1282 map_blank (self, self->x, self->y, dx, self->h);
1237 else if (dx < 0) 1283 else if (dx < 0)
1238 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1284 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1239 1285
1240 if (dy > 0) 1286 if (dy > 0)
1241 map_blank (self, self->x, self->y, self->w, dy - 1); 1287 map_blank (self, self->x, self->y, self->w, dy);
1242 else if (dy < 0) 1288 else if (dy < 0)
1243 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1289 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1244 1290
1245 self->ox += dx; self->x += dx; 1291 self->ox += dx; self->x += dx;
1246 self->oy += dy; self->y += dy; 1292 self->oy += dy; self->y += dy;
1247 1293
1248 while (self->y < 0) 1294 while (self->y < 0)
… …
1253 self->y += MAP_EXTEND_Y; 1299 self->y += MAP_EXTEND_Y;
1254 } 1300 }
1255} 1301}
1256 1302
1257void 1303void
1258map1a_update (CFPlus::Map self, SV *data_) 1304map1a_update (CFPlus::Map self, SV *data_, int extmap)
1259 CODE: 1305 CODE:
1260{ 1306{
1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1307 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1262 uint8_t *data_end = (uint8_t *)SvEND (data_); 1308 uint8_t *data_end = (uint8_t *)SvEND (data_);
1263 mapcell *cell; 1309 mapcell *cell;
1264 int x, y, flags; 1310 int x, y, flags;
1265 1311
1266 while (data < data_end) 1312 while (data < data_end - 1)
1267 { 1313 {
1268 flags = (data [0] << 8) + data [1]; data += 2; 1314 flags = (data [0] << 8) + data [1]; data += 2;
1269 1315
1270 x = self->x + ((flags >> 10) & 63); 1316 x = self->x + ((flags >> 10) & 63);
1271 y = self->y + ((flags >> 4) & 63); 1317 y = self->y + ((flags >> 4) & 63);
1272 1318
1273 cell = map_get_cell (self, x, y); 1319 cell = map_get_cell (self, x, y);
1274 1320
1275 if (flags & 15) 1321 if (flags & 15)
1276 { 1322 {
1277 if (cell->darkness < 0) 1323 if (!cell->darkness)
1278 { 1324 {
1325 memset (cell, 0, sizeof (*cell));
1279 cell->darkness = 0; 1326 cell->darkness = 256;
1280 cell->face [0] = 0;
1281 cell->face [1] = 0;
1282 cell->face [2] = 0;
1283 } 1327 }
1284 1328
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1329 //TODO: don't trust server data to be in-range(!)
1330
1331 if (flags & 8)
1332 {
1333 if (extmap)
1334 {
1335 uint8_t ext, cmd;
1336
1337 do
1338 {
1339 ext = *data++;
1340 cmd = ext & 0x3f;
1341
1342 if (cmd < 4)
1343 cell->darkness = 255 - ext * 64 + 1;
1344 else if (cmd == 5) // health
1345 {
1346 cell->stat_width = 1;
1347 cell->stat_hp = *data++;
1348 }
1349 else if (cmd == 6) // monster width
1350 cell->stat_width = *data++ + 1;
1351 else if (cmd == 0x47) // monster width
1352 {
1353 if (*data == 4)
1354 ; // decode player tag
1355
1356 data += *data + 1;
1357 }
1358 else if (cmd == 8) // cell flags
1359 cell->flags = *data++;
1360 else if (ext & 0x40) // unknown, multibyte => skip
1361 data += *data + 1;
1362 else
1363 data++;
1364 }
1365 while (ext & 0x80);
1366 }
1367 else
1368 cell->darkness = *data++ + 1;
1369 }
1288 1370
1289 if (flags & 4) 1371 if (flags & 4)
1290 { 1372 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1373 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1292 } 1374 }
… …
1300 { 1382 {
1301 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1383 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1302 } 1384 }
1303 } 1385 }
1304 else 1386 else
1305 cell->darkness = -1; 1387 cell->darkness = 0;
1306 } 1388 }
1307} 1389}
1308 1390
1309SV * 1391SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1392mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1410 { 1492 {
1411 mapcell *cell = row->col + (x + vx - row->c0); 1493 mapcell *cell = row->col + (x + vx - row->c0);
1412 1494
1413 face = cell->face [z]; 1495 face = cell->face [z];
1414 1496
1415 if (face) 1497 if (face && face < self->texs)
1416 { 1498 {
1417 maptex tex = self->tex [face]; 1499 maptex tex = self->tex [face];
1418
1419 int px = (x + 1) * 32 - tex.w; 1500 int px = (x + 1) * 32 - tex.w;
1420 int py = (y + 1) * 32 - tex.h; 1501 int py = (y + 1) * 32 - tex.h;
1421 1502
1422 if (last_name != tex.name) 1503 if (last_name != tex.name)
1423 { 1504 {
1424 glEnd (); 1505 glEnd ();
1425 last_name = tex.name;
1426 glBindTexture (GL_TEXTURE_2D, last_name); 1506 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1427 glBegin (GL_QUADS); 1507 glBegin (GL_QUADS);
1428 } 1508 }
1429 1509
1430 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1510 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1431 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1511 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1432 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1512 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1433 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1513 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1434 } 1514 }
1515
1516 if (cell->flags && z == 2)
1517 {
1518 if (cell->flags & 1)
1519 {
1520 maptex tex = self->tex [1];
1521 int px = (x + 1) * 32 - tex.w + 2;
1522 int py = (y + 1) * 32 - tex.h - 6;
1523
1524 glEnd ();
1525 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1526 glBegin (GL_QUADS);
1527
1528 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1529 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1530 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1531 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1532 }
1533 }
1435 } 1534 }
1436 } 1535 }
1437 1536
1438 glEnd (); 1537 glEnd ();
1439 1538
1440 glDisable (GL_TEXTURE_2D); 1539 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1540 glDisable (GL_BLEND);
1541
1542 // top layer: overlays such as the health bar
1543 for (y = 0; y < sh; y++)
1544 if (0 <= y + vy && y + vy < self->rows)
1545 {
1546 maprow *row = self->row + (y + vy);
1547
1548 for (x = 0; x < sw; x++)
1549 if (row->c0 <= x + vx && x + vx < row->c1)
1550 {
1551 mapcell *cell = row->col + (x + vx - row->c0);
1552
1553 int px = x * 32;
1554 int py = y * 32;
1555
1556 if (cell->stat_hp)
1557 {
1558 int width = cell->stat_width * 32;
1559 int thick = sh / 28 + 1 + cell->stat_width;
1560
1561 glColor3ub (0, 0, 0);
1562 glRectf (px + 1, py - thick - 2,
1563 px + width - 1, py);
1564
1565 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1566 glRectf (px + 2,
1567 py - thick - 1,
1568 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1569 }
1570 }
1571 }
1442} 1572}
1443 1573
1444void 1574void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1575draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE: 1576 CODE:
… …
1526 for (x = 0; x < sw; x++) 1656 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 1657 if (row->c0 <= x + vx && x + vx < row->c1)
1528 { 1658 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 1659 mapcell *cell = row->col + (x + vx - row->c0);
1530 1660
1531 darkness[y * sw4 + x] = cell->darkness < 0 1661 darkness[y * sw4 + x] = cell->darkness
1662 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 1663 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 1664 }
1535 } 1665 }
1536 1666
1537 EXTEND (SP, 3); 1667 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 1668 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1653 1783
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1784 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1785 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1786 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1657 1787
1658 if (cell->darkness <= 0) 1788 if (cell->darkness == 0)
1659 { 1789 {
1660 cell->darkness = -1; 1790 cell->darkness = 0;
1661 1791
1662 for (z = 0; z <= 2; z++) 1792 for (z = 0; z <= 2; z++)
1663 { 1793 {
1664 cell->face[z] = face[z]; 1794 cell->face[z] = face[z];
1665 1795
… …
1803 const_iv (GL_SEPARABLE_2D), 1933 const_iv (GL_SEPARABLE_2D),
1804 const_iv (GL_CONVOLUTION_2D), 1934 const_iv (GL_CONVOLUTION_2D),
1805 const_iv (GL_CONVOLUTION_BORDER_MODE), 1935 const_iv (GL_CONVOLUTION_BORDER_MODE),
1806 const_iv (GL_CONSTANT_BORDER), 1936 const_iv (GL_CONSTANT_BORDER),
1807 const_iv (GL_LINES), 1937 const_iv (GL_LINES),
1938 const_iv (GL_LINE_STRIP),
1808 const_iv (GL_LINE_LOOP), 1939 const_iv (GL_LINE_LOOP),
1809 const_iv (GL_QUADS), 1940 const_iv (GL_QUADS),
1810 const_iv (GL_QUAD_STRIP), 1941 const_iv (GL_QUAD_STRIP),
1811 const_iv (GL_TRIANGLES), 1942 const_iv (GL_TRIANGLES),
1812 const_iv (GL_TRIANGLE_STRIP), 1943 const_iv (GL_TRIANGLE_STRIP),

Diff Legend

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