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.100 by root, Sun Jul 23 16:11:12 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::Pod;
41use CFClient::BindingEditor; 42use CFClient::BindingEditor;
42use CFClient::MapWidget; 43use CFClient::MapWidget;
43 44
44$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE'; 46$SIG{PIPE} = 'IGNORE';
… …
86our $CONSOLE; 87our $CONSOLE;
87our $METASERVER; 88our $METASERVER;
88our $LOGIN_BUTTON; 89our $LOGIN_BUTTON;
89our $QUIT_DIALOG; 90our $QUIT_DIALOG;
90our $HOST_ENTRY; 91our $HOST_ENTRY;
92our $FULLSCREEN_ENABLE;
91our $PICKUP_ENABLE; 93our $PICKUP_ENABLE;
92our $SERVER_INFO; 94our $SERVER_INFO;
93 95
94our $SETUP_DIALOG; 96our $SETUP_DIALOG;
95our $SETUP_NOTEBOOK; 97our $SETUP_NOTEBOOK;
… …
99our $PL_NOTEBOOK; 101our $PL_NOTEBOOK;
100our $PL_WINDOW; 102our $PL_WINDOW;
101 103
102our $INVENTORY_PAGE; 104our $INVENTORY_PAGE;
103our $STATS_PAGE; 105our $STATS_PAGE;
106our $SKILL_PAGE;
104our $SPELL_PAGE; 107our $SPELL_PAGE;
105 108
106our $HELP_WINDOW; 109our $HELP_WINDOW;
107our $MESSAGE_WINDOW; 110our $MESSAGE_WINDOW;
108our $FLOORBOX; 111our $FLOORBOX;
… …
128our $BIND_UPD_CB; 131our $BIND_UPD_CB;
129 132
130our $PICKUP_CFG; 133our $PICKUP_CFG;
131 134
132sub status { 135sub status {
133 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 136 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
134} 137}
135 138
136sub debug { 139sub debug {
137 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
138} 141}
… …
187 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
188 191
189 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
190 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
191 ellipsise => 0, 194 ellipsise => 0,
192 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
193 196
194 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
195 198
196 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
197 text => "Next Race", 200 text => "Next Race",
… …
214 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
215 ellipsise => 0, 218 ellipsise => 0,
216 markup => 219 markup =>
217 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
218 . "Look at the <b>Messages</b> window to see a description of this race " 221 . "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 " 222 . "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" 223 . "(<small>below this dialog window: you may need to move the dialog away and "
224 . "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, " 225 . "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." 226 . "this race eventually, so you can take your time making this important choice."
224 ; 227 ;
225 228
226 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
227 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
228 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
… …
234 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
235 238
236 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
237 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
238 ellipsise => 0, 241 ellipsise => 0,
239 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
240 243
241 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
242 245
243 # left: re-roll 246 # left: re-roll
244 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
… …
250 }, 253 },
251 ); 254 );
252 255
253 # center: swap stats 256 # center: swap stats
254 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
258 expand => 1,
255 value => $_, 259 value => $_,
256 options => [ 260 options => [
257 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
258 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
259 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
284 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
285 0 289 0
286 }, 290 },
287 ); 291 );
288 292
293 unshift @dialog, my $hbox = new CFClient::UI::HBox;
294 for (
295 [Str => CS_STAT_STR],
296 [Dex => CS_STAT_DEX],
297 [Con => CS_STAT_CON],
298 [Int => CS_STAT_INT],
299 [Wis => CS_STAT_WIS],
300 [Pow => CS_STAT_POW],
301 [Cha => CS_STAT_CHA],
302 ) {
303 my ($name, $id) = @$_;
304 $hbox->add (new CFClient::UI::Label
305 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306 align => 0,
307 expand => 1,
308 can_events => 1,
309 can_hover => 1,
310 tooltip => $CFClient::STAT_TOOLTIP{$name},
311 );
312 }
313
289 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
290 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
291 ellipsise => 0, 316 ellipsise => 0,
292 markup => 317 markup =>
293 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
294 . "Look at the <b>Stats</b> window to see your basic stats " 319 . "<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" 320 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321 . "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. " 322 . "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 ; 323 ;
299 } 324 }
300 325
301 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
302 on_changed => sub { 327 on_changed => sub {
… …
416 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
417 442
418 my $row = 1; 443 my $row = 1;
419 444
420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 445 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
421 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
422 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
423 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
425 ); 450 );
426 451
… …
642 667
643 $table 668 $table
644} 669}
645 670
646sub stats_window { 671sub stats_window {
672 my $r = new CFClient::UI::ScrolledWindow (
673 expand => 1,
674 scroll_y => 1
675 );
647 my $vb = new CFClient::UI::VBox; 676 $r->add (my $vb = new CFClient::UI::VBox);
648 677
649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 678 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
650 can_hover => 1, can_events => 1, 679 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."); 680 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, 681 $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); 695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
667 696
668 my $color2 = [1, 1, 0]; 697 my $color2 = [1, 1, 0];
669 698
670 for ( 699 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"], 700 [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"], 701 [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"], 702 [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"], 703 [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"], 704 [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"], 705 [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."], 706 [0, 6, st_cha => "Cha", 30],
678 707
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."], 708 [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."], 709 [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."], 710 [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."], 711 [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."], 712 [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."], 713 [2, 5, st_wspd => "WSp", 10.54],
685 ) { 714 ) {
686 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 715 my ($col, $row, $id, $label, $template) = @$_;
687 716
688 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 717 $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); 718 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
690 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 720 $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); 721 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
692 } 723 }
693 724
694 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
695 726
696 my $row = 0; 727 my $row = 0;
… …
769 $col += 3; 800 $col += 3;
770 $row = 0; 801 $row = 0;
771 } 802 }
772 } 803 }
773 804
774 update_stats_window ({}); 805 #update_stats_window ({});
775 806
776 $vb 807 $r
777} 808}
778 809
779sub skill_window { 810sub skill_window {
780 my ($self) = @_; 811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
781 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1; 812 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813 $sw
782} 814}
783 815
784sub formsep($) { 816sub formsep($) {
785 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 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} 818}
892 819
893my $METASERVER_ATIME; 820my $METASERVER_ATIME;
894 821
895sub update_metaserver { 822sub update_metaserver {
… …
1333sub inventory_widget { 1260sub inventory_widget {
1334 my $hb = new CFClient::UI::HBox homogeneous => 1; 1261 my $hb = new CFClient::UI::HBox homogeneous => 1;
1335 1262
1336 $hb->add (my $vb1 = new CFClient::UI::VBox); 1263 $hb->add (my $vb1 = new CFClient::UI::VBox);
1337 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1264 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1265
1266 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1267
1268 use sort 'stable';
1269
1270 $hb1->add (new CFClient::UI::Combobox
1271 value => undef,
1272 options => [
1273 [undef, "Type/Name"],
1274 [
1275 sub { sort {
1276 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 "Weight/Type",
1280 ],
1281 [sub { } => "#TODO#"],
1282 ],
1283 on_changed => sub {
1284 $INV->set_sort_order ($_[1]);
1285 },
1286 );
1287 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1288 #TODO# update to weigh/maxweight
1289 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1290
1291 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1338 $vb1->add ($INV = new CFClient::UI::Inventory); 1292 $sw1->add ($INV = new CFClient::UI::Inventory);
1339 1293
1340 $hb->add (my $vb2 = new CFClient::UI::VBox); 1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1341 1295
1342 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1343 1297
1298 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1344 $vb2->add ($INVR = new CFClient::UI::Inventory); 1299 $sw2->add ($INVR = new CFClient::UI::Inventory);
1345 1300
1346 # XXX: Call after $INVR = ... because set_opencont sets the items 1301 # XXX: Call after $INVR = ... because set_opencont sets the items
1347 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1302 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1348 1303
1349 $hb 1304 $hb
… …
1371 has_close_button => 1 1326 has_close_button => 1
1372 ; 1327 ;
1373 1328
1374 my $ntb = 1329 my $ntb =
1375 $PL_NOTEBOOK = 1330 $PL_NOTEBOOK =
1376 new CFClient::UI::Notebook 1331 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 1332
1382 $ntb->add ( 1333 $ntb->add (
1383 "Stats" => $STATS_PAGE = stats_window, 1334 "Statistics (F2)" => $STATS_PAGE = stats_window,
1384 "Shows statistics, where all your Stats and Resistances are shown." 1335 "Shows statistics, where all your Stats and Resistances are shown."
1385 ); 1336 );
1386 $ntb->add ( 1337 $ntb->add (
1387 "Skills" => $STATS_PAGE = skill_window, 1338 "Skills (F3)" => $SKILL_PAGE = skill_window,
1388 "Shows all your Skills." 1339 "Shows all your Skills."
1389 ); 1340 );
1341
1342 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1343 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1390 $ntb->add ( 1344 $ntb->add (
1391 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1345 "Spellbook (F4)" => $spellsw,
1392 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1346 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1393 ); 1347 );
1394 $ntb->add ( 1348 $ntb->add (
1395 Inventory => $INVENTORY_PAGE = inventory_widget, 1349 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1396 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1350 "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." 1351 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1398 ); 1352 );
1399 1353
1400 $ntb->set_current_page ($INVENTORY_PAGE); 1354 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1513 $refresh->(); 1467 $refresh->();
1514 1468
1515 $vb 1469 $vb
1516} 1470}
1517 1471
1472# just weirdness, pls. ignore
1473sub load_html_page {
1474 my ($viewer, $base) = @_;
1475
1476 $viewer->clear;
1477
1478 require LWP::Simple;
1479 require HTML::Parser;
1480 require URI;
1481
1482 my $page = LWP::Simple::get ($base)
1483 or return;
1484
1485 my @s = { };
1486 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488 my $parser = HTML::Parser->new (
1489 text_h => [sub {
1490 my ($text) = @_;
1491 $text =~ s/\s+/ /g;
1492 $s[-1]{text} .= CFClient::asxml $text;
1493 }, "dtext"],
1494 start_h => [sub {
1495 my ($tag, $attr) = @_;
1496 if ($passthrough{$tag}) {
1497 $s[-1]{text} .= "<$tag>";
1498 } elsif ($tag eq "h1") {
1499 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500 } elsif ($tag eq "h2") {
1501 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502 } elsif ($tag eq "h3") {
1503 push @s, { text => "<span size='large'>" };
1504 } elsif ($tag eq "a") {
1505 push @s, { text => "", url => $attr->{href} };
1506 } elsif ($tag eq "p") {
1507 push @s, { };
1508 } elsif ($tag eq "img") {
1509 eval {
1510 push @{$s[-1]{obj}}, new CFClient::UI::Image
1511 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512 $s[-1]{text} .= "\x{fffc}";
1513 };
1514 }
1515 }, "tagname, attr"],
1516 end_h => [sub {
1517 my ($tag) = @_;
1518 if ($passthrough{$tag}) {
1519 $s[-1]{text} .= "</$tag>";
1520 } elsif ($tag =~ /^h\d$/) {
1521 $s[-1]{text} .= "</span>";
1522 push @s, { };
1523 } elsif ($tag eq "a") {
1524 my $S = pop @s;
1525 $s[-1]{text} .= "\x{fffc}";
1526 push @{$s[-1]{obj}}, new CFClient::UI::Label
1527 fg => [0.8, 0.8, 1],
1528 markup => "<u>$S->{text}</u>",
1529 fontsize => 0.8,
1530 can_events => 1,
1531 can_focus => 1,
1532 on_button_up => sub {
1533 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534 },
1535 ;
1536 }
1537 }, "tagname"],
1538 );
1539
1540 $parser->parse ($page);
1541 $parser->eof;
1542
1543 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544 for @s;
1545
1546 $viewer->set_offset (0);
1547}
1548
1518sub help_window { 1549sub help_window {
1519 my $win = new CFClient::UI::FancyFrame 1550 my $win = new CFClient::UI::FancyFrame
1520 x => 'center', 1551 x => 'center',
1521 y => 'center', 1552 y => 'center',
1522 z => 2, 1553 z => 2,
… …
1540 [manual => "Main Manual"], 1571 [manual => "Main Manual"],
1541 [skill_help => "Skill Reference"], 1572 [skill_help => "Skill Reference"],
1542 [command_help => "Command Reference"], 1573 [command_help => "Command Reference"],
1543 [dmcommand_help => "DM Commands"], 1574 [dmcommand_help => "DM Commands"],
1544 [COPYING => "License Terms"], 1575 [COPYING => "License Terms"],
1576 [test => "test (do not select)"], #d#TODO
1545 ], 1577 ],
1546 on_changed => sub { 1578 on_changed => sub {
1547 my ($self, $pod) = @_; 1579 my ($self, $pod) = @_;
1548 1580
1581 if ($pod eq "test") {#d#TODO
1582 eval {
1583 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1584 };
1585 warn "$@" if $@;
1586 return;
1587 }
1588
1549 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1550 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1590 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591
1592 #use Data::Dumper; warn Dumper $pom;#d#
1551 1593
1552 $viewer->clear; 1594 $viewer->clear;
1553 1595
1554# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n", 1596# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1555# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 1597# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1556# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 1598# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1557# ]);#d# 1599# ]);#d#
1558 1600
1559 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1560 for @$pom; 1602 for @$pom;
1561 1603
1562 $viewer->set_offset (0); 1604 $viewer->set_offset (0);
1563 1605
1564 0 1606 0
… …
1830 1872
1831 $WANT_REFRESH = 0; 1873 $WANT_REFRESH = 0;
1832 $CAN_REFRESH = 0; 1874 $CAN_REFRESH = 0;
1833 $LAST_REFRESH = $NOW; 1875 $LAST_REFRESH = $NOW;
1834 1876
18350 && do {
1836 # some weird model-drawing code, just a joke right now
1837 use CFClient::OpenGL;
1838
1839 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1840 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1841 $demo{r} ||= do {
1842 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1843 $mod->{v} = pack "f*", @{$mod->{v}};
1844 $_ = [scalar @$_, pack "S!*", @$_]
1845 for values %{$mod->{g}};
1846 $mod
1847 };
1848
1849 my $r = $demo{r} or die;
1850
1851 glDepthMask 1;
1852 glClear GL_DEPTH_BUFFER_BIT;
1853 glEnable GL_TEXTURE_2D;
1854 glEnable GL_DEPTH_TEST;
1855 glEnable GL_CULL_FACE;
1856 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1857
1858 glMatrixMode GL_PROJECTION;
1859 glLoadIdentity;
1860 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1861 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1862 glMatrixMode GL_MODELVIEW;
1863 glLoadIdentity;
1864
1865 glPushMatrix;
1866 glTranslate 0, 0, -800;
1867 glScale 1, -1, 1;
1868 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1869 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1870 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1871 glScale 50, 50, 50;
1872
1873 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1874 while (my ($k, $v) = each %{$r->{g}}) {
1875 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1876 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1877 }
1878
1879 glPopMatrix;
1880
1881 glShadeModel GL_FLAT;
1882 glDisable GL_DEPTH_TEST;
1883 glDisable GL_TEXTURE_2D;
1884 glDepthMask 0;
1885
1886 $WANT_REFRESH++;
1887};
1888
1889 CFClient::SDL_GL_SwapBuffers; 1877 CFClient::SDL_GL_SwapBuffers;
1890} 1878}
1891 1879
1892my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1880my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1893 $NOW = time; 1881 $NOW = time;
… …
1939# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1927# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1940 }, 1928 },
1941 CFClient::SDL_KEYDOWN => sub { 1929 CFClient::SDL_KEYDOWN => sub {
1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1943 # alt-enter 1931 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle;
1944 video_shutdown; 1933 video_shutdown;
1945 $CFG->{fullscreen} = !$CFG->{fullscreen};
1946 video_init; 1934 video_init;
1947 } else { 1935 } else {
1948 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1936 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1949 } 1937 }
1950 }, 1938 },
… …
1966$SIG{INT} = $SIG{TERM} = sub { exit }; 1954$SIG{INT} = $SIG{TERM} = sub { exit };
1967 1955
1968{ 1956{
1969 local $SIG{__DIE__} = sub { 1957 local $SIG{__DIE__} = sub {
1970 return unless defined $^S && !$^S; 1958 return unless defined $^S && !$^S;
1971 Carp::confess $_[1];#d#TODO: remove when stable 1959 Carp::confess $_[0];#d#TODO: remove when stable
1972 CFClient::fatal $_[0]; 1960 CFClient::fatal $_[0];
1973 }; 1961 };
1974 1962
1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1976 CFClient::UI::set_layout ($::CFG->{layout}); 1964 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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