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.74 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 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 {
… …
109 110
110our $ALT_ENTER_MESSAGE; 111our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 112our $STATUSBOX;
112our $DEBUG_STATUS; 113our $DEBUG_STATUS;
113 114
114our $INV_WINDOW;
115our $INV; 115our $INV;
116our $INVR; 116our $INVR;
117our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
118 118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121
119our $BIND_EDITOR; 122our $BIND_EDITOR;
123our $BIND_UPD_CB;
120 124
121our $PICKUP_CFG; 125our $PICKUP_CFG;
122 126
123sub status { 127sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 128 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
324 $LOGIN_BUTTON->set_text ("Logout"); 328 $LOGIN_BUTTON->set_text ("Logout");
325 $SETUP_DIALOG->hide; 329 $SETUP_DIALOG->hide;
326 330
327 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 331 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
328 332
329 my ($host, $port) = split /:/, $CFG->{host}; 333 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
330 334
331 $MAP = new CFClient::Map $mapsize, $mapsize; 335 $MAP = new CFClient::Map $mapsize, $mapsize;
332 336
333 $CONN = eval { 337 $CONN = eval {
334 new CFClient::Protocol 338 new CFClient::Protocol
335 host => $host, 339 host => $host,
336 port => $port || 13327, 340 port => $port || 13327,
337 user => $CFG->{user}, 341 user => $CFG->{profile}{default}{user},
338 pass => $CFG->{password}, 342 pass => $CFG->{profile}{default}{password},
339 mapw => $mapsize, 343 mapw => $mapsize,
340 maph => $mapsize, 344 maph => $mapsize,
341 345
342 map_widget => $MAPWIDGET, 346 map_widget => $MAPWIDGET,
343 logview => $LOGVIEW, 347 logview => $LOGVIEW,
… …
371 375
372sub stop_game { 376sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 377 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 379 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 380 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 381 $SETUP_SPELLS->clear_spells;
378 382
379 return unless $CONN; 383 return unless $CONN;
380 384
381 status "connection closed"; 385 status "connection closed";
382 386
383 destroy_query_dialog $CONN; 387 destroy_query_dialog $CONN;
384 $CONN->destroy; 388 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 389 $CONN = 0; # false, does not autovivify
390
391 undef $MAP;
386} 392}
387 393
388sub graphics_setup { 394sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 395 my $vbox = new CFClient::UI::VBox;
390 396
… …
649 655
650 $table 656 $table
651} 657}
652 658
653sub stats_window { 659sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw =
655 y => $HEIGHT * (2/8), 661 new CFClient::UI::Window
656 x => "max", 662 child => my $vb = new CFClient::UI::VBox;
657 title => "Stats",
658 name => "stats_window",
659 has_close_button => 1;
660 663
661 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
662 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
663 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
664 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
665 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
666 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
… …
690 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
691 693
692 [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."], 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."],
693 [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."], 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."],
694 [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."], 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."],
695 [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."], 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. This is the same as the physical resistance."],
696 [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."], 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."],
697 [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."], 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."],
698 ) { 700 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
700 702
… …
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
720 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
721 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
723 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
724 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 726 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.)",
725 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
726 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)", 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)",
727 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
728 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
729 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
746 ); 748 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
748 font => $FONT_FIXED, 750 font => $FONT_FIXED,
749 can_hover => 1, 751 can_hover => 1,
750 can_events => 1, 752 can_events => 1,
751 image => "ui/resist/resist_$_.png", 753 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 754 tooltip => $resist_names{$_},
753 ); 755 );
754 756
755 $row++; 757 $row++;
756 if ($row % 6 == 0) { 758 if ($row % 6 == 0) {
… …
804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
812 814
813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
814 816
… …
838} 840}
839 841
840my $METASERVER_ATIME; 842my $METASERVER_ATIME;
841 843
842sub update_metaserver { 844sub update_metaserver {
845 my ($metaserver_dialog) = @_;
846
847 $METASERVER = $metaserver_dialog
848 if defined $metaserver_dialog;
849
843 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
845 852
846 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
847 $table->clear; 854 $table->clear;
… …
912 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
913 (new CFClient::UI::Button 920 (new CFClient::UI::Button
914 text => "Use", 921 text => "Use",
915 tooltip => "Put this server into the <b>Host:Port</b> field", 922 tooltip => "Put this server into the <b>Host:Port</b> field",
916 on_activate => sub { 923 on_activate => sub {
917 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
918 $METASERVER->hide; 925 $METASERVER->hide;
919 0 926 0
920 }, 927 },
921 ), 928 ),
922 (new CFClient::UI::Empty expand => 1), 929 (new CFClient::UI::Empty expand => 1),
… …
935 } 942 }
936 }); 943 });
937} 944}
938 945
939sub metaserver_dialog { 946sub metaserver_dialog {
947 my $vbox = new CFClient::UI::VBox;
948 my $table = new CFClient::UI::Table;
949 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
950
940 my $dialog = new CFClient::UI::FancyFrame 951 my $dialog = new CFClient::UI::FancyFrame
941 title => "Server List", 952 title => "Server List",
942 name => 'metaserver_dialog', 953 name => 'metaserver_dialog',
943 x => 'center', 954 x => 'center',
944 y => 'center', 955 y => 'center',
945 z => 3, 956 z => 3,
946 force_h => $::HEIGHT * 0.4, 957 force_h => $::HEIGHT * 0.4,
947 child => (my $vbox = new CFClient::UI::VBox), 958 child => $vbox,
959 has_close_button => 1,
960 table => $table,
948 on_visibility_change => sub { 961 on_visibility_change => sub {
949 update_metaserver if $_[1]; 962 update_metaserver ($_[0]) if $_[1];
950 0 963 0
951 }, 964 },
952 ; 965 ;
953 966
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957
958 $dialog 967 $dialog
959} 968}
960 969
961sub server_setup { 970sub server_setup {
962 my $vbox = new CFClient::UI::VBox; 971 my $vbox = new CFClient::UI::VBox;
… …
968 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 977 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
969 978
970 $vbox->add ( 979 $vbox->add (
971 $HOST_ENTRY = new CFClient::UI::Entry 980 $HOST_ENTRY = new CFClient::UI::Entry
972 expand => 1, 981 expand => 1,
973 text => $CFG->{host}, 982 text => $CFG->{profile}{default}{host},
974 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 983 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
975 on_changed => sub { 984 on_changed => sub {
976 my ($self, $value) = @_; 985 my ($self, $value) = @_;
977 $CFG->{host} = $value; 986 $CFG->{profile}{default}{host} = $value;
978 0 987 0
979 } 988 }
980 ); 989 );
981
982 $METASERVER = metaserver_dialog;
983 990
984 $vbox->add (new CFClient::UI::Button 991 $vbox->add (new CFClient::UI::Button
985 expand => 1, 992 expand => 1,
986 text => "Server List", 993 text => "Server List",
987 other => $METASERVER, 994 other => $METASERVER,
… …
991 ); 998 );
992 } 999 }
993 1000
994 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1001 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
995 $table->add (1, 4, new CFClient::UI::Entry 1002 $table->add (1, 4, new CFClient::UI::Entry
996 text => $CFG->{user}, 1003 text => $CFG->{profile}{default}{user},
997 tooltip => "The name of your character on the server", 1004 tooltip => "The name of your character on the server",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; 0 } 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
999 ); 1006 );
1000 1007
1001 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1008 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1002 $table->add (1, 5, new CFClient::UI::Entry 1009 $table->add (1, 5, new CFClient::UI::Entry
1003 text => $CFG->{password}, 1010 text => $CFG->{profile}{default}{password},
1004 hidden => 1, 1011 hidden => 1,
1005 tooltip => "The password for your character", 1012 tooltip => "The password for your character",
1006 on_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; 0 } 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1007 ); 1014 );
1008 1015
1009 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1016 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1010 $table->add (1, 7, new CFClient::UI::Slider 1017 $table->add (1, 7, new CFClient::UI::Slider
1011 force_w => 100, 1018 force_w => 100,
… …
1227 ++$y; 1234 ++$y;
1228 1235
1229 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1240 on_changed => sub {
1234 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1235 1242
1236 if ($value) { 1243 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1244 $::CFG->{pickup} |= $mask;
… …
1246 }); 1253 });
1247 } 1254 }
1248 } 1255 }
1249 1256
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1257 $table->add (2, 18, new CFClient::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1260 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1261 on_changed => sub {
1254 my ($slider, $value) = @_; 1262 my ($slider, $value) = @_;
1255 1263
1256 $::CFG->{pickup} &= ~0x7; 1264 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1265 $::CFG->{pickup} |= int $value
1258 if $value; 1266 if $value;
1259 1; 1267 1;
1260 }); 1268 });
1269
1261 $table->add (3, 18, new CFClient::UI::Button 1270 $table->add (3, 18, new CFClient::UI::Button
1262 text => "set", 1271 text => "set",
1263 on_activate => sub { 1272 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1274 if defined $::CONN;
… …
1267 }); 1276 });
1268 1277
1269 $table 1278 $table
1270} 1279}
1271 1280
1272sub inventory_window { 1281sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283
1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1286 $vb1->add ($INV = new CFClient::UI::Inventory);
1287
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $hb
1298}
1299
1300sub player_window {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1274 x => "center", 1302 x => "center",
1275 y => "center", 1303 y => "center",
1276 force_w => $WIDTH * 9/10, 1304 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1305 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1306 title => "Player",
1279 has_close_button => 1, 1307 has_close_button => 1
1280 ; 1308 ;
1281 1309
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook
1313 expand => 1,
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add (
1318 Inventory => inventory_widget,
1319 "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."
1321 );
1283 1322
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1323 $ntb->add (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1324 Stats => $STATS_WINDOW = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 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 );
1287 1331
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1332 $plwin->add ($ntb);
1289 1333 $plwin
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $invwin
1298} 1334}
1299 1335
1300sub spell_setup { 1336sub update_bindings {
1301 new CFClient::UI::SpellList 1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1302} 1338}
1303 1339
1304sub keyboard_setup { 1340sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1341 my $binding_list = new CFClient::UI::VBox;
1306 1342
1307 my $refresh; 1343 my $refresh;
1308 $refresh = sub { 1344 $refresh = $BIND_UPD_CB = sub {
1309 $binding_list->clear (); 1345 $binding_list->clear ();
1310 1346
1311 for my $mod (keys %{$::CFG->{bindings}}) { 1347 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315 1351
1316 my $lbl = join "; ", @$cmds; 1352 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox); 1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button 1355 $hb->add (new CFClient::UI::Button
1320 text => "delete", 1356 text => "delete",
1321 tooltip => "Deletes the binding", 1357 tooltip => "Deletes the binding",
1322 on_activate => sub { 1358 on_activate => sub {
1323 $binding_list->remove ($hb); 1359 $binding_list->remove ($hb);
1324 delete $::CFG->{bindings}->{$mod}->{$sym}; 1360 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1325 0 1361 0
1326 }); 1362 });
1327 1363
1328 $hb->add (new CFClient::UI::Button 1364 $hb->add (new CFClient::UI::Button
1329 text => "edit", 1365 text => "edit",
1330 tooltip => "Edits the binding", 1366 tooltip => "Edits the binding",
1331 on_activate => sub { 1367 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1368 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1369 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1370 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1371 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym}; 1372 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1373 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1374 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1376 $SETUP_DIALOG->show;
1341 }, 1377 },
1342 sub { 1378 sub {
… …
1376 tooltip => "This button opens the binding editor with an empty binding.", 1412 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub { 1413 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [], 1414 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub { 1415 sub {
1380 my ($mod, $sym, $cmds) = @_; 1416 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1417 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1382 $refresh->(); 1418 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show; 1420 $SETUP_DIALOG->show;
1385 }, 1421 },
1386 sub { 1422 sub {
… …
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1464 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1465 $buttons->add (my $combo = new CFClient::UI::Combobox
1430 value => undef, 1466 value => undef,
1431 options => [ 1467 options => [
1432 [intro => "Introduction"], 1468 [intro => "Introduction"],
1433 [manual => "Manual"], 1469 [manual => "Main Manual"],
1434 [skill_help => "Skills"], 1470 [skill_help => "Skill Reference"],
1435 [command_help => "Commands"], 1471 [command_help => "Command Reference"],
1436 [dmcommand_help => "DM Commands"], 1472 [dmcommand_help => "DM Commands"],
1437 [COPYING => "License Terms"], 1473 [COPYING => "License Terms"],
1438 ], 1474 ],
1439 on_changed => sub { 1475 on_changed => sub {
1440 my ($self, $pod) = @_; 1476 my ($self, $pod) = @_;
1441 1477
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1444 1480
1445 $viewer->clear; 1481 $viewer->clear;
1482
1483# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1484# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1485# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1486# ]);#d#
1446 1487
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1448 for @$pom; 1489 for @$pom;
1449 1490
1450 $viewer->set_offset (0); 1491 $viewer->set_offset (0);
1492
1451 0 1493 0
1452 }, 1494 },
1453 on_visibility_change => sub { 1495 on_visibility_change => sub {
1454 my ($self, $visible) = @_; 1496 my ($self, $visible) = @_;
1455 return unless $visible; 1497 return unless $visible;
… …
1502 z => 100, 1544 z => 100,
1503 force_x => "max", 1545 force_x => "max",
1504 force_y => 0; 1546 force_y => 0;
1505 $DEBUG_STATUS->show; 1547 $DEBUG_STATUS->show;
1506 1548
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1549 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1508 1550
1509 $STATUSBOX = new CFClient::UI::Statusbox; 1551 $STATUSBOX = new CFClient::UI::Statusbox;
1510 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1552 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1511 1553
1512 (new CFClient::UI::Frame 1554 (new CFClient::UI::Frame
… …
1563 force_w => $::WIDTH * 0.6, 1605 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 1606 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 1607 has_close_button => 1,
1566 ; 1608 ;
1567 1609
1610 $METASERVER = metaserver_dialog;
1611
1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1612 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1613 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 1614
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1615 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1572 "Configure the server to play on, your username, password and other server-related options."); 1616 "Configure the server to play on, your username, password and other server-related options.");
… …
1575 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1619 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1576 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1620 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1577 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1621 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1578 "Configure the use of audio, sound effects and background music."); 1622 "Configure the use of audio, sound effects and background music.");
1579 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1623 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1580 "Lets you define, edit and delete bindings." 1624 "Lets you define, edit and delete key bindings."
1581 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1625 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1582 . "with nothing set and the recording started. After doing the actions you " 1626 . "with nothing set and the recording started. After doing the actions you "
1583 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1627 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1584 . "After pressing the combo the binding will be saved automatically and the " 1628 . "After pressing the combo the binding will be saved automatically and the "
1585 . "binding editor closes"); 1629 . "binding editor closes");
1586 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1587 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1588 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1589 "Some debuggign options. Do not ask."); 1631 "Some debuggin' options. Do not ask.");
1590 1632
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1633 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592 1634
1593 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1635 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1594 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1636 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
… …
1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1597 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1598 1640
1599 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 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
1600 1642
1601 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1602 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1605 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1606 1645
1607 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1608 text => "Save Config", 1647 text => "Save Config",
1609 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1648 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1610 on_activate => sub { 1649 on_activate => sub {
… …
1864 1903
1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1866 CFClient::UI::set_layout ($::CFG->{layout}); 1905 CFClient::UI::set_layout ($::CFG->{layout});
1867 1906
1868 my %DEF_CFG = ( 1907 my %DEF_CFG = (
1869 sdl_mode => 0, 1908 sdl_mode => 0,
1870 width => 640, 1909 width => 640,
1871 height => 480, 1910 height => 480,
1872 fullscreen => 0, 1911 fullscreen => 0,
1873 fast => 0, 1912 fast => 0,
1874 map_scale => 1, 1913 map_scale => 1,
1875 fow_enable => 1, 1914 fow_enable => 1,
1876 fow_intensity => 0.45, 1915 fow_intensity => 0.45,
1877 fow_smooth => 0, 1916 fow_smooth => 0,
1878 gui_fontsize => 1, 1917 gui_fontsize => 1,
1879 log_fontsize => 0.7, 1918 log_fontsize => 0.7,
1880 gauge_fontsize=> 1, 1919 gauge_fontsize => 1,
1881 gauge_size => 0.35, 1920 gauge_size => 0.35,
1882 stat_fontsize => 0.7, 1921 stat_fontsize => 0.7,
1883 mapsize => 100, 1922 mapsize => 100,
1884 host => "crossfire.schmorp.de",
1885 say_command => 'say', 1923 say_command => 'say',
1886 audio_enable => 1, 1924 audio_enable => 1,
1887 bgm_enable => 1, 1925 bgm_enable => 1,
1888 bgm_volume => 0.25, 1926 bgm_volume => 0.25,
1889 face_prefetch => 0, 1927 face_prefetch => 0,
1890 output_sync => 1, 1928 output_sync => 1,
1891 output_count => 1, 1929 output_count => 1,
1892 pickup => 0, 1930 pickup => 0,
1931 default => "profile", # default profile
1932 );
1893 ); 1933
1894
1895 while (my ($k, $v) = each %DEF_CFG) { 1934 while (my ($k, $v) = each %DEF_CFG) {
1896 $CFG->{$k} = $v unless exists $CFG->{$k}; 1935 $CFG->{$k} = $v unless exists $CFG->{$k};
1897 } 1936 }
1937
1938 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1898 1939
1899 sdl_init; 1940 sdl_init;
1900 1941
1901 @SDL_MODES = reverse 1942 @SDL_MODES = reverse
1902 grep $_->[0] >= 640 && $_->[1] >= 480, 1943 grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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