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.80 by root, Mon Jun 26 21:59:04 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" };
46$SIG{PIPE} = 'IGNORE';
45 47
46$Event::DIED = sub { 48$Event::DIED = sub {
47 # TODO: display dialog box or so 49 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable 50 Carp::confess $_[1];#d#TODO: remove when stable
49 CFClient::error $_[1]; 51 CFClient::error $_[1];
… …
85our $CONSOLE; 87our $CONSOLE;
86our $METASERVER; 88our $METASERVER;
87our $LOGIN_BUTTON; 89our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 90our $QUIT_DIALOG;
89our $HOST_ENTRY; 91our $HOST_ENTRY;
92our $FULLSCREEN_ENABLE;
93our $PICKUP_ENABLE;
90our $SERVER_INFO; 94our $SERVER_INFO;
91 95
92our $SETUP_DIALOG; 96our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK; 97our $SETUP_NOTEBOOK;
94our $SETUP_SERVER; 98our $SETUP_SERVER;
95our $SETUP_KEYBOARD; 99our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97 100
101our $PL_NOTEBOOK;
98our $STATS_WINDOW; 102our $PL_WINDOW;
103
104our $INVENTORY_PAGE;
105our $STATS_PAGE;
106our $SKILL_PAGE;
107our $SPELL_PAGE;
108
109our $HELP_WINDOW;
99our $MESSAGE_WINDOW; 110our $MESSAGE_WINDOW;
100our $FLOORBOX; 111our $FLOORBOX;
101our $GAUGES; 112our $GAUGES;
102our $STATWIDS; 113our $STATWIDS;
103 114
… …
110 121
111our $ALT_ENTER_MESSAGE; 122our $ALT_ENTER_MESSAGE;
112our $STATUSBOX; 123our $STATUSBOX;
113our $DEBUG_STATUS; 124our $DEBUG_STATUS;
114 125
115our $INV_WINDOW;
116our $INV; 126our $INV;
117our $INVR; 127our $INVR;
118our $INV_RIGHT_HB; 128our $INV_RIGHT_HB;
119 129
120our $BIND_EDITOR; 130our $BIND_EDITOR;
121our $BIND_UPD_CB; 131our $BIND_UPD_CB;
122 132
123our $PICKUP_CFG; 133our $PICKUP_CFG;
124 134
125sub status { 135sub status {
126 $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]);
127} 137}
128 138
129sub debug { 139sub debug {
130 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
131} 141}
… …
180 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
181 191
182 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
183 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
184 ellipsise => 0, 194 ellipsise => 0,
185 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
186 196
187 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
188 198
189 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
190 text => "Next Race", 200 text => "Next Race",
… …
207 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
208 ellipsise => 0, 218 ellipsise => 0,
209 markup => 219 markup =>
210 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
211 . "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 "
212 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
213 . "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 "
214 . "(<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"
215 . "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 "
216 . "so you can take your time making this important choice." 226 . "this race eventually, so you can take your time making this important choice."
217 ; 227 ;
218 228
219 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
220 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
221 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
222 destroy_query_dialog $conn; 232 destroy_query_dialog $conn;
223 return; 233 return;
224 } 234 }
225 235
226 $STATS_WINDOW->show; 236 $STATS_PAGE->show;
227 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
228 238
229 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
230 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
231 ellipsise => 0, 241 ellipsise => 0,
232 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
233 243
234 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
235 245
236 # left: re-roll 246 # left: re-roll
237 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
… …
243 }, 253 },
244 ); 254 );
245 255
246 # center: swap stats 256 # center: swap stats
247 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
258 expand => 1,
248 value => $_, 259 value => $_,
249 options => [ 260 options => [
250 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
251 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
252 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
271 # right: accept 282 # right: accept
272 $table->add (4, 0, new CFClient::UI::Button 283 $table->add (4, 0, new CFClient::UI::Button
273 text => "Accept", 284 text => "Accept",
274 on_activate => sub { 285 on_activate => sub {
275 $conn->send ("reply n"); 286 $conn->send ("reply n");
276 $STATS_WINDOW->hide; 287 $STATS_PAGE->hide;
277 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
278 0 289 0
279 }, 290 },
280 ); 291 );
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 }
281 313
282 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
283 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
284 ellipsise => 0, 316 ellipsise => 0,
285 markup => 317 markup =>
286 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
287 . "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"
288 . "(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"
289 . "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"
290 . "Race selection will influence those values later on."
291 ; 323 ;
292 } 324 }
293 325
294 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
295 on_changed => sub { 327 on_changed => sub {
… …
373 405
374sub stop_game { 406sub stop_game {
375 $LOGIN_BUTTON->set_text ("Login"); 407 $LOGIN_BUTTON->set_text ("Login");
376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 408 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
377 $SETUP_DIALOG->show; 409 $SETUP_DIALOG->show;
378 $INV_WINDOW->hide; 410 $PL_WINDOW->hide;
379 $SETUP_SPELLS->clear_spells; 411 $SPELL_PAGE->clear_spells;
380 412
381 return unless $CONN; 413 return unless $CONN;
382 414
383 status "connection closed"; 415 status "connection closed";
384 416
… …
409 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
410 442
411 my $row = 1; 443 my $row = 1;
412 444
413 $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");
414 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
415 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
416 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
417 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
418 ); 450 );
419 451
… …
469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
470 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 502 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
472 ); 504 );
473 505
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
475
476 $table->add (1, $row++, new CFClient::UI::Slider
477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
479 on_changed => sub {
480 $CFG->{stat_fontsize} = $_[1];
481 &set_stats_window_fontsize;
482 0
483 }
484 );
485
486 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 506 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487 $table->add (1, $row++, new CFClient::UI::Slider 507 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 509 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490 on_changed => sub { 510 on_changed => sub {
… …
559 ); 579 );
560 580
561 $vbox 581 $vbox
562} 582}
563 583
564sub set_stats_window_fontsize {
565 for (values %{$STATWIDS}) {
566 $_->set_fontsize ($::CFG->{stat_fontsize});
567 }
568}
569
570sub set_gauge_window_fontsize { 584sub set_gauge_window_fontsize {
571 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 585 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
572 $_->set_fontsize ($::CFG->{gauge_fontsize}); 586 $_->set_fontsize ($::CFG->{gauge_fontsize});
573 } 587 }
574} 588}
… …
653 667
654 $table 668 $table
655} 669}
656 670
657sub stats_window { 671sub stats_window {
658 my $tgw = new CFClient::UI::FancyFrame 672 my $r = new CFClient::UI::ScrolledWindow (
659 y => $HEIGHT * (2/8), 673 expand => 1,
660 x => "max", 674 scroll_y => 1
661 title => "Stats", 675 );
662 name => "stats_window", 676 $r->add (my $vb = new CFClient::UI::VBox);
663 has_close_button => 1;
664 677
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
666 $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,
667 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
668 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.");
669 $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,
670 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
… …
683 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
684 696
685 my $color2 = [1, 1, 0]; 697 my $color2 = [1, 1, 0];
686 698
687 for ( 699 for (
688 [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],
689 [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],
690 [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],
691 [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],
692 [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],
693 [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],
694 [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],
695 707
696 [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],
697 [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],
698 [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],
699 [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."], 711 [2, 3, st_arm => "Arm", 120],
700 [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],
701 [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],
702 ) { 714 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 715 my ($col, $row, $id, $label, $template) = @$_;
704 716
705 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
706 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});
707 $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
708 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});
709 } 723 }
710 724
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
712 726
713 my $row = 0; 727 my $row = 0;
714 my $col = 0; 728 my $col = 0;
715 729
716 my %resist_names = ( 730 my %resist_names = (
731 slow => ["Slow",
717 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 732 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
733 holyw => ["Holy Word",
718 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 734 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
735 conf => ["Confusion",
719 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 736 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
737 fire => ["Fire",
720 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 738 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
739 depl => ["Depletion",
721 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 740 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
741 magic => ["Magic",
722 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 742 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
743 drain => ["Draining",
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 744 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
745 acid => ["Acid",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 746 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
747 pois => ["Poison",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 748 "<b>Poison</b> (resistance to getting poisoned)"],
749 para => ["Paralysation",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 750 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
751 deat => ["Death",
727 deat => "<b>Death</b> (resistance against death spells)", 752 "<b>Death</b> (resistance against death spells)"],
728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 753 phys => ["Physical",
754 "<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.)"],
755 blind => ["Blind",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 756 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
757 fear => ["Fear",
730 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)", 758 "<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)"],
759 tund => ["Turn undead",
731 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 760 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
761 elec => ["Electricity",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 762 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
763 cold => ["Cold",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 764 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
765 ghit => ["Ghost hit",
734 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 766 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
735 ); 767 );
736 for (qw/slow holyw conf fire depl magic 768 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 769 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 770 blind fear tund elec cold ghit/)
739 { 771 {
… …
744 template => "-100%", 776 template => "-100%",
745 align => +1, 777 align => +1,
746 valign => 0, 778 valign => 0,
747 can_events => 1, 779 can_events => 1,
748 can_hover => 1, 780 can_hover => 1,
749 tooltip => $resist_names{$_}, 781 tooltip => $resist_names{$_}->[1],
750 ); 782 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
752 font => $FONT_FIXED, 784 font => $FONT_FIXED,
753 can_hover => 1, 785 can_hover => 1,
754 can_events => 1, 786 can_events => 1,
755 path => "ui/resist/resist_$_.png", 787 path => "ui/resist/resist_$_.png",
756 tooltip => $resist_names{$_}, 788 tooltip => $resist_names{$_}->[1],
789 );
790 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
791 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED,
793 can_hover => 1,
794 can_events => 1,
795 tooltip => $resist_names{$_}->[1],
757 ); 796 );
758 797
759 $row++; 798 $row++;
760 if ($row % 6 == 0) { 799 if ($row % 6 == 0) {
761 $col += 2; 800 $col += 3;
762 $row = 0; 801 $row = 0;
763 } 802 }
764 } 803 }
765 804
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 805 #update_stats_window ({});
768 806
807 $r
808}
809
810sub skill_window {
811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
812 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
769 $tgw 813 $sw
770} 814}
771 815
772sub formsep($) { 816sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774} 818}
775 819
776sub update_stats_window {
777 my ($stats) = @_;
778
779 # I love text protocols...
780
781 my $hp = $stats->{+CS_STAT_HP} * 1;
782 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
783 my $sp = $stats->{+CS_STAT_SP} * 1;
784 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
785 my $fo = $stats->{+CS_STAT_FOOD} * 1;
786 my $fo_m = 999;
787 my $gr = $stats->{+CS_STAT_GRACE} * 1;
788 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
789
790 $GAUGES->{hp} ->set_value ($hp, $hp_m);
791 $GAUGES->{mana} ->set_value ($sp, $sp_m);
792 $GAUGES->{food} ->set_value ($fo, $fo_m);
793 $GAUGES->{grace} ->set_value ($gr, $gr_m);
794 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
795 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
796 my $rng = $stats->{+CS_STAT_RANGE};
797 $rng =~ s/^Range: //; # thank you so much dear server
798 $GAUGES->{range} ->set_text ("Rng: " . $rng);
799 my $title = $stats->{+CS_STAT_TITLE};
800 $title =~ s/^Player: //;
801 $STATWIDS->{title} ->set_text ("Title: " . $title);
802
803 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
804 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
805 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
806 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
807 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818
819 my %tbl = (
820 phys => CS_STAT_RES_PHYS,
821 magic => CS_STAT_RES_MAG,
822 fire => CS_STAT_RES_FIRE,
823 elec => CS_STAT_RES_ELEC,
824 cold => CS_STAT_RES_COLD,
825 conf => CS_STAT_RES_CONF,
826 acid => CS_STAT_RES_ACID,
827 drain => CS_STAT_RES_DRAIN,
828 ghit => CS_STAT_RES_GHOSTHIT,
829 pois => CS_STAT_RES_POISON,
830 slow => CS_STAT_RES_SLOW,
831 para => CS_STAT_RES_PARA,
832 tund => CS_STAT_TURN_UNDEAD,
833 fear => CS_STAT_RES_FEAR,
834 depl => CS_STAT_RES_DEPLETE,
835 deat => CS_STAT_RES_DEATH,
836 holyw => CS_STAT_RES_HOLYWORD,
837 blind => CS_STAT_RES_BLIND,
838 );
839
840 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
841 for keys %tbl;
842}
843
844my $METASERVER_ATIME; 820my $METASERVER_ATIME;
845 821
846sub update_metaserver { 822sub update_metaserver {
823 my ($metaserver_dialog) = @_;
824
825 $METASERVER = $metaserver_dialog
826 if defined $metaserver_dialog;
827
847 return if $METASERVER_ATIME > time; 828 return if $METASERVER_ATIME > time;
848 $METASERVER_ATIME = time + 60; 829 $METASERVER_ATIME = time + 60;
849 830
850 my $table = $METASERVER->{table}; 831 my $table = $METASERVER->{table};
851 $table->clear; 832 $table->clear;
… …
939 } 920 }
940 }); 921 });
941} 922}
942 923
943sub metaserver_dialog { 924sub metaserver_dialog {
925 my $vbox = new CFClient::UI::VBox;
926 my $table = new CFClient::UI::Table;
927 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
928
944 my $dialog = new CFClient::UI::FancyFrame 929 my $dialog = new CFClient::UI::FancyFrame
945 title => "Server List", 930 title => "Server List",
946 name => 'metaserver_dialog', 931 name => 'metaserver_dialog',
947 x => 'center', 932 x => 'center',
948 y => 'center', 933 y => 'center',
949 z => 3, 934 z => 3,
950 force_h => $::HEIGHT * 0.4, 935 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 936 child => $vbox,
952 has_close_button => 1, 937 has_close_button => 1,
938 table => $table,
953 on_visibility_change => sub { 939 on_visibility_change => sub {
954 update_metaserver if $_[1]; 940 update_metaserver ($_[0]) if $_[1];
955 0 941 0
956 }, 942 },
957 ; 943 ;
958
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962 944
963 $dialog 945 $dialog
964} 946}
965 947
966sub server_setup { 948sub server_setup {
… …
982 $CFG->{profile}{default}{host} = $value; 964 $CFG->{profile}{default}{host} = $value;
983 0 965 0
984 } 966 }
985 ); 967 );
986 968
987 $METASERVER = metaserver_dialog;
988
989 $vbox->add (new CFClient::UI::Button 969 $vbox->add (new CFClient::UI::Button
990 expand => 1, 970 expand => 1,
991 text => "Server List", 971 text => "Server List",
992 other => $METASERVER, 972 other => $METASERVER,
993 tooltip => "Show a list of available crossfire servers", 973 tooltip => "Show a list of available crossfire servers",
… …
1088sub message_window { 1068sub message_window {
1089 my $window = new CFClient::UI::FancyFrame 1069 my $window = new CFClient::UI::FancyFrame
1090 name => "message_window", 1070 name => "message_window",
1091 title => "Messages", 1071 title => "Messages",
1092 border_bg => [1, 1, 1, 1], 1072 border_bg => [1, 1, 1, 1],
1093 bg => [0, 0, 0, 0.75],
1094 x => "max", 1073 x => "max",
1095 y => 0, 1074 y => 0,
1096 force_w => $::WIDTH * 0.4, 1075 force_w => $::WIDTH * 0.4,
1097 force_h => $::HEIGHT * 0.5, 1076 force_h => $::HEIGHT * 0.5,
1098 child => (my $vbox = new CFClient::UI::VBox), 1077 child => (my $vbox = new CFClient::UI::VBox),
… …
1184sub autopickup_setup { 1163sub autopickup_setup {
1185 my $table = new CFClient::UI::Table; 1164 my $table = new CFClient::UI::Table;
1186 1165
1187 for ( 1166 for (
1188 ["General", 0, 0, 1167 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE], 1168 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT], 1169 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP], 1170 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG], 1171 ["Debug autopickup" => PICKUP_DEBUG],
1193 ], 1172 ],
1194 ["Weapons", 0, 6, 1173 ["Weapons", 0, 6,
… …
1231 for (@bits) { 1210 for (@bits) {
1232 ++$y; 1211 ++$y;
1233 1212
1234 my $mask = $_->[1]; 1213 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1214 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1215 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1237 state => $CFG->{pickup} & $mask, 1216 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1217 on_changed => sub {
1239 my ($box, $value) = @_; 1218 my ($box, $value) = @_;
1240 1219
1241 if ($value) { 1220 if ($value) {
1242 $::CFG->{pickup} |= $mask; 1221 $::CFG->{pickup} |= $mask;
… …
1247 $::CONN->send_command ("pickup $::CFG->{pickup}") 1226 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN; 1227 if defined $::CONN;
1249 1228
1250 0 1229 0
1251 }); 1230 });
1231
1232 ${$_->[2]} = $checkbox if $_->[2];
1252 } 1233 }
1253 } 1234 }
1254 1235
1255 $table->add (2, 18, new CFClient::UI::ValSlider 1236 $table->add (2, 18, new CFClient::UI::ValSlider
1256 range => [0, 0, 16, 1, 1], 1237 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238 template => ">= 99",
1257 to_value => sub { ">= " . 5 * $_[0] }, 1239 to_value => sub { ">= " . 5 * $_[0] },
1258 on_changed => sub { 1240 on_changed => sub {
1259 my ($slider, $value) = @_; 1241 my ($slider, $value) = @_;
1260 1242
1261 $::CFG->{pickup} &= ~0x7; 1243 $::CFG->{pickup} &= ~0xF;
1262 $::CFG->{pickup} |= int $value 1244 $::CFG->{pickup} |= int $value
1263 if $value; 1245 if $value;
1264 1; 1246 1;
1265 }); 1247 });
1248
1266 $table->add (3, 18, new CFClient::UI::Button 1249 $table->add (3, 18, new CFClient::UI::Button
1267 text => "set", 1250 text => "set",
1268 on_activate => sub { 1251 on_activate => sub {
1269 $::CONN->send_command ("pickup $::CFG->{pickup}") 1252 $::CONN->send_command ("pickup $::CFG->{pickup}")
1270 if defined $::CONN; 1253 if defined $::CONN;
… …
1272 }); 1255 });
1273 1256
1274 $table 1257 $table
1275} 1258}
1276 1259
1277sub inventory_window { 1260sub inventory_widget {
1261 my $hb = new CFClient::UI::HBox homogeneous => 1;
1262
1263 $hb->add (my $vb1 = new CFClient::UI::VBox);
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);
1292 $sw1->add ($INV = new CFClient::UI::Inventory);
1293
1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1295
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1297
1298 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1299 $sw2->add ($INVR = new CFClient::UI::Inventory);
1300
1301 # XXX: Call after $INVR = ... because set_opencont sets the items
1302 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1303
1304 $hb
1305}
1306
1307sub toggle_player_page {
1308 my ($widget) = @_;
1309
1310 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1311 $PL_WINDOW->hide;
1312 } else {
1313 $PL_NOTEBOOK->set_current_page ($widget);
1314 $PL_WINDOW->show;
1315 }
1316}
1317
1318sub player_window {
1278 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1319 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1279 x => "center", 1320 x => "center",
1280 y => "center", 1321 y => "center",
1281 force_w => $WIDTH * 9/10, 1322 force_w => $WIDTH * 9/10,
1282 force_h => $HEIGHT * 9/10, 1323 force_h => $HEIGHT * 9/10,
1283 title => "Inventory", 1324 title => "Player",
1325 name => "playerbook",
1284 has_close_button => 1, 1326 has_close_button => 1
1285 ; 1327 ;
1286 1328
1287 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1329 my $ntb =
1330 $PL_NOTEBOOK =
1331 new CFClient::UI::Notebook expand => 1, debug => 1;
1288 1332
1289 $hb->add (my $vb1 = new CFClient::UI::VBox); 1333 $ntb->add (
1290 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1334 "Statistics (F2)" => $STATS_PAGE = stats_window,
1291 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1335 "Shows statistics, where all your Stats and Resistances are shown."
1336 );
1337 $ntb->add (
1338 "Skills (F3)" => $SKILL_PAGE = skill_window,
1339 "Shows all your Skills."
1340 );
1292 1341
1293 $hb->add (my $vb2 = new CFClient::UI::VBox); 1342 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1343 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1344 $ntb->add (
1345 "Spellbook (F4)" => $spellsw,
1346 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1347 );
1348 $ntb->add (
1349 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1350 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1351 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1352 );
1294 1353
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1354 $ntb->set_current_page ($INVENTORY_PAGE);
1296 1355
1297 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1356 $plwin->add ($ntb);
1298 1357 $plwin
1299 # XXX: Call after $INVR = ... because set_opencont sets the items
1300 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1301
1302 $invwin
1303}
1304
1305sub spell_setup {
1306 new CFClient::UI::SpellList
1307} 1358}
1308 1359
1309sub update_bindings { 1360sub update_bindings {
1310 $BIND_UPD_CB->() if $BIND_UPD_CB; 1361 $BIND_UPD_CB->() if $BIND_UPD_CB;
1311} 1362}
… …
1321 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1372 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1322 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1373 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1323 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1374 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1324 1375
1325 my $lbl = join "; ", @$cmds; 1376 my $lbl = join "; ", @$cmds;
1326 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1377 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1327 $binding_list->add (my $hb = new CFClient::UI::HBox); 1378 $binding_list->add (my $hb = new CFClient::UI::HBox);
1328 $hb->add (new CFClient::UI::Button 1379 $hb->add (new CFClient::UI::Button
1329 text => "delete", 1380 text => "delete",
1330 tooltip => "Deletes the binding", 1381 tooltip => "Deletes the binding",
1331 on_activate => sub { 1382 on_activate => sub {
… …
1416 $refresh->(); 1467 $refresh->();
1417 1468
1418 $vb 1469 $vb
1419} 1470}
1420 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
1421sub help_window { 1549sub help_window {
1422 my $win = new CFClient::UI::FancyFrame 1550 my $win = new CFClient::UI::FancyFrame
1423 x => 'center', 1551 x => 'center',
1424 y => 'center', 1552 y => 'center',
1425 z => 2, 1553 z => 2,
1426 name => 'doc_browser', 1554 name => 'doc_browser',
1427 force_w => int $WIDTH * 7/8, 1555 force_w => int $WIDTH * 7/8,
1428 force_h => int $HEIGHT * 7/8, 1556 force_h => int $HEIGHT * 7/8,
1429 title => "Documentation"; 1557 title => "Help Browser",
1558 has_close_button => 1;
1430 1559
1431 $win->add (my $vbox = new CFClient::UI::VBox); 1560 $win->add (my $vbox = new CFClient::UI::VBox);
1432 1561
1433 $vbox->add (my $buttons = new CFClient::UI::HBox); 1562 $vbox->add (my $buttons = new CFClient::UI::HBox);
1434 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1563 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1442 [manual => "Main Manual"], 1571 [manual => "Main Manual"],
1443 [skill_help => "Skill Reference"], 1572 [skill_help => "Skill Reference"],
1444 [command_help => "Command Reference"], 1573 [command_help => "Command Reference"],
1445 [dmcommand_help => "DM Commands"], 1574 [dmcommand_help => "DM Commands"],
1446 [COPYING => "License Terms"], 1575 [COPYING => "License Terms"],
1576 [test => "test (do not select)"], #d#TODO
1447 ], 1577 ],
1448 on_changed => sub { 1578 on_changed => sub {
1449 my ($self, $pod) = @_; 1579 my ($self, $pod) = @_;
1450 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
1451 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1452 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#
1453 1593
1454 $viewer->clear; 1594 $viewer->clear;
1455 1595
1456# $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",
1457# (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),
1458# (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 => "??"),
1459# ]);#d# 1599# ]);#d#
1460 1600
1461 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1462 for @$pom; 1602 for @$pom;
1463 1603
1464 $viewer->set_offset (0); 1604 $viewer->set_offset (0);
1465 1605
1466 0 1606 0
… …
1577 z => 2, 1717 z => 2,
1578 force_w => $::WIDTH * 0.6, 1718 force_w => $::WIDTH * 0.6,
1579 force_h => $::HEIGHT * 0.6, 1719 force_h => $::HEIGHT * 0.6,
1580 has_close_button => 1, 1720 has_close_button => 1,
1581 ; 1721 ;
1722
1723 $METASERVER = metaserver_dialog;
1582 1724
1583 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1725 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1584 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1726 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1585 1727
1586 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1728 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1596 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1738 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1597 . "with nothing set and the recording started. After doing the actions you " 1739 . "with nothing set and the recording started. After doing the actions you "
1598 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1740 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1599 . "After pressing the combo the binding will be saved automatically and the " 1741 . "After pressing the combo the binding will be saved automatically and the "
1600 . "binding editor closes"); 1742 . "binding editor closes");
1601 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1602 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1603 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1743 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1604 "Some debuggin' options. Do not ask."); 1744 "Some debuggin' options. Do not ask.");
1605 1745
1606 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1746 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1607 1747
… …
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1751 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1612 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1752 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1613 1753
1614 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 1754 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
1615 1755
1616 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1617 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1756 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1619 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1757 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1620 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1621 1758
1622 $BUTTONBAR->add (new CFClient::UI::Button 1759 $BUTTONBAR->add (new CFClient::UI::Button
1623 text => "Save Config", 1760 text => "Save Config",
1624 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1761 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1625 on_activate => sub { 1762 on_activate => sub {
… …
1628 status "Configuration Saved"; 1765 status "Configuration Saved";
1629 0 1766 0
1630 }, 1767 },
1631 ); 1768 );
1632 1769
1633 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1770 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1634 tooltip => "View Documentation"); 1771 tooltip => "View Documentation");
1635 1772
1636 $BUTTONBAR->add (new CFClient::UI::Button 1773 $BUTTONBAR->add (new CFClient::UI::Button
1637 text => "Quit", 1774 text => "Quit",
1638 tooltip => "Terminates the program", 1775 tooltip => "Terminates the program",
… …
1735 1872
1736 $WANT_REFRESH = 0; 1873 $WANT_REFRESH = 0;
1737 $CAN_REFRESH = 0; 1874 $CAN_REFRESH = 0;
1738 $LAST_REFRESH = $NOW; 1875 $LAST_REFRESH = $NOW;
1739 1876
17400 && do {
1741 # some weird model-drawing code, just a joke right now
1742 use CFClient::OpenGL;
1743
1744 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1745 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1746 $demo{r} ||= do {
1747 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1748 $mod->{v} = pack "f*", @{$mod->{v}};
1749 $_ = [scalar @$_, pack "S!*", @$_]
1750 for values %{$mod->{g}};
1751 $mod
1752 };
1753
1754 my $r = $demo{r} or die;
1755
1756 glDepthMask 1;
1757 glClear GL_DEPTH_BUFFER_BIT;
1758 glEnable GL_TEXTURE_2D;
1759 glEnable GL_DEPTH_TEST;
1760 glEnable GL_CULL_FACE;
1761 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1762
1763 glMatrixMode GL_PROJECTION;
1764 glLoadIdentity;
1765 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1766 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1767 glMatrixMode GL_MODELVIEW;
1768 glLoadIdentity;
1769
1770 glPushMatrix;
1771 glTranslate 0, 0, -800;
1772 glScale 1, -1, 1;
1773 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1774 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1775 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1776 glScale 50, 50, 50;
1777
1778 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1779 while (my ($k, $v) = each %{$r->{g}}) {
1780 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1781 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1782 }
1783
1784 glPopMatrix;
1785
1786 glShadeModel GL_FLAT;
1787 glDisable GL_DEPTH_TEST;
1788 glDisable GL_TEXTURE_2D;
1789 glDepthMask 0;
1790
1791 $WANT_REFRESH++;
1792};
1793
1794 CFClient::SDL_GL_SwapBuffers; 1877 CFClient::SDL_GL_SwapBuffers;
1795} 1878}
1796 1879
1797my $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 {
1798 $NOW = time; 1881 $NOW = time;
… …
1844# 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#
1845 }, 1928 },
1846 CFClient::SDL_KEYDOWN => sub { 1929 CFClient::SDL_KEYDOWN => sub {
1847 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1848 # alt-enter 1931 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle;
1849 video_shutdown; 1933 video_shutdown;
1850 $CFG->{fullscreen} = !$CFG->{fullscreen};
1851 video_init; 1934 video_init;
1852 } else { 1935 } else {
1853 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1936 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1854 } 1937 }
1855 }, 1938 },
… …
1871$SIG{INT} = $SIG{TERM} = sub { exit }; 1954$SIG{INT} = $SIG{TERM} = sub { exit };
1872 1955
1873{ 1956{
1874 local $SIG{__DIE__} = sub { 1957 local $SIG{__DIE__} = sub {
1875 return unless defined $^S && !$^S; 1958 return unless defined $^S && !$^S;
1876 Carp::confess $_[1];#d#TODO: remove when stable 1959 Carp::confess $_[0];#d#TODO: remove when stable
1877 CFClient::fatal $_[0]; 1960 CFClient::fatal $_[0];
1878 }; 1961 };
1879 1962
1880 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1881 CFClient::UI::set_layout ($::CFG->{layout}); 1964 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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