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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.91 by root, Tue Jul 11 13:51:38 2006 UTC

… …
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor; 41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43 43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
45 46
46$Event::DIED = sub { 47$Event::DIED = sub {
47 # TODO: display dialog box or so 48 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
49 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
85our $CONSOLE; 86our $CONSOLE;
86our $METASERVER; 87our $METASERVER;
87our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 89our $QUIT_DIALOG;
89our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $PICKUP_ENABLE;
90our $SERVER_INFO; 92our $SERVER_INFO;
91 93
92our $SETUP_DIALOG; 94our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK; 95our $SETUP_NOTEBOOK;
94our $SETUP_SERVER; 96our $SETUP_SERVER;
95our $SETUP_KEYBOARD; 97our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97 98
99our $PL_NOTEBOOK;
98our $STATS_WINDOW; 100our $PL_WINDOW;
101
102our $INVENTORY_PAGE;
103our $STATS_PAGE;
104our $SPELL_PAGE;
105
106our $HELP_WINDOW;
99our $MESSAGE_WINDOW; 107our $MESSAGE_WINDOW;
100our $FLOORBOX; 108our $FLOORBOX;
101our $GAUGES; 109our $GAUGES;
102our $STATWIDS; 110our $STATWIDS;
103 111
… …
113our $DEBUG_STATUS; 121our $DEBUG_STATUS;
114 122
115our $INV; 123our $INV;
116our $INVR; 124our $INVR;
117our $INV_RIGHT_HB; 125our $INV_RIGHT_HB;
118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121 126
122our $BIND_EDITOR; 127our $BIND_EDITOR;
123our $BIND_UPD_CB; 128our $BIND_UPD_CB;
124 129
125our $PICKUP_CFG; 130our $PICKUP_CFG;
… …
223 $conn->send ("reply $stat"); 228 $conn->send ("reply $stat");
224 destroy_query_dialog $conn; 229 destroy_query_dialog $conn;
225 return; 230 return;
226 } 231 }
227 232
228 $STATS_WINDOW->show; 233 $STATS_PAGE->show;
229 $MESSAGE_WINDOW->hide; 234 $MESSAGE_WINDOW->hide;
230 235
231 unshift @dialog, new CFClient::UI::Label 236 unshift @dialog, new CFClient::UI::Label
232 max_w => $::WIDTH * 0.4, 237 max_w => $::WIDTH * 0.4,
233 ellipsise => 0, 238 ellipsise => 0,
… …
273 # right: accept 278 # right: accept
274 $table->add (4, 0, new CFClient::UI::Button 279 $table->add (4, 0, new CFClient::UI::Button
275 text => "Accept", 280 text => "Accept",
276 on_activate => sub { 281 on_activate => sub {
277 $conn->send ("reply n"); 282 $conn->send ("reply n");
278 $STATS_WINDOW->hide; 283 $STATS_PAGE->hide;
279 destroy_query_dialog $conn; 284 destroy_query_dialog $conn;
280 0 285 0
281 }, 286 },
282 ); 287 );
283 288
… …
376sub stop_game { 381sub stop_game {
377 $LOGIN_BUTTON->set_text ("Login"); 382 $LOGIN_BUTTON->set_text ("Login");
378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
379 $SETUP_DIALOG->show; 384 $SETUP_DIALOG->show;
380 $PL_WINDOW->hide; 385 $PL_WINDOW->hide;
381 $SETUP_SPELLS->clear_spells; 386 $SPELL_PAGE->clear_spells;
382 387
383 return unless $CONN; 388 return unless $CONN;
384 389
385 status "connection closed"; 390 status "connection closed";
386 391
… …
471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
472 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 477 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 478 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
474 ); 479 );
475 480
476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
477
478 $table->add (1, $row++, new CFClient::UI::Slider
479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
481 on_changed => sub {
482 $CFG->{stat_fontsize} = $_[1];
483 &set_stats_window_fontsize;
484 0
485 }
486 );
487
488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
489 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
492 on_changed => sub { 485 on_changed => sub {
… …
561 ); 554 );
562 555
563 $vbox 556 $vbox
564} 557}
565 558
566sub set_stats_window_fontsize {
567 for (values %{$STATWIDS}) {
568 $_->set_fontsize ($::CFG->{stat_fontsize});
569 }
570}
571
572sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
573 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
574 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
575 } 562 }
576} 563}
… …
655 642
656 $table 643 $table
657} 644}
658 645
659sub stats_window { 646sub stats_window {
660 my $tgw =
661 new CFClient::UI::Window
662 child => my $vb = new CFClient::UI::VBox; 647 my $vb = new CFClient::UI::VBox;
663 648
664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
665 can_hover => 1, can_events => 1, 650 can_hover => 1, can_events => 1,
666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 651 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
… …
759 $col += 2; 744 $col += 2;
760 $row = 0; 745 $row = 0;
761 } 746 }
762 } 747 }
763 748
764 &set_stats_window_fontsize; 749 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
750 $STATWIDS->{"_skill_tbl"} = $tbl3;
751
765 update_stats_window ({}); 752 update_stats_window ({});
766 753
767 $tgw 754 $vb
768} 755}
769 756
770sub formsep($) { 757sub formsep($) {
771 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 758 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
772} 759}
… …
832 depl => CS_STAT_RES_DEPLETE, 819 depl => CS_STAT_RES_DEPLETE,
833 deat => CS_STAT_RES_DEATH, 820 deat => CS_STAT_RES_DEATH,
834 holyw => CS_STAT_RES_HOLYWORD, 821 holyw => CS_STAT_RES_HOLYWORD,
835 blind => CS_STAT_RES_BLIND, 822 blind => CS_STAT_RES_BLIND,
836 ); 823 );
824
825 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
826 my $sktbl = $STATWIDS->{_skill_tbl};
827 $sktbl->clear;
828
829 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
830 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
831 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
832
833 my @skills;
834
835 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
836 push @skills, [$i, $::CONN->{skill_info}{$i}];
837 }
838
839 my $y = 1;
840 for (sort { $a->[1] cmp $b->[1] } @skills) {
841 my ($idx, $name) = @$_;
842
843 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
844 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
846 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
847 }
848 }
849
850 $STATWIDS->{_skill_tbl_init} = 1;
851 }
852
853 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
854 if (exists $stats->{$i}) {
855 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
856 if $STATWIDS->{"sk_xp_$i"};
857 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
858 if $STATWIDS->{"sk_lvl_$i"};
859 }
860 }
837 861
838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 862 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
839 for keys %tbl; 863 for keys %tbl;
840} 864}
841 865
… …
1186sub autopickup_setup { 1210sub autopickup_setup {
1187 my $table = new CFClient::UI::Table; 1211 my $table = new CFClient::UI::Table;
1188 1212
1189 for ( 1213 for (
1190 ["General", 0, 0, 1214 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE], 1215 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT], 1216 ["Inhibit autopickup" => PICKUP_INHIBIT],
1193 ["Stop before pickup" => PICKUP_STOP], 1217 ["Stop before pickup" => PICKUP_STOP],
1194 ["Debug autopickup" => PICKUP_DEBUG], 1218 ["Debug autopickup" => PICKUP_DEBUG],
1195 ], 1219 ],
1196 ["Weapons", 0, 6, 1220 ["Weapons", 0, 6,
… …
1233 for (@bits) { 1257 for (@bits) {
1234 ++$y; 1258 ++$y;
1235 1259
1236 my $mask = $_->[1]; 1260 my $mask = $_->[1];
1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1261 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1262 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask, 1263 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub { 1264 on_changed => sub {
1241 my ($box, $value) = @_; 1265 my ($box, $value) = @_;
1242 1266
1243 if ($value) { 1267 if ($value) {
… …
1249 $::CONN->send_command ("pickup $::CFG->{pickup}") 1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1250 if defined $::CONN; 1274 if defined $::CONN;
1251 1275
1252 0 1276 0
1253 }); 1277 });
1278
1279 ${$_->[2]} = $checkbox if $_->[2];
1254 } 1280 }
1255 } 1281 }
1256 1282
1257 $table->add (2, 18, new CFClient::UI::ValSlider 1283 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1284 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
… …
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1321 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296 1322
1297 $hb 1323 $hb
1298} 1324}
1299 1325
1326sub toggle_player_page {
1327 my ($widget) = @_;
1328
1329 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1330 $PL_WINDOW->hide;
1331 } else {
1332 $PL_NOTEBOOK->set_current_page ($widget);
1333 $PL_WINDOW->show;
1334 }
1335}
1336
1300sub player_window { 1337sub player_window {
1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1338 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1302 x => "center", 1339 x => "center",
1303 y => "center", 1340 y => "center",
1304 force_w => $WIDTH * 9/10, 1341 force_w => $WIDTH * 9/10,
1305 force_h => $HEIGHT * 9/10, 1342 force_h => $HEIGHT * 9/10,
1306 title => "Player", 1343 title => "Player",
1344 name => "playerbook",
1307 has_close_button => 1 1345 has_close_button => 1
1308 ; 1346 ;
1309 1347
1310 my $ntb = 1348 my $ntb =
1311 $PL_NOTEBOOK = 1349 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook 1350 new CFClient::UI::Notebook
1313 expand => 1, 1351 expand => 1,
1314 debug => 1, 1352 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1), 1353 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ; 1354 ;
1355
1317 $ntb->add ( 1356 $ntb->add (
1357 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1358 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1359 );
1360 $ntb->add (
1361 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1362 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1363 );
1364 $ntb->add (
1318 Inventory => inventory_widget, 1365 Inventory => $INVENTORY_PAGE = inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1366 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1367 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 ); 1368 );
1322 1369
1323 $ntb->add ( 1370 $ntb->set_current_page ($INVENTORY_PAGE);
1324 Stats => $STATS_WINDOW = stats_window,
1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1331 1371
1332 $plwin->add ($ntb); 1372 $plwin->add ($ntb);
1333 $plwin 1373 $plwin
1334} 1374}
1335 1375
… …
1451 y => 'center', 1491 y => 'center',
1452 z => 2, 1492 z => 2,
1453 name => 'doc_browser', 1493 name => 'doc_browser',
1454 force_w => int $WIDTH * 7/8, 1494 force_w => int $WIDTH * 7/8,
1455 force_h => int $HEIGHT * 7/8, 1495 force_h => int $HEIGHT * 7/8,
1456 title => "Documentation"; 1496 title => "Help Browser",
1497 has_close_button => 1;
1457 1498
1458 $win->add (my $vbox = new CFClient::UI::VBox); 1499 $win->add (my $vbox = new CFClient::UI::VBox);
1459 1500
1460 $vbox->add (my $buttons = new CFClient::UI::HBox); 1501 $vbox->add (my $buttons = new CFClient::UI::HBox);
1461 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1502 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1679 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1680 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1640 1681
1641 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1682 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1642 1683
1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window, 1684 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1685 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1645 1686
1646 $BUTTONBAR->add (new CFClient::UI::Button 1687 $BUTTONBAR->add (new CFClient::UI::Button
1647 text => "Save Config", 1688 text => "Save Config",
1648 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1689 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
… …
1652 status "Configuration Saved"; 1693 status "Configuration Saved";
1653 0 1694 0
1654 }, 1695 },
1655 ); 1696 );
1656 1697
1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1698 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1658 tooltip => "View Documentation"); 1699 tooltip => "View Documentation");
1659 1700
1660 $BUTTONBAR->add (new CFClient::UI::Button 1701 $BUTTONBAR->add (new CFClient::UI::Button
1661 text => "Quit", 1702 text => "Quit",
1662 tooltip => "Terminates the program", 1703 tooltip => "Terminates the program",

Diff Legend

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