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.75 by root, Sun Jun 18 17:23:36 2006 UTC vs.
Revision 1.89 by elmex, Sun Jul 9 21:11:48 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
383 destroy_query_dialog $CONN; 391 destroy_query_dialog $CONN;
384 $CONN->destroy; 392 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 393 $CONN = 0; # false, does not autovivify
394
395 undef $MAP;
386} 396}
387 397
388sub graphics_setup { 398sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 399 my $vbox = new CFClient::UI::VBox;
390 400
… …
465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 475 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
466 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 476 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
467 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 477 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
468 ); 478 );
469 479
470 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
471
472 $table->add (1, $row++, new CFClient::UI::Slider
473 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
474 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
475 on_changed => sub {
476 $CFG->{stat_fontsize} = $_[1];
477 &set_stats_window_fontsize;
478 0
479 }
480 );
481
482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 480 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
483 $table->add (1, $row++, new CFClient::UI::Slider 481 $table->add (1, $row++, new CFClient::UI::Slider
484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 482 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 483 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
486 on_changed => sub { 484 on_changed => sub {
… …
555 ); 553 );
556 554
557 $vbox 555 $vbox
558} 556}
559 557
560sub set_stats_window_fontsize {
561 for (values %{$STATWIDS}) {
562 $_->set_fontsize ($::CFG->{stat_fontsize});
563 }
564}
565
566sub set_gauge_window_fontsize { 558sub set_gauge_window_fontsize {
567 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 559 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
568 $_->set_fontsize ($::CFG->{gauge_fontsize}); 560 $_->set_fontsize ($::CFG->{gauge_fontsize});
569 } 561 }
570} 562}
… …
649 641
650 $table 642 $table
651} 643}
652 644
653sub stats_window { 645sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 646 my $vb = new CFClient::UI::VBox;
655 y => $HEIGHT * (2/8),
656 x => "max",
657 title => "Stats",
658 name => "stats_window",
659 has_close_button => 1;
660 647
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, 648 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
663 can_hover => 1, can_events => 1, 649 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."); 650 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, 651 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
666 can_hover => 1, can_events => 1, 652 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."], 676 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
691 677
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."], 678 [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."], 679 [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."], 680 [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."], 681 [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."], 682 [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."], 683 [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 ) { 684 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 685 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
700 686
… …
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 705 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)", 706 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)", 707 pois => "<b>Poison</b> (resistance to getting poisoned)",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 708 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
723 deat => "<b>Death</b> (resistance against death spells)", 709 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)", 710 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)", 711 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)", 712 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...", 713 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, ...)", 714 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, ...)", 715 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
746 ); 732 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 733 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
748 font => $FONT_FIXED, 734 font => $FONT_FIXED,
749 can_hover => 1, 735 can_hover => 1,
750 can_events => 1, 736 can_events => 1,
751 image => "ui/resist/resist_$_.png", 737 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 738 tooltip => $resist_names{$_},
753 ); 739 );
754 740
755 $row++; 741 $row++;
756 if ($row % 6 == 0) { 742 if ($row % 6 == 0) {
757 $col += 2; 743 $col += 2;
758 $row = 0; 744 $row = 0;
759 } 745 }
760 } 746 }
761 747
762 &set_stats_window_fontsize; 748 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
749 $STATWIDS->{"_skill_tbl"} = $tbl3;
750
763 update_stats_window ({}); 751 update_stats_window ({});
764 752
765 $tgw 753 $vb
766} 754}
767 755
768sub formsep($) { 756sub formsep($) {
769 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 757 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
770} 758}
… …
804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 792 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 793 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 794 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 795 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 796 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 797 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 798 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 799 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
812 800
813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 801 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
814 802
… …
831 deat => CS_STAT_RES_DEATH, 819 deat => CS_STAT_RES_DEATH,
832 holyw => CS_STAT_RES_HOLYWORD, 820 holyw => CS_STAT_RES_HOLYWORD,
833 blind => CS_STAT_RES_BLIND, 821 blind => CS_STAT_RES_BLIND,
834 ); 822 );
835 823
824 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
825 my $sktbl = $STATWIDS->{_skill_tbl};
826 $sktbl->clear;
827
828 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
829 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
830 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
831
832 my @skills;
833
834 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
835 push @skills, [$i, $::CONN->{skill_info}{$i}];
836 }
837
838 my $y = 1;
839 for (sort { $a->[1] cmp $b->[1] } @skills) {
840 my ($idx, $name) = @$_;
841
842 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
843 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
844 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
846 }
847 }
848
849 $STATWIDS->{_skill_tbl_init} = 1;
850 }
851
852 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
853 if (exists $stats->{$i}) {
854 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
855 if $STATWIDS->{"sk_xp_$i"};
856 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
857 if $STATWIDS->{"sk_lvl_$i"};
858 }
859 }
860
836 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
837 for keys %tbl; 862 for keys %tbl;
838} 863}
839 864
840my $METASERVER_ATIME; 865my $METASERVER_ATIME;
841 866
842sub update_metaserver { 867sub update_metaserver {
868 my ($metaserver_dialog) = @_;
869
870 $METASERVER = $metaserver_dialog
871 if defined $metaserver_dialog;
872
843 return if $METASERVER_ATIME > time; 873 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 874 $METASERVER_ATIME = time + 60;
845 875
846 my $table = $METASERVER->{table}; 876 my $table = $METASERVER->{table};
847 $table->clear; 877 $table->clear;
… …
935 } 965 }
936 }); 966 });
937} 967}
938 968
939sub metaserver_dialog { 969sub metaserver_dialog {
970 my $vbox = new CFClient::UI::VBox;
971 my $table = new CFClient::UI::Table;
972 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
973
940 my $dialog = new CFClient::UI::FancyFrame 974 my $dialog = new CFClient::UI::FancyFrame
941 title => "Server List", 975 title => "Server List",
942 name => 'metaserver_dialog', 976 name => 'metaserver_dialog',
943 x => 'center', 977 x => 'center',
944 y => 'center', 978 y => 'center',
945 z => 3, 979 z => 3,
946 force_h => $::HEIGHT * 0.4, 980 force_h => $::HEIGHT * 0.4,
947 child => (my $vbox = new CFClient::UI::VBox), 981 child => $vbox,
982 has_close_button => 1,
983 table => $table,
948 on_visibility_change => sub { 984 on_visibility_change => sub {
949 update_metaserver if $_[1]; 985 update_metaserver ($_[0]) if $_[1];
950 0 986 0
951 }, 987 },
952 ; 988 ;
953
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957 989
958 $dialog 990 $dialog
959} 991}
960 992
961sub server_setup { 993sub server_setup {
… …
976 my ($self, $value) = @_; 1008 my ($self, $value) = @_;
977 $CFG->{profile}{default}{host} = $value; 1009 $CFG->{profile}{default}{host} = $value;
978 0 1010 0
979 } 1011 }
980 ); 1012 );
981
982 $METASERVER = metaserver_dialog;
983 1013
984 $vbox->add (new CFClient::UI::Button 1014 $vbox->add (new CFClient::UI::Button
985 expand => 1, 1015 expand => 1,
986 text => "Server List", 1016 text => "Server List",
987 other => $METASERVER, 1017 other => $METASERVER,
… …
1179sub autopickup_setup { 1209sub autopickup_setup {
1180 my $table = new CFClient::UI::Table; 1210 my $table = new CFClient::UI::Table;
1181 1211
1182 for ( 1212 for (
1183 ["General", 0, 0, 1213 ["General", 0, 0,
1184 ["Enable autopickup" => PICKUP_NEWMODE], 1214 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1185 ["Inhibit autopickup" => PICKUP_INHIBIT], 1215 ["Inhibit autopickup" => PICKUP_INHIBIT],
1186 ["Stop before pickup" => PICKUP_STOP], 1216 ["Stop before pickup" => PICKUP_STOP],
1187 ["Debug autopickup" => PICKUP_DEBUG], 1217 ["Debug autopickup" => PICKUP_DEBUG],
1188 ], 1218 ],
1189 ["Weapons", 0, 6, 1219 ["Weapons", 0, 6,
… …
1226 for (@bits) { 1256 for (@bits) {
1227 ++$y; 1257 ++$y;
1228 1258
1229 my $mask = $_->[1]; 1259 my $mask = $_->[1];
1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1260 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1261 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1262 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1263 on_changed => sub {
1234 my ($box, $value) = @_; 1264 my ($box, $value) = @_;
1235 1265
1236 if ($value) { 1266 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1267 $::CFG->{pickup} |= $mask;
… …
1242 $::CONN->send_command ("pickup $::CFG->{pickup}") 1272 $::CONN->send_command ("pickup $::CFG->{pickup}")
1243 if defined $::CONN; 1273 if defined $::CONN;
1244 1274
1245 0 1275 0
1246 }); 1276 });
1277
1278 ${$_->[2]} = $checkbox if $_->[2];
1247 } 1279 }
1248 } 1280 }
1249 1281
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1282 $table->add (2, 18, new CFClient::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1283 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1284 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1285 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1286 on_changed => sub {
1254 my ($slider, $value) = @_; 1287 my ($slider, $value) = @_;
1255 1288
1256 $::CFG->{pickup} &= ~0x7; 1289 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1290 $::CFG->{pickup} |= int $value
1258 if $value; 1291 if $value;
1259 1; 1292 1;
1260 }); 1293 });
1294
1261 $table->add (3, 18, new CFClient::UI::Button 1295 $table->add (3, 18, new CFClient::UI::Button
1262 text => "set", 1296 text => "set",
1263 on_activate => sub { 1297 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1298 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1299 if defined $::CONN;
… …
1267 }); 1301 });
1268 1302
1269 $table 1303 $table
1270} 1304}
1271 1305
1272sub inventory_window { 1306sub inventory_widget {
1307 my $hb = new CFClient::UI::HBox homogeneous => 1;
1308
1309 $hb->add (my $vb1 = new CFClient::UI::VBox);
1310 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1311 $vb1->add ($INV = new CFClient::UI::Inventory);
1312
1313 $hb->add (my $vb2 = new CFClient::UI::VBox);
1314
1315 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1316
1317 $vb2->add ($INVR = new CFClient::UI::Inventory);
1318
1319 # XXX: Call after $INVR = ... because set_opencont sets the items
1320 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1321
1322 $hb
1323}
1324
1325sub toggle_player_page {
1326 my ($widget) = @_;
1327
1328 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1329 $PL_WINDOW->hide;
1330 } else {
1331 $PL_NOTEBOOK->set_current_page ($widget);
1332 $PL_WINDOW->show;
1333 }
1334}
1335
1336sub player_window {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1337 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1274 x => "center", 1338 x => "center",
1275 y => "center", 1339 y => "center",
1276 force_w => $WIDTH * 9/10, 1340 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1341 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1342 title => "Player",
1279 has_close_button => 1, 1343 has_close_button => 1
1280 ; 1344 ;
1281 1345
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1346 my $ntb =
1347 $PL_NOTEBOOK =
1348 new CFClient::UI::Notebook
1349 expand => 1,
1350 debug => 1,
1351 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1352 ;
1283 1353
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1354 $ntb->add (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1355 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1356 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1357 );
1358 $ntb->add (
1359 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1360 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1361 );
1362 $ntb->add (
1363 Inventory => $INVENTORY_PAGE = inventory_widget,
1364 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1365 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1366 );
1287 1367
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1368 $ntb->set_current_page ($INVENTORY_PAGE);
1289 1369
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1370 $plwin->add ($ntb);
1291 1371 $plwin
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} 1372}
1299 1373
1300sub spell_setup { 1374sub update_bindings {
1301 new CFClient::UI::SpellList 1375 $BIND_UPD_CB->() if $BIND_UPD_CB;
1302} 1376}
1303 1377
1304sub keyboard_setup { 1378sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1379 my $binding_list = new CFClient::UI::VBox;
1306 1380
1307 my $refresh; 1381 my $refresh;
1308 $refresh = sub { 1382 $refresh = $BIND_UPD_CB = sub {
1309 $binding_list->clear (); 1383 $binding_list->clear ();
1310 1384
1311 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1385 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1386 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1387 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1388 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315 1389
1316 my $lbl = join "; ", @$cmds; 1390 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1391 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox); 1392 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button 1393 $hb->add (new CFClient::UI::Button
1320 text => "delete", 1394 text => "delete",
1321 tooltip => "Deletes the binding", 1395 tooltip => "Deletes the binding",
1322 on_activate => sub { 1396 on_activate => sub {
… …
1331 on_activate => sub { 1405 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1406 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1407 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1408 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1409 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1410 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds; 1411 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1412 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1413 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1414 $SETUP_DIALOG->show;
1341 }, 1415 },
1342 sub { 1416 sub {
… …
1376 tooltip => "This button opens the binding editor with an empty binding.", 1450 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub { 1451 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [], 1452 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub { 1453 sub {
1380 my ($mod, $sym, $cmds) = @_; 1454 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds; 1455 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1382 $refresh->(); 1456 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1457 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show; 1458 $SETUP_DIALOG->show;
1385 }, 1459 },
1386 sub { 1460 sub {
… …
1415 y => 'center', 1489 y => 'center',
1416 z => 2, 1490 z => 2,
1417 name => 'doc_browser', 1491 name => 'doc_browser',
1418 force_w => int $WIDTH * 7/8, 1492 force_w => int $WIDTH * 7/8,
1419 force_h => int $HEIGHT * 7/8, 1493 force_h => int $HEIGHT * 7/8,
1420 title => "Documentation"; 1494 title => "Help Browser",
1495 has_close_button => 1;
1421 1496
1422 $win->add (my $vbox = new CFClient::UI::VBox); 1497 $win->add (my $vbox = new CFClient::UI::VBox);
1423 1498
1424 $vbox->add (my $buttons = new CFClient::UI::HBox); 1499 $vbox->add (my $buttons = new CFClient::UI::HBox);
1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1500 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1503 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1504 $buttons->add (my $combo = new CFClient::UI::Combobox
1430 value => undef, 1505 value => undef,
1431 options => [ 1506 options => [
1432 [intro => "Introduction"], 1507 [intro => "Introduction"],
1433 [manual => "Manual"], 1508 [manual => "Main Manual"],
1434 [skill_help => "Skills"], 1509 [skill_help => "Skill Reference"],
1435 [command_help => "Commands"], 1510 [command_help => "Command Reference"],
1436 [dmcommand_help => "DM Commands"], 1511 [dmcommand_help => "DM Commands"],
1437 [COPYING => "License Terms"], 1512 [COPYING => "License Terms"],
1438 ], 1513 ],
1439 on_changed => sub { 1514 on_changed => sub {
1440 my ($self, $pod) = @_; 1515 my ($self, $pod) = @_;
1441 1516
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1517 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1518 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1444 1519
1445 $viewer->clear; 1520 $viewer->clear;
1521
1522# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1523# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1524# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1525# ]);#d#
1446 1526
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1527 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1448 for @$pom; 1528 for @$pom;
1449 1529
1450 $viewer->set_offset (0); 1530 $viewer->set_offset (0);
1531
1451 0 1532 0
1452 }, 1533 },
1453 on_visibility_change => sub { 1534 on_visibility_change => sub {
1454 my ($self, $visible) = @_; 1535 my ($self, $visible) = @_;
1455 return unless $visible; 1536 return unless $visible;
… …
1502 z => 100, 1583 z => 100,
1503 force_x => "max", 1584 force_x => "max",
1504 force_y => 0; 1585 force_y => 0;
1505 $DEBUG_STATUS->show; 1586 $DEBUG_STATUS->show;
1506 1587
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1588 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1508 1589
1509 $STATUSBOX = new CFClient::UI::Statusbox; 1590 $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]); 1591 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1511 1592
1512 (new CFClient::UI::Frame 1593 (new CFClient::UI::Frame
… …
1562 z => 2, 1643 z => 2,
1563 force_w => $::WIDTH * 0.6, 1644 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 1645 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 1646 has_close_button => 1,
1566 ; 1647 ;
1648
1649 $METASERVER = metaserver_dialog;
1567 1650
1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1651 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1652 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 1653
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1581 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1664 . "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 " 1665 . "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. " 1666 . "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 " 1667 . "After pressing the combo the binding will be saved automatically and the "
1585 . "binding editor closes"); 1668 . "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, 1669 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1589 "Some debuggin' options. Do not ask."); 1670 "Some debuggin' options. Do not ask.");
1590 1671
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1672 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592 1673
… …
1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1677 $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."); 1678 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1598 1679
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 1680 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 1681
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, 1682 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1683 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 1684
1607 $BUTTONBAR->add (new CFClient::UI::Button 1685 $BUTTONBAR->add (new CFClient::UI::Button
1608 text => "Save Config", 1686 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.", 1687 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 { 1688 on_activate => sub {
… …
1613 status "Configuration Saved"; 1691 status "Configuration Saved";
1614 0 1692 0
1615 }, 1693 },
1616 ); 1694 );
1617 1695
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1619 tooltip => "View Documentation"); 1697 tooltip => "View Documentation");
1620 1698
1621 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFClient::UI::Button
1622 text => "Quit", 1700 text => "Quit",
1623 tooltip => "Terminates the program", 1701 tooltip => "Terminates the program",

Diff Legend

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