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.106 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
… …
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 68$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 69$SIG{PIPE} = 'IGNORE';
47 70
48$Event::Eval = 0; 71$Event::Eval = 0;
49$Event::DIED = sub { 72$Event::DIED = sub {
50 # TODO: display dialog box or so 73 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 74};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 75
66my $MAX_FPS = 60; 76my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 77my $MIN_FPS = 5; # unused as of yet
68 78
69our $META_SERVER = "crossfire.real-time.com:13326"; 79our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 80
71our $LAST_REFRESH; 81our $LAST_REFRESH;
72our $NOW; 82our $NOW;
73 83
74our $CFG; 84our $CFG;
75our $CONN; 85our $CONN;
86our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 87our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 88
78our $WANT_REFRESH; 89our $WANT_REFRESH;
79our $CAN_REFRESH; 90our $CAN_REFRESH;
80 91
… …
111 122
112our $INVENTORY_PAGE; 123our $INVENTORY_PAGE;
113our $STATS_PAGE; 124our $STATS_PAGE;
114our $SKILL_PAGE; 125our $SKILL_PAGE;
115our $SPELL_PAGE; 126our $SPELL_PAGE;
127our $SPELL_LIST;
116 128
117our $HELP_WINDOW; 129our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 130our $MESSAGE_WINDOW;
119our $FLOORBOX; 131our $FLOORBOX;
120our $GAUGES; 132our $GAUGES;
… …
138our $BIND_EDITOR; 150our $BIND_EDITOR;
139our $BIND_UPD_CB; 151our $BIND_UPD_CB;
140 152
141our $PICKUP_CFG; 153our $PICKUP_CFG;
142 154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157
143sub status { 158sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 160}
146 161
147sub debug { 162sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
164}
165
166sub message {
167 my ($para) = @_;
168
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
149} 175}
150 176
151sub destroy_query_dialog { 177sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
… …
155 181
156# server query dialog 182# server query dialog
157sub server_query { 183sub server_query {
158 my ($conn, $flags, $prompt) = @_; 184 my ($conn, $flags, $prompt) = @_;
159 185
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 186 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 187 x => "center",
162 y => "center", 188 y => "center",
163 title => "Server Query", 189 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 190 child => my $vbox = new CFPlus::UI::VBox,
165 ; 191 ;
… …
190 ); 216 );
191 217
192 $dialog->grab_focus; 218 $dialog->grab_focus;
193 219
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 220 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 221 $dialog->{tooltip} = "#charcreation_focus";
196 222
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 223 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 224 $MESSAGE_WINDOW->show;
199 225
200 unshift @dialog, new CFPlus::UI::Label 226 unshift @dialog, new CFPlus::UI::Label
… …
222 ); 248 );
223 249
224 unshift @dialog, new CFPlus::UI::Label 250 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 251 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 252 ellipsise => 0,
227 markup => 253 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 "<big><b>Character Creation: Race</b></big>\n\n"
229 . "Look at the <b>Messages</b> window to see a description of this race "
230 . "and the center of the screen to see how this race looks like "
231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
233 . "You can look at another race, or accept this race (you will cycle back to "
234 . "this race eventually, so you can take your time making this important choice."
235 ; 254 ;
236 255
237 } elsif ($prompt =~ /roll new stats/) { 256 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 257 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 258 $conn->send ("reply $stat");
… …
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 332 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0, 333 align => 0,
315 expand => 1, 334 expand => 1,
316 can_events => 1, 335 can_events => 1,
317 can_hover => 1, 336 can_hover => 1,
318 tooltip => $CFPlus::STAT_TOOLTIP{$name}, 337 tooltip => "#stat_$name",
319 ); 338 );
320 } 339 }
321 340
322 unshift @dialog, new CFPlus::UI::Label 341 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 342 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 343 ellipsise => 0,
325 markup => 344 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326 "<big><b>Character Creation: Stats</b></big>\n\n"
327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331 ; 345 ;
332 } 346 }
333 347
334 push @dialog, my $entry = new CFPlus::UI::Entry 348 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 349 on_changed => sub {
… …
364 status "logging in..."; 378 status "logging in...";
365 379
366 $LOGIN_BUTTON->set_text ("Logout"); 380 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 381 $SETUP_DIALOG->hide;
368 382
383 $PROFILE = $CFG->{profile}{default};
384
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 386
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 387 my ($host, $port) = split /:/, $PROFILE->{host};
372 388
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 389 $MAP = new CFPlus::Map;
374 390
375 $CONN = eval { 391 $CONN = eval {
376 new CFPlus::Protocol 392 new CFPlus::Protocol
377 host => $host, 393 host => $host,
378 port => $port || 13327, 394 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 395 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 396 pass => $PROFILE->{password},
381 mapw => $mapsize, 397 mapw => $mapsize,
382 maph => $mapsize, 398 maph => $mapsize,
399
400 client => "cfplus $CFPlus::VERSION $] $^O",
383 401
384 map_widget => $MAPWIDGET, 402 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 403 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 404 statusbox => $STATUSBOX,
387 map => $MAP, 405 map => $MAP,
… …
414sub stop_game { 432sub stop_game {
415 $LOGIN_BUTTON->set_text ("Login"); 433 $LOGIN_BUTTON->set_text ("Login");
416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show; 435 $SETUP_DIALOG->show;
418 $PL_WINDOW->hide; 436 $PL_WINDOW->hide;
419 $SPELL_PAGE->clear_spells; 437 $SPELL_LIST->clear_spells;
420 438
421 return unless $CONN; 439 return unless $CONN;
422 440
423 status "connection closed"; 441 status "connection closed";
424 442
… …
622 (new CFPlus::UI::Empty expand => 1), 640 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 641 (my $hb = new CFPlus::UI::HBox),
624 ], 642 ],
625 ); 643 );
626 644
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 645 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', 646 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', 647 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', 648 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635 649
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 650 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
637 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 651 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
639 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640 652
641 $GAUGES = { 653 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 654 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 655 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 656 };
… …
657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 669 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
658 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 670 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
659 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 671 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
660 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 672 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
661 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 673 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
674 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
662 675
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 677
665 for my $x (0..2) { 678 for my $x (0..2) {
666 for my $y (0 .. 2) { 679 for my $y (0 .. 2) {
… …
681 expand => 1, 694 expand => 1,
682 scroll_y => 1 695 scroll_y => 1
683 ); 696 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 697 $r->add (my $vb = new CFPlus::UI::VBox);
685 698
699 $vb->add (new CFPlus::UI::FancyFrame
700 label => "Player",
701 child => (my $pi = new CFPlus::UI::VBox),
702 );
703
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 704 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 705 can_hover => 1, can_events => 1,
688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 706 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
689 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 707 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 708 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 709 tooltip => "The map you are currently on (if supported by the server).");
692 710
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 711 $pi->add (my $hb0 = new CFPlus::UI::HBox);
694 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 712 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 713 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 714 tooltip => "The weight of the player including all inventory items.");
697 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 715 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
698 can_hover => 1, can_events => 1, 716 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 717 tooltip => "The weight limit: you cannot carry more than this.");
700 718
719 $vb->add (new CFPlus::UI::FancyFrame
720 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 721 child => (my $hb = new CFPlus::UI::HBox expand => 1),
722 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 723 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 724
704 my $color2 = [1, 1, 0]; 725 my $color2 = [1, 1, 0];
705 726
706 for ( 727 for (
… …
721 ) { 742 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 743 my ($col, $row, $id, $label, $template) = @$_;
723 744
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 745 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 746 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 747 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 748 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 749 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 750 align => -1, text => $label, tooltip => "#stat_$label");
730 } 751 }
731 752
753 $vb->add (new CFPlus::UI::FancyFrame
754 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 755 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
756 );
733 757
734 my $row = 0; 758 my $row = 0;
735 my $col = 0; 759 my $col = 0;
736 760
737 my %resist_names = ( 761 my %resist_names = (
… …
837 861
838 my $table = $METASERVER->{table}; 862 my $table = $METASERVER->{table};
839 $table->clear; 863 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 864 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 865
842 my $buf; 866 my $ok = 0;
843 867
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 868 CFPlus::background {
869 my $ua = CFPlus::lwp_useragent;
845 870
846 unless ($fh) { 871 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 872 } sub {
848 return; 873 my ($msg) = @_;
849 } 874 if ($msg) {
850
851 Event->io (fd => $fh, poll => 'r', cb => sub {
852 my $res = sysread $fh, $buf, 8192, length $buf;
853
854 if (!defined $res) {
855 $_[0]->w->cancel;
856 $label->set_text ("error while retrieving server list: $!");
857 } elsif ($res == 0) {
858 $_[0]->w->cancel;
859 status "server list retrieved";
860
861 utf8::decode $buf if utf8::valid $buf;
862
863 $table->clear; 875 $table->clear;
864 876
865 my @tip = ( 877 my @tip = (
866 "The current number of users logged in on the server.", 878 "The current number of users logged in on the server.",
867 "The hostname of the server.", 879 "The hostname of the server.",
… …
877 for 0 .. $#col; 889 for 0 .. $#col;
878 890
879 my @align = qw(1 0 1 1 -1); 891 my @align = qw(1 0 1 1 -1);
880 892
881 my $y = 0; 893 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 894 for my $m (
895 sort {
896 $b->{version} <=> $a->{version}
897 or $b->{users} <=> $a->{users}
898 }
899 @{ $msg->{servers} }
900 ) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 901 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
902 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
884 903
885 for ($desc) { 904 for ($desc) {
886 s/<br>/\n/gi; 905 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 906 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 907 s/<.*?>//sgi;
889 s/&/&amp;/g; 908 s/&amp;/&/g;
890 s/</&lt;/g; 909 s/&lt;/</g;
891 s/>/&gt;/g; 910 s/&gt;/>/g;
892 } 911 }
893 912
894 $uptime = sprintf "%dd %02d:%02d:%02d", 913 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 914 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 915 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 916 (int $uptime / 60) % 60,
898 $m->[8] % 60; 917 $uptime % 60;
899 918
900 $m = [$users, $host, $uptime, $version, $desc]; 919 $m = [$users, $host, $uptime, $version, $desc];
901 920
902 $y++; 921 $y++;
903 922
… …
913 ), 932 ),
914 (new CFPlus::UI::Empty expand => 1), 933 (new CFPlus::UI::Empty expand => 1),
915 ]); 934 ]);
916 935
917 $table->add ($_, $y, new CFPlus::UI::Label 936 $table->add ($_, $y, new CFPlus::UI::Label
937 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 938 ellipsise => 0,
919 align => $align[$_], 939 align => $align[$_],
920 text => $m->[$_], 940 text => $m->[$_],
921 tooltip => $tip[$_], 941 tooltip => $tip[$_],
942 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 943 can_hover => 1,
923 can_events => 1, 944 can_events => 1,
924 fontsize => 0.8) 945 fontsize => 0.8)
925 for 0 .. $#$m; 946 for 0 .. $#$m;
926 } 947 }
948 } else {
949 $ok or $label->set_text ("error while contacting metaserver");
927 } 950 }
928 }); 951 };
952
929} 953}
930 954
931sub metaserver_dialog { 955sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 956 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 957 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 958 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 959
936 my $dialog = new CFPlus::UI::FancyFrame 960 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 961 title => "Server List",
938 name => 'metaserver_dialog', 962 name => 'metaserver_dialog',
939 x => 'center', 963 x => 'center',
940 y => 'center', 964 y => 'center',
941 z => 3, 965 z => 3,
966 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 967 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 968 child => $vbox,
944 has_close_button => 1, 969 has_close_button => 1,
945 table => $table, 970 table => $table,
946 on_visibility_change => sub { 971 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 972 update_metaserver ($_[0]) if $_[1];
… …
953} 978}
954 979
955sub server_setup { 980sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 981 my $vbox = new CFPlus::UI::VBox;
957 982
983 $vbox->add (new CFPlus::UI::FancyFrame
984 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 985 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
986 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 987 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 988
961 { 989 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 990 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 991
… …
1047 }, 1075 },
1048 ); 1076 );
1049 1077
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1078 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1079 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1080 text => $CFG->{say_command},
1053 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1081 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1082 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1055 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1083 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1084 on_changed => sub {
1057 my ($self, $value) = @_; 1085 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1086 $CFG->{say_command} = $value;
1059 0 1087 0
1060 } 1088 }
1061 ); 1089 );
1062 1090
1091 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1092 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1093 state => $CFG->{show_tips},
1094 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1095 on_changed => sub {
1096 my ($self, $value) = @_;
1097 $CFG->{show_tips} = $value;
1098 0
1099 }
1100 );
1101
1063 $vbox->add (new CFPlus::UI::Label 1102 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1103 label => "Server Info",
1065 fontsize => 1.2,
1066 padding_y => 8,
1067 fg => [1, 1, 0, 1],
1068 );
1069
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1104 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1105 );
1071 1106
1072 $vbox 1107 $vbox
1073} 1108}
1074 1109
1075sub message_window { 1110sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1111 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1112 name => "message_window",
1078 title => "Messages", 1113 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1114 border_bg => [1, 1, 1, 1],
1080 x => "max", 1115 x => "max",
1081 y => 0, 1116 y => 0,
… …
1131 window => $window, 1166 window => $window,
1132 input => $input, 1167 input => $input,
1133 }; 1168 };
1134 1169
1135 $window 1170 $window
1136}
1137
1138sub open_string_query {
1139 my $cb = $_[1];
1140 my $dialog = new CFPlus::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 force_w => $WIDTH * 4/5,
1145 title => $_[0];
1146
1147 $dialog->add (
1148 my $e = new CFPlus::UI::Entry
1149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1151 );
1152
1153 $e->grab_focus;
1154 $dialog->show;
1155}
1156
1157sub open_quit_dialog {
1158 unless ($QUIT_DIALOG) {
1159 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1160 x => "center",
1161 y => "center",
1162 z => 50,
1163 title => "Really Quit?",
1164 on_key_down => sub {
1165 my ($dialog, $ev) = @_;
1166 $ev->{sym} == 27 and $dialog->hide;
1167 }
1168 ;
1169
1170 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1171
1172 $vb->add (new CFPlus::UI::Label
1173 text => "You should find a savebed and apply it first!",
1174 max_w => $WIDTH * 0.25,
1175 ellipsize => 0,
1176 );
1177 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1178 $hb->add (new CFPlus::UI::Button
1179 text => "Ok",
1180 expand => 1,
1181 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1182 );
1183 $hb->add (new CFPlus::UI::Button
1184 text => "Quit anyway",
1185 expand => 1,
1186 on_activate => sub { exit },
1187 );
1188 }
1189
1190 $QUIT_DIALOG->show;
1191 $QUIT_DIALOG->grab_focus;
1192} 1171}
1193 1172
1194sub autopickup_setup { 1173sub autopickup_setup {
1195 my $table = new CFPlus::UI::Table; 1174 my $table = new CFPlus::UI::Table;
1196 1175
… …
1214 ["Boots" => PICKUP_BOOTS], 1193 ["Boots" => PICKUP_BOOTS],
1215 ["Gloves" => PICKUP_GLOVES], 1194 ["Gloves" => PICKUP_GLOVES],
1216 ["Cloaks" => PICKUP_CLOAK], 1195 ["Cloaks" => PICKUP_CLOAK],
1217 ], 1196 ],
1218 1197
1219 ["Readables", 2, 2, 1198 ["Readables", 2, 0,
1220 ["Spellbooks" => PICKUP_SPELLBOOK], 1199 ["Spellbooks" => PICKUP_SPELLBOOK],
1221 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1222 ["Normal Books/Scrolls" => PICKUP_READABLES], 1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
1223 ], 1202 ],
1224 ["Misc", 2, 7, 1203 ["Misc", 2, 5,
1225 ["Food" => PICKUP_FOOD], 1204 ["Food" => PICKUP_FOOD],
1226 ["Drinks" => PICKUP_DRINK], 1205 ["Drinks" => PICKUP_DRINK],
1227 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1228 ["Keys" => PICKUP_KEY], 1207 ["Keys" => PICKUP_KEY],
1229 ["Magical Items" => PICKUP_MAGICAL], 1208 ["Magical Items" => PICKUP_MAGICAL],
1230 ["Potions" => PICKUP_POTION], 1209 ["Potions" => PICKUP_POTION],
1231 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1232 ["Ignore cursed" => PICKUP_NOT_CURSED], 1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
1233 ["Jewelery" => PICKUP_JEWELS], 1212 ["Jewelery" => PICKUP_JEWELS],
1213 ["Flesh" => PICKUP_FLESH],
1234 ], 1214 ],
1235 ["Weight/Value ratio", 2, 17] 1215 ["Weight/Value ratio", 2, 17]
1236 ) 1216 )
1237 { 1217 {
1238 my ($title, $x, $y, @bits) = @$_; 1218 my ($title, $x, $y, @bits) = @$_;
… …
1288 $table 1268 $table
1289} 1269}
1290 1270
1291my %SORT_ORDER = ( 1271my %SORT_ORDER = (
1292 type => undef, 1272 type => undef,
1293 mtime => sub { sort { 1273 mtime => sub {
1274 my $NOW = time;
1275 sort {
1276 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1277 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1278
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1279 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1280 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1281 or $a->{type} <=> $b->{type}
1282 } @_
1297 } @_ }, 1283 },
1298 weight => sub { sort { 1284 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1285 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1286 or $a->{type} <=> $b->{type}
1301 } @_ }, 1287 } @_ },
1302); 1288);
… …
1327 #TODO# update to weigh/maxweight 1313 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1314 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1315
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1316 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1317 $sw1->add ($INV = new CFPlus::UI::Inventory);
1318 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1319
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1320 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1321
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1322 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1323
… …
1353 $PL_WINDOW->show; 1340 $PL_WINDOW->show;
1354 } 1341 }
1355} 1342}
1356 1343
1357sub player_window { 1344sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1345 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1346 x => "center",
1360 y => "center", 1347 y => "center",
1361 force_w => $WIDTH * 9/10, 1348 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1349 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1350 title => "Player",
… …
1376 $ntb->add ( 1363 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1364 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1365 "Shows all your Skills."
1379 ); 1366 );
1380 1367
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1368 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1369 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1370 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1371 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1372 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1373 );
1387 $ntb->add ( 1374 $ntb->add (
… …
1405 1392
1406 my $refresh; 1393 my $refresh;
1407 $refresh = $BIND_UPD_CB = sub { 1394 $refresh = $BIND_UPD_CB = sub {
1408 $binding_list->clear (); 1395 $binding_list->clear ();
1409 1396
1397 return unless $PROFILE;
1398
1410 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1399 for my $mod (keys %{$PROFILE->{bindings}}) {
1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1400 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1401 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1402 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1414 1403
1415 my $lbl = join "; ", @$cmds; 1404 my $lbl = join "; ", @$cmds;
1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1405 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1417 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1406 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1418 $hb->add (new CFPlus::UI::Button 1407 $hb->add (new CFPlus::UI::Button
1419 text => "delete", 1408 text => "delete",
1420 tooltip => "Deletes the binding", 1409 tooltip => "Deletes the binding",
1421 on_activate => sub { 1410 on_activate => sub {
1422 $binding_list->remove ($hb); 1411 $binding_list->remove ($hb);
1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1412 delete $PROFILE->{bindings}{$mod}{$sym};
1424 0 1413 0
1425 }); 1414 });
1426 1415
1427 $hb->add (new CFPlus::UI::Button 1416 $hb->add (new CFPlus::UI::Button
1428 text => "edit", 1417 text => "edit",
1429 tooltip => "Edits the binding", 1418 tooltip => "Edits the binding",
1430 on_activate => sub { 1419 on_activate => sub {
1431 $::BIND_EDITOR->set_binding ( 1420 $::BIND_EDITOR->set_binding (
1432 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1421 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1433 sub { 1422 sub {
1434 my ($nmod, $nsym, $ncmds) = @_; 1423 my ($nmod, $nsym, $ncmds) = @_;
1435 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1424 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1436 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1425 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1437 $refresh->(); 1426 $refresh->();
… …
1452 } 1441 }
1453 } 1442 }
1454 }; 1443 };
1455 1444
1456 my $vb = new CFPlus::UI::VBox; 1445 my $vb = new CFPlus::UI::VBox;
1446 $vb->add (new CFPlus::UI::FancyFrame
1447 label => "Options",
1457 $vb->add (my $hb = new CFPlus::UI::HBox); 1448 child => (my $hb = new CFPlus::UI::HBox),
1449 );
1458 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1450 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1459 $hb->add (new CFPlus::UI::CheckBox 1451 $hb->add (new CFPlus::UI::CheckBox
1460 expand => 1, 1452 expand => 1,
1461 state => $CFG->{shift_fire_stop}, 1453 state => $CFG->{shift_fire_stop},
1462 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1454 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1464 my ($cbox, $value) = @_; 1456 my ($cbox, $value) = @_;
1465 $CFG->{shift_fire_stop} = $value; 1457 $CFG->{shift_fire_stop} = $value;
1466 0 1458 0
1467 }); 1459 });
1468 1460
1469 $vb->add ($binding_list); 1461 $vb->add (new CFPlus::UI::FancyFrame
1462 label => "Bindings",
1463 child => $binding_list);
1470 $vb->add (my $hb = new CFPlus::UI::HBox); 1464 $vb->add (my $hb = new CFPlus::UI::HBox);
1471 1465
1472 $hb->add (new CFPlus::UI::Button 1466 $hb->add (new CFPlus::UI::Button
1473 text => "record new", 1467 text => "record new",
1474 expand => 1, 1468 expand => 1,
… …
1507 1501
1508 $vb 1502 $vb
1509} 1503}
1510 1504
1511sub help_window { 1505sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1506 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1507 x => 'center',
1514 y => 'center', 1508 y => 'center',
1515 z => 2, 1509 z => 4,
1516 name => 'doc_browser', 1510 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1511 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1512 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1513 title => "Help Browser",
1520 has_close_button => 1; 1514 has_close_button => 1;
1521 1515
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1516 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1517
1518 $vbox->add (new CFPlus::UI::FancyFrame
1519 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1520 child => (my $buttons = new CFPlus::UI::HBox),
1521 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1522 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1523 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1524
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1525 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1526 my @future;
1530 value => undef, 1527 my $curnode;
1531 options => [ 1528
1532 [intro => "Introduction"], 1529 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1530 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1531
1535 [command_help => "Command Reference"], 1532 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1533
1537 [COPYING => "License Terms"], 1534 $buttons->add (new CFPlus::UI::Button
1535 text => "⇤",
1536 tooltip => "back to the starting page",
1537 on_activate => sub {
1538 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1539 unshift @future, @history;
1540 @history = ();
1541 $load_node->(@{shift @future});
1542 },
1543 );
1544
1545 if (@history) {
1546 $buttons->add (new CFPlus::UI::Button
1547 text => "⋘",
1548 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1549 on_activate => sub {
1550 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1551 $load_node->(@{pop @history});
1552 },
1553 );
1538 ], 1554 }
1539 on_changed => sub {
1540 my ($self, $pod) = @_;
1541 1555
1556 if (@future) {
1557 $buttons->add (new CFPlus::UI::Button
1558 text => "⋙",
1559 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1560 on_activate => sub {
1561 push @history, [$curnode, $viewer->current_paragraph];
1562 $load_node->(@{shift @future});
1563 },
1564 );
1565 }
1566
1567 $buttons->add (new CFPlus::UI::Label text => " ");
1568
1569 my @path = CFPlus::Pod::full_path_of $node;
1570 pop @path; # drop current node
1571
1572 for my $node (@path) {
1573 $buttons->add (new CFPlus::UI::Button
1574 text => $node->{kw}[0],
1575 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1576 on_activate => sub {
1577 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1578 $load_node->($node);
1579 },
1580 );
1581 $buttons->add (new CFPlus::UI::Label text => "/");
1582 }
1583
1584 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1585
1586 $curnode = $node;
1587
1542 $viewer->clear; 1588 $viewer->clear;
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1589 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1544 $viewer->set_offset (0); 1590 $viewer->scroll_to ($para);
1591 };
1545 1592
1593 $load_node->(CFPlus::Pod::find pod => "mainpage");
1594
1595 $CFPlus::Pod::goto_document = sub {
1596 my (@path) = @_;
1597
1598 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1599
1600 $load_node->((CFPlus::Pod::find @path)[0]);
1601 $win->show;
1602 };
1603
1604 $win
1605}
1606
1607sub open_string_query {
1608 my ($title, $cb, $txt, $tooltip) = @_;
1609 my $dialog = new CFPlus::UI::Toplevel
1610 x => "center",
1611 y => "center",
1612 z => 50,
1613 force_w => $WIDTH * 4/5,
1614 title => $title;
1615
1616 $dialog->add (
1617 my $e = new CFPlus::UI::Entry
1618 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1619 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1620 tooltip => $tooltip
1621 );
1622
1623 $e->grab_focus;
1624 $e->set_text ($txt) if $txt;
1625 $dialog->show;
1626}
1627
1628sub open_quit_dialog {
1629 unless ($QUIT_DIALOG) {
1630 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1631 x => "center",
1632 y => "center",
1633 z => 50,
1634 title => "Really Quit?",
1635 on_key_down => sub {
1636 my ($dialog, $ev) = @_;
1637 $ev->{sym} == 27 and $dialog->hide;
1546 0 1638 }
1639 ;
1640
1641 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1642
1643 $vb->add (new CFPlus::UI::Label
1644 text => "You should find a savebed and apply it first!",
1645 max_w => $WIDTH * 0.25,
1646 ellipsize => 0,
1647 );
1648 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1649 $hb->add (new CFPlus::UI::Button
1650 text => "Ok",
1651 expand => 1,
1652 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1653 );
1654 $hb->add (new CFPlus::UI::Button
1655 text => "Quit anyway",
1656 expand => 1,
1657 on_activate => sub { exit },
1658 );
1659 }
1660
1661 $QUIT_DIALOG->show;
1662 $QUIT_DIALOG->grab_focus;
1663}
1664
1665sub show_tip_of_the_day {
1666 # find all tips
1667 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1668
1669 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1670 $todindex = 0 if $todindex >= @tod;
1671 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1672
1673 # create dialog
1674 my $dialog;
1675
1676 my $close = sub {
1677 $dialog->destroy;
1678 };
1679
1680 $dialog = new CFPlus::UI::Toplevel
1681 x => "center",
1682 y => "center",
1683 z => 3,
1684 name => 'tip_of_the_day',
1685 force_w => int $WIDTH * 4/9,
1686 force_h => int $WIDTH * 2/9,
1687 title => "Tip of the day #" . (1 + $todindex),
1688 child => my $vbox = new CFPlus::UI::VBox,
1689 has_close_button => 1,
1690 on_delete => $close,
1691 ;
1692
1693 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1694 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1695 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1696
1697 $vbox->add (my $table = new CFPlus::UI::Table);
1698
1699 $table->add (0, 0, new CFPlus::UI::Button
1700 text => "Close",
1701 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1702 on_activate => $close,
1703 );
1704
1705 $table->add (2, 0, new CFPlus::UI::Button
1706 text => "Next",
1707 tooltip => "Show the next <b>Tip of the day</b>.",
1708 on_activate => sub {
1709 $close->();
1710 &show_tip_of_the_day;
1547 }, 1711 },
1548 on_visibility_change => sub {
1549 my ($self, $visible) = @_;
1550 return unless $visible;
1551 return if $self->{value};
1552 $self->set_value ("intro");
1553 0
1554 },
1555 ); 1712 );
1556 1713
1557 $win 1714 $dialog->show;
1558} 1715}
1559 1716
1560sub sdl_init { 1717sub sdl_init {
1561 CFPlus::SDL_Init 1718 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1719 and die "SDL::Init failed!\n";
… …
1609 force_x => 0, 1766 force_x => 0,
1610 force_y => "max", 1767 force_y => "max",
1611 child => $STATUSBOX, 1768 child => $STATUSBOX,
1612 )->show; 1769 )->show;
1613 1770
1614 CFPlus::UI::FancyFrame->new ( 1771 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1772 title => "Map",
1616 name => "mapmap", 1773 name => "mapmap",
1617 x => 0, 1774 x => 0,
1618 y => $FONTSIZE + 8, 1775 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1776 border_bg => [1, 1, 1, 192/255],
… …
1647 can_hover => 1, 1804 can_hover => 1,
1648 can_events => 1, 1805 can_events => 1,
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1806 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1650 ; 1807 ;
1651 1808
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1809 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1810 title => "Setup",
1654 name => "setup_dialog", 1811 name => "setup_dialog",
1655 x => 'center', 1812 x => 'center',
1656 y => 'center', 1813 y => 'center',
1657 z => 2, 1814 z => 2,
… …
1708 ); 1865 );
1709 1866
1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1867 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1711 tooltip => "View Documentation"); 1868 tooltip => "View Documentation");
1712 1869
1870
1713 $BUTTONBAR->add (new CFPlus::UI::Button 1871 $BUTTONBAR->add (new CFPlus::UI::Button
1714 text => "Quit", 1872 text => "Quit",
1715 tooltip => "Terminates the program", 1873 tooltip => "Terminates the program",
1716 on_activate => sub { 1874 on_activate => sub {
1717 if ($CONN) { 1875 if ($CONN) {
… …
1728 } 1886 }
1729 1887
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1888 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1731} 1889}
1732 1890
1891sub setup_build_button {
1892 my ($enabled) = @_;
1893 if ($enabled) {
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build",
1896 tooltip => "Opens the ingame builder",
1897 on_activate => sub {
1898 if ($CONN) {
1899 $CONN->send_ext_req (builder_player_items => sub {
1900 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1901 });
1902 }
1903 0
1904 };
1905 $BUTTONBAR->add ($BUILD_BUTTON);
1906 } else {
1907 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1908 }
1909}
1910
1911sub open_ingame_editor {
1912 my ($msg) = @_;
1913
1914 my $win = new CFPlus::UI::Toplevel
1915 x => 0,
1916 y => 'center',
1917 z => 4,
1918 name => 'builder_window',
1919 force_w => int $WIDTH * 1/4,
1920 force_h => int $HEIGHT * 3/4,
1921 title => "In game builder",
1922 has_close_button => 1;
1923
1924 my $r = new CFPlus::UI::ScrolledWindow (
1925 expand => 1,
1926 scroll_y => 1
1927 );
1928 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r);
1930
1931
1932 $vb->add (my $chk = new CFPlus::UI::Button text => "Disable build mode", on_activate => sub { $::IN_BUILD_MODE = undef });
1933 $vb->add (my $chk = new CFPlus::UI::Button text => "ERASE", on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } });
1934
1935 for my $itemarchname (keys %{$msg->{items}}) {
1936 $vb->add (
1937 new CFPlus::UI::Button text => "$itemarchname",
1938 on_activate => sub {
1939 $::IN_BUILD_MODE = $itemarchname;
1940 }
1941 );
1942 }
1943
1944 $win->show;
1945}
1946
1733sub video_shutdown { 1947sub video_shutdown {
1734 CFPlus::OpenGL::shutdown; 1948 CFPlus::OpenGL::shutdown;
1735 1949
1736 undef $SDL_ACTIVE; 1950 undef $SDL_ACTIVE;
1737} 1951}
… …
1768 CFPlus::Mix_AllocateChannels 8; 1982 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1983 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 1984
1771 audio_music_finished; 1985 audio_music_finished;
1772 1986
1987 local $_;
1773 while (<$fh>) { 1988 while (<$fh>) {
1774 next if /^\s*#/; 1989 next if /^\s*#/;
1775 next if /^\s*$/; 1990 next if /^\s*$/;
1776 1991
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 1992 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1911 log_fontsize => 0.7, 2126 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2127 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2128 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2129 stat_fontsize => 0.7,
1915 mapsize => 100, 2130 mapsize => 100,
1916 say_command => 'say', 2131 say_command => 'chat',
1917 audio_enable => 1, 2132 audio_enable => 1,
1918 bgm_enable => 1, 2133 bgm_enable => 1,
1919 bgm_volume => 0.25, 2134 bgm_volume => 0.25,
1920 face_prefetch => 0, 2135 face_prefetch => 0,
1921 output_sync => 1, 2136 output_sync => 1,
1922 output_count => 1, 2137 output_count => 1,
1923 pickup => 0, 2138 pickup => 0,
1924 inv_sort => "mtime", 2139 inv_sort => "mtime",
1925 default => "profile", # default profile 2140 default => "profile", # default profile
2141 show_tips => 1,
1926 ); 2142 );
1927 2143
1928 while (my ($k, $v) = each %DEF_CFG) { 2144 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2145 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2146 }
… …
1974# } 2190# }
1975# my $t2 = Time::HiRes::time; 2191# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2192# warn $t2-$t1;
1977# } 2193# }
1978 2194
2195 $startup_done->();
2196
1979 video_init; 2197 video_init;
1980 audio_init; 2198 audio_init;
1981} 2199}
2200
2201show_tip_of_the_day if $CFG->{show_tips};
1982 2202
1983Event::loop; 2203Event::loop;
1984#CFPlus::SDL_Quit; 2204#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2205#CFPlus::_exit 0;
1986 2206

Diff Legend

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