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.85 by elmex, Sun Jul 2 19:32:56 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;
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
… …
114 125
115our $INV; 126our $INV;
116our $INVR; 127our $INVR;
117our $INV_RIGHT_HB; 128our $INV_RIGHT_HB;
118 129
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121
122our $BIND_EDITOR; 130our $BIND_EDITOR;
123our $BIND_UPD_CB; 131our $BIND_UPD_CB;
124 132
125our $PICKUP_CFG; 133our $PICKUP_CFG;
126 134
127sub status { 135sub status {
128 $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]);
129} 137}
130 138
131sub debug { 139sub debug {
132 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
133} 141}
… …
182 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
183 191
184 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
185 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
186 ellipsise => 0, 194 ellipsise => 0,
187 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
188 196
189 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
190 198
191 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
192 text => "Next Race", 200 text => "Next Race",
… …
209 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
210 ellipsise => 0, 218 ellipsise => 0,
211 markup => 219 markup =>
212 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
213 . "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 "
214 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
215 . "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 "
216 . "(<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"
217 . "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 "
218 . "so you can take your time making this important choice." 226 . "this race eventually, so you can take your time making this important choice."
219 ; 227 ;
220 228
221 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
222 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
223 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
224 destroy_query_dialog $conn; 232 destroy_query_dialog $conn;
225 return; 233 return;
226 } 234 }
227 235
228 $STATS_WINDOW->show; 236 $STATS_PAGE->show;
229 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
230 238
231 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
232 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
233 ellipsise => 0, 241 ellipsise => 0,
234 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
235 243
236 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
237 245
238 # left: re-roll 246 # left: re-roll
239 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
… …
244 0 252 0
245 }, 253 },
246 ); 254 );
247 255
248 # center: swap stats 256 # center: swap stats
249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Selector
258 expand => 1,
250 value => $_, 259 value => $_,
251 options => [ 260 options => [
252 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
253 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
254 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
273 # right: accept 282 # right: accept
274 $table->add (4, 0, new CFClient::UI::Button 283 $table->add (4, 0, new CFClient::UI::Button
275 text => "Accept", 284 text => "Accept",
276 on_activate => sub { 285 on_activate => sub {
277 $conn->send ("reply n"); 286 $conn->send ("reply n");
278 $STATS_WINDOW->hide; 287 $STATS_PAGE->hide;
279 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
280 0 289 0
281 }, 290 },
282 ); 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 }
283 313
284 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
285 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 316 ellipsise => 0,
287 markup => 317 markup =>
288 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
289 . "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"
290 . "(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"
291 . "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"
292 . "Race selection will influence those values later on."
293 ; 323 ;
294 } 324 }
295 325
296 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
297 on_changed => sub { 327 on_changed => sub {
… …
376sub stop_game { 406sub stop_game {
377 $LOGIN_BUTTON->set_text ("Login"); 407 $LOGIN_BUTTON->set_text ("Login");
378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 408 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
379 $SETUP_DIALOG->show; 409 $SETUP_DIALOG->show;
380 $PL_WINDOW->hide; 410 $PL_WINDOW->hide;
381 $SETUP_SPELLS->clear_spells; 411 $SPELL_PAGE->clear_spells;
382 412
383 return unless $CONN; 413 return unless $CONN;
384 414
385 status "connection closed"; 415 status "connection closed";
386 416
… …
411 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
412 442
413 my $row = 1; 443 my $row = 1;
414 444
415 $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");
416 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
417 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
418 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
420 ); 450 );
421 451
… …
471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
472 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.",
473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
474 ); 504 );
475 505
476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
477
478 $table->add (1, $row++, new CFClient::UI::Slider
479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
481 on_changed => sub {
482 $CFG->{stat_fontsize} = $_[1];
483 &set_stats_window_fontsize;
484 0
485 }
486 );
487
488 $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");
489 $table->add (1, $row++, new CFClient::UI::Slider 507 $table->add (1, $row++, new CFClient::UI::Slider
490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
491 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.",
492 on_changed => sub { 510 on_changed => sub {
… …
561 ); 579 );
562 580
563 $vbox 581 $vbox
564} 582}
565 583
566sub set_stats_window_fontsize {
567 for (values %{$STATWIDS}) {
568 $_->set_fontsize ($::CFG->{stat_fontsize});
569 }
570}
571
572sub set_gauge_window_fontsize { 584sub set_gauge_window_fontsize {
573 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 585 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
574 $_->set_fontsize ($::CFG->{gauge_fontsize}); 586 $_->set_fontsize ($::CFG->{gauge_fontsize});
575 } 587 }
576} 588}
… …
655 667
656 $table 668 $table
657} 669}
658 670
659sub stats_window { 671sub stats_window {
660 my $tgw = 672 my $r = new CFClient::UI::ScrolledWindow (
661 new CFClient::UI::Window 673 expand => 1,
674 scroll_y => 1
675 );
662 child => my $vb = new CFClient::UI::VBox; 676 $r->add (my $vb = new CFClient::UI::VBox);
663 677
664 $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,
665 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
666 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.");
667 $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,
… …
674 tooltip => "The weight of the player including all inventory items."); 688 tooltip => "The weight of the player including all inventory items.");
675 $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,
676 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
677 tooltip => "The weight limit: you cannot carry more than this."); 691 tooltip => "The weight limit: you cannot carry more than this.");
678 692
679
680 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 693 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
681 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
682 695
683 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
684 697
685 for ( 698 for (
686 [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],
687 [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],
688 [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],
689 [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],
690 [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],
691 [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],
692 [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],
693 706
694 [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],
695 [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],
696 [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],
697 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."], 710 [2, 3, st_arm => "Arm", 120],
698 [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],
699 [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],
700 ) { 713 ) {
701 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
702 715
703 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
704 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});
705 $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
706 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});
707 } 722 }
708 723
709 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
710 725
711 my $row = 0; 726 my $row = 0;
712 my $col = 0; 727 my $col = 0;
713 728
714 my %resist_names = ( 729 my %resist_names = (
730 slow => ["Slow",
715 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",
716 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",
717 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",
718 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",
719 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",
720 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",
721 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",
722 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",
723 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
724 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",
725 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
752 phys => ["Physical",
726 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)", 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",
727 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",
728 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",
729 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",
730 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",
731 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",
732 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)"],
733 ); 766 );
734 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
735 drain acid pois para deat phys 768 drain acid pois para deat phys
736 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
737 { 770 {
… …
742 template => "-100%", 775 template => "-100%",
743 align => +1, 776 align => +1,
744 valign => 0, 777 valign => 0,
745 can_events => 1, 778 can_events => 1,
746 can_hover => 1, 779 can_hover => 1,
747 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
748 ); 781 );
749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
750 font => $FONT_FIXED, 783 font => $FONT_FIXED,
751 can_hover => 1, 784 can_hover => 1,
752 can_events => 1, 785 can_events => 1,
753 path => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
754 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],
755 ); 795 );
756 796
757 $row++; 797 $row++;
758 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
759 $col += 2; 799 $col += 3;
760 $row = 0; 800 $row = 0;
761 } 801 }
762 } 802 }
763 803
764 &set_stats_window_fontsize;
765 update_stats_window ({}); 804 #update_stats_window ({});
766 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]);
767 $tgw 812 $sw
768} 813}
769 814
770sub formsep($) { 815sub formsep($) {
771 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
772}
773
774sub update_stats_window {
775 my ($stats) = @_;
776
777 # I love text protocols...
778
779 my $hp = $stats->{+CS_STAT_HP} * 1;
780 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
781 my $sp = $stats->{+CS_STAT_SP} * 1;
782 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
783 my $fo = $stats->{+CS_STAT_FOOD} * 1;
784 my $fo_m = 999;
785 my $gr = $stats->{+CS_STAT_GRACE} * 1;
786 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
787
788 $GAUGES->{hp} ->set_value ($hp, $hp_m);
789 $GAUGES->{mana} ->set_value ($sp, $sp_m);
790 $GAUGES->{food} ->set_value ($fo, $fo_m);
791 $GAUGES->{grace} ->set_value ($gr, $gr_m);
792 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
793 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
794 my $rng = $stats->{+CS_STAT_RANGE};
795 $rng =~ s/^Range: //; # thank you so much dear server
796 $GAUGES->{range} ->set_text ("Rng: " . $rng);
797 my $title = $stats->{+CS_STAT_TITLE};
798 $title =~ s/^Player: //;
799 $STATWIDS->{title} ->set_text ("Title: " . $title);
800
801 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
802 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
803 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
804 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
805 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
814
815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
816
817 my %tbl = (
818 phys => CS_STAT_RES_PHYS,
819 magic => CS_STAT_RES_MAG,
820 fire => CS_STAT_RES_FIRE,
821 elec => CS_STAT_RES_ELEC,
822 cold => CS_STAT_RES_COLD,
823 conf => CS_STAT_RES_CONF,
824 acid => CS_STAT_RES_ACID,
825 drain => CS_STAT_RES_DRAIN,
826 ghit => CS_STAT_RES_GHOSTHIT,
827 pois => CS_STAT_RES_POISON,
828 slow => CS_STAT_RES_SLOW,
829 para => CS_STAT_RES_PARA,
830 tund => CS_STAT_TURN_UNDEAD,
831 fear => CS_STAT_RES_FEAR,
832 depl => CS_STAT_RES_DEPLETE,
833 deat => CS_STAT_RES_DEATH,
834 holyw => CS_STAT_RES_HOLYWORD,
835 blind => CS_STAT_RES_BLIND,
836 );
837
838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
839 for keys %tbl;
840} 817}
841 818
842my $METASERVER_ATIME; 819my $METASERVER_ATIME;
843 820
844sub update_metaserver { 821sub update_metaserver {
… …
1090sub message_window { 1067sub message_window {
1091 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1092 name => "message_window", 1069 name => "message_window",
1093 title => "Messages", 1070 title => "Messages",
1094 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1095 bg => [0, 0, 0, 0.75],
1096 x => "max", 1072 x => "max",
1097 y => 0, 1073 y => 0,
1098 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1099 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1100 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFClient::UI::VBox),
… …
1156 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1157 x => "center", 1133 x => "center",
1158 y => "center", 1134 y => "center",
1159 z => 50, 1135 z => 50,
1160 title => "Really Quit?", 1136 title => "Really Quit?",
1137 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1161 ; 1141 ;
1162 1142
1163 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1164 1144
1165 $vb->add (new CFClient::UI::Label 1145 $vb->add (new CFClient::UI::Label
… …
1179 on_activate => sub { exit }, 1159 on_activate => sub { exit },
1180 ); 1160 );
1181 } 1161 }
1182 1162
1183 $QUIT_DIALOG->show; 1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1184} 1165}
1185 1166
1186sub autopickup_setup { 1167sub autopickup_setup {
1187 my $table = new CFClient::UI::Table; 1168 my $table = new CFClient::UI::Table;
1188 1169
1189 for ( 1170 for (
1190 ["General", 0, 0, 1171 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE], 1172 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT], 1173 ["Inhibit autopickup" => PICKUP_INHIBIT],
1193 ["Stop before pickup" => PICKUP_STOP], 1174 ["Stop before pickup" => PICKUP_STOP],
1194 ["Debug autopickup" => PICKUP_DEBUG], 1175 ["Debug autopickup" => PICKUP_DEBUG],
1195 ], 1176 ],
1196 ["Weapons", 0, 6, 1177 ["Weapons", 0, 6,
… …
1233 for (@bits) { 1214 for (@bits) {
1234 ++$y; 1215 ++$y;
1235 1216
1236 my $mask = $_->[1]; 1217 my $mask = $_->[1];
1237 $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);
1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1219 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask, 1220 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub { 1221 on_changed => sub {
1241 my ($box, $value) = @_; 1222 my ($box, $value) = @_;
1242 1223
1243 if ($value) { 1224 if ($value) {
… …
1249 $::CONN->send_command ("pickup $::CFG->{pickup}") 1230 $::CONN->send_command ("pickup $::CFG->{pickup}")
1250 if defined $::CONN; 1231 if defined $::CONN;
1251 1232
1252 0 1233 0
1253 }); 1234 });
1235
1236 ${$_->[2]} = $checkbox if $_->[2];
1254 } 1237 }
1255 } 1238 }
1256 1239
1257 $table->add (2, 18, new CFClient::UI::ValSlider 1240 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1241 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
… …
1276 }); 1259 });
1277 1260
1278 $table 1261 $table
1279} 1262}
1280 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
1281sub inventory_widget { 1277sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1; 1278 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283 1279
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1280 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 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);
1286 $vb1->add ($INV = new CFClient::UI::Inventory); 1304 $sw1->add ($INV = new CFClient::UI::Inventory);
1287 1305
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1306 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289 1307
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1308 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291 1309
1310 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292 $vb2->add ($INVR = new CFClient::UI::Inventory); 1311 $sw2->add ($INVR = new CFClient::UI::Inventory);
1293 1312
1294 # XXX: Call after $INVR = ... because set_opencont sets the items 1313 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1314 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296 1315
1297 $hb 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 }
1298} 1328}
1299 1329
1300sub player_window { 1330sub player_window {
1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1331 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1302 x => "center", 1332 x => "center",
1303 y => "center", 1333 y => "center",
1304 force_w => $WIDTH * 9/10, 1334 force_w => $WIDTH * 9/10,
1305 force_h => $HEIGHT * 9/10, 1335 force_h => $HEIGHT * 9/10,
1306 title => "Player", 1336 title => "Player",
1337 name => "playerbook",
1307 has_close_button => 1 1338 has_close_button => 1
1308 ; 1339 ;
1309 1340
1310 my $ntb = 1341 my $ntb =
1311 $PL_NOTEBOOK = 1342 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook 1343 new CFClient::UI::Notebook expand => 1, debug => 1;
1313 expand => 1, 1344
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add ( 1345 $ntb->add (
1318 Inventory => inventory_widget, 1346 "Statistics (F2)" => $STATS_PAGE = stats_window,
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 );
1353
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,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1362 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1363 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 ); 1364 );
1322 1365
1323 $ntb->add ( 1366 $ntb->set_current_page ($INVENTORY_PAGE);
1324 Stats => $STATS_WINDOW = stats_window,
1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1331 1367
1332 $plwin->add ($ntb); 1368 $plwin->add ($ntb);
1333 $plwin 1369 $plwin
1334} 1370}
1335 1371
… …
1443 $refresh->(); 1479 $refresh->();
1444 1480
1445 $vb 1481 $vb
1446} 1482}
1447 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
1448sub help_window { 1561sub help_window {
1449 my $win = new CFClient::UI::FancyFrame 1562 my $win = new CFClient::UI::FancyFrame
1450 x => 'center', 1563 x => 'center',
1451 y => 'center', 1564 y => 'center',
1452 z => 2, 1565 z => 2,
1453 name => 'doc_browser', 1566 name => 'doc_browser',
1454 force_w => int $WIDTH * 7/8, 1567 force_w => int $WIDTH * 7/8,
1455 force_h => int $HEIGHT * 7/8, 1568 force_h => int $HEIGHT * 7/8,
1456 title => "Documentation"; 1569 title => "Help Browser",
1570 has_close_button => 1;
1457 1571
1458 $win->add (my $vbox = new CFClient::UI::VBox); 1572 $win->add (my $vbox = new CFClient::UI::VBox);
1459 1573
1460 $vbox->add (my $buttons = new CFClient::UI::HBox); 1574 $vbox->add (my $buttons = new CFClient::UI::HBox);
1461 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1462 expand => 1, fontsize => 0.8, padding_x => 4); 1576 expand => 1, fontsize => 0.8, padding_x => 4);
1463 1577
1464 $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: ");
1465 $buttons->add (my $combo = new CFClient::UI::Combobox 1579 $buttons->add (my $combo = new CFClient::UI::Selector
1466 value => undef, 1580 value => undef,
1467 options => [ 1581 options => [
1468 [intro => "Introduction"], 1582 [intro => "Introduction"],
1469 [manual => "Main Manual"], 1583 [manual => "Main Manual"],
1470 [skill_help => "Skill Reference"], 1584 [skill_help => "Skill Reference"],
1471 [command_help => "Command Reference"], 1585 [command_help => "Command Reference"],
1472 [dmcommand_help => "DM Commands"], 1586 [dmcommand_help => "DM Commands"],
1473 [COPYING => "License Terms"], 1587 [COPYING => "License Terms"],
1588 [test => "test (do not select)"], #d#TODO
1474 ], 1589 ],
1475 on_changed => sub { 1590 on_changed => sub {
1476 my ($self, $pod) = @_; 1591 my ($self, $pod) = @_;
1477 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
1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1479 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#
1480 1605
1481 $viewer->clear; 1606 $viewer->clear;
1482 1607
1483# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n", 1608# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1484# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 1609# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1485# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 1610# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1486# ]);#d# 1611# ]);#d#
1487 1612
1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1489 for @$pom; 1614 for @$pom;
1490 1615
1491 $viewer->set_offset (0); 1616 $viewer->set_offset (0);
1492 1617
1493 0 1618 0
… …
1638 $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,
1639 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.");
1640 1765
1641 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
1642 1767
1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window, 1768 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1769 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1645 1770
1646 $BUTTONBAR->add (new CFClient::UI::Button 1771 $BUTTONBAR->add (new CFClient::UI::Button
1647 text => "Save Config", 1772 text => "Save Config",
1648 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.",
… …
1652 status "Configuration Saved"; 1777 status "Configuration Saved";
1653 0 1778 0
1654 }, 1779 },
1655 ); 1780 );
1656 1781
1657 $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,
1658 tooltip => "View Documentation"); 1783 tooltip => "View Documentation");
1659 1784
1660 $BUTTONBAR->add (new CFClient::UI::Button 1785 $BUTTONBAR->add (new CFClient::UI::Button
1661 text => "Quit", 1786 text => "Quit",
1662 tooltip => "Terminates the program", 1787 tooltip => "Terminates the program",
… …
1759 1884
1760 $WANT_REFRESH = 0; 1885 $WANT_REFRESH = 0;
1761 $CAN_REFRESH = 0; 1886 $CAN_REFRESH = 0;
1762 $LAST_REFRESH = $NOW; 1887 $LAST_REFRESH = $NOW;
1763 1888
17640 && do {
1765 # some weird model-drawing code, just a joke right now
1766 use CFClient::OpenGL;
1767
1768 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1769 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1770 $demo{r} ||= do {
1771 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1772 $mod->{v} = pack "f*", @{$mod->{v}};
1773 $_ = [scalar @$_, pack "S!*", @$_]
1774 for values %{$mod->{g}};
1775 $mod
1776 };
1777
1778 my $r = $demo{r} or die;
1779
1780 glDepthMask 1;
1781 glClear GL_DEPTH_BUFFER_BIT;
1782 glEnable GL_TEXTURE_2D;
1783 glEnable GL_DEPTH_TEST;
1784 glEnable GL_CULL_FACE;
1785 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1786
1787 glMatrixMode GL_PROJECTION;
1788 glLoadIdentity;
1789 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1790 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1791 glMatrixMode GL_MODELVIEW;
1792 glLoadIdentity;
1793
1794 glPushMatrix;
1795 glTranslate 0, 0, -800;
1796 glScale 1, -1, 1;
1797 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1798 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1799 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1800 glScale 50, 50, 50;
1801
1802 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1803 while (my ($k, $v) = each %{$r->{g}}) {
1804 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1805 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1806 }
1807
1808 glPopMatrix;
1809
1810 glShadeModel GL_FLAT;
1811 glDisable GL_DEPTH_TEST;
1812 glDisable GL_TEXTURE_2D;
1813 glDepthMask 0;
1814
1815 $WANT_REFRESH++;
1816};
1817
1818 CFClient::SDL_GL_SwapBuffers; 1889 CFClient::SDL_GL_SwapBuffers;
1819} 1890}
1820 1891
1821my $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 {
1822 $NOW = time; 1893 $NOW = time;
… …
1868# 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#
1869 }, 1940 },
1870 CFClient::SDL_KEYDOWN => sub { 1941 CFClient::SDL_KEYDOWN => sub {
1871 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1872 # alt-enter 1943 # alt-enter
1944 $FULLSCREEN_ENABLE->toggle;
1873 video_shutdown; 1945 video_shutdown;
1874 $CFG->{fullscreen} = !$CFG->{fullscreen};
1875 video_init; 1946 video_init;
1876 } else { 1947 } else {
1877 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1948 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1878 } 1949 }
1879 }, 1950 },
… …
1895$SIG{INT} = $SIG{TERM} = sub { exit }; 1966$SIG{INT} = $SIG{TERM} = sub { exit };
1896 1967
1897{ 1968{
1898 local $SIG{__DIE__} = sub { 1969 local $SIG{__DIE__} = sub {
1899 return unless defined $^S && !$^S; 1970 return unless defined $^S && !$^S;
1900 Carp::confess $_[1];#d#TODO: remove when stable 1971 Carp::confess $_[0];#d#TODO: remove when stable
1901 CFClient::fatal $_[0]; 1972 CFClient::fatal $_[0];
1902 }; 1973 };
1903 1974
1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1905 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
… …
1926 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1927 face_prefetch => 0, 1998 face_prefetch => 0,
1928 output_sync => 1, 1999 output_sync => 1,
1929 output_count => 1, 2000 output_count => 1,
1930 pickup => 0, 2001 pickup => 0,
2002 inv_sort => "mtime",
1931 default => "profile", # default profile 2003 default => "profile", # default profile
1932 ); 2004 );
1933 2005
1934 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
1935 $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