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.76 by root, Tue Jun 20 08:49:40 2006 UTC vs.
Revision 1.87 by root, Sun Jul 2 21:41:34 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44 45
45$Event::DIED = sub { 46$Event::DIED = sub {
… …
84our $CONSOLE; 85our $CONSOLE;
85our $METASERVER; 86our $METASERVER;
86our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 88our $QUIT_DIALOG;
88our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $PICKUP_ENABLE;
89our $SERVER_INFO; 91our $SERVER_INFO;
90 92
91our $SETUP_DIALOG; 93our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 94our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 95our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 96our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 97
98our $PL_NOTEBOOK;
97our $STATS_WINDOW; 99our $PL_WINDOW;
100
101our $INVENTORY_PAGE;
102our $STATS_PAGE;
103our $SPELL_PAGE;
104
105our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 106our $MESSAGE_WINDOW;
99our $FLOORBOX; 107our $FLOORBOX;
100our $GAUGES; 108our $GAUGES;
101our $STATWIDS; 109our $STATWIDS;
102 110
… …
109 117
110our $ALT_ENTER_MESSAGE; 118our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 119our $STATUSBOX;
112our $DEBUG_STATUS; 120our $DEBUG_STATUS;
113 121
114our $INV_WINDOW;
115our $INV; 122our $INV;
116our $INVR; 123our $INVR;
117our $INV_RIGHT_HB; 124our $INV_RIGHT_HB;
118 125
119our $BIND_EDITOR; 126our $BIND_EDITOR;
127our $BIND_UPD_CB;
120 128
121our $PICKUP_CFG; 129our $PICKUP_CFG;
122 130
123sub status { 131sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 132 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
219 $conn->send ("reply $stat"); 227 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 228 destroy_query_dialog $conn;
221 return; 229 return;
222 } 230 }
223 231
224 $STATS_WINDOW->show; 232 $STATS_PAGE->show;
225 $MESSAGE_WINDOW->hide; 233 $MESSAGE_WINDOW->hide;
226 234
227 unshift @dialog, new CFClient::UI::Label 235 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4, 236 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 237 ellipsise => 0,
… …
269 # right: accept 277 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 278 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept", 279 text => "Accept",
272 on_activate => sub { 280 on_activate => sub {
273 $conn->send ("reply n"); 281 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 282 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
276 0 284 0
277 }, 285 },
278 ); 286 );
279 287
… …
371 379
372sub stop_game { 380sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 381 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 382 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 383 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 384 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 385 $SPELL_PAGE->clear_spells;
378 386
379 return unless $CONN; 387 return unless $CONN;
380 388
381 status "connection closed"; 389 status "connection closed";
382 390
… …
651 659
652 $table 660 $table
653} 661}
654 662
655sub stats_window { 663sub stats_window {
656 my $tgw = new CFClient::UI::FancyFrame 664 my $tgw =
657 y => $HEIGHT * (2/8), 665 new CFClient::UI::Window
658 x => "max", 666 child => my $vb = new CFClient::UI::VBox;
659 title => "Stats",
660 name => "stats_window",
661 has_close_button => 1;
662 667
663 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
665 can_hover => 1, can_events => 1, 669 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."); 670 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, 671 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
668 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
… …
692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 696 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
693 697
694 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 698 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
695 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 699 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
696 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 700 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
697 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 701 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
698 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 702 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
699 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 703 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
700 ) { 704 ) {
701 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 705 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
702 706
… …
721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
723 pois => "<b>Poison</b> (resistance to getting poisoned)", 727 pois => "<b>Poison</b> (resistance to getting poisoned)",
724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
725 deat => "<b>Death</b> (resistance against death spells)", 729 deat => "<b>Death</b> (resistance against death spells)",
726 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 730 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
728 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 732 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
748 ); 752 );
749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
750 font => $FONT_FIXED, 754 font => $FONT_FIXED,
751 can_hover => 1, 755 can_hover => 1,
752 can_events => 1, 756 can_events => 1,
753 image => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
754 tooltip => $resist_names{$_}, 758 tooltip => $resist_names{$_},
755 ); 759 );
756 760
757 $row++; 761 $row++;
758 if ($row % 6 == 0) { 762 if ($row % 6 == 0) {
… …
806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
814 818
815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
816 820
… …
840} 844}
841 845
842my $METASERVER_ATIME; 846my $METASERVER_ATIME;
843 847
844sub update_metaserver { 848sub update_metaserver {
849 my ($metaserver_dialog) = @_;
850
851 $METASERVER = $metaserver_dialog
852 if defined $metaserver_dialog;
853
845 return if $METASERVER_ATIME > time; 854 return if $METASERVER_ATIME > time;
846 $METASERVER_ATIME = time + 60; 855 $METASERVER_ATIME = time + 60;
847 856
848 my $table = $METASERVER->{table}; 857 my $table = $METASERVER->{table};
849 $table->clear; 858 $table->clear;
… …
937 } 946 }
938 }); 947 });
939} 948}
940 949
941sub metaserver_dialog { 950sub metaserver_dialog {
951 my $vbox = new CFClient::UI::VBox;
952 my $table = new CFClient::UI::Table;
953 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
954
942 my $dialog = new CFClient::UI::FancyFrame 955 my $dialog = new CFClient::UI::FancyFrame
943 title => "Server List", 956 title => "Server List",
944 name => 'metaserver_dialog', 957 name => 'metaserver_dialog',
945 x => 'center', 958 x => 'center',
946 y => 'center', 959 y => 'center',
947 z => 3, 960 z => 3,
948 force_h => $::HEIGHT * 0.4, 961 force_h => $::HEIGHT * 0.4,
949 child => (my $vbox = new CFClient::UI::VBox), 962 child => $vbox,
963 has_close_button => 1,
964 table => $table,
950 on_visibility_change => sub { 965 on_visibility_change => sub {
951 update_metaserver if $_[1]; 966 update_metaserver ($_[0]) if $_[1];
952 0 967 0
953 }, 968 },
954 ; 969 ;
955
956 $dialog->{table} = new CFClient::UI::Table;
957
958 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
959 970
960 $dialog 971 $dialog
961} 972}
962 973
963sub server_setup { 974sub server_setup {
… …
978 my ($self, $value) = @_; 989 my ($self, $value) = @_;
979 $CFG->{profile}{default}{host} = $value; 990 $CFG->{profile}{default}{host} = $value;
980 0 991 0
981 } 992 }
982 ); 993 );
983
984 $METASERVER = metaserver_dialog;
985 994
986 $vbox->add (new CFClient::UI::Button 995 $vbox->add (new CFClient::UI::Button
987 expand => 1, 996 expand => 1,
988 text => "Server List", 997 text => "Server List",
989 other => $METASERVER, 998 other => $METASERVER,
… …
1181sub autopickup_setup { 1190sub autopickup_setup {
1182 my $table = new CFClient::UI::Table; 1191 my $table = new CFClient::UI::Table;
1183 1192
1184 for ( 1193 for (
1185 ["General", 0, 0, 1194 ["General", 0, 0,
1186 ["Enable autopickup" => PICKUP_NEWMODE], 1195 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1187 ["Inhibit autopickup" => PICKUP_INHIBIT], 1196 ["Inhibit autopickup" => PICKUP_INHIBIT],
1188 ["Stop before pickup" => PICKUP_STOP], 1197 ["Stop before pickup" => PICKUP_STOP],
1189 ["Debug autopickup" => PICKUP_DEBUG], 1198 ["Debug autopickup" => PICKUP_DEBUG],
1190 ], 1199 ],
1191 ["Weapons", 0, 6, 1200 ["Weapons", 0, 6,
… …
1228 for (@bits) { 1237 for (@bits) {
1229 ++$y; 1238 ++$y;
1230 1239
1231 my $mask = $_->[1]; 1240 my $mask = $_->[1];
1232 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1241 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1233 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1242 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1234 state => $CFG->{pickup} & $mask, 1243 state => $::CFG->{pickup} & $mask,
1235 on_changed => sub { 1244 on_changed => sub {
1236 my ($box, $value) = @_; 1245 my ($box, $value) = @_;
1237 1246
1238 if ($value) { 1247 if ($value) {
1239 $::CFG->{pickup} |= $mask; 1248 $::CFG->{pickup} |= $mask;
… …
1244 $::CONN->send_command ("pickup $::CFG->{pickup}") 1253 $::CONN->send_command ("pickup $::CFG->{pickup}")
1245 if defined $::CONN; 1254 if defined $::CONN;
1246 1255
1247 0 1256 0
1248 }); 1257 });
1258
1259 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1260 }
1250 } 1261 }
1251 1262
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1263 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1266 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1267 on_changed => sub {
1256 my ($slider, $value) = @_; 1268 my ($slider, $value) = @_;
1257 1269
1258 $::CFG->{pickup} &= ~0x7; 1270 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1271 $::CFG->{pickup} |= int $value
1260 if $value; 1272 if $value;
1261 1; 1273 1;
1262 }); 1274 });
1275
1263 $table->add (3, 18, new CFClient::UI::Button 1276 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1277 text => "set",
1265 on_activate => sub { 1278 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1279 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1280 if defined $::CONN;
… …
1269 }); 1282 });
1270 1283
1271 $table 1284 $table
1272} 1285}
1273 1286
1274sub inventory_window { 1287sub inventory_widget {
1288 my $hb = new CFClient::UI::HBox homogeneous => 1;
1289
1290 $hb->add (my $vb1 = new CFClient::UI::VBox);
1291 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1292 $vb1->add ($INV = new CFClient::UI::Inventory);
1293
1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1295
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1297
1298 $vb2->add ($INVR = new CFClient::UI::Inventory);
1299
1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1302
1303 $hb
1304}
1305
1306sub toggle_player_page {
1307 my ($widget) = @_;
1308
1309 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1310 $PL_WINDOW->hide;
1311 } else {
1312 $PL_NOTEBOOK->set_current_page ($widget);
1313 $PL_WINDOW->show;
1314 }
1315}
1316
1317sub player_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1319 x => "center",
1277 y => "center", 1320 y => "center",
1278 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1323 title => "Player",
1281 has_close_button => 1, 1324 has_close_button => 1
1282 ; 1325 ;
1283 1326
1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1327 my $ntb =
1328 $PL_NOTEBOOK =
1329 new CFClient::UI::Notebook
1330 expand => 1,
1331 debug => 1,
1332 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1333 ;
1285 1334
1286 $hb->add (my $vb1 = new CFClient::UI::VBox); 1335 $ntb->add (
1287 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1336 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1288 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1337 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1338 );
1339 $ntb->add (
1340 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1341 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1342 );
1343 $ntb->add (
1344 Inventory => $INVENTORY_PAGE = inventory_widget,
1345 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1346 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1347 );
1289 1348
1290 $hb->add (my $vb2 = new CFClient::UI::VBox);
1291 1349
1292 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1350 $plwin->add ($ntb);
1293 1351 $plwin
1294 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1295
1296 # XXX: Call after $INVR = ... because set_opencont sets the items
1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299 $invwin
1300} 1352}
1301 1353
1302sub spell_setup { 1354sub update_bindings {
1303 new CFClient::UI::SpellList 1355 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304} 1356}
1305 1357
1306sub keyboard_setup { 1358sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox; 1359 my $binding_list = new CFClient::UI::VBox;
1308 1360
1309 my $refresh; 1361 my $refresh;
1310 $refresh = sub { 1362 $refresh = $BIND_UPD_CB = sub {
1311 $binding_list->clear (); 1363 $binding_list->clear ();
1312 1364
1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1365 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1366 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1367 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1368 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1369
1318 my $lbl = join "; ", @$cmds; 1370 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1371 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1372 $binding_list->add (my $hb = new CFClient::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1373 $hb->add (new CFClient::UI::Button
1322 text => "delete", 1374 text => "delete",
1323 tooltip => "Deletes the binding", 1375 tooltip => "Deletes the binding",
1324 on_activate => sub { 1376 on_activate => sub {
… …
1333 on_activate => sub { 1385 on_activate => sub {
1334 $::BIND_EDITOR->set_binding ( 1386 $::BIND_EDITOR->set_binding (
1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1387 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1336 sub { 1388 sub {
1337 my ($nmod, $nsym, $ncmds) = @_; 1389 my ($nmod, $nsym, $ncmds) = @_;
1338 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1390 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1339 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds; 1391 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1340 $refresh->(); 1392 $refresh->();
1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1342 $SETUP_DIALOG->show; 1394 $SETUP_DIALOG->show;
1343 }, 1395 },
1344 sub { 1396 sub {
… …
1378 tooltip => "This button opens the binding editor with an empty binding.", 1430 tooltip => "This button opens the binding editor with an empty binding.",
1379 on_activate => sub { 1431 on_activate => sub {
1380 $::BIND_EDITOR->set_binding (undef, undef, [], 1432 $::BIND_EDITOR->set_binding (undef, undef, [],
1381 sub { 1433 sub {
1382 my ($mod, $sym, $cmds) = @_; 1434 my ($mod, $sym, $cmds) = @_;
1383 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds; 1435 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1384 $refresh->(); 1436 $refresh->();
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1437 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show; 1438 $SETUP_DIALOG->show;
1387 }, 1439 },
1388 sub { 1440 sub {
… …
1417 y => 'center', 1469 y => 'center',
1418 z => 2, 1470 z => 2,
1419 name => 'doc_browser', 1471 name => 'doc_browser',
1420 force_w => int $WIDTH * 7/8, 1472 force_w => int $WIDTH * 7/8,
1421 force_h => int $HEIGHT * 7/8, 1473 force_h => int $HEIGHT * 7/8,
1422 title => "Documentation"; 1474 title => "Help Browser",
1475 has_close_button => 1;
1423 1476
1424 $win->add (my $vbox = new CFClient::UI::VBox); 1477 $win->add (my $vbox = new CFClient::UI::VBox);
1425 1478
1426 $vbox->add (my $buttons = new CFClient::UI::HBox); 1479 $vbox->add (my $buttons = new CFClient::UI::HBox);
1427 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1480 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1430 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1483 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1431 $buttons->add (my $combo = new CFClient::UI::Combobox 1484 $buttons->add (my $combo = new CFClient::UI::Combobox
1432 value => undef, 1485 value => undef,
1433 options => [ 1486 options => [
1434 [intro => "Introduction"], 1487 [intro => "Introduction"],
1435 [manual => "Manual"], 1488 [manual => "Main Manual"],
1436 [skill_help => "Skills"], 1489 [skill_help => "Skill Reference"],
1437 [command_help => "Commands"], 1490 [command_help => "Command Reference"],
1438 [dmcommand_help => "DM Commands"], 1491 [dmcommand_help => "DM Commands"],
1439 [COPYING => "License Terms"], 1492 [COPYING => "License Terms"],
1440 ], 1493 ],
1441 on_changed => sub { 1494 on_changed => sub {
1442 my ($self, $pod) = @_; 1495 my ($self, $pod) = @_;
1443 1496
1444 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1497 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1445 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1498 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1446 1499
1447 $viewer->clear; 1500 $viewer->clear;
1501
1502# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1503# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1504# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1505# ]);#d#
1448 1506
1449 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1507 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1450 for @$pom; 1508 for @$pom;
1451 1509
1452 $viewer->set_offset (0); 1510 $viewer->set_offset (0);
1511
1453 0 1512 0
1454 }, 1513 },
1455 on_visibility_change => sub { 1514 on_visibility_change => sub {
1456 my ($self, $visible) = @_; 1515 my ($self, $visible) = @_;
1457 return unless $visible; 1516 return unless $visible;
… …
1504 z => 100, 1563 z => 100,
1505 force_x => "max", 1564 force_x => "max",
1506 force_y => 0; 1565 force_y => 0;
1507 $DEBUG_STATUS->show; 1566 $DEBUG_STATUS->show;
1508 1567
1509 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1568 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1510 1569
1511 $STATUSBOX = new CFClient::UI::Statusbox; 1570 $STATUSBOX = new CFClient::UI::Statusbox;
1512 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1571 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1513 1572
1514 (new CFClient::UI::Frame 1573 (new CFClient::UI::Frame
… …
1564 z => 2, 1623 z => 2,
1565 force_w => $::WIDTH * 0.6, 1624 force_w => $::WIDTH * 0.6,
1566 force_h => $::HEIGHT * 0.6, 1625 force_h => $::HEIGHT * 0.6,
1567 has_close_button => 1, 1626 has_close_button => 1,
1568 ; 1627 ;
1628
1629 $METASERVER = metaserver_dialog;
1569 1630
1570 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1631 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1571 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1632 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1572 1633
1573 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1634 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1583 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1644 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1584 . "with nothing set and the recording started. After doing the actions you " 1645 . "with nothing set and the recording started. After doing the actions you "
1585 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1646 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1586 . "After pressing the combo the binding will be saved automatically and the " 1647 . "After pressing the combo the binding will be saved automatically and the "
1587 . "binding editor closes"); 1648 . "binding editor closes");
1588 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1589 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1590 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1649 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1591 "Some debuggin' options. Do not ask."); 1650 "Some debuggin' options. Do not ask.");
1592 1651
1593 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1652 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1594 1653
… …
1598 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1599 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1658 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1600 1659
1601 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 1660 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
1602 1661
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1604 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1605 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1662 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1606 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1663 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1607 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1608 1664
1609 $BUTTONBAR->add (new CFClient::UI::Button 1665 $BUTTONBAR->add (new CFClient::UI::Button
1610 text => "Save Config", 1666 text => "Save Config",
1611 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1667 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1612 on_activate => sub { 1668 on_activate => sub {
… …
1615 status "Configuration Saved"; 1671 status "Configuration Saved";
1616 0 1672 0
1617 }, 1673 },
1618 ); 1674 );
1619 1675
1620 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1621 tooltip => "View Documentation"); 1677 tooltip => "View Documentation");
1622 1678
1623 $BUTTONBAR->add (new CFClient::UI::Button 1679 $BUTTONBAR->add (new CFClient::UI::Button
1624 text => "Quit", 1680 text => "Quit",
1625 tooltip => "Terminates the program", 1681 tooltip => "Terminates the program",

Diff Legend

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