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.76 by root, Tue Jun 20 08:49:40 2006 UTC vs.
Revision 1.103 by root, Mon Jul 24 08:23:28 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
48$Event::Eval = 0;
45$Event::DIED = sub { 49$Event::DIED = sub {
46 # TODO: display dialog box or so 50 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 52 CFClient::error $_[1];
49}; 53};
50 54
51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 55$SIG{__DIE__} = sub {
56 return if CFClient::in_destruct;
57 Carp::cluck $_[0];
58 CFClient::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
52 63
53our $VERSION = '0.1'; 64our $VERSION = '0.1';
54 65
55my $MAX_FPS = 60; 66my $MAX_FPS = 60;
56my $MIN_FPS = 5; # unused as of yet 67my $MIN_FPS = 5; # unused as of yet
… …
84our $CONSOLE; 95our $CONSOLE;
85our $METASERVER; 96our $METASERVER;
86our $LOGIN_BUTTON; 97our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 98our $QUIT_DIALOG;
88our $HOST_ENTRY; 99our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE;
101our $PICKUP_ENABLE;
89our $SERVER_INFO; 102our $SERVER_INFO;
90 103
91our $SETUP_DIALOG; 104our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 105our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 106our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 107our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 108
109our $PL_NOTEBOOK;
97our $STATS_WINDOW; 110our $PL_WINDOW;
111
112our $INVENTORY_PAGE;
113our $STATS_PAGE;
114our $SKILL_PAGE;
115our $SPELL_PAGE;
116
117our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 118our $MESSAGE_WINDOW;
99our $FLOORBOX; 119our $FLOORBOX;
100our $GAUGES; 120our $GAUGES;
101our $STATWIDS; 121our $STATWIDS;
102 122
… …
109 129
110our $ALT_ENTER_MESSAGE; 130our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 131our $STATUSBOX;
112our $DEBUG_STATUS; 132our $DEBUG_STATUS;
113 133
114our $INV_WINDOW;
115our $INV; 134our $INV;
116our $INVR; 135our $INVR;
117our $INV_RIGHT_HB; 136our $INV_RIGHT_HB;
118 137
119our $BIND_EDITOR; 138our $BIND_EDITOR;
139our $BIND_UPD_CB;
120 140
121our $PICKUP_CFG; 141our $PICKUP_CFG;
122 142
123sub status { 143sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 144 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
125} 145}
126 146
127sub debug { 147sub debug {
128 $DEBUG_STATUS->set_text ($_[0]); 148 $DEBUG_STATUS->set_text ($_[0]);
129} 149}
… …
178 $MESSAGE_WINDOW->show; 198 $MESSAGE_WINDOW->show;
179 199
180 unshift @dialog, new CFClient::UI::Label 200 unshift @dialog, new CFClient::UI::Label
181 max_w => $::WIDTH * 0.4, 201 max_w => $::WIDTH * 0.4,
182 ellipsise => 0, 202 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n"; 203 markup => "\nOr use your keyboard and the text entry below:\n";
184 204
185 unshift @dialog, my $table = new CFClient::UI::Table; 205 unshift @dialog, my $table = new CFClient::UI::Table;
186 206
187 $table->add (0, 0, new CFClient::UI::Button 207 $table->add (0, 0, new CFClient::UI::Button
188 text => "Next Race", 208 text => "Next Race",
… …
205 max_w => $::WIDTH * 0.4, 225 max_w => $::WIDTH * 0.4,
206 ellipsise => 0, 226 ellipsise => 0,
207 markup => 227 markup =>
208 "<big><b>Character Creation: Race</b></big>\n\n" 228 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "Look at the <b>Messages</b> window to see a description of this race " 229 . "Look at the <b>Messages</b> window to see a description of this race "
210 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
211 . "and the center of the screen to see how this race looks like " 230 . "and the center of the screen to see how this race looks like "
212 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
213 . "You can look at another race, or accept this race (you will come back to this race eventually, " 233 . "You can look at another race, or accept this race (you will cycle back to "
214 . "so you can take your time making this important choice." 234 . "this race eventually, so you can take your time making this important choice."
215 ; 235 ;
216 236
217 } elsif ($prompt =~ /roll new stats/) { 237 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) { 238 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat"); 239 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 240 destroy_query_dialog $conn;
221 return; 241 return;
222 } 242 }
223 243
224 $STATS_WINDOW->show; 244 $STATS_PAGE->show;
225 $MESSAGE_WINDOW->hide; 245 $MESSAGE_WINDOW->hide;
226 246
227 unshift @dialog, new CFClient::UI::Label 247 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4, 248 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 249 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n"; 250 markup => "\nOr use your keyboard and the text entry below:\n";
231 251
232 unshift @dialog, my $table = new CFClient::UI::Table; 252 unshift @dialog, my $table = new CFClient::UI::Table;
233 253
234 # left: re-roll 254 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button 255 $table->add (0, 0, new CFClient::UI::Button
… …
240 0 260 0
241 }, 261 },
242 ); 262 );
243 263
244 # center: swap stats 264 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 265 my ($sw1, $sw2) = map +(new CFClient::UI::Selector
266 expand => 1,
246 value => $_, 267 value => $_,
247 options => [ 268 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 271 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
269 # right: accept 290 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 291 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept", 292 text => "Accept",
272 on_activate => sub { 293 on_activate => sub {
273 $conn->send ("reply n"); 294 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 295 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 296 destroy_query_dialog $conn;
276 0 297 0
277 }, 298 },
278 ); 299 );
300
301 unshift @dialog, my $hbox = new CFClient::UI::HBox;
302 for (
303 [Str => CS_STAT_STR],
304 [Dex => CS_STAT_DEX],
305 [Con => CS_STAT_CON],
306 [Int => CS_STAT_INT],
307 [Wis => CS_STAT_WIS],
308 [Pow => CS_STAT_POW],
309 [Cha => CS_STAT_CHA],
310 ) {
311 my ($name, $id) = @$_;
312 $hbox->add (new CFClient::UI::Label
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0,
315 expand => 1,
316 can_events => 1,
317 can_hover => 1,
318 tooltip => $CFClient::STAT_TOOLTIP{$name},
319 );
320 }
279 321
280 unshift @dialog, new CFClient::UI::Label 322 unshift @dialog, new CFClient::UI::Label
281 max_w => $::WIDTH * 0.4, 323 max_w => $::WIDTH * 0.4,
282 ellipsise => 0, 324 ellipsise => 0,
283 markup => 325 markup =>
284 "<big><b>Character Creation: Stats</b></big>\n\n" 326 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "Look at the <b>Stats</b> window to see your basic stats " 327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
286 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
287 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
288 . "Race selection will influence those values later on."
289 ; 331 ;
290 } 332 }
291 333
292 push @dialog, my $entry = new CFClient::UI::Entry 334 push @dialog, my $entry = new CFClient::UI::Entry
293 on_changed => sub { 335 on_changed => sub {
… …
371 413
372sub stop_game { 414sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 415 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 417 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 418 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 419 $SPELL_PAGE->clear_spells;
378 420
379 return unless $CONN; 421 return unless $CONN;
380 422
381 status "connection closed"; 423 status "connection closed";
382 424
… …
407 $mode_slider->emit (changed => $mode_slider->{range}[0]); 449 $mode_slider->emit (changed => $mode_slider->{range}[0]);
408 450
409 my $row = 1; 451 my $row = 1;
410 452
411 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 453 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
412 $table->add (1, $row++, new CFClient::UI::CheckBox 454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
413 state => $CFG->{fullscreen}, 455 state => $CFG->{fullscreen},
414 tooltip => "Bring the client into fullscreen mode.", 456 tooltip => "Bring the client into fullscreen mode.",
415 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
416 ); 458 );
417 459
… …
467 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
468 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 510 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
469 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
470 ); 512 );
471 513
472 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
473
474 $table->add (1, $row++, new CFClient::UI::Slider
475 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
476 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
477 on_changed => sub {
478 $CFG->{stat_fontsize} = $_[1];
479 &set_stats_window_fontsize;
480 0
481 }
482 );
483
484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 514 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485 $table->add (1, $row++, new CFClient::UI::Slider 515 $table->add (1, $row++, new CFClient::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 516 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 517 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488 on_changed => sub { 518 on_changed => sub {
… …
557 ); 587 );
558 588
559 $vbox 589 $vbox
560} 590}
561 591
562sub set_stats_window_fontsize {
563 for (values %{$STATWIDS}) {
564 $_->set_fontsize ($::CFG->{stat_fontsize});
565 }
566}
567
568sub set_gauge_window_fontsize { 592sub set_gauge_window_fontsize {
569 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 593 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
570 $_->set_fontsize ($::CFG->{gauge_fontsize}); 594 $_->set_fontsize ($::CFG->{gauge_fontsize});
571 } 595 }
572} 596}
… …
651 675
652 $table 676 $table
653} 677}
654 678
655sub stats_window { 679sub stats_window {
656 my $tgw = new CFClient::UI::FancyFrame 680 my $r = new CFClient::UI::ScrolledWindow (
657 y => $HEIGHT * (2/8), 681 expand => 1,
658 x => "max", 682 scroll_y => 1
659 title => "Stats", 683 );
660 name => "stats_window", 684 $r->add (my $vb = new CFClient::UI::VBox);
661 has_close_button => 1;
662 685
663 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 686 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
665 can_hover => 1, can_events => 1, 687 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."); 688 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, 689 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
668 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
… …
674 tooltip => "The weight of the player including all inventory items."); 696 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, 697 $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, 698 can_hover => 1, can_events => 1,
677 tooltip => "The weight limit: you cannot carry more than this."); 699 tooltip => "The weight limit: you cannot carry more than this.");
678 700
679
680 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 701 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
681 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 702 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
682 703
683 my $color2 = [1, 1, 0]; 704 my $color2 = [1, 1, 0];
684 705
685 for ( 706 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"], 707 [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"], 708 [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"], 709 [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"], 710 [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"], 711 [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"], 712 [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."], 713 [0, 6, st_cha => "Cha", 30],
693 714
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."], 715 [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."], 716 [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."], 717 [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."], 718 [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."], 719 [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."], 720 [2, 5, st_wspd => "WSp", 10.54],
700 ) { 721 ) {
701 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 722 my ($col, $row, $id, $label, $template) = @$_;
702 723
703 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 724 $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); 725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
705 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 727 $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); 728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
707 } 730 }
708 731
709 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 732 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
710 733
711 my $row = 0; 734 my $row = 0;
712 my $col = 0; 735 my $col = 0;
713 736
714 my %resist_names = ( 737 my %resist_names = (
738 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.)", 739 "<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.)"],
740 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.)", 741 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
742 conf => ["Confusion",
717 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 743 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
744 fire => ["Fire",
718 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 745 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
746 depl => ["Depletion",
719 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 747 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
748 magic => ["Magic",
720 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 749 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
750 drain => ["Draining",
721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 751 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
752 acid => ["Acid",
722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 753 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
754 pois => ["Poison",
723 pois => "<b>Poison</b> (resistance to getting poisoned)", 755 "<b>Poison</b> (resistance to getting poisoned)"],
756 para => ["Paralysation",
724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 757 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
758 deat => ["Death",
725 deat => "<b>Death</b> (resistance against death spells)", 759 "<b>Death</b> (resistance against death spells)"],
726 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 760 phys => ["Physical",
761 "<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.)"],
762 blind => ["Blind",
727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 763 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
764 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)", 765 "<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)"],
766 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...", 767 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
768 elec => ["Electricity",
730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 769 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
770 cold => ["Cold",
731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 771 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
772 ghit => ["Ghost hit",
732 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 773 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
733 ); 774 );
734 for (qw/slow holyw conf fire depl magic 775 for (qw/slow holyw conf fire depl magic
735 drain acid pois para deat phys 776 drain acid pois para deat phys
736 blind fear tund elec cold ghit/) 777 blind fear tund elec cold ghit/)
737 { 778 {
… …
742 template => "-100%", 783 template => "-100%",
743 align => +1, 784 align => +1,
744 valign => 0, 785 valign => 0,
745 can_events => 1, 786 can_events => 1,
746 can_hover => 1, 787 can_hover => 1,
747 tooltip => $resist_names{$_}, 788 tooltip => $resist_names{$_}->[1],
748 ); 789 );
749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 790 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
750 font => $FONT_FIXED, 791 font => $FONT_FIXED,
751 can_hover => 1, 792 can_hover => 1,
752 can_events => 1, 793 can_events => 1,
753 image => "ui/resist/resist_$_.png", 794 path => "ui/resist/resist_$_.png",
754 tooltip => $resist_names{$_}, 795 tooltip => $resist_names{$_}->[1],
796 );
797 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
798 text => $resist_names{$_}->[0],
799 font => $FONT_FIXED,
800 can_hover => 1,
801 can_events => 1,
802 tooltip => $resist_names{$_}->[1],
755 ); 803 );
756 804
757 $row++; 805 $row++;
758 if ($row % 6 == 0) { 806 if ($row % 6 == 0) {
759 $col += 2; 807 $col += 3;
760 $row = 0; 808 $row = 0;
761 } 809 }
762 } 810 }
763 811
764 &set_stats_window_fontsize;
765 update_stats_window ({}); 812 #update_stats_window ({});
766 813
814 $r
815}
816
817sub skill_window {
818 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
819 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
767 $tgw 820 $sw
768} 821}
769 822
770sub formsep($) { 823sub formsep($) {
771 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 824 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
772} 825}
773 826
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_ARMOUR});
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}
841
842my $METASERVER_ATIME; 827my $METASERVER_ATIME;
843 828
844sub update_metaserver { 829sub update_metaserver {
830 my ($metaserver_dialog) = @_;
831
832 $METASERVER = $metaserver_dialog
833 if defined $metaserver_dialog;
834
845 return if $METASERVER_ATIME > time; 835 return if $METASERVER_ATIME > time;
846 $METASERVER_ATIME = time + 60; 836 $METASERVER_ATIME = time + 60;
847 837
848 my $table = $METASERVER->{table}; 838 my $table = $METASERVER->{table};
849 $table->clear; 839 $table->clear;
… …
937 } 927 }
938 }); 928 });
939} 929}
940 930
941sub metaserver_dialog { 931sub metaserver_dialog {
932 my $vbox = new CFClient::UI::VBox;
933 my $table = new CFClient::UI::Table;
934 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
935
942 my $dialog = new CFClient::UI::FancyFrame 936 my $dialog = new CFClient::UI::FancyFrame
943 title => "Server List", 937 title => "Server List",
944 name => 'metaserver_dialog', 938 name => 'metaserver_dialog',
945 x => 'center', 939 x => 'center',
946 y => 'center', 940 y => 'center',
947 z => 3, 941 z => 3,
948 force_h => $::HEIGHT * 0.4, 942 force_h => $::HEIGHT * 0.4,
949 child => (my $vbox = new CFClient::UI::VBox), 943 child => $vbox,
944 has_close_button => 1,
945 table => $table,
950 on_visibility_change => sub { 946 on_visibility_change => sub {
951 update_metaserver if $_[1]; 947 update_metaserver ($_[0]) if $_[1];
952 0 948 0
953 }, 949 },
954 ; 950 ;
955
956 $dialog->{table} = new CFClient::UI::Table;
957
958 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
959 951
960 $dialog 952 $dialog
961} 953}
962 954
963sub server_setup { 955sub server_setup {
… …
979 $CFG->{profile}{default}{host} = $value; 971 $CFG->{profile}{default}{host} = $value;
980 0 972 0
981 } 973 }
982 ); 974 );
983 975
984 $METASERVER = metaserver_dialog;
985
986 $vbox->add (new CFClient::UI::Button 976 $vbox->add (new CFClient::UI::Button
987 expand => 1, 977 expand => 1,
988 text => "Server List", 978 text => "Server List",
989 other => $METASERVER, 979 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 980 tooltip => "Show a list of available crossfire servers",
… …
1085sub message_window { 1075sub message_window {
1086 my $window = new CFClient::UI::FancyFrame 1076 my $window = new CFClient::UI::FancyFrame
1087 name => "message_window", 1077 name => "message_window",
1088 title => "Messages", 1078 title => "Messages",
1089 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1090 bg => [0, 0, 0, 0.75],
1091 x => "max", 1080 x => "max",
1092 y => 0, 1081 y => 0,
1093 force_w => $::WIDTH * 0.4, 1082 force_w => $::WIDTH * 0.4,
1094 force_h => $::HEIGHT * 0.5, 1083 force_h => $::HEIGHT * 0.5,
1095 child => (my $vbox = new CFClient::UI::VBox), 1084 child => (my $vbox = new CFClient::UI::VBox),
… …
1151 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1140 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1152 x => "center", 1141 x => "center",
1153 y => "center", 1142 y => "center",
1154 z => 50, 1143 z => 50,
1155 title => "Really Quit?", 1144 title => "Really Quit?",
1145 on_key_down => sub {
1146 my ($dialog, $ev) = @_;
1147 $ev->{sym} == 27 and $dialog->hide;
1148 }
1156 ; 1149 ;
1157 1150
1158 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1151 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1159 1152
1160 $vb->add (new CFClient::UI::Label 1153 $vb->add (new CFClient::UI::Label
… …
1174 on_activate => sub { exit }, 1167 on_activate => sub { exit },
1175 ); 1168 );
1176 } 1169 }
1177 1170
1178 $QUIT_DIALOG->show; 1171 $QUIT_DIALOG->show;
1172 $QUIT_DIALOG->grab_focus;
1179} 1173}
1180 1174
1181sub autopickup_setup { 1175sub autopickup_setup {
1182 my $table = new CFClient::UI::Table; 1176 my $table = new CFClient::UI::Table;
1183 1177
1184 for ( 1178 for (
1185 ["General", 0, 0, 1179 ["General", 0, 0,
1186 ["Enable autopickup" => PICKUP_NEWMODE], 1180 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1187 ["Inhibit autopickup" => PICKUP_INHIBIT], 1181 ["Inhibit autopickup" => PICKUP_INHIBIT],
1188 ["Stop before pickup" => PICKUP_STOP], 1182 ["Stop before pickup" => PICKUP_STOP],
1189 ["Debug autopickup" => PICKUP_DEBUG], 1183 ["Debug autopickup" => PICKUP_DEBUG],
1190 ], 1184 ],
1191 ["Weapons", 0, 6, 1185 ["Weapons", 0, 6,
… …
1228 for (@bits) { 1222 for (@bits) {
1229 ++$y; 1223 ++$y;
1230 1224
1231 my $mask = $_->[1]; 1225 my $mask = $_->[1];
1232 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1226 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1233 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1227 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1234 state => $CFG->{pickup} & $mask, 1228 state => $::CFG->{pickup} & $mask,
1235 on_changed => sub { 1229 on_changed => sub {
1236 my ($box, $value) = @_; 1230 my ($box, $value) = @_;
1237 1231
1238 if ($value) { 1232 if ($value) {
1239 $::CFG->{pickup} |= $mask; 1233 $::CFG->{pickup} |= $mask;
… …
1244 $::CONN->send_command ("pickup $::CFG->{pickup}") 1238 $::CONN->send_command ("pickup $::CFG->{pickup}")
1245 if defined $::CONN; 1239 if defined $::CONN;
1246 1240
1247 0 1241 0
1248 }); 1242 });
1243
1244 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1245 }
1250 } 1246 }
1251 1247
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1248 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1249 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1251 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1252 on_changed => sub {
1256 my ($slider, $value) = @_; 1253 my ($slider, $value) = @_;
1257 1254
1258 $::CFG->{pickup} &= ~0x7; 1255 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1256 $::CFG->{pickup} |= int $value
1260 if $value; 1257 if $value;
1261 1; 1258 1;
1262 }); 1259 });
1260
1263 $table->add (3, 18, new CFClient::UI::Button 1261 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set", 1262 text => "set",
1265 on_activate => sub { 1263 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1264 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1265 if defined $::CONN;
… …
1269 }); 1267 });
1270 1268
1271 $table 1269 $table
1272} 1270}
1273 1271
1272my %SORT_ORDER = (
1273 type => undef,
1274 mtime => sub { sort {
1275 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1276 or $b->{mtime} <=> $a->{mtime}
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 weight => sub { sort {
1280 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1281 or $a->{type} <=> $b->{type}
1282 } @_ },
1283);
1284
1274sub inventory_window { 1285sub inventory_widget {
1286 my $hb = new CFClient::UI::HBox homogeneous => 1;
1287
1288 $hb->add (my $vb1 = new CFClient::UI::VBox);
1289 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1290
1291 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1292
1293 use sort 'stable';
1294
1295 $hb1->add (new CFClient::UI::Selector
1296 value => $::CFG->{inv_sort},
1297 options => [
1298 [type => "Type/Name"],
1299 [mtime => "Recent/Normal/Locked"],
1300 [weight => "Weight/Type"],
1301 ],
1302 on_changed => sub {
1303 $::CFG->{inv_sort} = $_[1];
1304 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1305 },
1306 );
1307 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1308 #TODO# update to weigh/maxweight
1309 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1310
1311 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1312 $sw1->add ($INV = new CFClient::UI::Inventory);
1313
1314 $hb->add (my $vb2 = new CFClient::UI::VBox);
1315
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1317
1318 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1319 $sw2->add ($INVR = new CFClient::UI::Inventory);
1320
1321 # XXX: Call after $INVR = ... because set_opencont sets the items
1322 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1323
1324 $hb
1325}
1326
1327sub toggle_player_page {
1328 my ($widget) = @_;
1329
1330 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1331 $PL_WINDOW->hide;
1332 } else {
1333 $PL_NOTEBOOK->set_current_page ($widget);
1334 $PL_WINDOW->show;
1335 }
1336}
1337
1338sub player_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1339 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center", 1340 x => "center",
1277 y => "center", 1341 y => "center",
1278 force_w => $WIDTH * 9/10, 1342 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1343 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1344 title => "Player",
1345 name => "playerbook",
1281 has_close_button => 1, 1346 has_close_button => 1
1282 ; 1347 ;
1283 1348
1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1349 my $ntb =
1350 $PL_NOTEBOOK =
1351 new CFClient::UI::Notebook expand => 1, debug => 1;
1285 1352
1286 $hb->add (my $vb1 = new CFClient::UI::VBox); 1353 $ntb->add (
1287 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1354 "Statistics (F2)" => $STATS_PAGE = stats_window,
1288 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1355 "Shows statistics, where all your Stats and Resistances are shown."
1356 );
1357 $ntb->add (
1358 "Skills (F3)" => $SKILL_PAGE = skill_window,
1359 "Shows all your Skills."
1360 );
1289 1361
1290 $hb->add (my $vb2 = new CFClient::UI::VBox); 1362 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1363 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1364 $ntb->add (
1365 "Spellbook (F4)" => $spellsw,
1366 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1367 );
1368 $ntb->add (
1369 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1370 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1371 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1372 );
1291 1373
1292 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1374 $ntb->set_current_page ($INVENTORY_PAGE);
1293 1375
1294 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1376 $plwin->add ($ntb);
1295 1377 $plwin
1296 # XXX: Call after $INVR = ... because set_opencont sets the items
1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299 $invwin
1300} 1378}
1301 1379
1302sub spell_setup { 1380sub update_bindings {
1303 new CFClient::UI::SpellList 1381 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304} 1382}
1305 1383
1306sub keyboard_setup { 1384sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox; 1385 my $binding_list = new CFClient::UI::VBox;
1308 1386
1309 my $refresh; 1387 my $refresh;
1310 $refresh = sub { 1388 $refresh = $BIND_UPD_CB = sub {
1311 $binding_list->clear (); 1389 $binding_list->clear ();
1312 1390
1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1391 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1392 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1393 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1394 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1395
1318 my $lbl = join "; ", @$cmds; 1396 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1397 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1398 $binding_list->add (my $hb = new CFClient::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFClient::UI::Button
1322 text => "delete", 1400 text => "delete",
1323 tooltip => "Deletes the binding", 1401 tooltip => "Deletes the binding",
1324 on_activate => sub { 1402 on_activate => sub {
… …
1333 on_activate => sub { 1411 on_activate => sub {
1334 $::BIND_EDITOR->set_binding ( 1412 $::BIND_EDITOR->set_binding (
1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1413 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1336 sub { 1414 sub {
1337 my ($nmod, $nsym, $ncmds) = @_; 1415 my ($nmod, $nsym, $ncmds) = @_;
1338 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1416 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1339 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds; 1417 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1340 $refresh->(); 1418 $refresh->();
1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1342 $SETUP_DIALOG->show; 1420 $SETUP_DIALOG->show;
1343 }, 1421 },
1344 sub { 1422 sub {
… …
1378 tooltip => "This button opens the binding editor with an empty binding.", 1456 tooltip => "This button opens the binding editor with an empty binding.",
1379 on_activate => sub { 1457 on_activate => sub {
1380 $::BIND_EDITOR->set_binding (undef, undef, [], 1458 $::BIND_EDITOR->set_binding (undef, undef, [],
1381 sub { 1459 sub {
1382 my ($mod, $sym, $cmds) = @_; 1460 my ($mod, $sym, $cmds) = @_;
1383 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds; 1461 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1384 $refresh->(); 1462 $refresh->();
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1463 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show; 1464 $SETUP_DIALOG->show;
1387 }, 1465 },
1388 sub { 1466 sub {
… …
1417 y => 'center', 1495 y => 'center',
1418 z => 2, 1496 z => 2,
1419 name => 'doc_browser', 1497 name => 'doc_browser',
1420 force_w => int $WIDTH * 7/8, 1498 force_w => int $WIDTH * 7/8,
1421 force_h => int $HEIGHT * 7/8, 1499 force_h => int $HEIGHT * 7/8,
1422 title => "Documentation"; 1500 title => "Help Browser",
1501 has_close_button => 1;
1423 1502
1424 $win->add (my $vbox = new CFClient::UI::VBox); 1503 $win->add (my $vbox = new CFClient::UI::VBox);
1425 1504
1426 $vbox->add (my $buttons = new CFClient::UI::HBox); 1505 $vbox->add (my $buttons = new CFClient::UI::HBox);
1427 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1506 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1428 expand => 1, fontsize => 0.8, padding_x => 4); 1507 expand => 1, fontsize => 0.8, padding_x => 4);
1429 1508
1430 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1509 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1431 $buttons->add (my $combo = new CFClient::UI::Combobox 1510 $buttons->add (my $combo = new CFClient::UI::Selector
1432 value => undef, 1511 value => undef,
1433 options => [ 1512 options => [
1434 [intro => "Introduction"], 1513 [intro => "Introduction"],
1435 [manual => "Manual"], 1514 [manual => "Main Manual"],
1436 [skill_help => "Skills"], 1515 [skill_help => "Skill Reference"],
1437 [command_help => "Commands"], 1516 [command_help => "Command Reference"],
1438 [dmcommand_help => "DM Commands"], 1517 [dmcommand_help => "DM Commands"],
1439 [COPYING => "License Terms"], 1518 [COPYING => "License Terms"],
1440 ], 1519 ],
1441 on_changed => sub { 1520 on_changed => sub {
1442 my ($self, $pod) = @_; 1521 my ($self, $pod) = @_;
1443 1522
1444 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1445 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1446
1447 $viewer->clear; 1523 $viewer->clear;
1448 1524 $viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod });
1449 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1450 for @$pom;
1451
1452 $viewer->set_offset (0); 1525 $viewer->set_offset (0);
1526
1453 0 1527 0
1454 }, 1528 },
1455 on_visibility_change => sub { 1529 on_visibility_change => sub {
1456 my ($self, $visible) = @_; 1530 my ($self, $visible) = @_;
1457 return unless $visible; 1531 return unless $visible;
… …
1504 z => 100, 1578 z => 100,
1505 force_x => "max", 1579 force_x => "max",
1506 force_y => 0; 1580 force_y => 0;
1507 $DEBUG_STATUS->show; 1581 $DEBUG_STATUS->show;
1508 1582
1509 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1583 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1510 1584
1511 $STATUSBOX = new CFClient::UI::Statusbox; 1585 $STATUSBOX = new CFClient::UI::Statusbox;
1512 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1586 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1513 1587
1514 (new CFClient::UI::Frame 1588 (new CFClient::UI::Frame
… …
1564 z => 2, 1638 z => 2,
1565 force_w => $::WIDTH * 0.6, 1639 force_w => $::WIDTH * 0.6,
1566 force_h => $::HEIGHT * 0.6, 1640 force_h => $::HEIGHT * 0.6,
1567 has_close_button => 1, 1641 has_close_button => 1,
1568 ; 1642 ;
1643
1644 $METASERVER = metaserver_dialog;
1569 1645
1570 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1646 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1571 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1647 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1572 1648
1573 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1649 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1583 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1659 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1584 . "with nothing set and the recording started. After doing the actions you " 1660 . "with nothing set and the recording started. After doing the actions you "
1585 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1661 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1586 . "After pressing the combo the binding will be saved automatically and the " 1662 . "After pressing the combo the binding will be saved automatically and the "
1587 . "binding editor closes"); 1663 . "binding editor closes");
1588 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1589 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1590 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1664 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1591 "Some debuggin' options. Do not ask."); 1665 "Some debuggin' options. Do not ask.");
1592 1666
1593 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1667 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1594 1668
… …
1598 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1672 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1599 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1673 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1600 1674
1601 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 1675 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
1602 1676
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1604 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1605 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1677 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1606 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1678 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1607 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1608 1679
1609 $BUTTONBAR->add (new CFClient::UI::Button 1680 $BUTTONBAR->add (new CFClient::UI::Button
1610 text => "Save Config", 1681 text => "Save Config",
1611 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1682 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1612 on_activate => sub { 1683 on_activate => sub {
… …
1615 status "Configuration Saved"; 1686 status "Configuration Saved";
1616 0 1687 0
1617 }, 1688 },
1618 ); 1689 );
1619 1690
1620 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1691 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1621 tooltip => "View Documentation"); 1692 tooltip => "View Documentation");
1622 1693
1623 $BUTTONBAR->add (new CFClient::UI::Button 1694 $BUTTONBAR->add (new CFClient::UI::Button
1624 text => "Quit", 1695 text => "Quit",
1625 tooltip => "Terminates the program", 1696 tooltip => "Terminates the program",
… …
1722 1793
1723 $WANT_REFRESH = 0; 1794 $WANT_REFRESH = 0;
1724 $CAN_REFRESH = 0; 1795 $CAN_REFRESH = 0;
1725 $LAST_REFRESH = $NOW; 1796 $LAST_REFRESH = $NOW;
1726 1797
17270 && do {
1728 # some weird model-drawing code, just a joke right now
1729 use CFClient::OpenGL;
1730
1731 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1732 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1733 $demo{r} ||= do {
1734 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1735 $mod->{v} = pack "f*", @{$mod->{v}};
1736 $_ = [scalar @$_, pack "S!*", @$_]
1737 for values %{$mod->{g}};
1738 $mod
1739 };
1740
1741 my $r = $demo{r} or die;
1742
1743 glDepthMask 1;
1744 glClear GL_DEPTH_BUFFER_BIT;
1745 glEnable GL_TEXTURE_2D;
1746 glEnable GL_DEPTH_TEST;
1747 glEnable GL_CULL_FACE;
1748 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1749
1750 glMatrixMode GL_PROJECTION;
1751 glLoadIdentity;
1752 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1753 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1754 glMatrixMode GL_MODELVIEW;
1755 glLoadIdentity;
1756
1757 glPushMatrix;
1758 glTranslate 0, 0, -800;
1759 glScale 1, -1, 1;
1760 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1761 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1762 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1763 glScale 50, 50, 50;
1764
1765 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1766 while (my ($k, $v) = each %{$r->{g}}) {
1767 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1768 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1769 }
1770
1771 glPopMatrix;
1772
1773 glShadeModel GL_FLAT;
1774 glDisable GL_DEPTH_TEST;
1775 glDisable GL_TEXTURE_2D;
1776 glDepthMask 0;
1777
1778 $WANT_REFRESH++;
1779};
1780
1781 CFClient::SDL_GL_SwapBuffers; 1798 CFClient::SDL_GL_SwapBuffers;
1782} 1799}
1783 1800
1784my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1801my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1785 $NOW = time; 1802 $NOW = time;
… …
1831# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1848# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1832 }, 1849 },
1833 CFClient::SDL_KEYDOWN => sub { 1850 CFClient::SDL_KEYDOWN => sub {
1834 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1851 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1835 # alt-enter 1852 # alt-enter
1853 $FULLSCREEN_ENABLE->toggle;
1836 video_shutdown; 1854 video_shutdown;
1837 $CFG->{fullscreen} = !$CFG->{fullscreen};
1838 video_init; 1855 video_init;
1839 } else { 1856 } else {
1840 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1857 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1841 } 1858 }
1842 }, 1859 },
… …
1856############################################################################# 1873#############################################################################
1857 1874
1858$SIG{INT} = $SIG{TERM} = sub { exit }; 1875$SIG{INT} = $SIG{TERM} = sub { exit };
1859 1876
1860{ 1877{
1861 local $SIG{__DIE__} = sub {
1862 return unless defined $^S && !$^S;
1863 Carp::confess $_[1];#d#TODO: remove when stable
1864 CFClient::fatal $_[0];
1865 };
1866
1867 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1868 CFClient::UI::set_layout ($::CFG->{layout}); 1879 CFClient::UI::set_layout ($::CFG->{layout});
1869 1880
1870 my %DEF_CFG = ( 1881 my %DEF_CFG = (
1871 sdl_mode => 0, 1882 sdl_mode => 0,
… …
1889 bgm_volume => 0.25, 1900 bgm_volume => 0.25,
1890 face_prefetch => 0, 1901 face_prefetch => 0,
1891 output_sync => 1, 1902 output_sync => 1,
1892 output_count => 1, 1903 output_count => 1,
1893 pickup => 0, 1904 pickup => 0,
1905 inv_sort => "mtime",
1894 default => "profile", # default profile 1906 default => "profile", # default profile
1895 ); 1907 );
1896 1908
1897 while (my ($k, $v) = each %DEF_CFG) { 1909 while (my ($k, $v) = each %DEF_CFG) {
1898 $CFG->{$k} = $v unless exists $CFG->{$k}; 1910 $CFG->{$k} = $v unless exists $CFG->{$k};

Diff Legend

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