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.75 by root, Sun Jun 18 17:23:36 2006 UTC vs.
Revision 1.101 by elmex, Sun Jul 23 17:03:44 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::Pod;
42use CFClient::BindingEditor;
41use CFClient::MapWidget; 43use CFClient::MapWidget;
42 44
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE';
44 47
45$Event::DIED = sub { 48$Event::DIED = sub {
46 # TODO: display dialog box or so 49 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 50 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 51 CFClient::error $_[1];
… …
84our $CONSOLE; 87our $CONSOLE;
85our $METASERVER; 88our $METASERVER;
86our $LOGIN_BUTTON; 89our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 90our $QUIT_DIALOG;
88our $HOST_ENTRY; 91our $HOST_ENTRY;
92our $FULLSCREEN_ENABLE;
93our $PICKUP_ENABLE;
89our $SERVER_INFO; 94our $SERVER_INFO;
90 95
91our $SETUP_DIALOG; 96our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 97our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 98our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 99our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 100
101our $PL_NOTEBOOK;
97our $STATS_WINDOW; 102our $PL_WINDOW;
103
104our $INVENTORY_PAGE;
105our $STATS_PAGE;
106our $SKILL_PAGE;
107our $SPELL_PAGE;
108
109our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 110our $MESSAGE_WINDOW;
99our $FLOORBOX; 111our $FLOORBOX;
100our $GAUGES; 112our $GAUGES;
101our $STATWIDS; 113our $STATWIDS;
102 114
… …
109 121
110our $ALT_ENTER_MESSAGE; 122our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 123our $STATUSBOX;
112our $DEBUG_STATUS; 124our $DEBUG_STATUS;
113 125
114our $INV_WINDOW;
115our $INV; 126our $INV;
116our $INVR; 127our $INVR;
117our $INV_RIGHT_HB; 128our $INV_RIGHT_HB;
118 129
119our $BIND_EDITOR; 130our $BIND_EDITOR;
131our $BIND_UPD_CB;
120 132
121our $PICKUP_CFG; 133our $PICKUP_CFG;
122 134
123sub status { 135sub status {
124 $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]);
125} 137}
126 138
127sub debug { 139sub debug {
128 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
129} 141}
… …
178 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
179 191
180 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
181 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
182 ellipsise => 0, 194 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
184 196
185 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
186 198
187 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
188 text => "Next Race", 200 text => "Next Race",
… …
205 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
206 ellipsise => 0, 218 ellipsise => 0,
207 markup => 219 markup =>
208 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "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 "
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 " 222 . "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" 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"
213 . "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 "
214 . "so you can take your time making this important choice." 226 . "this race eventually, so you can take your time making this important choice."
215 ; 227 ;
216 228
217 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 232 destroy_query_dialog $conn;
221 return; 233 return;
222 } 234 }
223 235
224 $STATS_WINDOW->show; 236 $STATS_PAGE->show;
225 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
226 238
227 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 241 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
231 243
232 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
233 245
234 # left: re-roll 246 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
… …
241 }, 253 },
242 ); 254 );
243 255
244 # center: swap stats 256 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
258 expand => 1,
246 value => $_, 259 value => $_,
247 options => [ 260 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
269 # right: accept 282 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 283 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept", 284 text => "Accept",
272 on_activate => sub { 285 on_activate => sub {
273 $conn->send ("reply n"); 286 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 287 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
276 0 289 0
277 }, 290 },
278 ); 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 }
279 313
280 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
281 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
282 ellipsise => 0, 316 ellipsise => 0,
283 markup => 317 markup =>
284 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "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"
286 . "(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"
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. " 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"
288 . "Race selection will influence those values later on."
289 ; 323 ;
290 } 324 }
291 325
292 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
293 on_changed => sub { 327 on_changed => sub {
… …
371 405
372sub stop_game { 406sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 407 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 408 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 409 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 410 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 411 $SPELL_PAGE->clear_spells;
378 412
379 return unless $CONN; 413 return unless $CONN;
380 414
381 status "connection closed"; 415 status "connection closed";
382 416
383 destroy_query_dialog $CONN; 417 destroy_query_dialog $CONN;
384 $CONN->destroy; 418 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 419 $CONN = 0; # false, does not autovivify
420
421 undef $MAP;
386} 422}
387 423
388sub graphics_setup { 424sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 425 my $vbox = new CFClient::UI::VBox;
390 426
… …
405 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
406 442
407 my $row = 1; 443 my $row = 1;
408 444
409 $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");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
411 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
412 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
413 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
414 ); 450 );
415 451
… …
465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
466 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.",
467 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
468 ); 504 );
469 505
470 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
471
472 $table->add (1, $row++, new CFClient::UI::Slider
473 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
474 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
475 on_changed => sub {
476 $CFG->{stat_fontsize} = $_[1];
477 &set_stats_window_fontsize;
478 0
479 }
480 );
481
482 $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");
483 $table->add (1, $row++, new CFClient::UI::Slider 507 $table->add (1, $row++, new CFClient::UI::Slider
484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
485 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.",
486 on_changed => sub { 510 on_changed => sub {
… …
555 ); 579 );
556 580
557 $vbox 581 $vbox
558} 582}
559 583
560sub set_stats_window_fontsize {
561 for (values %{$STATWIDS}) {
562 $_->set_fontsize ($::CFG->{stat_fontsize});
563 }
564}
565
566sub set_gauge_window_fontsize { 584sub set_gauge_window_fontsize {
567 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 585 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
568 $_->set_fontsize ($::CFG->{gauge_fontsize}); 586 $_->set_fontsize ($::CFG->{gauge_fontsize});
569 } 587 }
570} 588}
… …
649 667
650 $table 668 $table
651} 669}
652 670
653sub stats_window { 671sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 672 my $r = new CFClient::UI::ScrolledWindow (
655 y => $HEIGHT * (2/8), 673 expand => 1,
656 x => "max", 674 scroll_y => 1
657 title => "Stats", 675 );
658 name => "stats_window", 676 $r->add (my $vb = new CFClient::UI::VBox);
659 has_close_button => 1;
660 677
661 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
662 $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,
663 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
664 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.");
665 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 681 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
666 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
… …
679 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
680 696
681 my $color2 = [1, 1, 0]; 697 my $color2 = [1, 1, 0];
682 698
683 for ( 699 for (
684 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 700 [0, 0, st_str => "Str", 30],
685 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 701 [0, 1, st_dex => "Dex", 30],
686 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 702 [0, 2, st_con => "Con", 30],
687 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 703 [0, 3, st_int => "Int", 30],
688 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 704 [0, 4, st_wis => "Wis", 30],
689 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 705 [0, 5, st_pow => "Pow", 30],
690 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 706 [0, 6, st_cha => "Cha", 30],
691 707
692 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 708 [2, 0, st_wc => "Wc", -120],
693 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 709 [2, 1, st_ac => "Ac", -120],
694 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 710 [2, 2, st_dam => "Dam", 120],
695 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 711 [2, 3, st_arm => "Arm", 120],
696 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 712 [2, 4, st_spd => "Spd", 10.54],
697 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 713 [2, 5, st_wspd => "WSp", 10.54],
698 ) { 714 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 715 my ($col, $row, $id, $label, $template) = @$_;
700 716
701 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
702 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 718 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
703 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 720 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
704 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 721 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
705 } 723 }
706 724
707 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
708 726
709 my $row = 0; 727 my $row = 0;
710 my $col = 0; 728 my $col = 0;
711 729
712 my %resist_names = ( 730 my %resist_names = (
731 slow => ["Slow",
713 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 732 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
733 holyw => ["Holy Word",
714 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 734 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
735 conf => ["Confusion",
715 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 736 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
737 fire => ["Fire",
716 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 738 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
739 depl => ["Depletion",
717 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 740 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
741 magic => ["Magic",
718 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 742 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
743 drain => ["Draining",
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 744 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
745 acid => ["Acid",
720 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 746 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
747 pois => ["Poison",
721 pois => "<b>Poison</b> (resistance to getting poisoned)", 748 "<b>Poison</b> (resistance to getting poisoned)"],
749 para => ["Paralysation",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 750 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
751 deat => ["Death",
723 deat => "<b>Death</b> (resistance against death spells)", 752 "<b>Death</b> (resistance against death spells)"],
724 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 753 phys => ["Physical",
754 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
755 blind => ["Blind",
725 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 756 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
757 fear => ["Fear",
726 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 758 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
759 tund => ["Turn undead",
727 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 760 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
761 elec => ["Electricity",
728 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 762 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
763 cold => ["Cold",
729 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 764 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
765 ghit => ["Ghost hit",
730 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 766 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
731 ); 767 );
732 for (qw/slow holyw conf fire depl magic 768 for (qw/slow holyw conf fire depl magic
733 drain acid pois para deat phys 769 drain acid pois para deat phys
734 blind fear tund elec cold ghit/) 770 blind fear tund elec cold ghit/)
735 { 771 {
… …
740 template => "-100%", 776 template => "-100%",
741 align => +1, 777 align => +1,
742 valign => 0, 778 valign => 0,
743 can_events => 1, 779 can_events => 1,
744 can_hover => 1, 780 can_hover => 1,
745 tooltip => $resist_names{$_}, 781 tooltip => $resist_names{$_}->[1],
746 ); 782 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
748 font => $FONT_FIXED, 784 font => $FONT_FIXED,
749 can_hover => 1, 785 can_hover => 1,
750 can_events => 1, 786 can_events => 1,
751 image => "ui/resist/resist_$_.png", 787 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 788 tooltip => $resist_names{$_}->[1],
789 );
790 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
791 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED,
793 can_hover => 1,
794 can_events => 1,
795 tooltip => $resist_names{$_}->[1],
753 ); 796 );
754 797
755 $row++; 798 $row++;
756 if ($row % 6 == 0) { 799 if ($row % 6 == 0) {
757 $col += 2; 800 $col += 3;
758 $row = 0; 801 $row = 0;
759 } 802 }
760 } 803 }
761 804
762 &set_stats_window_fontsize;
763 update_stats_window ({}); 805 #update_stats_window ({});
764 806
807 $r
808}
809
810sub skill_window {
811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
812 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
765 $tgw 813 $sw
766} 814}
767 815
768sub formsep($) { 816sub formsep($) {
769 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
770} 818}
771 819
772sub update_stats_window {
773 my ($stats) = @_;
774
775 # I love text protocols...
776
777 my $hp = $stats->{+CS_STAT_HP} * 1;
778 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
779 my $sp = $stats->{+CS_STAT_SP} * 1;
780 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
781 my $fo = $stats->{+CS_STAT_FOOD} * 1;
782 my $fo_m = 999;
783 my $gr = $stats->{+CS_STAT_GRACE} * 1;
784 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
785
786 $GAUGES->{hp} ->set_value ($hp, $hp_m);
787 $GAUGES->{mana} ->set_value ($sp, $sp_m);
788 $GAUGES->{food} ->set_value ($fo, $fo_m);
789 $GAUGES->{grace} ->set_value ($gr, $gr_m);
790 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
791 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
792 my $rng = $stats->{+CS_STAT_RANGE};
793 $rng =~ s/^Range: //; # thank you so much dear server
794 $GAUGES->{range} ->set_text ("Rng: " . $rng);
795 my $title = $stats->{+CS_STAT_TITLE};
796 $title =~ s/^Player: //;
797 $STATWIDS->{title} ->set_text ("Title: " . $title);
798
799 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
800 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
801 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
802 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
803 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
812
813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
814
815 my %tbl = (
816 phys => CS_STAT_RES_PHYS,
817 magic => CS_STAT_RES_MAG,
818 fire => CS_STAT_RES_FIRE,
819 elec => CS_STAT_RES_ELEC,
820 cold => CS_STAT_RES_COLD,
821 conf => CS_STAT_RES_CONF,
822 acid => CS_STAT_RES_ACID,
823 drain => CS_STAT_RES_DRAIN,
824 ghit => CS_STAT_RES_GHOSTHIT,
825 pois => CS_STAT_RES_POISON,
826 slow => CS_STAT_RES_SLOW,
827 para => CS_STAT_RES_PARA,
828 tund => CS_STAT_TURN_UNDEAD,
829 fear => CS_STAT_RES_FEAR,
830 depl => CS_STAT_RES_DEPLETE,
831 deat => CS_STAT_RES_DEATH,
832 holyw => CS_STAT_RES_HOLYWORD,
833 blind => CS_STAT_RES_BLIND,
834 );
835
836 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
837 for keys %tbl;
838}
839
840my $METASERVER_ATIME; 820my $METASERVER_ATIME;
841 821
842sub update_metaserver { 822sub update_metaserver {
823 my ($metaserver_dialog) = @_;
824
825 $METASERVER = $metaserver_dialog
826 if defined $metaserver_dialog;
827
843 return if $METASERVER_ATIME > time; 828 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 829 $METASERVER_ATIME = time + 60;
845 830
846 my $table = $METASERVER->{table}; 831 my $table = $METASERVER->{table};
847 $table->clear; 832 $table->clear;
… …
935 } 920 }
936 }); 921 });
937} 922}
938 923
939sub metaserver_dialog { 924sub metaserver_dialog {
925 my $vbox = new CFClient::UI::VBox;
926 my $table = new CFClient::UI::Table;
927 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
928
940 my $dialog = new CFClient::UI::FancyFrame 929 my $dialog = new CFClient::UI::FancyFrame
941 title => "Server List", 930 title => "Server List",
942 name => 'metaserver_dialog', 931 name => 'metaserver_dialog',
943 x => 'center', 932 x => 'center',
944 y => 'center', 933 y => 'center',
945 z => 3, 934 z => 3,
946 force_h => $::HEIGHT * 0.4, 935 force_h => $::HEIGHT * 0.4,
947 child => (my $vbox = new CFClient::UI::VBox), 936 child => $vbox,
937 has_close_button => 1,
938 table => $table,
948 on_visibility_change => sub { 939 on_visibility_change => sub {
949 update_metaserver if $_[1]; 940 update_metaserver ($_[0]) if $_[1];
950 0 941 0
951 }, 942 },
952 ; 943 ;
953
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957 944
958 $dialog 945 $dialog
959} 946}
960 947
961sub server_setup { 948sub server_setup {
… …
977 $CFG->{profile}{default}{host} = $value; 964 $CFG->{profile}{default}{host} = $value;
978 0 965 0
979 } 966 }
980 ); 967 );
981 968
982 $METASERVER = metaserver_dialog;
983
984 $vbox->add (new CFClient::UI::Button 969 $vbox->add (new CFClient::UI::Button
985 expand => 1, 970 expand => 1,
986 text => "Server List", 971 text => "Server List",
987 other => $METASERVER, 972 other => $METASERVER,
988 tooltip => "Show a list of available crossfire servers", 973 tooltip => "Show a list of available crossfire servers",
… …
1083sub message_window { 1068sub message_window {
1084 my $window = new CFClient::UI::FancyFrame 1069 my $window = new CFClient::UI::FancyFrame
1085 name => "message_window", 1070 name => "message_window",
1086 title => "Messages", 1071 title => "Messages",
1087 border_bg => [1, 1, 1, 1], 1072 border_bg => [1, 1, 1, 1],
1088 bg => [0, 0, 0, 0.75],
1089 x => "max", 1073 x => "max",
1090 y => 0, 1074 y => 0,
1091 force_w => $::WIDTH * 0.4, 1075 force_w => $::WIDTH * 0.4,
1092 force_h => $::HEIGHT * 0.5, 1076 force_h => $::HEIGHT * 0.5,
1093 child => (my $vbox = new CFClient::UI::VBox), 1077 child => (my $vbox = new CFClient::UI::VBox),
… …
1149 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1133 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1150 x => "center", 1134 x => "center",
1151 y => "center", 1135 y => "center",
1152 z => 50, 1136 z => 50,
1153 title => "Really Quit?", 1137 title => "Really Quit?",
1138 on_key_down => sub {
1139 my ($dialog, $ev) = @_;
1140 $ev->{sym} == 27 and $dialog->hide;
1141 }
1154 ; 1142 ;
1155 1143
1156 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1144 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1157 1145
1158 $vb->add (new CFClient::UI::Label 1146 $vb->add (new CFClient::UI::Label
… …
1172 on_activate => sub { exit }, 1160 on_activate => sub { exit },
1173 ); 1161 );
1174 } 1162 }
1175 1163
1176 $QUIT_DIALOG->show; 1164 $QUIT_DIALOG->show;
1165 $QUIT_DIALOG->grab_focus;
1177} 1166}
1178 1167
1179sub autopickup_setup { 1168sub autopickup_setup {
1180 my $table = new CFClient::UI::Table; 1169 my $table = new CFClient::UI::Table;
1181 1170
1182 for ( 1171 for (
1183 ["General", 0, 0, 1172 ["General", 0, 0,
1184 ["Enable autopickup" => PICKUP_NEWMODE], 1173 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1185 ["Inhibit autopickup" => PICKUP_INHIBIT], 1174 ["Inhibit autopickup" => PICKUP_INHIBIT],
1186 ["Stop before pickup" => PICKUP_STOP], 1175 ["Stop before pickup" => PICKUP_STOP],
1187 ["Debug autopickup" => PICKUP_DEBUG], 1176 ["Debug autopickup" => PICKUP_DEBUG],
1188 ], 1177 ],
1189 ["Weapons", 0, 6, 1178 ["Weapons", 0, 6,
… …
1226 for (@bits) { 1215 for (@bits) {
1227 ++$y; 1216 ++$y;
1228 1217
1229 my $mask = $_->[1]; 1218 my $mask = $_->[1];
1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1219 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1220 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1221 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1222 on_changed => sub {
1234 my ($box, $value) = @_; 1223 my ($box, $value) = @_;
1235 1224
1236 if ($value) { 1225 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1226 $::CFG->{pickup} |= $mask;
… …
1242 $::CONN->send_command ("pickup $::CFG->{pickup}") 1231 $::CONN->send_command ("pickup $::CFG->{pickup}")
1243 if defined $::CONN; 1232 if defined $::CONN;
1244 1233
1245 0 1234 0
1246 }); 1235 });
1236
1237 ${$_->[2]} = $checkbox if $_->[2];
1247 } 1238 }
1248 } 1239 }
1249 1240
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1241 $table->add (2, 18, new CFClient::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1242 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1243 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1244 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1245 on_changed => sub {
1254 my ($slider, $value) = @_; 1246 my ($slider, $value) = @_;
1255 1247
1256 $::CFG->{pickup} &= ~0x7; 1248 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1249 $::CFG->{pickup} |= int $value
1258 if $value; 1250 if $value;
1259 1; 1251 1;
1260 }); 1252 });
1253
1261 $table->add (3, 18, new CFClient::UI::Button 1254 $table->add (3, 18, new CFClient::UI::Button
1262 text => "set", 1255 text => "set",
1263 on_activate => sub { 1256 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1257 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1258 if defined $::CONN;
… …
1267 }); 1260 });
1268 1261
1269 $table 1262 $table
1270} 1263}
1271 1264
1272sub inventory_window { 1265sub inventory_widget {
1266 my $hb = new CFClient::UI::HBox homogeneous => 1;
1267
1268 $hb->add (my $vb1 = new CFClient::UI::VBox);
1269 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1270
1271 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1272
1273 use sort 'stable';
1274
1275 $hb1->add (new CFClient::UI::Combobox
1276 value => undef,
1277 options => [
1278 [undef, "Type/Name"],
1279 [
1280 sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type}
1283 } @_ },
1284 "Weight/Type",
1285 ],
1286 [sub { } => "#TODO#"],
1287 ],
1288 on_changed => sub {
1289 $INV->set_sort_order ($_[1]);
1290 },
1291 );
1292 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1293 #TODO# update to weigh/maxweight
1294 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1295
1296 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1297 $sw1->add ($INV = new CFClient::UI::Inventory);
1298
1299 $hb->add (my $vb2 = new CFClient::UI::VBox);
1300
1301 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1302
1303 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304 $sw2->add ($INVR = new CFClient::UI::Inventory);
1305
1306 # XXX: Call after $INVR = ... because set_opencont sets the items
1307 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1308
1309 $hb
1310}
1311
1312sub toggle_player_page {
1313 my ($widget) = @_;
1314
1315 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1316 $PL_WINDOW->hide;
1317 } else {
1318 $PL_NOTEBOOK->set_current_page ($widget);
1319 $PL_WINDOW->show;
1320 }
1321}
1322
1323sub player_window {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1324 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1274 x => "center", 1325 x => "center",
1275 y => "center", 1326 y => "center",
1276 force_w => $WIDTH * 9/10, 1327 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1328 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1329 title => "Player",
1330 name => "playerbook",
1279 has_close_button => 1, 1331 has_close_button => 1
1280 ; 1332 ;
1281 1333
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1334 my $ntb =
1335 $PL_NOTEBOOK =
1336 new CFClient::UI::Notebook expand => 1, debug => 1;
1283 1337
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1338 $ntb->add (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1339 "Statistics (F2)" => $STATS_PAGE = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1340 "Shows statistics, where all your Stats and Resistances are shown."
1341 );
1342 $ntb->add (
1343 "Skills (F3)" => $SKILL_PAGE = skill_window,
1344 "Shows all your Skills."
1345 );
1287 1346
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1347 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1348 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1349 $ntb->add (
1350 "Spellbook (F4)" => $spellsw,
1351 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1352 );
1353 $ntb->add (
1354 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1355 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1356 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1357 );
1289 1358
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1359 $ntb->set_current_page ($INVENTORY_PAGE);
1291 1360
1292 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1361 $plwin->add ($ntb);
1293 1362 $plwin
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $invwin
1298} 1363}
1299 1364
1300sub spell_setup { 1365sub update_bindings {
1301 new CFClient::UI::SpellList 1366 $BIND_UPD_CB->() if $BIND_UPD_CB;
1302} 1367}
1303 1368
1304sub keyboard_setup { 1369sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1370 my $binding_list = new CFClient::UI::VBox;
1306 1371
1307 my $refresh; 1372 my $refresh;
1308 $refresh = sub { 1373 $refresh = $BIND_UPD_CB = sub {
1309 $binding_list->clear (); 1374 $binding_list->clear ();
1310 1375
1311 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1376 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1377 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1378 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1379 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315 1380
1316 my $lbl = join "; ", @$cmds; 1381 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1382 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox); 1383 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button 1384 $hb->add (new CFClient::UI::Button
1320 text => "delete", 1385 text => "delete",
1321 tooltip => "Deletes the binding", 1386 tooltip => "Deletes the binding",
1322 on_activate => sub { 1387 on_activate => sub {
… …
1331 on_activate => sub { 1396 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1397 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1398 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1399 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1400 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1401 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds; 1402 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1403 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1404 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1405 $SETUP_DIALOG->show;
1341 }, 1406 },
1342 sub { 1407 sub {
… …
1376 tooltip => "This button opens the binding editor with an empty binding.", 1441 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub { 1442 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [], 1443 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub { 1444 sub {
1380 my ($mod, $sym, $cmds) = @_; 1445 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds; 1446 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1382 $refresh->(); 1447 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1448 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show; 1449 $SETUP_DIALOG->show;
1385 }, 1450 },
1386 sub { 1451 sub {
… …
1407 $refresh->(); 1472 $refresh->();
1408 1473
1409 $vb 1474 $vb
1410} 1475}
1411 1476
1477# just weirdness, pls. ignore
1478sub load_html_page {
1479 my ($viewer, $base) = @_;
1480
1481 $viewer->clear;
1482
1483 require LWP::Simple;
1484 require HTML::Parser;
1485 require URI;
1486
1487 my $page = LWP::Simple::get ($base)
1488 or return;
1489
1490 my @s = { };
1491 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1492
1493 my $parser = HTML::Parser->new (
1494 text_h => [sub {
1495 my ($text) = @_;
1496 $text =~ s/\s+/ /g;
1497 $s[-1]{text} .= CFClient::asxml $text;
1498 }, "dtext"],
1499 start_h => [sub {
1500 my ($tag, $attr) = @_;
1501 if ($passthrough{$tag}) {
1502 $s[-1]{text} .= "<$tag>";
1503 } elsif ($tag eq "h1") {
1504 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1505 } elsif ($tag eq "h2") {
1506 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1507 } elsif ($tag eq "h3") {
1508 push @s, { text => "<span size='large'>" };
1509 } elsif ($tag eq "a") {
1510 push @s, { text => "", url => $attr->{href} };
1511 } elsif ($tag eq "p") {
1512 push @s, { };
1513 } elsif ($tag eq "img") {
1514 eval {
1515 push @{$s[-1]{obj}}, new CFClient::UI::Image
1516 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1517 $s[-1]{text} .= "\x{fffc}";
1518 };
1519 }
1520 }, "tagname, attr"],
1521 end_h => [sub {
1522 my ($tag) = @_;
1523 if ($passthrough{$tag}) {
1524 $s[-1]{text} .= "</$tag>";
1525 } elsif ($tag =~ /^h\d$/) {
1526 $s[-1]{text} .= "</span>";
1527 push @s, { };
1528 } elsif ($tag eq "a") {
1529 my $S = pop @s;
1530 $s[-1]{text} .= "\x{fffc}";
1531 push @{$s[-1]{obj}}, new CFClient::UI::Label
1532 fg => [0.8, 0.8, 1],
1533 markup => "<u>$S->{text}</u>",
1534 fontsize => 0.8,
1535 can_events => 1,
1536 can_focus => 1,
1537 on_button_up => sub {
1538 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1539 },
1540 ;
1541 }
1542 }, "tagname"],
1543 );
1544
1545 $parser->parse ($page);
1546 $parser->eof;
1547
1548 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1549 for @s;
1550
1551 $viewer->set_offset (0);
1552}
1553
1412sub help_window { 1554sub help_window {
1413 my $win = new CFClient::UI::FancyFrame 1555 my $win = new CFClient::UI::FancyFrame
1414 x => 'center', 1556 x => 'center',
1415 y => 'center', 1557 y => 'center',
1416 z => 2, 1558 z => 2,
1417 name => 'doc_browser', 1559 name => 'doc_browser',
1418 force_w => int $WIDTH * 7/8, 1560 force_w => int $WIDTH * 7/8,
1419 force_h => int $HEIGHT * 7/8, 1561 force_h => int $HEIGHT * 7/8,
1420 title => "Documentation"; 1562 title => "Help Browser",
1563 has_close_button => 1;
1421 1564
1422 $win->add (my $vbox = new CFClient::UI::VBox); 1565 $win->add (my $vbox = new CFClient::UI::VBox);
1423 1566
1424 $vbox->add (my $buttons = new CFClient::UI::HBox); 1567 $vbox->add (my $buttons = new CFClient::UI::HBox);
1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1568 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1571 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1572 $buttons->add (my $combo = new CFClient::UI::Combobox
1430 value => undef, 1573 value => undef,
1431 options => [ 1574 options => [
1432 [intro => "Introduction"], 1575 [intro => "Introduction"],
1433 [manual => "Manual"], 1576 [manual => "Main Manual"],
1434 [skill_help => "Skills"], 1577 [skill_help => "Skill Reference"],
1435 [command_help => "Commands"], 1578 [command_help => "Command Reference"],
1436 [dmcommand_help => "DM Commands"], 1579 [dmcommand_help => "DM Commands"],
1437 [COPYING => "License Terms"], 1580 [COPYING => "License Terms"],
1581 [test => "test (do not select)"], #d#TODO
1438 ], 1582 ],
1439 on_changed => sub { 1583 on_changed => sub {
1440 my ($self, $pod) = @_; 1584 my ($self, $pod) = @_;
1441 1585
1586 if ($pod eq "test") {#d#TODO
1587 eval {
1588 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1589 };
1590 warn "$@" if $@;
1591 return;
1592 }
1593
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1594 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1595 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1596
1597 #use Data::Dumper; warn Dumper $pom;#d#
1444 1598
1445 $viewer->clear; 1599 $viewer->clear;
1600
1601# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1602# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1603# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1604# ]);#d#
1446 1605
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1606 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1448 for @$pom; 1607 for @$pom;
1449 1608
1450 $viewer->set_offset (0); 1609 $viewer->set_offset (0);
1610
1451 0 1611 0
1452 }, 1612 },
1453 on_visibility_change => sub { 1613 on_visibility_change => sub {
1454 my ($self, $visible) = @_; 1614 my ($self, $visible) = @_;
1455 return unless $visible; 1615 return unless $visible;
… …
1502 z => 100, 1662 z => 100,
1503 force_x => "max", 1663 force_x => "max",
1504 force_y => 0; 1664 force_y => 0;
1505 $DEBUG_STATUS->show; 1665 $DEBUG_STATUS->show;
1506 1666
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1667 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1508 1668
1509 $STATUSBOX = new CFClient::UI::Statusbox; 1669 $STATUSBOX = new CFClient::UI::Statusbox;
1510 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1670 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1511 1671
1512 (new CFClient::UI::Frame 1672 (new CFClient::UI::Frame
… …
1562 z => 2, 1722 z => 2,
1563 force_w => $::WIDTH * 0.6, 1723 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 1724 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 1725 has_close_button => 1,
1566 ; 1726 ;
1727
1728 $METASERVER = metaserver_dialog;
1567 1729
1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1730 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1731 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 1732
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1733 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1581 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1743 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1582 . "with nothing set and the recording started. After doing the actions you " 1744 . "with nothing set and the recording started. After doing the actions you "
1583 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1745 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1584 . "After pressing the combo the binding will be saved automatically and the " 1746 . "After pressing the combo the binding will be saved automatically and the "
1585 . "binding editor closes"); 1747 . "binding editor closes");
1586 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1587 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1588 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1748 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1589 "Some debuggin' options. Do not ask."); 1749 "Some debuggin' options. Do not ask.");
1590 1750
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1751 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592 1752
… …
1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1756 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1597 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1757 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1598 1758
1599 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 1759 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
1600 1760
1601 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1602 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1761 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1762 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1605 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1606 1763
1607 $BUTTONBAR->add (new CFClient::UI::Button 1764 $BUTTONBAR->add (new CFClient::UI::Button
1608 text => "Save Config", 1765 text => "Save Config",
1609 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1766 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1610 on_activate => sub { 1767 on_activate => sub {
… …
1613 status "Configuration Saved"; 1770 status "Configuration Saved";
1614 0 1771 0
1615 }, 1772 },
1616 ); 1773 );
1617 1774
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1775 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1619 tooltip => "View Documentation"); 1776 tooltip => "View Documentation");
1620 1777
1621 $BUTTONBAR->add (new CFClient::UI::Button 1778 $BUTTONBAR->add (new CFClient::UI::Button
1622 text => "Quit", 1779 text => "Quit",
1623 tooltip => "Terminates the program", 1780 tooltip => "Terminates the program",
… …
1720 1877
1721 $WANT_REFRESH = 0; 1878 $WANT_REFRESH = 0;
1722 $CAN_REFRESH = 0; 1879 $CAN_REFRESH = 0;
1723 $LAST_REFRESH = $NOW; 1880 $LAST_REFRESH = $NOW;
1724 1881
17250 && do {
1726 # some weird model-drawing code, just a joke right now
1727 use CFClient::OpenGL;
1728
1729 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1730 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1731 $demo{r} ||= do {
1732 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1733 $mod->{v} = pack "f*", @{$mod->{v}};
1734 $_ = [scalar @$_, pack "S!*", @$_]
1735 for values %{$mod->{g}};
1736 $mod
1737 };
1738
1739 my $r = $demo{r} or die;
1740
1741 glDepthMask 1;
1742 glClear GL_DEPTH_BUFFER_BIT;
1743 glEnable GL_TEXTURE_2D;
1744 glEnable GL_DEPTH_TEST;
1745 glEnable GL_CULL_FACE;
1746 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1747
1748 glMatrixMode GL_PROJECTION;
1749 glLoadIdentity;
1750 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1751 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1752 glMatrixMode GL_MODELVIEW;
1753 glLoadIdentity;
1754
1755 glPushMatrix;
1756 glTranslate 0, 0, -800;
1757 glScale 1, -1, 1;
1758 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1759 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1760 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1761 glScale 50, 50, 50;
1762
1763 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1764 while (my ($k, $v) = each %{$r->{g}}) {
1765 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1766 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1767 }
1768
1769 glPopMatrix;
1770
1771 glShadeModel GL_FLAT;
1772 glDisable GL_DEPTH_TEST;
1773 glDisable GL_TEXTURE_2D;
1774 glDepthMask 0;
1775
1776 $WANT_REFRESH++;
1777};
1778
1779 CFClient::SDL_GL_SwapBuffers; 1882 CFClient::SDL_GL_SwapBuffers;
1780} 1883}
1781 1884
1782my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1885my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1783 $NOW = time; 1886 $NOW = time;
… …
1829# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1932# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1830 }, 1933 },
1831 CFClient::SDL_KEYDOWN => sub { 1934 CFClient::SDL_KEYDOWN => sub {
1832 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1935 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1833 # alt-enter 1936 # alt-enter
1937 $FULLSCREEN_ENABLE->toggle;
1834 video_shutdown; 1938 video_shutdown;
1835 $CFG->{fullscreen} = !$CFG->{fullscreen};
1836 video_init; 1939 video_init;
1837 } else { 1940 } else {
1838 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1941 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1839 } 1942 }
1840 }, 1943 },
… …
1856$SIG{INT} = $SIG{TERM} = sub { exit }; 1959$SIG{INT} = $SIG{TERM} = sub { exit };
1857 1960
1858{ 1961{
1859 local $SIG{__DIE__} = sub { 1962 local $SIG{__DIE__} = sub {
1860 return unless defined $^S && !$^S; 1963 return unless defined $^S && !$^S;
1861 Carp::confess $_[1];#d#TODO: remove when stable 1964 Carp::confess $_[0];#d#TODO: remove when stable
1862 CFClient::fatal $_[0]; 1965 CFClient::fatal $_[0];
1863 }; 1966 };
1864 1967
1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1968 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1866 CFClient::UI::set_layout ($::CFG->{layout}); 1969 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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