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.162 by root, Fri Oct 13 19:23:08 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

… …
359 n |= n >> 16; 359 n |= n >> 16;
360 360
361 return n + 1; 361 return n + 1;
362} 362}
363 363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
367
364MODULE = CFPlus PACKAGE = CFPlus 368MODULE = CFPlus PACKAGE = CFPlus
365 369
366PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
367 371
368BOOT: 372BOOT:
… …
371 static const struct { 375 static const struct {
372 const char *name; 376 const char *name;
373 IV iv; 377 IV iv;
374 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
375# define const_iv(name) { # name, (IV)name } 379# define const_iv(name) { # name, (IV)name }
380 const_iv (SDLK_MODIFIER_MIN),
381 const_iv (SDLK_MODIFIER_MAX),
382
376 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
377 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
378 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
379 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
380 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
… …
389 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
390 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
391 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
392 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
393 const_iv (SDL_USEREVENT), 400 const_iv (SDL_USEREVENT),
401
402 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE),
405
394 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
395 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
396 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
397 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
398 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
… …
453 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
454 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
455 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
456 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
457 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
458 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
460 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
461 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
462 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
463 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
464 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
465 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
466 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
467 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
468 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
469 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
470 const_iv (KMOD_CTRL),
471 const_iv (KMOD_SHIFT),
472 const_iv (KMOD_ALT),
473 const_iv (KMOD_META)
474# undef const_iv 487# undef const_iv
475 }; 488 };
476 489
477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
479} 495}
480 496
481int 497int
482in_destruct () 498in_destruct ()
483 CODE: 499 CODE:
… …
587 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
588 case SDL_KEYUP: 604 case SDL_KEYUP:
589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593 break; 610 break;
594 611
595 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
1049xy_to_index (CFPlus::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
1050 CODE: 1067 CODE:
1051{ 1068{
1052 int index, trailing; 1069 int index, trailing;
1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1054 RETVAL = index; 1071 RETVAL = index + trailing;
1055} 1072}
1056 OUTPUT: 1073 OUTPUT:
1057 RETVAL 1074 RETVAL
1058 1075
1059void 1076void
… …
1065 1082
1066 EXTEND (SP, 3); 1083 EXTEND (SP, 3);
1067 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1087}
1088
1089void
1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1091 PPCODE:
1092{
1093 int line, x;
1094
1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1097
1098 EXTEND (SP, 2);
1099 PUSHs (sv_2mortal (newSViv (line - 1)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101}
1102
1103void
1104line_x_to_index (CFPlus::Layout self, int line, int x)
1105 PPCODE:
1106{
1107 PangoLayoutLine *lp;
1108 int index, trailing;
1109
1110 if (line < 0)
1111 XSRETURN_EMPTY;
1112
1113 if (!(lp = pango_layout_get_line (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */
1115
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117
1118 EXTEND (SP, 2);
1119 if (GIMME_V == G_SCALAR)
1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
1121 else
1122 {
1123 PUSHs (sv_2mortal (newSViv (index)));
1124 PUSHs (sv_2mortal (newSViv (trailing)));
1125 }
1070} 1126}
1071 1127
1072void 1128void
1073render (CFPlus::Layout self, float x, float y, int flags = 0) 1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1074 PPCODE: 1130 PPCODE:
… …
1168} 1224}
1169 1225
1170MODULE = CFPlus PACKAGE = CFPlus::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1171 1227
1172CFPlus::Map 1228CFPlus::Map
1173new (SV *class, int map_width, int map_height) 1229new (SV *class)
1174 CODE: 1230 CODE:
1175 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1176 RETVAL->x = 0; 1232 RETVAL->x = 0;
1177 RETVAL->y = 0; 1233 RETVAL->y = 0;
1178 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1179 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1180 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1181 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1182 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1183 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1184 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
… …
1195 map_clear (self); 1251 map_clear (self);
1196 Safefree (self->face); 1252 Safefree (self->face);
1197 Safefree (self->tex); 1253 Safefree (self->tex);
1198 Safefree (self); 1254 Safefree (self);
1199} 1255}
1256
1257void
1258resize (CFPlus::Map self, int map_width, int map_height)
1259 CODE:
1260 self->w = map_width;
1261 self->h = map_height;
1200 1262
1201void 1263void
1202clear (CFPlus::Map self) 1264clear (CFPlus::Map self)
1203 CODE: 1265 CODE:
1204 map_clear (self); 1266 map_clear (self);
… …
1444} 1506}
1445 OUTPUT: 1507 OUTPUT:
1446 RETVAL 1508 RETVAL
1447 1509
1448void 1510void
1449draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1511draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1450 CODE: 1512 CODE:
1451{ 1513{
1452 int vx, vy;
1453 int x, y, z; 1514 int x, y, z;
1454 int last_name; 1515 int last_name;
1455 mapface face; 1516 mapface face;
1456
1457 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1458 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1459
1460 /*
1461 int vx = self->vx = self->w >= sw
1462 ? self->x + (self->w - sw) / 2
1463 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1464
1465 int vy = self->vy = self->h >= sh
1466 ? self->y + (self->h - sh) / 2
1467 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1468 */
1469 1517
1470 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1471 1519
1472 glEnable (GL_BLEND); 1520 glEnable (GL_BLEND);
1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1476 1524
1477 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1478 1526
1479 last_name = 0; 1527 last_name = 0;
1480 1528
1529 mx += self->x;
1530 my += self->y;
1531
1481 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1482 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1483 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1484 { 1535 {
1485 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1486 1537
1487 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1488 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1489 { 1540 {
1490 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1491 1542
1492 face = cell->face [z]; 1543 face = cell->face [z];
1493 1544
1494 if (face && face < self->texs) 1545 if (face && face < self->texs)
1495 { 1546 {
… …
1536 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1537 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1538 1589
1539 // top layer: overlays such as the health bar 1590 // top layer: overlays such as the health bar
1540 for (y = 0; y < sh; y++) 1591 for (y = 0; y < sh; y++)
1541 if (0 <= y + vy && y + vy < self->rows) 1592 if (0 <= y + my && y + my < self->rows)
1542 { 1593 {
1543 maprow *row = self->row + (y + vy); 1594 maprow *row = self->row + (y + my);
1544 1595
1545 for (x = 0; x < sw; x++) 1596 for (x = 0; x < sw; x++)
1546 if (row->c0 <= x + vx && x + vx < row->c1) 1597 if (row->c0 <= x + mx && x + mx < row->c1)
1547 { 1598 {
1548 mapcell *cell = row->col + (x + vx - row->c0); 1599 mapcell *cell = row->col + (x + mx - row->c0);
1549 1600
1550 int px = x * 32; 1601 int px = x * 32;
1551 int py = y * 32; 1602 int py = y * 32;
1552 1603
1553 if (cell->stat_hp) 1604 if (cell->stat_hp)
… …
1627 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1628 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1629} 1680}
1630 1681
1631void 1682void
1632fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1633 PPCODE: 1684 PPCODE:
1634{ 1685{
1635 int vx, vy;
1636 int x, y; 1686 int x, y;
1637 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1638 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1639 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1640 1690
1641 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1642 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1643 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1644 1694
1645 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1646 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1647 1697
1648 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1649 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1650 { 1700 {
1651 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1652 1702
1653 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1654 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1655 { 1705 {
1656 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1657 1707
1658 darkness[y * sw4 + x] = cell->darkness 1708 darkness[y * sw4 + x] = cell->darkness
1659 ? 255 - (cell->darkness - 1) 1709 ? 255 - (cell->darkness - 1)
1660 : 255 - FOW_DARKNESS; 1710 : 255 - FOW_DARKNESS;
1661 } 1711 }

Diff Legend

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