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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.98 by root, Sat Jul 22 13:20:33 2006 UTC

… …
86our $CONSOLE; 86our $CONSOLE;
87our $METASERVER; 87our $METASERVER;
88our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
89our $QUIT_DIALOG; 89our $QUIT_DIALOG;
90our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
91our $PICKUP_ENABLE; 92our $PICKUP_ENABLE;
92our $SERVER_INFO; 93our $SERVER_INFO;
93 94
94our $SETUP_DIALOG; 95our $SETUP_DIALOG;
95our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
… …
99our $PL_NOTEBOOK; 100our $PL_NOTEBOOK;
100our $PL_WINDOW; 101our $PL_WINDOW;
101 102
102our $INVENTORY_PAGE; 103our $INVENTORY_PAGE;
103our $STATS_PAGE; 104our $STATS_PAGE;
105our $SKILL_PAGE;
104our $SPELL_PAGE; 106our $SPELL_PAGE;
105 107
106our $HELP_WINDOW; 108our $HELP_WINDOW;
107our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
108our $FLOORBOX; 110our $FLOORBOX;
… …
187 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
188 190
189 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFClient::UI::Label
190 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
191 ellipsise => 0, 193 ellipsise => 0,
192 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
193 195
194 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFClient::UI::Table;
195 197
196 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
197 text => "Next Race", 199 text => "Next Race",
… …
214 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
215 ellipsise => 0, 217 ellipsise => 0,
216 markup => 218 markup =>
217 "<big><b>Character Creation: Race</b></big>\n\n" 219 "<big><b>Character Creation: Race</b></big>\n\n"
218 . "Look at the <b>Messages</b> window to see a description of this race " 220 . "Look at the <b>Messages</b> window to see a description of this race "
219 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
220 . "and the center of the screen to see how this race looks like " 221 . "and the center of the screen to see how this race looks like "
221 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "click into the display area to make it visible</small>).\n\n"
222 . "You can look at another race, or accept this race (you will come back to this race eventually, " 224 . "You can look at another race, or accept this race (you will cycle back to "
223 . "so you can take your time making this important choice." 225 . "this race eventually, so you can take your time making this important choice."
224 ; 226 ;
225 227
226 } elsif ($prompt =~ /roll new stats/) { 228 } elsif ($prompt =~ /roll new stats/) {
227 if (my $stat = delete $conn->{stat_change_with}) { 229 if (my $stat = delete $conn->{stat_change_with}) {
228 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
… …
234 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
235 237
236 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
237 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
238 ellipsise => 0, 240 ellipsise => 0,
239 markup => "\nOr use your keyboard:\n"; 241 markup => "\nOr use your keyboard and the text entry below:\n";
240 242
241 unshift @dialog, my $table = new CFClient::UI::Table; 243 unshift @dialog, my $table = new CFClient::UI::Table;
242 244
243 # left: re-roll 245 # left: re-roll
244 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
… …
250 }, 252 },
251 ); 253 );
252 254
253 # center: swap stats 255 # center: swap stats
254 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
257 expand => 1,
255 value => $_, 258 value => $_,
256 options => [ 259 options => [
257 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
258 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
259 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 262 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
284 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
285 0 288 0
286 }, 289 },
287 ); 290 );
288 291
292 unshift @dialog, my $hbox = new CFClient::UI::HBox;
293 for (
294 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA],
301 ) {
302 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0,
306 expand => 1,
307 can_events => 1,
308 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name},
310 );
311 }
312
289 unshift @dialog, new CFClient::UI::Label 313 unshift @dialog, new CFClient::UI::Label
290 max_w => $::WIDTH * 0.4, 314 max_w => $::WIDTH * 0.4,
291 ellipsise => 0, 315 ellipsise => 0,
292 markup => 316 markup =>
293 "<big><b>Character Creation: Stats</b></big>\n\n" 317 "<big><b>Character Creation: Stats</b></big>\n\n"
294 . "Look at the <b>Stats</b> window to see your basic stats " 318 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
295 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "They will be modified later by both the race and the class you choose.\n\n"
296 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 321 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
297 . "Race selection will influence those values later on."
298 ; 322 ;
299 } 323 }
300 324
301 push @dialog, my $entry = new CFClient::UI::Entry 325 push @dialog, my $entry = new CFClient::UI::Entry
302 on_changed => sub { 326 on_changed => sub {
… …
416 $mode_slider->emit (changed => $mode_slider->{range}[0]); 440 $mode_slider->emit (changed => $mode_slider->{range}[0]);
417 441
418 my $row = 1; 442 my $row = 1;
419 443
420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
421 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
422 state => $CFG->{fullscreen}, 446 state => $CFG->{fullscreen},
423 tooltip => "Bring the client into fullscreen mode.", 447 tooltip => "Bring the client into fullscreen mode.",
424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
425 ); 449 );
426 450
… …
642 666
643 $table 667 $table
644} 668}
645 669
646sub stats_window { 670sub stats_window {
671 my $r = new CFClient::UI::ScrolledWindow (
672 expand => 1,
673 scroll_y => 1
674 );
647 my $vb = new CFClient::UI::VBox; 675 $r->add (my $vb = new CFClient::UI::VBox);
648 676
649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 677 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
650 can_hover => 1, can_events => 1, 678 can_hover => 1, can_events => 1,
651 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 679 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 680 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
… …
666 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
667 695
668 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
669 697
670 for ( 698 for (
671 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 699 [0, 0, st_str => "Str", 30],
672 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
673 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
674 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 702 [0, 3, st_int => "Int", 30],
675 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 703 [0, 4, st_wis => "Wis", 30],
676 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 704 [0, 5, st_pow => "Pow", 30],
677 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
678 706
679 [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."], 707 [2, 0, st_wc => "Wc", -120],
680 [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."], 708 [2, 1, st_ac => "Ac", -120],
681 [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."], 709 [2, 2, st_dam => "Dam", 120],
682 [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."], 710 [2, 3, st_arm => "Arm", 120],
683 [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."], 711 [2, 4, st_spd => "Spd", 10.54],
684 [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."], 712 [2, 5, st_wspd => "WSp", 10.54],
685 ) { 713 ) {
686 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
687 715
688 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
689 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
690 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
691 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
692 } 722 }
693 723
694 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
695 725
696 my $row = 0; 726 my $row = 0;
… …
769 $col += 3; 799 $col += 3;
770 $row = 0; 800 $row = 0;
771 } 801 }
772 } 802 }
773 803
774 update_stats_window ({}); 804 #update_stats_window ({});
775 805
776 $vb 806 $r
777} 807}
778 808
779sub skill_window { 809sub skill_window {
780 my ($self) = @_; 810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
781 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1; 811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
812 $sw
782} 813}
783 814
784sub formsep($) { 815sub formsep($) {
785 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
786}
787
788sub update_stats_window {
789 my ($stats) = @_;
790
791 # I love text protocols...
792
793 my $hp = $stats->{+CS_STAT_HP} * 1;
794 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
795 my $sp = $stats->{+CS_STAT_SP} * 1;
796 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
797 my $fo = $stats->{+CS_STAT_FOOD} * 1;
798 my $fo_m = 999;
799 my $gr = $stats->{+CS_STAT_GRACE} * 1;
800 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
801
802 $GAUGES->{hp} ->set_value ($hp, $hp_m);
803 $GAUGES->{mana} ->set_value ($sp, $sp_m);
804 $GAUGES->{food} ->set_value ($fo, $fo_m);
805 $GAUGES->{grace} ->set_value ($gr, $gr_m);
806 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
807 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
808 my $rng = $stats->{+CS_STAT_RANGE};
809 $rng =~ s/^Range: //; # thank you so much dear server
810 $GAUGES->{range} ->set_text ("Rng: " . $rng);
811 my $title = $stats->{+CS_STAT_TITLE};
812 $title =~ s/^Player: //;
813 $STATWIDS->{title} ->set_text ("Title: " . $title);
814
815 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
816 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
817 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
818 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
819 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
820 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
821 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
822 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
823 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
824 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
825 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
826 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
827 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
828
829 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
830
831 my %tbl = (
832 phys => CS_STAT_RES_PHYS,
833 magic => CS_STAT_RES_MAG,
834 fire => CS_STAT_RES_FIRE,
835 elec => CS_STAT_RES_ELEC,
836 cold => CS_STAT_RES_COLD,
837 conf => CS_STAT_RES_CONF,
838 acid => CS_STAT_RES_ACID,
839 drain => CS_STAT_RES_DRAIN,
840 ghit => CS_STAT_RES_GHOSTHIT,
841 pois => CS_STAT_RES_POISON,
842 slow => CS_STAT_RES_SLOW,
843 para => CS_STAT_RES_PARA,
844 tund => CS_STAT_TURN_UNDEAD,
845 fear => CS_STAT_RES_FEAR,
846 depl => CS_STAT_RES_DEPLETE,
847 deat => CS_STAT_RES_DEATH,
848 holyw => CS_STAT_RES_HOLYWORD,
849 blind => CS_STAT_RES_BLIND,
850 );
851
852 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
853 my $sktbl = $STATWIDS->{_skill_tbl};
854 $sktbl->clear;
855
856 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
857 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
858 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
859
860 my @skills;
861
862 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
863 push @skills, [$i, $::CONN->{skill_info}{$i}];
864 }
865
866 my $y = 1;
867 for (sort { $a->[1] cmp $b->[1] } @skills) {
868 my ($idx, $name) = @$_;
869
870 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
871 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
872 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
874 }
875 }
876
877 $STATWIDS->{_skill_tbl_init} = 1;
878 }
879
880 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
881 if (exists $stats->{$i}) {
882 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
883 if $STATWIDS->{"sk_xp_$i"};
884 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
885 if $STATWIDS->{"sk_lvl_$i"};
886 }
887 }
888
889 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
890 for keys %tbl;
891} 817}
892 818
893my $METASERVER_ATIME; 819my $METASERVER_ATIME;
894 820
895sub update_metaserver { 821sub update_metaserver {
… …
1333sub inventory_widget { 1259sub inventory_widget {
1334 my $hb = new CFClient::UI::HBox homogeneous => 1; 1260 my $hb = new CFClient::UI::HBox homogeneous => 1;
1335 1261
1336 $hb->add (my $vb1 = new CFClient::UI::VBox); 1262 $hb->add (my $vb1 = new CFClient::UI::VBox);
1337 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1264 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1338 $vb1->add ($INV = new CFClient::UI::Inventory); 1265 $sw1->add ($INV = new CFClient::UI::Inventory);
1339 1266
1340 $hb->add (my $vb2 = new CFClient::UI::VBox); 1267 $hb->add (my $vb2 = new CFClient::UI::VBox);
1341 1268
1342 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1269 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1343 1270
1271 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1344 $vb2->add ($INVR = new CFClient::UI::Inventory); 1272 $sw2->add ($INVR = new CFClient::UI::Inventory);
1345 1273
1346 # XXX: Call after $INVR = ... because set_opencont sets the items 1274 # XXX: Call after $INVR = ... because set_opencont sets the items
1347 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1275 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1348 1276
1349 $hb 1277 $hb
… …
1371 has_close_button => 1 1299 has_close_button => 1
1372 ; 1300 ;
1373 1301
1374 my $ntb = 1302 my $ntb =
1375 $PL_NOTEBOOK = 1303 $PL_NOTEBOOK =
1376 new CFClient::UI::Notebook 1304 new CFClient::UI::Notebook expand => 1, debug => 1;
1377 expand => 1,
1378 debug => 1,
1379 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1380 ;
1381 1305
1382 $ntb->add ( 1306 $ntb->add (
1383 "Stats" => $STATS_PAGE = stats_window, 1307 "Statistics (F2)" => $STATS_PAGE = stats_window,
1384 "Shows statistics, where all your Stats and Resistances are shown." 1308 "Shows statistics, where all your Stats and Resistances are shown."
1385 ); 1309 );
1386 $ntb->add ( 1310 $ntb->add (
1387 "Skills" => $STATS_PAGE = skill_window, 1311 "Skills (F3)" => $SKILL_PAGE = skill_window,
1388 "Shows all your Skills." 1312 "Shows all your Skills."
1389 ); 1313 );
1314
1315 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1316 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1390 $ntb->add ( 1317 $ntb->add (
1391 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1318 "Spellbook (F4)" => $spellsw,
1392 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1319 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1393 ); 1320 );
1394 $ntb->add ( 1321 $ntb->add (
1395 Inventory => $INVENTORY_PAGE = inventory_widget, 1322 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1396 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1323 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1397 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1324 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1398 ); 1325 );
1399 1326
1400 $ntb->set_current_page ($INVENTORY_PAGE); 1327 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1513 $refresh->(); 1440 $refresh->();
1514 1441
1515 $vb 1442 $vb
1516} 1443}
1517 1444
1445# just weirdness, pls. ignore
1446sub load_html_page {
1447 my ($viewer, $base) = @_;
1448
1449 $viewer->clear;
1450
1451 require LWP::Simple;
1452 require HTML::Parser;
1453 require URI;
1454
1455 my $page = LWP::Simple::get ($base)
1456 or return;
1457
1458 my @s = { };
1459 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1460
1461 my $parser = HTML::Parser->new (
1462 text_h => [sub {
1463 my ($text) = @_;
1464 $text =~ s/\s+/ /g;
1465 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1466 }, "dtext"],
1467 start_h => [sub {
1468 my ($tag, $attr) = @_;
1469 if ($passthrough{$tag}) {
1470 $s[-1]{text} .= "<$tag>";
1471 } elsif ($tag eq "h1") {
1472 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1473 } elsif ($tag eq "h2") {
1474 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1475 } elsif ($tag eq "h3") {
1476 push @s, { text => "<span size='large'>" };
1477 } elsif ($tag eq "a") {
1478 push @s, { text => "", url => $attr->{href} };
1479 } elsif ($tag eq "p") {
1480 push @s, { };
1481 } elsif ($tag eq "img") {
1482 eval {
1483 push @{$s[-1]{obj}}, new CFClient::UI::Image
1484 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1485 $s[-1]{text} .= "\x{fffc}";
1486 };
1487 }
1488 }, "tagname, attr"],
1489 end_h => [sub {
1490 my ($tag) = @_;
1491 if ($passthrough{$tag}) {
1492 $s[-1]{text} .= "</$tag>";
1493 } elsif ($tag =~ /^h\d$/) {
1494 $s[-1]{text} .= "</span>";
1495 push @s, { };
1496 } elsif ($tag eq "a") {
1497 my $S = pop @s;
1498 $s[-1]{text} .= "\x{fffc}";
1499 push @{$s[-1]{obj}}, new CFClient::UI::Label
1500 fg => [0.8, 0.8, 1],
1501 markup => "<u>$S->{text}</u>",
1502 fontsize => 0.8,
1503 can_events => 1,
1504 can_focus => 1,
1505 on_button_up => sub {
1506 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1507 },
1508 ;
1509 }
1510 }, "tagname"],
1511 );
1512
1513 $parser->parse ($page);
1514 $parser->eof;
1515
1516 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1517 for @s;
1518
1519 $viewer->set_offset (0);
1520}
1521
1518sub help_window { 1522sub help_window {
1519 my $win = new CFClient::UI::FancyFrame 1523 my $win = new CFClient::UI::FancyFrame
1520 x => 'center', 1524 x => 'center',
1521 y => 'center', 1525 y => 'center',
1522 z => 2, 1526 z => 2,
… …
1540 [manual => "Main Manual"], 1544 [manual => "Main Manual"],
1541 [skill_help => "Skill Reference"], 1545 [skill_help => "Skill Reference"],
1542 [command_help => "Command Reference"], 1546 [command_help => "Command Reference"],
1543 [dmcommand_help => "DM Commands"], 1547 [dmcommand_help => "DM Commands"],
1544 [COPYING => "License Terms"], 1548 [COPYING => "License Terms"],
1549 [test => "test (do not select)"], #d#TODO
1545 ], 1550 ],
1546 on_changed => sub { 1551 on_changed => sub {
1547 my ($self, $pod) = @_; 1552 my ($self, $pod) = @_;
1553
1554 if ($pod eq "test") {#d#TODO
1555 eval {
1556 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1557 };
1558 warn "$@" if $@;
1559 return;
1560 }
1548 1561
1549 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1562 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1550 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1563 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1551 1564
1552 $viewer->clear; 1565 $viewer->clear;
… …
1939# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1952# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1940 }, 1953 },
1941 CFClient::SDL_KEYDOWN => sub { 1954 CFClient::SDL_KEYDOWN => sub {
1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1955 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1943 # alt-enter 1956 # alt-enter
1957 $FULLSCREEN_ENABLE->toggle;
1944 video_shutdown; 1958 video_shutdown;
1945 $CFG->{fullscreen} = !$CFG->{fullscreen};
1946 video_init; 1959 video_init;
1947 } else { 1960 } else {
1948 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1961 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1949 } 1962 }
1950 }, 1963 },
… …
1966$SIG{INT} = $SIG{TERM} = sub { exit }; 1979$SIG{INT} = $SIG{TERM} = sub { exit };
1967 1980
1968{ 1981{
1969 local $SIG{__DIE__} = sub { 1982 local $SIG{__DIE__} = sub {
1970 return unless defined $^S && !$^S; 1983 return unless defined $^S && !$^S;
1971 Carp::confess $_[1];#d#TODO: remove when stable 1984 Carp::confess $_[0];#d#TODO: remove when stable
1972 CFClient::fatal $_[0]; 1985 CFClient::fatal $_[0];
1973 }; 1986 };
1974 1987
1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1988 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1976 CFClient::UI::set_layout ($::CFG->{layout}); 1989 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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