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.78 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.102 by root, Mon Jul 24 04:24:43 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;
42use CFClient::BindingEditor;
41use CFClient::MapWidget; 43use CFClient::MapWidget;
42 44
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE';
44 47
45$Event::DIED = sub { 48$Event::DIED = sub {
46 # TODO: display dialog box or so 49 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 50 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 51 CFClient::error $_[1];
… …
84our $CONSOLE; 87our $CONSOLE;
85our $METASERVER; 88our $METASERVER;
86our $LOGIN_BUTTON; 89our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 90our $QUIT_DIALOG;
88our $HOST_ENTRY; 91our $HOST_ENTRY;
92our $FULLSCREEN_ENABLE;
93our $PICKUP_ENABLE;
89our $SERVER_INFO; 94our $SERVER_INFO;
90 95
91our $SETUP_DIALOG; 96our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 97our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 98our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 99our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 100
101our $PL_NOTEBOOK;
97our $STATS_WINDOW; 102our $PL_WINDOW;
103
104our $INVENTORY_PAGE;
105our $STATS_PAGE;
106our $SKILL_PAGE;
107our $SPELL_PAGE;
108
109our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 110our $MESSAGE_WINDOW;
99our $FLOORBOX; 111our $FLOORBOX;
100our $GAUGES; 112our $GAUGES;
101our $STATWIDS; 113our $STATWIDS;
102 114
… …
109 121
110our $ALT_ENTER_MESSAGE; 122our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 123our $STATUSBOX;
112our $DEBUG_STATUS; 124our $DEBUG_STATUS;
113 125
114our $INV_WINDOW;
115our $INV; 126our $INV;
116our $INVR; 127our $INVR;
117our $INV_RIGHT_HB; 128our $INV_RIGHT_HB;
118 129
119our $BIND_EDITOR; 130our $BIND_EDITOR;
120our $BIND_UPD_CB; 131our $BIND_UPD_CB;
121 132
122our $PICKUP_CFG; 133our $PICKUP_CFG;
123 134
124sub status { 135sub status {
125 $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]);
126} 137}
127 138
128sub debug { 139sub debug {
129 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
130} 141}
… …
179 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
180 191
181 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
182 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
183 ellipsise => 0, 194 ellipsise => 0,
184 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
185 196
186 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
187 198
188 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
189 text => "Next Race", 200 text => "Next Race",
… …
206 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
207 ellipsise => 0, 218 ellipsise => 0,
208 markup => 219 markup =>
209 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
210 . "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 "
211 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
212 . "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 "
213 . "(<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"
214 . "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 "
215 . "so you can take your time making this important choice." 226 . "this race eventually, so you can take your time making this important choice."
216 ; 227 ;
217 228
218 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
219 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
220 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
221 destroy_query_dialog $conn; 232 destroy_query_dialog $conn;
222 return; 233 return;
223 } 234 }
224 235
225 $STATS_WINDOW->show; 236 $STATS_PAGE->show;
226 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
227 238
228 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
229 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
230 ellipsise => 0, 241 ellipsise => 0,
231 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
232 243
233 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
234 245
235 # left: re-roll 246 # left: re-roll
236 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
… …
241 0 252 0
242 }, 253 },
243 ); 254 );
244 255
245 # center: swap stats 256 # center: swap stats
246 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Selector
258 expand => 1,
247 value => $_, 259 value => $_,
248 options => [ 260 options => [
249 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
250 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
251 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
270 # right: accept 282 # right: accept
271 $table->add (4, 0, new CFClient::UI::Button 283 $table->add (4, 0, new CFClient::UI::Button
272 text => "Accept", 284 text => "Accept",
273 on_activate => sub { 285 on_activate => sub {
274 $conn->send ("reply n"); 286 $conn->send ("reply n");
275 $STATS_WINDOW->hide; 287 $STATS_PAGE->hide;
276 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
277 0 289 0
278 }, 290 },
279 ); 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 }
280 313
281 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
282 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
283 ellipsise => 0, 316 ellipsise => 0,
284 markup => 317 markup =>
285 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
286 . "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"
287 . "(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"
288 . "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"
289 . "Race selection will influence those values later on."
290 ; 323 ;
291 } 324 }
292 325
293 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
294 on_changed => sub { 327 on_changed => sub {
… …
372 405
373sub stop_game { 406sub stop_game {
374 $LOGIN_BUTTON->set_text ("Login"); 407 $LOGIN_BUTTON->set_text ("Login");
375 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 408 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
376 $SETUP_DIALOG->show; 409 $SETUP_DIALOG->show;
377 $INV_WINDOW->hide; 410 $PL_WINDOW->hide;
378 $SETUP_SPELLS->clear_spells; 411 $SPELL_PAGE->clear_spells;
379 412
380 return unless $CONN; 413 return unless $CONN;
381 414
382 status "connection closed"; 415 status "connection closed";
383 416
… …
408 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
409 442
410 my $row = 1; 443 my $row = 1;
411 444
412 $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");
413 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
414 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
415 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
416 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
417 ); 450 );
418 451
… …
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 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.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 504 );
472 505
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474
475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize;
481 0
482 }
483 );
484
485 $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");
486 $table->add (1, $row++, new CFClient::UI::Slider 507 $table->add (1, $row++, new CFClient::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
488 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.",
489 on_changed => sub { 510 on_changed => sub {
… …
558 ); 579 );
559 580
560 $vbox 581 $vbox
561} 582}
562 583
563sub set_stats_window_fontsize {
564 for (values %{$STATWIDS}) {
565 $_->set_fontsize ($::CFG->{stat_fontsize});
566 }
567}
568
569sub set_gauge_window_fontsize { 584sub set_gauge_window_fontsize {
570 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 585 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
571 $_->set_fontsize ($::CFG->{gauge_fontsize}); 586 $_->set_fontsize ($::CFG->{gauge_fontsize});
572 } 587 }
573} 588}
… …
652 667
653 $table 668 $table
654} 669}
655 670
656sub stats_window { 671sub stats_window {
657 my $tgw = new CFClient::UI::FancyFrame 672 my $r = new CFClient::UI::ScrolledWindow (
658 y => $HEIGHT * (2/8), 673 expand => 1,
659 x => "max", 674 scroll_y => 1
660 title => "Stats", 675 );
661 name => "stats_window", 676 $r->add (my $vb = new CFClient::UI::VBox);
662 has_close_button => 1;
663 677
664 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
665 $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,
666 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
667 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.");
668 $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,
669 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
… …
675 tooltip => "The weight of the player including all inventory items."); 688 tooltip => "The weight of the player including all inventory items.");
676 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 689 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
677 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
678 tooltip => "The weight limit: you cannot carry more than this."); 691 tooltip => "The weight limit: you cannot carry more than this.");
679 692
680
681 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 693 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
682 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
683 695
684 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
685 697
686 for ( 698 for (
687 [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],
688 [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],
689 [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],
690 [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],
691 [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],
692 [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],
693 [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],
694 706
695 [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],
696 [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],
697 [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],
698 [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."], 710 [2, 3, st_arm => "Arm", 120],
699 [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],
700 [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],
701 ) { 713 ) {
702 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
703 715
704 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
705 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});
706 $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
707 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});
708 } 722 }
709 723
710 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
711 725
712 my $row = 0; 726 my $row = 0;
713 my $col = 0; 727 my $col = 0;
714 728
715 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
716 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.)", 731 "<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 holyw => ["Holy Word",
717 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.)", 733 "<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 conf => ["Confusion",
718 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
719 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
720 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
721 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
722 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
723 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
724 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
725 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
726 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
727 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 752 phys => ["Physical",
753 "<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.)"],
754 blind => ["Blind",
728 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 fear => ["Fear",
729 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)", 757 "<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 tund => ["Turn undead",
730 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
731 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
732 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
733 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
734 ); 766 );
735 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
736 drain acid pois para deat phys 768 drain acid pois para deat phys
737 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
738 { 770 {
… …
743 template => "-100%", 775 template => "-100%",
744 align => +1, 776 align => +1,
745 valign => 0, 777 valign => 0,
746 can_events => 1, 778 can_events => 1,
747 can_hover => 1, 779 can_hover => 1,
748 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
749 ); 781 );
750 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
751 font => $FONT_FIXED, 783 font => $FONT_FIXED,
752 can_hover => 1, 784 can_hover => 1,
753 can_events => 1, 785 can_events => 1,
754 path => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
755 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
756 ); 795 );
757 796
758 $row++; 797 $row++;
759 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
760 $col += 2; 799 $col += 3;
761 $row = 0; 800 $row = 0;
762 } 801 }
763 } 802 }
764 803
765 &set_stats_window_fontsize;
766 update_stats_window ({}); 804 #update_stats_window ({});
767 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
768 $tgw 812 $sw
769} 813}
770 814
771sub formsep($) { 815sub formsep($) {
772 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
773} 817}
774 818
775sub update_stats_window {
776 my ($stats) = @_;
777
778 # I love text protocols...
779
780 my $hp = $stats->{+CS_STAT_HP} * 1;
781 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
782 my $sp = $stats->{+CS_STAT_SP} * 1;
783 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
784 my $fo = $stats->{+CS_STAT_FOOD} * 1;
785 my $fo_m = 999;
786 my $gr = $stats->{+CS_STAT_GRACE} * 1;
787 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
788
789 $GAUGES->{hp} ->set_value ($hp, $hp_m);
790 $GAUGES->{mana} ->set_value ($sp, $sp_m);
791 $GAUGES->{food} ->set_value ($fo, $fo_m);
792 $GAUGES->{grace} ->set_value ($gr, $gr_m);
793 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
794 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
795 my $rng = $stats->{+CS_STAT_RANGE};
796 $rng =~ s/^Range: //; # thank you so much dear server
797 $GAUGES->{range} ->set_text ("Rng: " . $rng);
798 my $title = $stats->{+CS_STAT_TITLE};
799 $title =~ s/^Player: //;
800 $STATWIDS->{title} ->set_text ("Title: " . $title);
801
802 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
803 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
804 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
805 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
806 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
807 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
808 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
809 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
810 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
811 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
812 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
813 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
814 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
815
816 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
817
818 my %tbl = (
819 phys => CS_STAT_RES_PHYS,
820 magic => CS_STAT_RES_MAG,
821 fire => CS_STAT_RES_FIRE,
822 elec => CS_STAT_RES_ELEC,
823 cold => CS_STAT_RES_COLD,
824 conf => CS_STAT_RES_CONF,
825 acid => CS_STAT_RES_ACID,
826 drain => CS_STAT_RES_DRAIN,
827 ghit => CS_STAT_RES_GHOSTHIT,
828 pois => CS_STAT_RES_POISON,
829 slow => CS_STAT_RES_SLOW,
830 para => CS_STAT_RES_PARA,
831 tund => CS_STAT_TURN_UNDEAD,
832 fear => CS_STAT_RES_FEAR,
833 depl => CS_STAT_RES_DEPLETE,
834 deat => CS_STAT_RES_DEATH,
835 holyw => CS_STAT_RES_HOLYWORD,
836 blind => CS_STAT_RES_BLIND,
837 );
838
839 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
840 for keys %tbl;
841}
842
843my $METASERVER_ATIME; 819my $METASERVER_ATIME;
844 820
845sub update_metaserver { 821sub update_metaserver {
822 my ($metaserver_dialog) = @_;
823
824 $METASERVER = $metaserver_dialog
825 if defined $metaserver_dialog;
826
846 return if $METASERVER_ATIME > time; 827 return if $METASERVER_ATIME > time;
847 $METASERVER_ATIME = time + 60; 828 $METASERVER_ATIME = time + 60;
848 829
849 my $table = $METASERVER->{table}; 830 my $table = $METASERVER->{table};
850 $table->clear; 831 $table->clear;
… …
938 } 919 }
939 }); 920 });
940} 921}
941 922
942sub metaserver_dialog { 923sub metaserver_dialog {
924 my $vbox = new CFClient::UI::VBox;
925 my $table = new CFClient::UI::Table;
926 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
927
943 my $dialog = new CFClient::UI::FancyFrame 928 my $dialog = new CFClient::UI::FancyFrame
944 title => "Server List", 929 title => "Server List",
945 name => 'metaserver_dialog', 930 name => 'metaserver_dialog',
946 x => 'center', 931 x => 'center',
947 y => 'center', 932 y => 'center',
948 z => 3, 933 z => 3,
949 force_h => $::HEIGHT * 0.4, 934 force_h => $::HEIGHT * 0.4,
950 child => (my $vbox = new CFClient::UI::VBox), 935 child => $vbox,
936 has_close_button => 1,
937 table => $table,
951 on_visibility_change => sub { 938 on_visibility_change => sub {
952 update_metaserver if $_[1]; 939 update_metaserver ($_[0]) if $_[1];
953 0 940 0
954 }, 941 },
955 ; 942 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 943
961 $dialog 944 $dialog
962} 945}
963 946
964sub server_setup { 947sub server_setup {
… …
980 $CFG->{profile}{default}{host} = $value; 963 $CFG->{profile}{default}{host} = $value;
981 0 964 0
982 } 965 }
983 ); 966 );
984 967
985 $METASERVER = metaserver_dialog;
986
987 $vbox->add (new CFClient::UI::Button 968 $vbox->add (new CFClient::UI::Button
988 expand => 1, 969 expand => 1,
989 text => "Server List", 970 text => "Server List",
990 other => $METASERVER, 971 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 972 tooltip => "Show a list of available crossfire servers",
… …
1086sub message_window { 1067sub message_window {
1087 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1088 name => "message_window", 1069 name => "message_window",
1089 title => "Messages", 1070 title => "Messages",
1090 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1091 bg => [0, 0, 0, 0.75],
1092 x => "max", 1072 x => "max",
1093 y => 0, 1073 y => 0,
1094 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1095 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1096 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFClient::UI::VBox),
… …
1152 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1153 x => "center", 1133 x => "center",
1154 y => "center", 1134 y => "center",
1155 z => 50, 1135 z => 50,
1156 title => "Really Quit?", 1136 title => "Really Quit?",
1137 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1157 ; 1141 ;
1158 1142
1159 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1160 1144
1161 $vb->add (new CFClient::UI::Label 1145 $vb->add (new CFClient::UI::Label
… …
1175 on_activate => sub { exit }, 1159 on_activate => sub { exit },
1176 ); 1160 );
1177 } 1161 }
1178 1162
1179 $QUIT_DIALOG->show; 1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1180} 1165}
1181 1166
1182sub autopickup_setup { 1167sub autopickup_setup {
1183 my $table = new CFClient::UI::Table; 1168 my $table = new CFClient::UI::Table;
1184 1169
1185 for ( 1170 for (
1186 ["General", 0, 0, 1171 ["General", 0, 0,
1187 ["Enable autopickup" => PICKUP_NEWMODE], 1172 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1188 ["Inhibit autopickup" => PICKUP_INHIBIT], 1173 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Stop before pickup" => PICKUP_STOP], 1174 ["Stop before pickup" => PICKUP_STOP],
1190 ["Debug autopickup" => PICKUP_DEBUG], 1175 ["Debug autopickup" => PICKUP_DEBUG],
1191 ], 1176 ],
1192 ["Weapons", 0, 6, 1177 ["Weapons", 0, 6,
… …
1229 for (@bits) { 1214 for (@bits) {
1230 ++$y; 1215 ++$y;
1231 1216
1232 my $mask = $_->[1]; 1217 my $mask = $_->[1];
1233 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1218 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1234 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1219 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1235 state => $CFG->{pickup} & $mask, 1220 state => $::CFG->{pickup} & $mask,
1236 on_changed => sub { 1221 on_changed => sub {
1237 my ($box, $value) = @_; 1222 my ($box, $value) = @_;
1238 1223
1239 if ($value) { 1224 if ($value) {
1240 $::CFG->{pickup} |= $mask; 1225 $::CFG->{pickup} |= $mask;
… …
1245 $::CONN->send_command ("pickup $::CFG->{pickup}") 1230 $::CONN->send_command ("pickup $::CFG->{pickup}")
1246 if defined $::CONN; 1231 if defined $::CONN;
1247 1232
1248 0 1233 0
1249 }); 1234 });
1235
1236 ${$_->[2]} = $checkbox if $_->[2];
1250 } 1237 }
1251 } 1238 }
1252 1239
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1240 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1], 1241 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242 template => ">= 99",
1255 to_value => sub { ">= " . 5 * $_[0] }, 1243 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub { 1244 on_changed => sub {
1257 my ($slider, $value) = @_; 1245 my ($slider, $value) = @_;
1258 1246
1259 $::CFG->{pickup} &= ~0x7; 1247 $::CFG->{pickup} &= ~0xF;
1260 $::CFG->{pickup} |= int $value 1248 $::CFG->{pickup} |= int $value
1261 if $value; 1249 if $value;
1262 1; 1250 1;
1263 }); 1251 });
1252
1264 $table->add (3, 18, new CFClient::UI::Button 1253 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set", 1254 text => "set",
1266 on_activate => sub { 1255 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1256 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1257 if defined $::CONN;
… …
1270 }); 1259 });
1271 1260
1272 $table 1261 $table
1273} 1262}
1274 1263
1264my %SORT_ORDER = (
1265 type => undef,
1266 mtime => sub { sort {
1267 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268 or $b->{mtime} <=> $a->{mtime}
1269 or $a->{type} <=> $b->{type}
1270 } @_ },
1271 weight => sub { sort {
1272 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273 or $a->{type} <=> $b->{type}
1274 } @_ },
1275);
1276
1275sub inventory_window { 1277sub inventory_widget {
1278 my $hb = new CFClient::UI::HBox homogeneous => 1;
1279
1280 $hb->add (my $vb1 = new CFClient::UI::VBox);
1281 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1282
1283 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1284
1285 use sort 'stable';
1286
1287 $hb1->add (new CFClient::UI::Selector
1288 value => $::CFG->{inv_sort},
1289 options => [
1290 [type => "Type/Name"],
1291 [mtime => "Recent/Normal/Locked"],
1292 [weight => "Weight/Type"],
1293 ],
1294 on_changed => sub {
1295 $::CFG->{inv_sort} = $_[1];
1296 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1297 },
1298 );
1299 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1300 #TODO# update to weigh/maxweight
1301 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1302
1303 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304 $sw1->add ($INV = new CFClient::UI::Inventory);
1305
1306 $hb->add (my $vb2 = new CFClient::UI::VBox);
1307
1308 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1309
1310 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311 $sw2->add ($INVR = new CFClient::UI::Inventory);
1312
1313 # XXX: Call after $INVR = ... because set_opencont sets the items
1314 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1315
1316 $hb
1317}
1318
1319sub toggle_player_page {
1320 my ($widget) = @_;
1321
1322 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1323 $PL_WINDOW->hide;
1324 } else {
1325 $PL_NOTEBOOK->set_current_page ($widget);
1326 $PL_WINDOW->show;
1327 }
1328}
1329
1330sub player_window {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1331 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center", 1332 x => "center",
1278 y => "center", 1333 y => "center",
1279 force_w => $WIDTH * 9/10, 1334 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1335 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1336 title => "Player",
1337 name => "playerbook",
1282 has_close_button => 1, 1338 has_close_button => 1
1283 ; 1339 ;
1284 1340
1285 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1341 my $ntb =
1342 $PL_NOTEBOOK =
1343 new CFClient::UI::Notebook expand => 1, debug => 1;
1286 1344
1287 $hb->add (my $vb1 = new CFClient::UI::VBox); 1345 $ntb->add (
1288 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1346 "Statistics (F2)" => $STATS_PAGE = stats_window,
1289 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1347 "Shows statistics, where all your Stats and Resistances are shown."
1348 );
1349 $ntb->add (
1350 "Skills (F3)" => $SKILL_PAGE = skill_window,
1351 "Shows all your Skills."
1352 );
1290 1353
1291 $hb->add (my $vb2 = new CFClient::UI::VBox); 1354 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1356 $ntb->add (
1357 "Spellbook (F4)" => $spellsw,
1358 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1359 );
1360 $ntb->add (
1361 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1362 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1363 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1364 );
1292 1365
1293 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1366 $ntb->set_current_page ($INVENTORY_PAGE);
1294 1367
1295 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1368 $plwin->add ($ntb);
1296 1369 $plwin
1297 # XXX: Call after $INVR = ... because set_opencont sets the items
1298 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1299
1300 $invwin
1301}
1302
1303sub spell_setup {
1304 new CFClient::UI::SpellList
1305} 1370}
1306 1371
1307sub update_bindings { 1372sub update_bindings {
1308 $BIND_UPD_CB->() if $BIND_UPD_CB; 1373 $BIND_UPD_CB->() if $BIND_UPD_CB;
1309} 1374}
… …
1319 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1384 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1320 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1385 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1321 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1386 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1322 1387
1323 my $lbl = join "; ", @$cmds; 1388 my $lbl = join "; ", @$cmds;
1324 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1389 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1325 $binding_list->add (my $hb = new CFClient::UI::HBox); 1390 $binding_list->add (my $hb = new CFClient::UI::HBox);
1326 $hb->add (new CFClient::UI::Button 1391 $hb->add (new CFClient::UI::Button
1327 text => "delete", 1392 text => "delete",
1328 tooltip => "Deletes the binding", 1393 tooltip => "Deletes the binding",
1329 on_activate => sub { 1394 on_activate => sub {
… …
1414 $refresh->(); 1479 $refresh->();
1415 1480
1416 $vb 1481 $vb
1417} 1482}
1418 1483
1484# just weirdness, pls. ignore
1485sub load_html_page {
1486 my ($viewer, $base) = @_;
1487
1488 $viewer->clear;
1489
1490 require LWP::Simple;
1491 require HTML::Parser;
1492 require URI;
1493
1494 my $page = LWP::Simple::get ($base)
1495 or return;
1496
1497 my @s = { };
1498 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500 my $parser = HTML::Parser->new (
1501 text_h => [sub {
1502 my ($text) = @_;
1503 $text =~ s/\s+/ /g;
1504 $s[-1]{text} .= CFClient::asxml $text;
1505 }, "dtext"],
1506 start_h => [sub {
1507 my ($tag, $attr) = @_;
1508 if ($passthrough{$tag}) {
1509 $s[-1]{text} .= "<$tag>";
1510 } elsif ($tag eq "h1") {
1511 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512 } elsif ($tag eq "h2") {
1513 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514 } elsif ($tag eq "h3") {
1515 push @s, { text => "<span size='large'>" };
1516 } elsif ($tag eq "a") {
1517 push @s, { text => "", url => $attr->{href} };
1518 } elsif ($tag eq "p") {
1519 push @s, { };
1520 } elsif ($tag eq "img") {
1521 eval {
1522 push @{$s[-1]{obj}}, new CFClient::UI::Image
1523 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524 $s[-1]{text} .= "\x{fffc}";
1525 };
1526 }
1527 }, "tagname, attr"],
1528 end_h => [sub {
1529 my ($tag) = @_;
1530 if ($passthrough{$tag}) {
1531 $s[-1]{text} .= "</$tag>";
1532 } elsif ($tag =~ /^h\d$/) {
1533 $s[-1]{text} .= "</span>";
1534 push @s, { };
1535 } elsif ($tag eq "a") {
1536 my $S = pop @s;
1537 $s[-1]{text} .= "\x{fffc}";
1538 push @{$s[-1]{obj}}, new CFClient::UI::Label
1539 fg => [0.8, 0.8, 1],
1540 markup => "<u>$S->{text}</u>",
1541 fontsize => 0.8,
1542 can_events => 1,
1543 can_focus => 1,
1544 on_button_up => sub {
1545 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546 },
1547 ;
1548 }
1549 }, "tagname"],
1550 );
1551
1552 $parser->parse ($page);
1553 $parser->eof;
1554
1555 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556 for @s;
1557
1558 $viewer->set_offset (0);
1559}
1560
1419sub help_window { 1561sub help_window {
1420 my $win = new CFClient::UI::FancyFrame 1562 my $win = new CFClient::UI::FancyFrame
1421 x => 'center', 1563 x => 'center',
1422 y => 'center', 1564 y => 'center',
1423 z => 2, 1565 z => 2,
1424 name => 'doc_browser', 1566 name => 'doc_browser',
1425 force_w => int $WIDTH * 7/8, 1567 force_w => int $WIDTH * 7/8,
1426 force_h => int $HEIGHT * 7/8, 1568 force_h => int $HEIGHT * 7/8,
1427 title => "Documentation"; 1569 title => "Help Browser",
1570 has_close_button => 1;
1428 1571
1429 $win->add (my $vbox = new CFClient::UI::VBox); 1572 $win->add (my $vbox = new CFClient::UI::VBox);
1430 1573
1431 $vbox->add (my $buttons = new CFClient::UI::HBox); 1574 $vbox->add (my $buttons = new CFClient::UI::HBox);
1432 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1433 expand => 1, fontsize => 0.8, padding_x => 4); 1576 expand => 1, fontsize => 0.8, padding_x => 4);
1434 1577
1435 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1578 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1436 $buttons->add (my $combo = new CFClient::UI::Combobox 1579 $buttons->add (my $combo = new CFClient::UI::Selector
1437 value => undef, 1580 value => undef,
1438 options => [ 1581 options => [
1439 [intro => "Introduction"], 1582 [intro => "Introduction"],
1440 [manual => "Main Manual"], 1583 [manual => "Main Manual"],
1441 [skill_help => "Skill Reference"], 1584 [skill_help => "Skill Reference"],
1442 [command_help => "Command Reference"], 1585 [command_help => "Command Reference"],
1443 [dmcommand_help => "DM Commands"], 1586 [dmcommand_help => "DM Commands"],
1444 [COPYING => "License Terms"], 1587 [COPYING => "License Terms"],
1588 [test => "test (do not select)"], #d#TODO
1445 ], 1589 ],
1446 on_changed => sub { 1590 on_changed => sub {
1447 my ($self, $pod) = @_; 1591 my ($self, $pod) = @_;
1448 1592
1593 if ($pod eq "test") {#d#TODO
1594 eval {
1595 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1596 };
1597 warn "$@" if $@;
1598 return;
1599 }
1600
1449 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1450 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1602 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603
1604 #use Data::Dumper; warn Dumper $pom;#d#
1451 1605
1452 $viewer->clear; 1606 $viewer->clear;
1453 1607
1454# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc}\n", 1608# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1455# (new CFClient::UI::Image path => "x.png"), 1609# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1610# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1456# ]);#d# 1611# ]);#d#
1457 1612
1458 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1459 for @$pom; 1614 for @$pom;
1460 1615
1461 $viewer->set_offset (0); 1616 $viewer->set_offset (0);
1462 1617
1463 0 1618 0
… …
1514 z => 100, 1669 z => 100,
1515 force_x => "max", 1670 force_x => "max",
1516 force_y => 0; 1671 force_y => 0;
1517 $DEBUG_STATUS->show; 1672 $DEBUG_STATUS->show;
1518 1673
1519 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1674 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1520 1675
1521 $STATUSBOX = new CFClient::UI::Statusbox; 1676 $STATUSBOX = new CFClient::UI::Statusbox;
1522 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1677 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1523 1678
1524 (new CFClient::UI::Frame 1679 (new CFClient::UI::Frame
… …
1574 z => 2, 1729 z => 2,
1575 force_w => $::WIDTH * 0.6, 1730 force_w => $::WIDTH * 0.6,
1576 force_h => $::HEIGHT * 0.6, 1731 force_h => $::HEIGHT * 0.6,
1577 has_close_button => 1, 1732 has_close_button => 1,
1578 ; 1733 ;
1734
1735 $METASERVER = metaserver_dialog;
1579 1736
1580 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1737 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1581 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1738 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1582 1739
1583 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1740 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1593 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1750 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1594 . "with nothing set and the recording started. After doing the actions you " 1751 . "with nothing set and the recording started. After doing the actions you "
1595 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1752 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1596 . "After pressing the combo the binding will be saved automatically and the " 1753 . "After pressing the combo the binding will be saved automatically and the "
1597 . "binding editor closes"); 1754 . "binding editor closes");
1598 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1599 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1600 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1755 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1601 "Some debuggin' options. Do not ask."); 1756 "Some debuggin' options. Do not ask.");
1602 1757
1603 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1758 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1604 1759
… …
1608 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1763 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1609 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1764 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1610 1765
1611 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 1766 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
1612 1767
1613 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1614 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1615 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1768 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1616 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1769 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1617 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1618 1770
1619 $BUTTONBAR->add (new CFClient::UI::Button 1771 $BUTTONBAR->add (new CFClient::UI::Button
1620 text => "Save Config", 1772 text => "Save Config",
1621 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1773 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1622 on_activate => sub { 1774 on_activate => sub {
… …
1625 status "Configuration Saved"; 1777 status "Configuration Saved";
1626 0 1778 0
1627 }, 1779 },
1628 ); 1780 );
1629 1781
1630 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1782 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1631 tooltip => "View Documentation"); 1783 tooltip => "View Documentation");
1632 1784
1633 $BUTTONBAR->add (new CFClient::UI::Button 1785 $BUTTONBAR->add (new CFClient::UI::Button
1634 text => "Quit", 1786 text => "Quit",
1635 tooltip => "Terminates the program", 1787 tooltip => "Terminates the program",
… …
1732 1884
1733 $WANT_REFRESH = 0; 1885 $WANT_REFRESH = 0;
1734 $CAN_REFRESH = 0; 1886 $CAN_REFRESH = 0;
1735 $LAST_REFRESH = $NOW; 1887 $LAST_REFRESH = $NOW;
1736 1888
17370 && do {
1738 # some weird model-drawing code, just a joke right now
1739 use CFClient::OpenGL;
1740
1741 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1742 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1743 $demo{r} ||= do {
1744 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1745 $mod->{v} = pack "f*", @{$mod->{v}};
1746 $_ = [scalar @$_, pack "S!*", @$_]
1747 for values %{$mod->{g}};
1748 $mod
1749 };
1750
1751 my $r = $demo{r} or die;
1752
1753 glDepthMask 1;
1754 glClear GL_DEPTH_BUFFER_BIT;
1755 glEnable GL_TEXTURE_2D;
1756 glEnable GL_DEPTH_TEST;
1757 glEnable GL_CULL_FACE;
1758 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1759
1760 glMatrixMode GL_PROJECTION;
1761 glLoadIdentity;
1762 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1763 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1764 glMatrixMode GL_MODELVIEW;
1765 glLoadIdentity;
1766
1767 glPushMatrix;
1768 glTranslate 0, 0, -800;
1769 glScale 1, -1, 1;
1770 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1771 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1772 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1773 glScale 50, 50, 50;
1774
1775 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1776 while (my ($k, $v) = each %{$r->{g}}) {
1777 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1778 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1779 }
1780
1781 glPopMatrix;
1782
1783 glShadeModel GL_FLAT;
1784 glDisable GL_DEPTH_TEST;
1785 glDisable GL_TEXTURE_2D;
1786 glDepthMask 0;
1787
1788 $WANT_REFRESH++;
1789};
1790
1791 CFClient::SDL_GL_SwapBuffers; 1889 CFClient::SDL_GL_SwapBuffers;
1792} 1890}
1793 1891
1794my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1892my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1795 $NOW = time; 1893 $NOW = time;
… …
1841# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1939# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1842 }, 1940 },
1843 CFClient::SDL_KEYDOWN => sub { 1941 CFClient::SDL_KEYDOWN => sub {
1844 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1845 # alt-enter 1943 # alt-enter
1944 $FULLSCREEN_ENABLE->toggle;
1846 video_shutdown; 1945 video_shutdown;
1847 $CFG->{fullscreen} = !$CFG->{fullscreen};
1848 video_init; 1946 video_init;
1849 } else { 1947 } else {
1850 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1948 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1851 } 1949 }
1852 }, 1950 },
… …
1868$SIG{INT} = $SIG{TERM} = sub { exit }; 1966$SIG{INT} = $SIG{TERM} = sub { exit };
1869 1967
1870{ 1968{
1871 local $SIG{__DIE__} = sub { 1969 local $SIG{__DIE__} = sub {
1872 return unless defined $^S && !$^S; 1970 return unless defined $^S && !$^S;
1873 Carp::confess $_[1];#d#TODO: remove when stable 1971 Carp::confess $_[0];#d#TODO: remove when stable
1874 CFClient::fatal $_[0]; 1972 CFClient::fatal $_[0];
1875 }; 1973 };
1876 1974
1877 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1878 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
… …
1899 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1900 face_prefetch => 0, 1998 face_prefetch => 0,
1901 output_sync => 1, 1999 output_sync => 1,
1902 output_count => 1, 2000 output_count => 1,
1903 pickup => 0, 2001 pickup => 0,
2002 inv_sort => "mtime",
1904 default => "profile", # default profile 2003 default => "profile", # default profile
1905 ); 2004 );
1906 2005
1907 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1908 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};

Diff Legend

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