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.107 by root, Sun Aug 13 03:20:56 2006 UTC vs.
Revision 1.140 by elmex, Sat Dec 16 16:01:09 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
… …
36 59
37use CFPlus; 60use CFPlus;
38use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
39use CFPlus::Protocol; 62use CFPlus::Protocol;
40use CFPlus::UI; 63use CFPlus::UI;
64use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList;
41use CFPlus::Pod; 66use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 67use CFPlus::MapWidget;
68use CFPlus::Macro;
44 69
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 70$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 71$SIG{PIPE} = 'IGNORE';
47 72
48$Event::Eval = 0; 73$Event::Eval = 1;
49$Event::DIED = sub { 74$Event::DIED = sub {
50 # TODO: display dialog box or so 75 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 76};
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 77
66my $MAX_FPS = 60; 78my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 79my $MIN_FPS = 5; # unused as of yet
68 80
69our $META_SERVER = "crossfire.real-time.com:13326"; 81our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 82
71our $LAST_REFRESH; 83our $LAST_REFRESH;
72our $NOW; 84our $NOW;
73 85
74our $CFG; 86our $CFG;
75our $CONN; 87our $CONN;
88our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 89our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 90
78our $WANT_REFRESH; 91our $WANT_REFRESH;
79our $CAN_REFRESH; 92our $CAN_REFRESH;
80 93
… …
111 124
112our $INVENTORY_PAGE; 125our $INVENTORY_PAGE;
113our $STATS_PAGE; 126our $STATS_PAGE;
114our $SKILL_PAGE; 127our $SKILL_PAGE;
115our $SPELL_PAGE; 128our $SPELL_PAGE;
129our $SPELL_LIST;
116 130
117our $HELP_WINDOW; 131our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 132our $MESSAGE_WINDOW;
119our $FLOORBOX; 133our $FLOORBOX;
120our $GAUGES; 134our $GAUGES;
… …
133 147
134our $INV; 148our $INV;
135our $INVR; 149our $INVR;
136our $INV_RIGHT_HB; 150our $INV_RIGHT_HB;
137 151
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 152our $PICKUP_CFG;
153
154our $IN_BUILD_MODE;
155our $BUILD_BUTTON;
142 156
143sub status { 157sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 158 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 159}
146 160
147sub debug { 161sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 162 $DEBUG_STATUS->set_text ($_[0]);
163}
164
165sub message {
166 my ($para) = @_;
167
168 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
169
170 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
171
172 $LOGVIEW->add_paragraph ($para);
173 $LOGVIEW->scroll_to_bottom;
149} 174}
150 175
151sub destroy_query_dialog { 176sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
… …
155 180
156# server query dialog 181# server query dialog
157sub server_query { 182sub server_query {
158 my ($conn, $flags, $prompt) = @_; 183 my ($conn, $flags, $prompt) = @_;
159 184
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 185 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 186 x => "center",
162 y => "center", 187 y => "center",
163 title => "Server Query", 188 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 189 child => my $vbox = new CFPlus::UI::VBox,
165 ; 190 ;
… …
190 ); 215 );
191 216
192 $dialog->grab_focus; 217 $dialog->grab_focus;
193 218
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 219 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 220 $dialog->{tooltip} = "#charcreation_focus";
196 221
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 222 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 223 $MESSAGE_WINDOW->show;
199 224
200 unshift @dialog, new CFPlus::UI::Label 225 unshift @dialog, new CFPlus::UI::Label
… …
222 ); 247 );
223 248
224 unshift @dialog, new CFPlus::UI::Label 249 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 250 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 251 ellipsise => 0,
227 markup => 252 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 ; 253 ;
236 254
237 } elsif ($prompt =~ /roll new stats/) { 255 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 256 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 257 $conn->send ("reply $stat");
… …
320 } 338 }
321 339
322 unshift @dialog, new CFPlus::UI::Label 340 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 341 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 342 ellipsise => 0,
325 markup => 343 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 ; 344 ;
332 } 345 }
333 346
334 push @dialog, my $entry = new CFPlus::UI::Entry 347 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 348 on_changed => sub {
… …
366 $LOGIN_BUTTON->set_text ("Logout"); 379 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 380 $SETUP_DIALOG->hide;
368 381
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 383
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
372 385
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
374 387
375 $CONN = eval { 388 $CONN = eval {
376 new CFPlus::Protocol 389 new CFPlus::Protocol
377 host => $host, 390 host => $host,
378 port => $port || 13327, 391 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 392 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 393 pass => $PROFILE->{password},
381 mapw => $mapsize, 394 mapw => $mapsize,
382 maph => $mapsize, 395 maph => $mapsize,
396
397 client => "cfplus $CFPlus::VERSION $] $^O",
383 398
384 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 400 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
387 map => $MAP, 402 map => $MAP,
… …
414sub stop_game { 429sub stop_game {
415 $LOGIN_BUTTON->set_text ("Login"); 430 $LOGIN_BUTTON->set_text ("Login");
416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show; 432 $SETUP_DIALOG->show;
418 $PL_WINDOW->hide; 433 $PL_WINDOW->hide;
419 $SPELL_PAGE->clear_spells; 434 $SPELL_LIST->clear_spells;
420 435
421 return unless $CONN; 436 return unless $CONN;
422 437
423 status "connection closed"; 438 status "connection closed";
424 439
… …
622 (new CFPlus::UI::Empty expand => 1), 637 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 638 (my $hb = new CFPlus::UI::HBox),
624 ], 639 ],
625 ); 640 );
626 641
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 642 $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', 643 $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', 644 $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', 645 $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 646
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 647 $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, 648 $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 649
641 $GAUGES = { 650 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 651 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 652 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 653 };
… …
657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 666 $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"); 667 $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 }); 668 $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"); 669 $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 }); 670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
671 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
662 672
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 674
665 for my $x (0..2) { 675 for my $x (0..2) {
666 for my $y (0 .. 2) { 676 for my $y (0 .. 2) {
… …
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 680 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 ); 681 );
672 } 682 }
673 } 683 }
674 684
685 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
675 686
676 $table 687 $table
677} 688}
678 689
679sub stats_window { 690sub stats_window {
… …
681 expand => 1, 692 expand => 1,
682 scroll_y => 1 693 scroll_y => 1
683 ); 694 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 695 $r->add (my $vb = new CFPlus::UI::VBox);
685 696
697 $vb->add (new CFPlus::UI::FancyFrame
698 label => "Player",
699 child => (my $pi = new CFPlus::UI::VBox),
700 );
701
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 702 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 703 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."); 704 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, 705 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 706 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 707 tooltip => "The map you are currently on (if supported by the server).");
692 708
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 709 $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, 710 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 711 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 712 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, 713 $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, 714 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 715 tooltip => "The weight limit: you cannot carry more than this.");
700 716
717 $vb->add (new CFPlus::UI::FancyFrame
718 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 719 child => (my $hb = new CFPlus::UI::HBox expand => 1),
720 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 721 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 722
704 my $color2 = [1, 1, 0]; 723 my $color2 = [1, 1, 0];
705 724
706 for ( 725 for (
… …
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 746 $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, 747 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => "#stat_$label"); 748 align => -1, text => $label, tooltip => "#stat_$label");
730 } 749 }
731 750
751 $vb->add (new CFPlus::UI::FancyFrame
752 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 753 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
754 );
733 755
734 my $row = 0; 756 my $row = 0;
735 my $col = 0; 757 my $col = 0;
736 758
737 my %resist_names = ( 759 my %resist_names = (
… …
837 859
838 my $table = $METASERVER->{table}; 860 my $table = $METASERVER->{table};
839 $table->clear; 861 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 862 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 863
842 my $buf; 864 my $ok = 0;
843 865
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 866 CFPlus::background {
867 my $ua = CFPlus::lwp_useragent;
845 868
846 unless ($fh) { 869 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 870 } sub {
848 return; 871 my ($msg) = @_;
849 } 872 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; 873 $table->clear;
864 874
865 my @tip = ( 875 my @tip = (
866 "The current number of users logged in on the server.", 876 "The current number of users logged in on the server.",
867 "The hostname of the server.", 877 "The hostname of the server.",
… …
877 for 0 .. $#col; 887 for 0 .. $#col;
878 888
879 my @align = qw(1 0 1 1 -1); 889 my @align = qw(1 0 1 1 -1);
880 890
881 my $y = 0; 891 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} }
898 ) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
884 901
885 for ($desc) { 902 for ($desc) {
886 s/<br>/\n/gi; 903 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 904 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 905 s/<.*?>//sgi;
889 s/&/&amp;/g; 906 s/&amp;/&/g;
890 s/</&lt;/g; 907 s/&lt;/</g;
891 s/>/&gt;/g; 908 s/&gt;/>/g;
892 } 909 }
893 910
894 $uptime = sprintf "%dd %02d:%02d:%02d", 911 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 912 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 913 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 914 (int $uptime / 60) % 60,
898 $m->[8] % 60; 915 $uptime % 60;
899 916
900 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
901 918
902 $y++; 919 $y++;
903 920
… …
913 ), 930 ),
914 (new CFPlus::UI::Empty expand => 1), 931 (new CFPlus::UI::Empty expand => 1),
915 ]); 932 ]);
916 933
917 $table->add ($_, $y, new CFPlus::UI::Label 934 $table->add ($_, $y, new CFPlus::UI::Label
935 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 936 ellipsise => 0,
919 align => $align[$_], 937 align => $align[$_],
920 text => $m->[$_], 938 text => $m->[$_],
921 tooltip => $tip[$_], 939 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 941 can_hover => 1,
923 can_events => 1, 942 can_events => 1,
924 fontsize => 0.8) 943 fontsize => 0.8)
925 for 0 .. $#$m; 944 for 0 .. $#$m;
926 } 945 }
946 } else {
947 $ok or $label->set_text ("error while contacting metaserver");
927 } 948 }
928 }); 949 };
950
929} 951}
930 952
931sub metaserver_dialog { 953sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 954 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 955 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 956 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 957
936 my $dialog = new CFPlus::UI::FancyFrame 958 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 959 title => "Server List",
938 name => 'metaserver_dialog', 960 name => 'metaserver_dialog',
939 x => 'center', 961 x => 'center',
940 y => 'center', 962 y => 'center',
941 z => 3, 963 z => 3,
964 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 965 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 966 child => $vbox,
944 has_close_button => 1, 967 has_close_button => 1,
945 table => $table, 968 table => $table,
946 on_visibility_change => sub { 969 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 970 update_metaserver ($_[0]) if $_[1];
… …
953} 976}
954 977
955sub server_setup { 978sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 979 my $vbox = new CFPlus::UI::VBox;
957 980
981 $vbox->add (new CFPlus::UI::FancyFrame
982 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 983 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
984 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 985 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 986
961 { 987 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 988 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 989
… …
1047 }, 1073 },
1048 ); 1074 );
1049 1075
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1076 $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 1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1078 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. " 1079 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. " 1080 . "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.", 1081 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1082 on_changed => sub {
1057 my ($self, $value) = @_; 1083 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1084 $CFG->{say_command} = $value;
1059 0 1085 0
1060 } 1086 }
1061 ); 1087 );
1062 1088
1089 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips},
1092 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1093 on_changed => sub {
1094 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value;
1096 0
1097 }
1098 );
1099
1063 $vbox->add (new CFPlus::UI::Label 1100 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1101 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); 1102 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1103 );
1071 1104
1072 $vbox 1105 $vbox
1073} 1106}
1074 1107
1075sub message_window { 1108sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1109 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1110 name => "message_window",
1078 title => "Messages", 1111 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1112 border_bg => [1, 1, 1, 1],
1080 x => "max", 1113 x => "max",
1081 y => 0, 1114 y => 0,
… …
1131 window => $window, 1164 window => $window,
1132 input => $input, 1165 input => $input,
1133 }; 1166 };
1134 1167
1135 $window 1168 $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} 1169}
1193 1170
1194sub autopickup_setup { 1171sub autopickup_setup {
1195 my $table = new CFPlus::UI::Table; 1172 my $table = new CFPlus::UI::Table;
1196 1173
… …
1214 ["Boots" => PICKUP_BOOTS], 1191 ["Boots" => PICKUP_BOOTS],
1215 ["Gloves" => PICKUP_GLOVES], 1192 ["Gloves" => PICKUP_GLOVES],
1216 ["Cloaks" => PICKUP_CLOAK], 1193 ["Cloaks" => PICKUP_CLOAK],
1217 ], 1194 ],
1218 1195
1219 ["Readables", 2, 2, 1196 ["Readables", 2, 0,
1220 ["Spellbooks" => PICKUP_SPELLBOOK], 1197 ["Spellbooks" => PICKUP_SPELLBOOK],
1221 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1198 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1222 ["Normal Books/Scrolls" => PICKUP_READABLES], 1199 ["Normal Books/Scrolls" => PICKUP_READABLES],
1223 ], 1200 ],
1224 ["Misc", 2, 7, 1201 ["Misc", 2, 5,
1225 ["Food" => PICKUP_FOOD], 1202 ["Food" => PICKUP_FOOD],
1226 ["Drinks" => PICKUP_DRINK], 1203 ["Drinks" => PICKUP_DRINK],
1227 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1204 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1228 ["Keys" => PICKUP_KEY], 1205 ["Keys" => PICKUP_KEY],
1229 ["Magical Items" => PICKUP_MAGICAL], 1206 ["Magical Items" => PICKUP_MAGICAL],
1230 ["Potions" => PICKUP_POTION], 1207 ["Potions" => PICKUP_POTION],
1231 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1208 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1232 ["Ignore cursed" => PICKUP_NOT_CURSED], 1209 ["Ignore cursed" => PICKUP_NOT_CURSED],
1233 ["Jewelery" => PICKUP_JEWELS], 1210 ["Jewelery" => PICKUP_JEWELS],
1211 ["Flesh" => PICKUP_FLESH],
1234 ], 1212 ],
1235 ["Weight/Value ratio", 2, 17] 1213 ["Weight/Value ratio", 2, 17]
1236 ) 1214 )
1237 { 1215 {
1238 my ($title, $x, $y, @bits) = @$_; 1216 my ($title, $x, $y, @bits) = @$_;
… …
1288 $table 1266 $table
1289} 1267}
1290 1268
1291my %SORT_ORDER = ( 1269my %SORT_ORDER = (
1292 type => undef, 1270 type => undef,
1293 mtime => sub { sort { 1271 mtime => sub {
1272 my $NOW = time;
1273 sort {
1274 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1275 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1276
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1277 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1278 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1279 or $a->{type} <=> $b->{type}
1280 } @_
1297 } @_ }, 1281 },
1298 weight => sub { sort { 1282 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1283 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1284 or $a->{type} <=> $b->{type}
1301 } @_ }, 1285 } @_ },
1302); 1286);
… …
1327 #TODO# update to weigh/maxweight 1311 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1312 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1313
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1314 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1315 $sw1->add ($INV = new CFPlus::UI::Inventory);
1316 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1317
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1318 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1319
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1320 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1321
… …
1353 $PL_WINDOW->show; 1338 $PL_WINDOW->show;
1354 } 1339 }
1355} 1340}
1356 1341
1357sub player_window { 1342sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1343 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1344 x => "center",
1360 y => "center", 1345 y => "center",
1361 force_w => $WIDTH * 9/10, 1346 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1347 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1348 title => "Player",
… …
1376 $ntb->add ( 1361 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1362 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1363 "Shows all your Skills."
1379 ); 1364 );
1380 1365
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1366 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1367 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1368 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1369 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1370 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1371 );
1387 $ntb->add ( 1372 $ntb->add (
… …
1394 1379
1395 $plwin->add ($ntb); 1380 $plwin->add ($ntb);
1396 $plwin 1381 $plwin
1397} 1382}
1398 1383
1399sub update_bindings {
1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1401}
1402
1403sub keyboard_setup { 1384sub keyboard_setup {
1404 my $binding_list = new CFPlus::UI::VBox; 1385 CFPlus::Macro::keyboard_setup
1405
1406 my $refresh;
1407 $refresh = $BIND_UPD_CB = sub {
1408 $binding_list->clear ();
1409
1410 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1414
1415 my $lbl = join "; ", @$cmds;
1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1417 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1418 $hb->add (new CFPlus::UI::Button
1419 text => "delete",
1420 tooltip => "Deletes the binding",
1421 on_activate => sub {
1422 $binding_list->remove ($hb);
1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1424 0
1425 });
1426
1427 $hb->add (new CFPlus::UI::Button
1428 text => "edit",
1429 tooltip => "Edits the binding",
1430 on_activate => sub {
1431 $::BIND_EDITOR->set_binding (
1432 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1433 sub {
1434 my ($nmod, $nsym, $ncmds) = @_;
1435 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1436 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1437 $refresh->();
1438 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1439 $SETUP_DIALOG->show;
1440 },
1441 sub {
1442 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1443 $SETUP_DIALOG->show;
1444 });
1445 $::BIND_EDITOR->show;
1446 $SETUP_DIALOG->hide;
1447 0
1448 });
1449
1450 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1451 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1452 }
1453 }
1454 };
1455
1456 my $vb = new CFPlus::UI::VBox;
1457 $vb->add (my $hb = new CFPlus::UI::HBox);
1458 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1459 $hb->add (new CFPlus::UI::CheckBox
1460 expand => 1,
1461 state => $CFG->{shift_fire_stop},
1462 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1463 on_changed => sub {
1464 my ($cbox, $value) = @_;
1465 $CFG->{shift_fire_stop} = $value;
1466 0
1467 });
1468
1469 $vb->add ($binding_list);
1470 $vb->add (my $hb = new CFPlus::UI::HBox);
1471
1472 $hb->add (new CFPlus::UI::Button
1473 text => "record new",
1474 expand => 1,
1475 tooltip => "This button opens the binding editor with an empty binding.",
1476 on_activate => sub {
1477 $::BIND_EDITOR->set_binding (undef, undef, [],
1478 sub {
1479 my ($mod, $sym, $cmds) = @_;
1480 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1481 $refresh->();
1482 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1483 $SETUP_DIALOG->show;
1484 },
1485 sub {
1486 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1487 $SETUP_DIALOG->show;
1488 },
1489 );
1490 $SETUP_DIALOG->hide;
1491 $::BIND_EDITOR->show;
1492 0
1493 },
1494 );
1495
1496 $hb->add (new CFPlus::UI::Button
1497 text => "close",
1498 tooltip => "Closes the binding window",
1499 expand => 1,
1500 on_activate => sub {
1501 $SETUP_DIALOG->hide;
1502 0
1503 }
1504 );
1505
1506 $refresh->();
1507
1508 $vb
1509} 1386}
1510 1387
1511sub help_window { 1388sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1389 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1390 x => 'center',
1514 y => 'center', 1391 y => 'center',
1515 z => 2, 1392 z => 4,
1516 name => 'doc_browser', 1393 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1394 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1395 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1396 title => "Help Browser",
1520 has_close_button => 1; 1397 has_close_button => 1;
1521 1398
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1399 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1400
1401 $vbox->add (new CFPlus::UI::FancyFrame
1402 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1403 child => (my $buttons = new CFPlus::UI::HBox),
1404 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1405 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1406 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1407
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1408 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1409 my @future;
1530 value => undef, 1410 my $curnode;
1531 options => [ 1411
1532 [intro => "Introduction"], 1412 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1413 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1414
1535 [command_help => "Command Reference"], 1415 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1416
1537 [COPYING => "License Terms"], 1417 $buttons->add (new CFPlus::UI::Button
1418 text => "⇤",
1419 tooltip => "back to the starting page",
1420 on_activate => sub {
1421 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1422 unshift @future, @history;
1423 @history = ();
1424 $load_node->(@{shift @future});
1425 },
1426 );
1427
1428 if (@history) {
1429 $buttons->add (new CFPlus::UI::Button
1430 text => "⋘",
1431 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1432 on_activate => sub {
1433 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1434 $load_node->(@{pop @history});
1435 },
1436 );
1538 ], 1437 }
1539 on_changed => sub {
1540 my ($self, $pod) = @_;
1541 1438
1439 if (@future) {
1440 $buttons->add (new CFPlus::UI::Button
1441 text => "⋙",
1442 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1443 on_activate => sub {
1444 push @history, [$curnode, $viewer->current_paragraph];
1445 $load_node->(@{shift @future});
1446 },
1447 );
1448 }
1449
1450 $buttons->add (new CFPlus::UI::Label text => " ");
1451
1452 my @path = CFPlus::Pod::full_path_of $node;
1453 pop @path; # drop current node
1454
1455 for my $node (@path) {
1456 $buttons->add (new CFPlus::UI::Button
1457 text => $node->{kw}[0],
1458 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1459 on_activate => sub {
1460 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1461 $load_node->($node);
1462 },
1463 );
1464 $buttons->add (new CFPlus::UI::Label text => "/");
1465 }
1466
1467 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1468
1469 $curnode = $node;
1470
1542 $viewer->clear; 1471 $viewer->clear;
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1472 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1544 $viewer->set_offset (0); 1473 $viewer->scroll_to ($para);
1474 };
1545 1475
1476 $load_node->(CFPlus::Pod::find pod => "mainpage");
1477
1478 $CFPlus::Pod::goto_document = sub {
1479 my (@path) = @_;
1480
1481 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1482
1483 $load_node->((CFPlus::Pod::find @path)[0]);
1484 $win->show;
1485 };
1486
1487 $win
1488}
1489
1490sub open_string_query {
1491 my ($title, $cb, $txt, $tooltip) = @_;
1492 my $dialog = new CFPlus::UI::Toplevel
1493 x => "center",
1494 y => "center",
1495 z => 50,
1496 force_w => $WIDTH * 4/5,
1497 title => $title;
1498
1499 $dialog->add (
1500 my $e = new CFPlus::UI::Entry
1501 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1502 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1503 tooltip => $tooltip
1504 );
1505
1506 $e->grab_focus;
1507 $e->set_text ($txt) if $txt;
1508 $dialog->show;
1509}
1510
1511sub open_quit_dialog {
1512 unless ($QUIT_DIALOG) {
1513 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1514 x => "center",
1515 y => "center",
1516 z => 50,
1517 title => "Really Quit?",
1518 on_key_down => sub {
1519 my ($dialog, $ev) = @_;
1520 $ev->{sym} == 27 and $dialog->hide;
1546 0 1521 }
1522 ;
1523
1524 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1525
1526 $vb->add (new CFPlus::UI::Label
1527 text => "You should find a savebed and apply it first!",
1528 max_w => $WIDTH * 0.25,
1529 ellipsize => 0,
1530 );
1531 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1532 $hb->add (new CFPlus::UI::Button
1533 text => "Ok",
1534 expand => 1,
1535 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1536 );
1537 $hb->add (new CFPlus::UI::Button
1538 text => "Quit anyway",
1539 expand => 1,
1540 on_activate => sub { exit },
1541 );
1542 }
1543
1544 $QUIT_DIALOG->show;
1545 $QUIT_DIALOG->grab_focus;
1546}
1547
1548sub show_tip_of_the_day {
1549 # find all tips
1550 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1551
1552 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1553 $todindex = 0 if $todindex >= @tod;
1554 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1555
1556 # create dialog
1557 my $dialog;
1558
1559 my $close = sub {
1560 $dialog->destroy;
1561 };
1562
1563 $dialog = new CFPlus::UI::Toplevel
1564 x => "center",
1565 y => "center",
1566 z => 3,
1567 name => 'tip_of_the_day',
1568 force_w => int $WIDTH * 4/9,
1569 force_h => int $WIDTH * 2/9,
1570 title => "Tip of the day #" . (1 + $todindex),
1571 child => my $vbox = new CFPlus::UI::VBox,
1572 has_close_button => 1,
1573 on_delete => $close,
1574 ;
1575
1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1579
1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1581
1582 $table->add (0, 0, new CFPlus::UI::Button
1583 text => "Close",
1584 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>.",
1585 on_activate => $close,
1586 );
1587
1588 $table->add (2, 0, new CFPlus::UI::Button
1589 text => "Next",
1590 tooltip => "Show the next <b>Tip of the day</b>.",
1591 on_activate => sub {
1592 $close->();
1593 &show_tip_of_the_day;
1547 }, 1594 },
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 ); 1595 );
1556 1596
1557 $win 1597 $dialog->show;
1558} 1598}
1559 1599
1560sub sdl_init { 1600sub sdl_init {
1561 CFPlus::SDL_Init 1601 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1602 and die "SDL::Init failed!\n";
… …
1597 z => 100, 1637 z => 100,
1598 force_x => "max", 1638 force_x => "max",
1599 force_y => 0; 1639 force_y => 0;
1600 $DEBUG_STATUS->show; 1640 $DEBUG_STATUS->show;
1601 1641
1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1603
1604 $STATUSBOX = new CFPlus::UI::Statusbox; 1642 $STATUSBOX = new CFPlus::UI::Statusbox;
1605 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1643 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1606 1644
1607 (new CFPlus::UI::Frame 1645 (new CFPlus::UI::Frame
1608 bg => [0, 0, 0, 0.4], 1646 bg => [0, 0, 0, 0.4],
1609 force_x => 0, 1647 force_x => 0,
1610 force_y => "max", 1648 force_y => "max",
1611 child => $STATUSBOX, 1649 child => $STATUSBOX,
1612 )->show; 1650 )->show;
1613 1651
1614 CFPlus::UI::FancyFrame->new ( 1652 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1653 title => "Map",
1616 name => "mapmap", 1654 name => "mapmap",
1617 x => 0, 1655 x => 0,
1618 y => $FONTSIZE + 8, 1656 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1657 border_bg => [1, 1, 1, 192/255],
… …
1647 can_hover => 1, 1685 can_hover => 1,
1648 can_events => 1, 1686 can_events => 1,
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1687 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1650 ; 1688 ;
1651 1689
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1690 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1691 title => "Setup",
1654 name => "setup_dialog", 1692 name => "setup_dialog",
1655 x => 'center', 1693 x => 'center',
1656 y => 'center', 1694 y => 'center',
1657 z => 2, 1695 z => 2,
… …
1708 ); 1746 );
1709 1747
1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1748 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1711 tooltip => "View Documentation"); 1749 tooltip => "View Documentation");
1712 1750
1751
1713 $BUTTONBAR->add (new CFPlus::UI::Button 1752 $BUTTONBAR->add (new CFPlus::UI::Button
1714 text => "Quit", 1753 text => "Quit",
1715 tooltip => "Terminates the program", 1754 tooltip => "Terminates the program",
1716 on_activate => sub { 1755 on_activate => sub {
1717 if ($CONN) { 1756 if ($CONN) {
… …
1728 } 1767 }
1729 1768
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1769 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1731} 1770}
1732 1771
1772sub setup_build_button {
1773 my ($enabled) = @_;
1774 if ($enabled) {
1775 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1776 $BUILD_BUTTON ||= new CFPlus::UI::Button
1777 text => "Build",
1778 tooltip => "Opens the ingame builder",
1779 on_activate => sub {
1780 if ($CONN) {
1781 $CONN->send_ext_req (builder_player_items => sub {
1782 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1783 });
1784 }
1785 0
1786 };
1787 $BUTTONBAR->add ($BUILD_BUTTON);
1788 } else {
1789 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1790 }
1791}
1792
1793sub open_ingame_editor {
1794 my ($msg) = @_;
1795
1796 my $win = new CFPlus::UI::Toplevel
1797 x => 0,
1798 y => 'center',
1799 z => 4,
1800 name => 'builder_window',
1801 force_w => int $WIDTH * 1/4,
1802 force_h => int $HEIGHT * 3/4,
1803 title => "In game builder",
1804 has_close_button => 1;
1805
1806 my $r = new CFPlus::UI::ScrolledWindow (
1807 expand => 1,
1808 scroll_y => 1
1809 );
1810 $r->add (my $vb = new CFPlus::UI::VBox);
1811 $win->add ($r);
1812
1813
1814 $vb->add (
1815 new CFPlus::UI::Button
1816 text => "Disable build mode",
1817 on_activate => sub { $::IN_BUILD_MODE = undef }
1818 );
1819 $vb->add (
1820 new CFPlus::UI::Button
1821 text => "ERASE",
1822 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1823 );
1824
1825 for my $itemarchname (
1826 sort {
1827 $msg->{items}->{$a}->{build_arch_name}
1828 cmp $msg->{items}->{$b}->{build_arch_name}
1829 } keys %{$msg->{items}}
1830 ) {
1831 my $info = $msg->{items}->{$itemarchname};
1832 $vb->add (
1833 new CFPlus::UI::Button text => $info->{build_arch_name},
1834 on_activate => sub {
1835 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1836
1837 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1838 build_mode_query_arch_info ();
1839 }
1840 }
1841 );
1842 }
1843
1844 $win->show;
1845}
1846
1847sub build_mode_query_arch_info {
1848 my ($iteminfo) = $::IN_BUILD_MODE;
1849 my $itemarchname = $iteminfo->{item};
1850 my $info = $iteminfo->{info};
1851
1852 my $dialog = new CFPlus::UI::Toplevel
1853 x => "center",
1854 y => "center",
1855 z => 50,
1856 force_w => int $WIDTH * 1/2,
1857 title => "Enter information for placement of '$itemarchname'",
1858 has_close_button => 1;
1859
1860 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1861
1862 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1863 my $row = 0;
1864 if ($info->{has_name}) {
1865 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1866 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1867 }
1868 if ($info->{has_text}) {
1869 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1870 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1871 }
1872 if ($info->{has_connection}) {
1873 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1874 $table->add (1, $row++,
1875 new CFPlus::UI::Entry
1876 expand => 1,
1877 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1878 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1879 );
1880 }
1881
1882 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1883 $hb->add (new CFPlus::UI::Button
1884 text => "Close",
1885 expand => 1,
1886 on_activate => sub { $dialog->hide; 0 },
1887 );
1888 $dialog->show;
1889}
1890
1733sub video_shutdown { 1891sub video_shutdown {
1734 CFPlus::OpenGL::shutdown; 1892 CFPlus::OpenGL::shutdown;
1735 1893
1736 undef $SDL_ACTIVE; 1894 undef $SDL_ACTIVE;
1737} 1895}
… …
1768 CFPlus::Mix_AllocateChannels 8; 1926 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1927 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 1928
1771 audio_music_finished; 1929 audio_music_finished;
1772 1930
1931 local $_;
1773 while (<$fh>) { 1932 while (<$fh>) {
1774 next if /^\s*#/; 1933 next if /^\s*#/;
1775 next if /^\s*$/; 1934 next if /^\s*$/;
1776 1935
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 1936 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1862 }, 2021 },
1863 CFPlus::SDL_VIDEOEXPOSE => sub { 2022 CFPlus::SDL_VIDEOEXPOSE => sub {
1864 CFPlus::UI::full_refresh; 2023 CFPlus::UI::full_refresh;
1865 }, 2024 },
1866 CFPlus::SDL_ACTIVEEVENT => sub { 2025 CFPlus::SDL_ACTIVEEVENT => sub {
1867# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2026# not useful, as APPACTIVE include sonly iconified state, not unmapped
2027# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2028# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2029# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2030# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1868 }, 2031 },
1869 CFPlus::SDL_KEYDOWN => sub { 2032 CFPlus::SDL_KEYDOWN => sub {
1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2033 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1871 # alt-enter 2034 # alt-enter
1872 $FULLSCREEN_ENABLE->toggle; 2035 $FULLSCREEN_ENABLE->toggle;
… …
1911 log_fontsize => 0.7, 2074 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2075 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2076 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2077 stat_fontsize => 0.7,
1915 mapsize => 100, 2078 mapsize => 100,
1916 say_command => 'say', 2079 say_command => 'chat',
1917 audio_enable => 1, 2080 audio_enable => 1,
1918 bgm_enable => 1, 2081 bgm_enable => 1,
1919 bgm_volume => 0.25, 2082 bgm_volume => 0.25,
1920 face_prefetch => 0, 2083 face_prefetch => 0,
1921 output_sync => 1, 2084 output_sync => 1,
1922 output_count => 1, 2085 output_count => 1,
1923 pickup => 0, 2086 pickup => 0,
1924 inv_sort => "mtime", 2087 inv_sort => "mtime",
1925 default => "profile", # default profile 2088 default => "profile", # default profile
2089 show_tips => 1,
1926 ); 2090 );
1927 2091
1928 while (my ($k, $v) = each %DEF_CFG) { 2092 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2093 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2094 }
1931 2095
1932 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2096 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2097 $PROFILE = $CFG->{profile}{default};
2098
2099 # convert old bindings (only default profile matters)
2100 if (my $bindings = delete $PROFILE->{bindings}) {
2101 while (my ($mod, $syms) = each %$bindings) {
2102 while (my ($sym, $cmds) = each %$syms) {
2103 push @{ $PROFILE->{macro} }, {
2104 accelkey => [$mod*1, $sym*1],
2105 action => $cmds,
2106 };
2107 }
2108 }
2109 }
1933 2110
1934 sdl_init; 2111 sdl_init;
1935 2112
1936 @SDL_MODES = reverse 2113 @SDL_MODES = reverse
1937 grep $_->[0] >= 640 && $_->[1] >= 480, 2114 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1974# } 2151# }
1975# my $t2 = Time::HiRes::time; 2152# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2153# warn $t2-$t1;
1977# } 2154# }
1978 2155
2156 $startup_done->();
2157
1979 video_init; 2158 video_init;
1980 audio_init; 2159 audio_init;
1981} 2160}
2161
2162show_tip_of_the_day if $CFG->{show_tips};
1982 2163
1983Event::loop; 2164Event::loop;
1984#CFPlus::SDL_Quit; 2165#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2166#CFPlus::_exit 0;
1986 2167

Diff Legend

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