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.97 by elmex, Wed Jul 19 16:41:51 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::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
89our $SERVER_INFO; 93our $SERVER_INFO;
90 94
91our $SETUP_DIALOG; 95our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 97our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 99
100our $PL_NOTEBOOK;
97our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
99our $FLOORBOX; 110our $FLOORBOX;
100our $GAUGES; 111our $GAUGES;
101our $STATWIDS; 112our $STATWIDS;
102 113
… …
109 120
110our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 122our $STATUSBOX;
112our $DEBUG_STATUS; 123our $DEBUG_STATUS;
113 124
114our $INV_WINDOW;
115our $INV; 125our $INV;
116our $INVR; 126our $INVR;
117our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
118 128
119our $BIND_EDITOR; 129our $BIND_EDITOR;
130our $BIND_UPD_CB;
120 131
121our $PICKUP_CFG; 132our $PICKUP_CFG;
122 133
123sub status { 134sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 135 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
219 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
221 return; 232 return;
222 } 233 }
223 234
224 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
225 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
226 237
227 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 240 ellipsise => 0,
… …
269 # right: accept 280 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 281 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept", 282 text => "Accept",
272 on_activate => sub { 283 on_activate => sub {
273 $conn->send ("reply n"); 284 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 285 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 286 destroy_query_dialog $conn;
276 0 287 0
277 }, 288 },
278 ); 289 );
279 290
… …
371 382
372sub stop_game { 383sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 384 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 385 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 386 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 387 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 388 $SPELL_PAGE->clear_spells;
378 389
379 return unless $CONN; 390 return unless $CONN;
380 391
381 status "connection closed"; 392 status "connection closed";
382 393
383 destroy_query_dialog $CONN; 394 destroy_query_dialog $CONN;
384 $CONN->destroy; 395 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 396 $CONN = 0; # false, does not autovivify
397
398 undef $MAP;
386} 399}
387 400
388sub graphics_setup { 401sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 402 my $vbox = new CFClient::UI::VBox;
390 403
… …
405 $mode_slider->emit (changed => $mode_slider->{range}[0]); 418 $mode_slider->emit (changed => $mode_slider->{range}[0]);
406 419
407 my $row = 1; 420 my $row = 1;
408 421
409 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
411 state => $CFG->{fullscreen}, 424 state => $CFG->{fullscreen},
412 tooltip => "Bring the client into fullscreen mode.", 425 tooltip => "Bring the client into fullscreen mode.",
413 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
414 ); 427 );
415 428
… …
465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 478 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.", 479 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 }, 480 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
468 ); 481 );
469 482
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"); 483 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
483 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFClient::UI::Slider
484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 485 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.", 486 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
486 on_changed => sub { 487 on_changed => sub {
… …
555 ); 556 );
556 557
557 $vbox 558 $vbox
558} 559}
559 560
560sub set_stats_window_fontsize {
561 for (values %{$STATWIDS}) {
562 $_->set_fontsize ($::CFG->{stat_fontsize});
563 }
564}
565
566sub set_gauge_window_fontsize { 561sub set_gauge_window_fontsize {
567 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 562 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
568 $_->set_fontsize ($::CFG->{gauge_fontsize}); 563 $_->set_fontsize ($::CFG->{gauge_fontsize});
569 } 564 }
570} 565}
… …
649 644
650 $table 645 $table
651} 646}
652 647
653sub stats_window { 648sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 649 my $r =
655 y => $HEIGHT * (2/8), 650 new CFClient::UI::ScrolledWindow (
656 x => "max", 651 expand => 1,
657 title => "Stats", 652 scroll_y => 1
658 name => "stats_window", 653 );
659 has_close_button => 1; 654 $r->add (my $vb = new CFClient::UI::VBox);
660 655
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, 656 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
663 can_hover => 1, can_events => 1, 657 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."); 658 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, 659 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
666 can_hover => 1, can_events => 1, 660 can_hover => 1, can_events => 1,
… …
690 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 684 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
691 685
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."], 686 [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."],
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."], 687 [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."],
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."], 688 [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."],
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."], 689 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
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."], 690 [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."],
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."], 691 [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."],
698 ) { 692 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 693 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
700 694
… …
702 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 696 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
703 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 697 $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); 698 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
705 } 699 }
706 700
707 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 701 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
708 702
709 my $row = 0; 703 my $row = 0;
710 my $col = 0; 704 my $col = 0;
711 705
712 my %resist_names = ( 706 my %resist_names = (
707 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.)", 708 "<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.)"],
709 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.)", 710 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
711 conf => ["Confusion",
715 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 712 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
713 fire => ["Fire",
716 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 714 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
715 depl => ["Depletion",
717 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 716 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
717 magic => ["Magic",
718 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 718 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
719 drain => ["Draining",
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 720 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
721 acid => ["Acid",
720 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
723 pois => ["Poison",
721 pois => "<b>Poison</b> (resistance to getting poisoned)", 724 "<b>Poison</b> (resistance to getting poisoned)"],
725 para => ["Paralysation",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 726 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
727 deat => ["Death",
723 deat => "<b>Death</b> (resistance against death spells)", 728 "<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)", 729 phys => ["Physical",
730 "<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.)"],
731 blind => ["Blind",
725 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 732 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
733 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)", 734 "<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)"],
735 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...", 736 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
737 elec => ["Electricity",
728 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 738 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
739 cold => ["Cold",
729 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 740 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
741 ghit => ["Ghost hit",
730 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 742 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
731 ); 743 );
732 for (qw/slow holyw conf fire depl magic 744 for (qw/slow holyw conf fire depl magic
733 drain acid pois para deat phys 745 drain acid pois para deat phys
734 blind fear tund elec cold ghit/) 746 blind fear tund elec cold ghit/)
735 { 747 {
… …
740 template => "-100%", 752 template => "-100%",
741 align => +1, 753 align => +1,
742 valign => 0, 754 valign => 0,
743 can_events => 1, 755 can_events => 1,
744 can_hover => 1, 756 can_hover => 1,
745 tooltip => $resist_names{$_}, 757 tooltip => $resist_names{$_}->[1],
746 ); 758 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 759 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
748 font => $FONT_FIXED, 760 font => $FONT_FIXED,
749 can_hover => 1, 761 can_hover => 1,
750 can_events => 1, 762 can_events => 1,
751 image => "ui/resist/resist_$_.png", 763 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 764 tooltip => $resist_names{$_}->[1],
765 );
766 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
767 text => $resist_names{$_}->[0],
768 font => $FONT_FIXED,
769 can_hover => 1,
770 can_events => 1,
771 tooltip => $resist_names{$_}->[1],
753 ); 772 );
754 773
755 $row++; 774 $row++;
756 if ($row % 6 == 0) { 775 if ($row % 6 == 0) {
757 $col += 2; 776 $col += 3;
758 $row = 0; 777 $row = 0;
759 } 778 }
760 } 779 }
761 780
762 &set_stats_window_fontsize;
763 update_stats_window ({}); 781 #update_stats_window ({});
764 782
783 $r
784}
785
786sub skill_window {
787 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
788 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
765 $tgw 789 $sw
766} 790}
767 791
768sub formsep($) { 792sub formsep($) {
769 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 793 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
770} 794}
771 795
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; 796my $METASERVER_ATIME;
841 797
842sub update_metaserver { 798sub update_metaserver {
799 my ($metaserver_dialog) = @_;
800
801 $METASERVER = $metaserver_dialog
802 if defined $metaserver_dialog;
803
843 return if $METASERVER_ATIME > time; 804 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 805 $METASERVER_ATIME = time + 60;
845 806
846 my $table = $METASERVER->{table}; 807 my $table = $METASERVER->{table};
847 $table->clear; 808 $table->clear;
… …
935 } 896 }
936 }); 897 });
937} 898}
938 899
939sub metaserver_dialog { 900sub metaserver_dialog {
901 my $vbox = new CFClient::UI::VBox;
902 my $table = new CFClient::UI::Table;
903 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
904
940 my $dialog = new CFClient::UI::FancyFrame 905 my $dialog = new CFClient::UI::FancyFrame
941 title => "Server List", 906 title => "Server List",
942 name => 'metaserver_dialog', 907 name => 'metaserver_dialog',
943 x => 'center', 908 x => 'center',
944 y => 'center', 909 y => 'center',
945 z => 3, 910 z => 3,
946 force_h => $::HEIGHT * 0.4, 911 force_h => $::HEIGHT * 0.4,
947 child => (my $vbox = new CFClient::UI::VBox), 912 child => $vbox,
913 has_close_button => 1,
914 table => $table,
948 on_visibility_change => sub { 915 on_visibility_change => sub {
949 update_metaserver if $_[1]; 916 update_metaserver ($_[0]) if $_[1];
950 0 917 0
951 }, 918 },
952 ; 919 ;
953
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957 920
958 $dialog 921 $dialog
959} 922}
960 923
961sub server_setup { 924sub server_setup {
… …
977 $CFG->{profile}{default}{host} = $value; 940 $CFG->{profile}{default}{host} = $value;
978 0 941 0
979 } 942 }
980 ); 943 );
981 944
982 $METASERVER = metaserver_dialog;
983
984 $vbox->add (new CFClient::UI::Button 945 $vbox->add (new CFClient::UI::Button
985 expand => 1, 946 expand => 1,
986 text => "Server List", 947 text => "Server List",
987 other => $METASERVER, 948 other => $METASERVER,
988 tooltip => "Show a list of available crossfire servers", 949 tooltip => "Show a list of available crossfire servers",
… …
1083sub message_window { 1044sub message_window {
1084 my $window = new CFClient::UI::FancyFrame 1045 my $window = new CFClient::UI::FancyFrame
1085 name => "message_window", 1046 name => "message_window",
1086 title => "Messages", 1047 title => "Messages",
1087 border_bg => [1, 1, 1, 1], 1048 border_bg => [1, 1, 1, 1],
1088 bg => [0, 0, 0, 0.75],
1089 x => "max", 1049 x => "max",
1090 y => 0, 1050 y => 0,
1091 force_w => $::WIDTH * 0.4, 1051 force_w => $::WIDTH * 0.4,
1092 force_h => $::HEIGHT * 0.5, 1052 force_h => $::HEIGHT * 0.5,
1093 child => (my $vbox = new CFClient::UI::VBox), 1053 child => (my $vbox = new CFClient::UI::VBox),
… …
1179sub autopickup_setup { 1139sub autopickup_setup {
1180 my $table = new CFClient::UI::Table; 1140 my $table = new CFClient::UI::Table;
1181 1141
1182 for ( 1142 for (
1183 ["General", 0, 0, 1143 ["General", 0, 0,
1184 ["Enable autopickup" => PICKUP_NEWMODE], 1144 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1185 ["Inhibit autopickup" => PICKUP_INHIBIT], 1145 ["Inhibit autopickup" => PICKUP_INHIBIT],
1186 ["Stop before pickup" => PICKUP_STOP], 1146 ["Stop before pickup" => PICKUP_STOP],
1187 ["Debug autopickup" => PICKUP_DEBUG], 1147 ["Debug autopickup" => PICKUP_DEBUG],
1188 ], 1148 ],
1189 ["Weapons", 0, 6, 1149 ["Weapons", 0, 6,
… …
1226 for (@bits) { 1186 for (@bits) {
1227 ++$y; 1187 ++$y;
1228 1188
1229 my $mask = $_->[1]; 1189 my $mask = $_->[1];
1230 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1190 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1191 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1192 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1193 on_changed => sub {
1234 my ($box, $value) = @_; 1194 my ($box, $value) = @_;
1235 1195
1236 if ($value) { 1196 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1197 $::CFG->{pickup} |= $mask;
… …
1242 $::CONN->send_command ("pickup $::CFG->{pickup}") 1202 $::CONN->send_command ("pickup $::CFG->{pickup}")
1243 if defined $::CONN; 1203 if defined $::CONN;
1244 1204
1245 0 1205 0
1246 }); 1206 });
1207
1208 ${$_->[2]} = $checkbox if $_->[2];
1247 } 1209 }
1248 } 1210 }
1249 1211
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1212 $table->add (2, 18, new CFClient::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1213 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1214 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1215 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1216 on_changed => sub {
1254 my ($slider, $value) = @_; 1217 my ($slider, $value) = @_;
1255 1218
1256 $::CFG->{pickup} &= ~0x7; 1219 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1220 $::CFG->{pickup} |= int $value
1258 if $value; 1221 if $value;
1259 1; 1222 1;
1260 }); 1223 });
1224
1261 $table->add (3, 18, new CFClient::UI::Button 1225 $table->add (3, 18, new CFClient::UI::Button
1262 text => "set", 1226 text => "set",
1263 on_activate => sub { 1227 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1228 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1229 if defined $::CONN;
… …
1267 }); 1231 });
1268 1232
1269 $table 1233 $table
1270} 1234}
1271 1235
1272sub inventory_window { 1236sub inventory_widget {
1237 my $hb = new CFClient::UI::HBox homogeneous => 1;
1238
1239 $hb->add (my $vb1 = new CFClient::UI::VBox);
1240 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1241 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1242 $sw1->add ($INV = new CFClient::UI::Inventory);
1243
1244 $hb->add (my $vb2 = new CFClient::UI::VBox);
1245
1246 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1247
1248 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1249 $sw2->add ($INVR = new CFClient::UI::Inventory);
1250
1251 # XXX: Call after $INVR = ... because set_opencont sets the items
1252 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1253
1254 $hb
1255}
1256
1257sub toggle_player_page {
1258 my ($widget) = @_;
1259
1260 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1261 $PL_WINDOW->hide;
1262 } else {
1263 $PL_NOTEBOOK->set_current_page ($widget);
1264 $PL_WINDOW->show;
1265 }
1266}
1267
1268sub player_window {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1269 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1274 x => "center", 1270 x => "center",
1275 y => "center", 1271 y => "center",
1276 force_w => $WIDTH * 9/10, 1272 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1273 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1274 title => "Player",
1275 name => "playerbook",
1279 has_close_button => 1, 1276 has_close_button => 1
1280 ; 1277 ;
1281 1278
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1279 my $ntb =
1280 $PL_NOTEBOOK =
1281 new CFClient::UI::Notebook expand => 1, debug => 1;
1283 1282
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1283 $ntb->add (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1284 "Statistics (F2)" => $STATS_PAGE = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1285 "Shows statistics, where all your Stats and Resistances are shown."
1286 );
1287 $ntb->add (
1288 "Skills (F3)" => $SKILL_PAGE = skill_window,
1289 "Shows all your Skills."
1290 );
1287 1291
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1292 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1293 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1294 $ntb->add (
1295 "Spellbook (F4)" => $spellsw,
1296 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1297 );
1298 $ntb->add (
1299 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1300 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1301 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1302 );
1289 1303
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1304 $ntb->set_current_page ($INVENTORY_PAGE);
1291 1305
1292 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1306 $plwin->add ($ntb);
1293 1307 $plwin
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $invwin
1298} 1308}
1299 1309
1300sub spell_setup { 1310sub update_bindings {
1301 new CFClient::UI::SpellList 1311 $BIND_UPD_CB->() if $BIND_UPD_CB;
1302} 1312}
1303 1313
1304sub keyboard_setup { 1314sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1315 my $binding_list = new CFClient::UI::VBox;
1306 1316
1307 my $refresh; 1317 my $refresh;
1308 $refresh = sub { 1318 $refresh = $BIND_UPD_CB = sub {
1309 $binding_list->clear (); 1319 $binding_list->clear ();
1310 1320
1311 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1321 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1322 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1323 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1324 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315 1325
1316 my $lbl = join "; ", @$cmds; 1326 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1327 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox); 1328 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button 1329 $hb->add (new CFClient::UI::Button
1320 text => "delete", 1330 text => "delete",
1321 tooltip => "Deletes the binding", 1331 tooltip => "Deletes the binding",
1322 on_activate => sub { 1332 on_activate => sub {
… …
1331 on_activate => sub { 1341 on_activate => sub {
1332 $::BIND_EDITOR->set_binding ( 1342 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1343 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub { 1344 sub {
1335 my ($nmod, $nsym, $ncmds) = @_; 1345 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1346 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds; 1347 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338 $refresh->(); 1348 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1349 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show; 1350 $SETUP_DIALOG->show;
1341 }, 1351 },
1342 sub { 1352 sub {
… …
1376 tooltip => "This button opens the binding editor with an empty binding.", 1386 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub { 1387 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [], 1388 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub { 1389 sub {
1380 my ($mod, $sym, $cmds) = @_; 1390 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds; 1391 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1382 $refresh->(); 1392 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1393 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show; 1394 $SETUP_DIALOG->show;
1385 }, 1395 },
1386 sub { 1396 sub {
… …
1407 $refresh->(); 1417 $refresh->();
1408 1418
1409 $vb 1419 $vb
1410} 1420}
1411 1421
1422# just weirdness, pls. ignore
1423sub load_html_page {
1424 my ($viewer, $base) = @_;
1425
1426 $viewer->clear;
1427
1428 require LWP::Simple;
1429 require HTML::Parser;
1430 require URI;
1431
1432 my $page = LWP::Simple::get ($base)
1433 or return;
1434
1435 my @s = { };
1436 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1437
1438 my $parser = HTML::Parser->new (
1439 text_h => [sub {
1440 my ($text) = @_;
1441 $text =~ s/\s+/ /g;
1442 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1443 }, "dtext"],
1444 start_h => [sub {
1445 my ($tag, $attr) = @_;
1446 if ($passthrough{$tag}) {
1447 $s[-1]{text} .= "<$tag>";
1448 } elsif ($tag eq "h1") {
1449 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1450 } elsif ($tag eq "h2") {
1451 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1452 } elsif ($tag eq "h3") {
1453 push @s, { text => "<span size='large'>" };
1454 } elsif ($tag eq "a") {
1455 push @s, { text => "", url => $attr->{href} };
1456 } elsif ($tag eq "p") {
1457 push @s, { };
1458 } elsif ($tag eq "img") {
1459 eval {
1460 push @{$s[-1]{obj}}, new CFClient::UI::Image
1461 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1462 $s[-1]{text} .= "\x{fffc}";
1463 };
1464 }
1465 }, "tagname, attr"],
1466 end_h => [sub {
1467 my ($tag) = @_;
1468 if ($passthrough{$tag}) {
1469 $s[-1]{text} .= "</$tag>";
1470 } elsif ($tag =~ /^h\d$/) {
1471 $s[-1]{text} .= "</span>";
1472 push @s, { };
1473 } elsif ($tag eq "a") {
1474 my $S = pop @s;
1475 $s[-1]{text} .= "\x{fffc}";
1476 push @{$s[-1]{obj}}, new CFClient::UI::Label
1477 fg => [0.8, 0.8, 1],
1478 markup => "<u>$S->{text}</u>",
1479 fontsize => 0.8,
1480 can_events => 1,
1481 can_focus => 1,
1482 on_button_up => sub {
1483 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1484 },
1485 ;
1486 }
1487 }, "tagname"],
1488 );
1489
1490 $parser->parse ($page);
1491 $parser->eof;
1492
1493 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1494 for @s;
1495
1496 $viewer->set_offset (0);
1497}
1498
1412sub help_window { 1499sub help_window {
1413 my $win = new CFClient::UI::FancyFrame 1500 my $win = new CFClient::UI::FancyFrame
1414 x => 'center', 1501 x => 'center',
1415 y => 'center', 1502 y => 'center',
1416 z => 2, 1503 z => 2,
1417 name => 'doc_browser', 1504 name => 'doc_browser',
1418 force_w => int $WIDTH * 7/8, 1505 force_w => int $WIDTH * 7/8,
1419 force_h => int $HEIGHT * 7/8, 1506 force_h => int $HEIGHT * 7/8,
1420 title => "Documentation"; 1507 title => "Help Browser",
1508 has_close_button => 1;
1421 1509
1422 $win->add (my $vbox = new CFClient::UI::VBox); 1510 $win->add (my $vbox = new CFClient::UI::VBox);
1423 1511
1424 $vbox->add (my $buttons = new CFClient::UI::HBox); 1512 $vbox->add (my $buttons = new CFClient::UI::HBox);
1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1513 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1516 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1517 $buttons->add (my $combo = new CFClient::UI::Combobox
1430 value => undef, 1518 value => undef,
1431 options => [ 1519 options => [
1432 [intro => "Introduction"], 1520 [intro => "Introduction"],
1433 [manual => "Manual"], 1521 [manual => "Main Manual"],
1434 [skill_help => "Skills"], 1522 [skill_help => "Skill Reference"],
1435 [command_help => "Commands"], 1523 [command_help => "Command Reference"],
1436 [dmcommand_help => "DM Commands"], 1524 [dmcommand_help => "DM Commands"],
1437 [COPYING => "License Terms"], 1525 [COPYING => "License Terms"],
1526 [test => "test (do not select)"], #d#TODO
1438 ], 1527 ],
1439 on_changed => sub { 1528 on_changed => sub {
1440 my ($self, $pod) = @_; 1529 my ($self, $pod) = @_;
1441 1530
1531 if ($pod eq "test") {#d#TODO
1532 eval {
1533 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1534 };
1535 warn "$@" if $@;
1536 return;
1537 }
1538
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1539 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1540 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1444 1541
1445 $viewer->clear; 1542 $viewer->clear;
1543
1544# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1545# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1546# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1547# ]);#d#
1446 1548
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1549 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1448 for @$pom; 1550 for @$pom;
1449 1551
1450 $viewer->set_offset (0); 1552 $viewer->set_offset (0);
1553
1451 0 1554 0
1452 }, 1555 },
1453 on_visibility_change => sub { 1556 on_visibility_change => sub {
1454 my ($self, $visible) = @_; 1557 my ($self, $visible) = @_;
1455 return unless $visible; 1558 return unless $visible;
… …
1502 z => 100, 1605 z => 100,
1503 force_x => "max", 1606 force_x => "max",
1504 force_y => 0; 1607 force_y => 0;
1505 $DEBUG_STATUS->show; 1608 $DEBUG_STATUS->show;
1506 1609
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1610 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1508 1611
1509 $STATUSBOX = new CFClient::UI::Statusbox; 1612 $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]); 1613 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1511 1614
1512 (new CFClient::UI::Frame 1615 (new CFClient::UI::Frame
… …
1562 z => 2, 1665 z => 2,
1563 force_w => $::WIDTH * 0.6, 1666 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 1667 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 1668 has_close_button => 1,
1566 ; 1669 ;
1670
1671 $METASERVER = metaserver_dialog;
1567 1672
1568 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1673 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1674 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 1675
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1676 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1581 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1686 . "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 " 1687 . "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. " 1688 . "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 " 1689 . "After pressing the combo the binding will be saved automatically and the "
1585 . "binding editor closes"); 1690 . "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, 1691 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1589 "Some debuggin' options. Do not ask."); 1692 "Some debuggin' options. Do not ask.");
1590 1693
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1694 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592 1695
… …
1596 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1699 $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."); 1700 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1598 1701
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 1702 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 1703
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, 1704 $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 :). " 1705 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 1706
1607 $BUTTONBAR->add (new CFClient::UI::Button 1707 $BUTTONBAR->add (new CFClient::UI::Button
1608 text => "Save Config", 1708 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.", 1709 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 { 1710 on_activate => sub {
… …
1613 status "Configuration Saved"; 1713 status "Configuration Saved";
1614 0 1714 0
1615 }, 1715 },
1616 ); 1716 );
1617 1717
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1718 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1619 tooltip => "View Documentation"); 1719 tooltip => "View Documentation");
1620 1720
1621 $BUTTONBAR->add (new CFClient::UI::Button 1721 $BUTTONBAR->add (new CFClient::UI::Button
1622 text => "Quit", 1722 text => "Quit",
1623 tooltip => "Terminates the program", 1723 tooltip => "Terminates the program",
… …
1829# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1929# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1830 }, 1930 },
1831 CFClient::SDL_KEYDOWN => sub { 1931 CFClient::SDL_KEYDOWN => sub {
1832 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1932 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1833 # alt-enter 1933 # alt-enter
1934 $FULLSCREEN_ENABLE->toggle;
1834 video_shutdown; 1935 video_shutdown;
1835 $CFG->{fullscreen} = !$CFG->{fullscreen};
1836 video_init; 1936 video_init;
1837 } else { 1937 } else {
1838 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1938 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1839 } 1939 }
1840 }, 1940 },
… …
1856$SIG{INT} = $SIG{TERM} = sub { exit }; 1956$SIG{INT} = $SIG{TERM} = sub { exit };
1857 1957
1858{ 1958{
1859 local $SIG{__DIE__} = sub { 1959 local $SIG{__DIE__} = sub {
1860 return unless defined $^S && !$^S; 1960 return unless defined $^S && !$^S;
1861 Carp::confess $_[1];#d#TODO: remove when stable 1961 Carp::confess $_[0];#d#TODO: remove when stable
1862 CFClient::fatal $_[0]; 1962 CFClient::fatal $_[0];
1863 }; 1963 };
1864 1964
1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1965 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1866 CFClient::UI::set_layout ($::CFG->{layout}); 1966 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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