ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.215 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.221 by root, Wed May 17 01:03:10 2006 UTC

… …
99our $STATUSBOX; 99our $STATUSBOX;
100our $DEBUG_STATUS; 100our $DEBUG_STATUS;
101 101
102our $INVWIN; 102our $INVWIN;
103our $INV; 103our $INV;
104our $INVR;
105our $OPENCONT;
104 106
105sub status { 107sub status {
106 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); 108 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
107} 109}
108 110
… …
164 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 166 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
165 167
166 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 168 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
167 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 169 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
168 170
169 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 171 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
170 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 172 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
171 173
172 $mode_slider->connect (changed => sub { 174 $mode_slider->connect (changed => sub {
173 my ($self, $value) = @_; 175 my ($self, $value) = @_;
174 176
… …
199 } 201 }
200 ); 202 );
201 203
202 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 204 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
203 $table->add (1, $row++, new CFClient::UI::Slider 205 $table->add (1, $row++, new CFClient::UI::Slider
204 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 206 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
205 tooltip => "Enlarge or shrink the displayed map", 207 tooltip => "Enlarge or shrink the displayed map",
206 connect_changed => sub { 208 connect_changed => sub {
207 my ($self, $value) = @_; 209 my ($self, $value) = @_;
208 $CFG->{map_scale} = 0.05 * int $value / 0.05; 210 $CFG->{map_scale} = $value;
209 } 211 }
210 ); 212 );
211 213
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 214 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 215 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
240 } 242 }
241 ); 243 );
242 244
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 245 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
244 $table->add (1, $row++, new CFClient::UI::Slider 246 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 247 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
246 tooltip => "The font size used by most GUI elements", 248 tooltip => "The font size used by most GUI elements",
247 connect_changed => sub { 249 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
248 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
249# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
250 }
251 ); 250 );
252 251
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
254 $table->add (1, $row++, new CFClient::UI::Slider 253 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 254 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
256 tooltip => "The font size used by the server log window only", 255 tooltip => "The font size used by the server log window only",
257 connect_changed => sub { 256 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
258 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
259 }
260 ); 257 );
261 258
262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 259 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
263 260
264 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
266 tooltip => "The font size used by the statistics window only", 263 tooltip => "The font size used by the statistics window only",
267 connect_changed => sub { 264 connect_changed => sub {
268 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 265 $CFG->{stat_fontsize} = $_[1];
269 &set_stats_window_fontsize; 266 &set_stats_window_fontsize;
270 } 267 }
271 ); 268 );
272 269
273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
274 $table->add (1, $row++, new CFClient::UI::Slider 271 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 272 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
276 tooltip => "Adjust the size of the stats gauges at the bottom right", 273 tooltip => "Adjust the size of the stats gauges at the bottom right",
277 connect_changed => sub { 274 connect_changed => sub {
278 $CFG->{gauge_size} = $_[1]; 275 $CFG->{gauge_size} = $_[1];
279 my $h = int $HEIGHT * $CFG->{gauge_size}; 276 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
280 $GAUGES->{win}->set_size ($WIDTH, $h);
281 $GAUGES->{win}->move (0, $HEIGHT - $h);
282 } 277 }
283 ); 278 );
284 279
285 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
286 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
287 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 282 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
288 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 283 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
289 connect_changed => sub { 284 connect_changed => sub {
290 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 285 $CFG->{gauge_fontsize} = $_[1];
291 &set_gauge_window_fontsize; 286 &set_gauge_window_fontsize;
292 } 287 }
293 ); 288 );
294 289
295 $table->add (1, $row++, new CFClient::UI::Button 290 $table->add (1, $row++, new CFClient::UI::Button
… …
736 ); 731 );
737 732
738 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 733 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
739 $table->add (1, 7, new CFClient::UI::Slider 734 $table->add (1, 7, new CFClient::UI::Slider
740 req_w => 100, 735 req_w => 100,
741 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 736 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
742 tooltip => "This is the size of the portion of the map update the server sends you. " 737 tooltip => "This is the size of the portion of the map update the server sends you. "
743 ."If you set this to a high value you will be able to see further for example.", 738 ."If you set this to a high value you will be able to see further for example.",
744 connect_changed => sub { 739 connect_changed => sub {
745 my ($self, $value) = @_; 740 my ($self, $value) = @_;
746 741
… …
814 809
815 $window 810 $window
816} 811}
817 812
818sub make_inventory_window { 813sub make_inventory_window {
819 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 814 my $invwin = new CFClient::UI::FancyFrame
815 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
816
817 $invwin->add (my $hb = new CFClient::UI::HBox);
820 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 818 $hb->add ($INV = new CFClient::UI::Inventory expand => 1);
819 $hb->add ($INVR = new CFClient::UI::Inventory expand => 1);
820
821 $invwin 821 $invwin
822} 822}
823 823
824sub sdl_init { 824sub sdl_init {
825 CFClient::SDL_Init 825 CFClient::SDL_Init
… …
1330 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1331 ); 1331 );
1332 1332
1333 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1333 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1334 1334
1335 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g; 1335 $text = CFClient::UI::Label::escape $text;
1336 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1336 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1337 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1337 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1338 1338
1339 $LOGVIEW->add_paragraph ($color[$color], 1339 $LOGVIEW->add_paragraph ($color[$color],
1340 join "\n", map "$time $_", split /\n/, $text); 1340 join "\n", map "$time $_", split /\n/, $text);
… …
1367} 1367}
1368 1368
1369sub conn::addme_success { 1369sub conn::addme_success {
1370 my ($self) = @_; 1370 my ($self) = @_;
1371 1371
1372 $MAPWIDGET->clr_commands;
1373
1372 for my $skill (values %{$self->{skill_info}}) { 1374 for my $skill (values %{$self->{skill_info}}) {
1373 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1375 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1374 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1376 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1375 } 1377 }
1376 1378
1377 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you"); 1379 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1378 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players"); 1380 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1379 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies"); 1381 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1380 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets"); 1382 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1383 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1384 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1385 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1386
1387 # TODO: add documentation on these
1388 for (qw(
1389 afk
1390 apply
1391 body
1392 bowmode
1393 brace
1394 build
1395 disarm
1396 dm
1397 dmhide
1398 drop
1399 dropall
1400 examine
1401 get
1402 gsay
1403 help
1404 hiscore
1405 inventory
1406 invoke
1407 killpets
1408 listen
1409 logs
1410 mapinfo
1411 maps
1412 mark
1413 motd
1414 output-count
1415 output-sync
1416 party
1417 peaceful
1418 petmode
1419 pickup
1420 players
1421 prepare
1422 quests
1423 rename
1424 resistances
1425 rotateshoottype
1426 save
1427 say
1428 search
1429 search-items
1430 showpets
1431 skills
1432 sound
1433 take
1434 throw
1435 time
1436 title
1437 usekeys
1438 version
1439 weather
1440 whereabouts
1441 whereami
1442 who
1443 wimpy
1444 )) {
1445 $MAPWIDGET->add_command ($_, "$_: no help available (yet)");
1446 }
1447
1448 #TODO: add " and ' "aliases" etc.
1381} 1449}
1382 1450
1383sub conn::eof { 1451sub conn::eof {
1452 $MAPWIDGET->clr_commands;
1453
1384 stop_game; 1454 stop_game;
1385} 1455}
1386 1456
1387sub update_floorbox { 1457sub update_floorbox {
1388 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1458 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
… …
1406} 1476}
1407 1477
1408sub conn::container_add { 1478sub conn::container_add {
1409 my ($self, $tag, $items) = @_; 1479 my ($self, $tag, $items) = @_;
1410 1480
1411 update_floorbox if $tag == 0; 1481 if ($tag == 0) {
1412 1482 update_floorbox;
1483 $INVR->set_items ($self->{container}{0});
1484 $OPENCONT = 0;
1485 } elsif ($tag == $self->{player}{tag}) {
1413 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1486 $INV->set_items ($self->{container}{$self->{player}{tag}})
1414 if $tag == $self->{player}{tag}; 1487 } else {
1488 $OPENCONT = $tag;
1489 $INVR->set_items ($self->{container}{$tag});
1490 }
1415 1491
1416 # $self-<{player}{tag} => player inv 1492 # $self-<{player}{tag} => player inv
1417 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1493 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1418} 1494}
1419 1495
1420sub conn::container_clear { 1496sub conn::container_clear {
1421 my ($self, $tag) = @_; 1497 my ($self, $tag) = @_;
1422 1498
1423 update_floorbox if $tag == 0; 1499 if ($tag == 0) {
1424 1500 update_floorbox;
1501 $INVR->set_items ($self->{container}{0});
1502 $OPENCONT = 0;
1503 } elsif ($tag == $self->{player}{tag}) {
1425 $INV->set_items ($self->{container}{$tag}) 1504 $INV->set_items ($self->{container}{$tag})
1426 if $tag == $self->{player}{tag}; 1505 } else {
1506 $INVR->set_items ($self->{container}{$tag});
1507 $OPENCONT = $tag;
1508 }
1427 1509
1428# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1510# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1429} 1511}
1430 1512
1431sub conn::item_delete { 1513sub conn::item_delete {
1432 my ($self, @items) = @_; 1514 my ($self, @items) = @_;
1433 1515
1434 for (@items) { 1516 for (@items) {
1435 update_floorbox if $_->{container} == 0; 1517 if ($_->{container} == 0) {
1436 1518 update_floorbox;
1437 $INV->set_items ($self->{container}{$_->{container}}) 1519 $INVR->set_items ($self->{container}{0});
1438 if $_->{container} == $self->{player}{tag}; 1520 } elsif ($_->{container} == $self->{player}{tag}) {
1521 $INV->set_items ($self->{container}{$self->{player}{tag}})
1522 } else {
1523 $INVR->set_items ($self->{container}{0});
1524 }
1439 } 1525 }
1440} 1526}
1441 1527
1442sub conn::item_update { 1528sub conn::item_update {
1443 my ($self, $item) = @_; 1529 my ($self, $item) = @_;
1444 1530
1445 update_floorbox if $item->{container} == 0; 1531 if ($item->{container} == 0) {
1446 1532 update_floorbox;
1533 $INVR->set_items ($self->{container}{0});
1534 } elsif ($item->{container} == $self->{player}{tag}) {
1447 $INV->set_items ($self->{container}{$item->{container}}) 1535 $INV->set_items ($self->{container}{$item->{container}})
1448 if $item->{container} == $self->{player}{tag}; 1536 }
1449} 1537}
1450 1538
1451%SDL_CB = ( 1539%SDL_CB = (
1452 CFClient::SDL_QUIT => sub { 1540 CFClient::SDL_QUIT => sub {
1453 Event::unloop -1; 1541 Event::unloop -1;
… …
1552 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1640 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1553 1641
1554 $FONT_PROP->make_default; 1642 $FONT_PROP->make_default;
1555 } 1643 }
1556 1644
1645# compare mono (ft) vs. rgba (cairo)
1646# ft - 1.8s, cairo 3s, even in alpha-only mode
1647# for my $rgba (0..1) {
1648# my $t1 = Time::HiRes::time;
1649# for (1..1000) {
1650# my $layout = CFClient::Layout->new ($rgba);
1651# $layout->set_text ("hallo" x 100);
1652# $layout->render;
1653# }
1654# my $t2 = Time::HiRes::time;
1655# warn $t2-$t1;
1656# }
1657
1557 video_init; 1658 video_init;
1558 audio_init; 1659 audio_init;
1559} 1660}
1560 1661
1561Event::loop; 1662Event::loop;

Diff Legend

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