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.144 by root, Fri Mar 16 03:14:50 2007 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};
154} 179}
155 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
156# server query dialog 184# server query dialog
157sub server_query { 185sub server_query {
158 my ($conn, $flags, $prompt) = @_; 186 my ($conn, $flags, $prompt) = @_;
159 187
188 # FIXME: a very ugly hack to wait for stat update #d#
189 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
190 unless ($QUERY_TIMER) {
191 $QUERY_TIMER =
192 Event->timer (
193 after => 1,
194 cb => sub {
195 server_query ($conn, $flags, $prompt, 1);
196 $QUERY_TIMER = undef
197 }
198 );
199 return;
200 }
201 }
202
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 204 x => "center",
162 y => "center", 205 y => "center",
163 title => "Server Query", 206 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 207 child => my $vbox = new CFPlus::UI::VBox,
165 ; 208 ;
… …
190 ); 233 );
191 234
192 $dialog->grab_focus; 235 $dialog->grab_focus;
193 236
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 237 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 238 $dialog->{tooltip} = "#charcreation_focus";
196 239
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 240 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 241 $MESSAGE_WINDOW->show;
199 242
200 unshift @dialog, new CFPlus::UI::Label 243 unshift @dialog, new CFPlus::UI::Label
… …
222 ); 265 );
223 266
224 unshift @dialog, new CFPlus::UI::Label 267 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 268 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 269 ellipsise => 0,
227 markup => 270 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 ; 271 ;
236 272
237 } elsif ($prompt =~ /roll new stats/) { 273 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 274 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 275 $conn->send ("reply $stat");
… …
320 } 356 }
321 357
322 unshift @dialog, new CFPlus::UI::Label 358 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 359 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 360 ellipsise => 0,
325 markup => 361 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 ; 362 ;
332 } 363 }
333 364
334 push @dialog, my $entry = new CFPlus::UI::Entry 365 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 366 on_changed => sub {
… …
366 $LOGIN_BUTTON->set_text ("Logout"); 397 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 398 $SETUP_DIALOG->hide;
368 399
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 400 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 401
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 402 my ($host, $port) = split /:/, $PROFILE->{host};
372 403
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 404 $MAP = new CFPlus::Map;
374 405
375 $CONN = eval { 406 $CONN = eval {
376 new CFPlus::Protocol 407 new CFPlus::Protocol
377 host => $host, 408 host => $host,
378 port => $port || 13327, 409 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 410 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 411 pass => $PROFILE->{password},
381 mapw => $mapsize, 412 mapw => $mapsize,
382 maph => $mapsize, 413 maph => $mapsize,
414
415 client => "cfplus $CFPlus::VERSION $] $^O",
383 416
384 map_widget => $MAPWIDGET, 417 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 418 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 419 statusbox => $STATUSBOX,
387 map => $MAP, 420 map => $MAP,
… …
414sub stop_game { 447sub stop_game {
415 $LOGIN_BUTTON->set_text ("Login"); 448 $LOGIN_BUTTON->set_text ("Login");
416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show; 450 $SETUP_DIALOG->show;
418 $PL_WINDOW->hide; 451 $PL_WINDOW->hide;
419 $SPELL_PAGE->clear_spells; 452 $SPELL_LIST->clear_spells;
420 453
421 return unless $CONN; 454 return unless $CONN;
422 455
423 status "connection closed"; 456 status "connection closed";
424 457
… …
432sub graphics_setup { 465sub graphics_setup {
433 my $vbox = new CFPlus::UI::VBox; 466 my $vbox = new CFPlus::UI::VBox;
434 467
435 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
436 469
470 my $row = 0;
471
472 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
473 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
474 can_events => 1,
475 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
476
437 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
438 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 478 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
439 479
440 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 480 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
441 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 481 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
442 482
443 $mode_slider->connect (changed => sub { 483 $mode_slider->connect (changed => sub {
… …
445 485
446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 486 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
447 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 487 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
448 }); 488 });
449 $mode_slider->emit (changed => $mode_slider->{range}[0]); 489 $mode_slider->emit (changed => $mode_slider->{range}[0]);
450
451 my $row = 1;
452 490
453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 491 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 492 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455 state => $CFG->{fullscreen}, 493 state => $CFG->{fullscreen},
456 tooltip => "Bring the client into fullscreen mode.", 494 tooltip => "Bring the client into fullscreen mode.",
… …
622 (new CFPlus::UI::Empty expand => 1), 660 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 661 (my $hb = new CFPlus::UI::HBox),
624 ], 662 ],
625 ); 663 );
626 664
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 665 $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', 666 $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', 667 $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', 668 $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 669
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 670 $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, 671 $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 672
641 $GAUGES = { 673 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 674 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 675 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 676 };
… …
657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 689 $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"); 690 $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 }); 691 $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"); 692 $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 }); 693 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
694 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
662 695
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 696 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 697
665 for my $x (0..2) { 698 for my $x (0..2) {
666 for my $y (0 .. 2) { 699 for my $y (0 .. 2) {
… …
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 703 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 ); 704 );
672 } 705 }
673 } 706 }
674 707
708 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
675 709
676 $table 710 $table
677} 711}
678 712
679sub stats_window { 713sub stats_window {
… …
681 expand => 1, 715 expand => 1,
682 scroll_y => 1 716 scroll_y => 1
683 ); 717 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 718 $r->add (my $vb = new CFPlus::UI::VBox);
685 719
720 $vb->add (new CFPlus::UI::FancyFrame
721 label => "Player",
722 child => (my $pi = new CFPlus::UI::VBox),
723 );
724
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 725 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 726 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."); 727 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, 728 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 729 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 730 tooltip => "The map you are currently on (if supported by the server).");
692 731
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 732 $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, 733 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 734 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 735 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, 736 $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, 737 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 738 tooltip => "The weight limit: you cannot carry more than this.");
700 739
740 $vb->add (new CFPlus::UI::FancyFrame
741 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 742 child => (my $hb = new CFPlus::UI::HBox expand => 1),
743 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 744 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 745
704 my $color2 = [1, 1, 0]; 746 my $color2 = [1, 1, 0];
705 747
706 for ( 748 for (
… …
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 769 $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, 770 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => "#stat_$label"); 771 align => -1, text => $label, tooltip => "#stat_$label");
730 } 772 }
731 773
774 $vb->add (new CFPlus::UI::FancyFrame
775 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 776 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
777 );
733 778
734 my $row = 0; 779 my $row = 0;
735 my $col = 0; 780 my $col = 0;
736 781
737 my %resist_names = ( 782 my %resist_names = (
… …
837 882
838 my $table = $METASERVER->{table}; 883 my $table = $METASERVER->{table};
839 $table->clear; 884 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 885 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 886
842 my $buf; 887 my $ok = 0;
843 888
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 889 CFPlus::background {
890 my $ua = CFPlus::lwp_useragent;
845 891
846 unless ($fh) { 892 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 893 } sub {
848 return; 894 my ($msg) = @_;
849 } 895 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; 896 $table->clear;
864 897
865 my @tip = ( 898 my @tip = (
866 "The current number of users logged in on the server.", 899 "The current number of users logged in on the server.",
867 "The hostname of the server.", 900 "The hostname of the server.",
… …
877 for 0 .. $#col; 910 for 0 .. $#col;
878 911
879 my @align = qw(1 0 1 1 -1); 912 my @align = qw(1 0 1 1 -1);
880 913
881 my $y = 0; 914 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 915 for my $m (@{ $msg->{servers} }) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 916 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
917 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
884 918
885 for ($desc) { 919 for ($desc) {
886 s/<br>/\n/gi; 920 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 921 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 922 s/<.*?>//sgi;
889 s/&/&amp;/g; 923 s/&amp;/&/g;
890 s/</&lt;/g; 924 s/&lt;/</g;
891 s/>/&gt;/g; 925 s/&gt;/>/g;
892 } 926 }
893 927
894 $uptime = sprintf "%dd %02d:%02d:%02d", 928 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 929 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 930 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 931 (int $uptime / 60) % 60,
898 $m->[8] % 60; 932 $uptime % 60;
899 933
900 $m = [$users, $host, $uptime, $version, $desc]; 934 $m = [$users, $host, $uptime, $version, $desc];
901 935
902 $y++; 936 $y++;
903 937
… …
913 ), 947 ),
914 (new CFPlus::UI::Empty expand => 1), 948 (new CFPlus::UI::Empty expand => 1),
915 ]); 949 ]);
916 950
917 $table->add ($_, $y, new CFPlus::UI::Label 951 $table->add ($_, $y, new CFPlus::UI::Label
952 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 953 ellipsise => 0,
919 align => $align[$_], 954 align => $align[$_],
920 text => $m->[$_], 955 text => $m->[$_],
921 tooltip => $tip[$_], 956 tooltip => $tip[$_],
957 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 958 can_hover => 1,
923 can_events => 1, 959 can_events => 1,
924 fontsize => 0.8) 960 fontsize => 0.8)
925 for 0 .. $#$m; 961 for 0 .. $#$m;
926 } 962 }
963 } else {
964 $ok or $label->set_text ("error while contacting metaserver");
927 } 965 }
928 }); 966 };
967
929} 968}
930 969
931sub metaserver_dialog { 970sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 971 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 972 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 973 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 974
936 my $dialog = new CFPlus::UI::FancyFrame 975 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 976 title => "Server List",
938 name => 'metaserver_dialog', 977 name => 'metaserver_dialog',
939 x => 'center', 978 x => 'center',
940 y => 'center', 979 y => 'center',
941 z => 3, 980 z => 3,
981 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 982 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 983 child => $vbox,
944 has_close_button => 1, 984 has_close_button => 1,
945 table => $table, 985 table => $table,
946 on_visibility_change => sub { 986 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 987 update_metaserver ($_[0]) if $_[1];
… …
953} 993}
954 994
955sub server_setup { 995sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 996 my $vbox = new CFPlus::UI::VBox;
957 997
998 $vbox->add (new CFPlus::UI::FancyFrame
999 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1000 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1001 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1002 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 1003
961 { 1004 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1005 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 1006
… …
1020 . "so only set it if you really need to prefetch images. " 1063 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1064 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1065 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1066 );
1024 1067
1025 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1068 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1026 $table->add (1, 9, new CFPlus::UI::Entry 1069 $table->add (1, 9, new CFPlus::UI::Entry
1070 text => $CFG->{output_rate},
1071 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1072 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1073 . "default will be used, which is usually around 100kb/s.",
1074 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1075 );
1076
1077 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1078 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1079 text => $CFG->{output_count},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1080 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1081 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1082 );
1031 1083
1032 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1084 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFPlus::UI::Entry 1085 $table->add (1, 11, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1086 text => $CFG->{output_sync},
1035 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1087 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1036 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1088 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1089 );
1038 1090
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1091 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1092 expand => 1,
1041 align => 0, 1093 align => 0,
1042 text => "Login", 1094 text => "Login",
1043 on_activate => sub { 1095 on_activate => sub {
1044 $CONN ? stop_game 1096 $CONN ? stop_game
1045 : start_game; 1097 : start_game;
1046 0 1098 0
1047 }, 1099 },
1048 ); 1100 );
1049 1101
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1102 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1103 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1104 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. " 1105 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. " 1106 . "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.", 1107 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1108 on_changed => sub {
1057 my ($self, $value) = @_; 1109 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1110 $CFG->{say_command} = $value;
1059 0 1111 0
1060 } 1112 }
1061 ); 1113 );
1062 1114
1115 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1116 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
1117 state => $CFG->{show_tips},
1118 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1119 on_changed => sub {
1120 my ($self, $value) = @_;
1121 $CFG->{show_tips} = $value;
1122 0
1123 }
1124 );
1125
1063 $vbox->add (new CFPlus::UI::Label 1126 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1127 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); 1128 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1129 );
1071 1130
1072 $vbox 1131 $vbox
1073} 1132}
1074 1133
1075sub message_window { 1134sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1135 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1136 name => "message_window",
1078 title => "Messages", 1137 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1138 border_bg => [1, 1, 1, 1],
1080 x => "max", 1139 x => "max",
1081 y => 0, 1140 y => 0,
… …
1131 window => $window, 1190 window => $window,
1132 input => $input, 1191 input => $input,
1133 }; 1192 };
1134 1193
1135 $window 1194 $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} 1195}
1193 1196
1194sub autopickup_setup { 1197sub autopickup_setup {
1195 my $table = new CFPlus::UI::Table; 1198 my $table = new CFPlus::UI::Table;
1196 1199
… …
1214 ["Boots" => PICKUP_BOOTS], 1217 ["Boots" => PICKUP_BOOTS],
1215 ["Gloves" => PICKUP_GLOVES], 1218 ["Gloves" => PICKUP_GLOVES],
1216 ["Cloaks" => PICKUP_CLOAK], 1219 ["Cloaks" => PICKUP_CLOAK],
1217 ], 1220 ],
1218 1221
1219 ["Readables", 2, 2, 1222 ["Readables", 2, 0,
1220 ["Spellbooks" => PICKUP_SPELLBOOK], 1223 ["Spellbooks" => PICKUP_SPELLBOOK],
1221 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1224 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1222 ["Normal Books/Scrolls" => PICKUP_READABLES], 1225 ["Normal Books/Scrolls" => PICKUP_READABLES],
1223 ], 1226 ],
1224 ["Misc", 2, 7, 1227 ["Misc", 2, 5,
1225 ["Food" => PICKUP_FOOD], 1228 ["Food" => PICKUP_FOOD],
1226 ["Drinks" => PICKUP_DRINK], 1229 ["Drinks" => PICKUP_DRINK],
1227 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1230 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1228 ["Keys" => PICKUP_KEY], 1231 ["Keys" => PICKUP_KEY],
1229 ["Magical Items" => PICKUP_MAGICAL], 1232 ["Magical Items" => PICKUP_MAGICAL],
1230 ["Potions" => PICKUP_POTION], 1233 ["Potions" => PICKUP_POTION],
1231 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1234 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1232 ["Ignore cursed" => PICKUP_NOT_CURSED], 1235 ["Ignore cursed" => PICKUP_NOT_CURSED],
1233 ["Jewelery" => PICKUP_JEWELS], 1236 ["Jewelery" => PICKUP_JEWELS],
1237 ["Flesh" => PICKUP_FLESH],
1234 ], 1238 ],
1235 ["Weight/Value ratio", 2, 17] 1239 ["Weight/Value ratio", 2, 17]
1236 ) 1240 )
1237 { 1241 {
1238 my ($title, $x, $y, @bits) = @$_; 1242 my ($title, $x, $y, @bits) = @$_;
… …
1288 $table 1292 $table
1289} 1293}
1290 1294
1291my %SORT_ORDER = ( 1295my %SORT_ORDER = (
1292 type => undef, 1296 type => undef,
1293 mtime => sub { sort { 1297 mtime => sub {
1298 my $NOW = time;
1299 sort {
1300 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1301 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1302
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1303 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1304 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1305 or $a->{type} <=> $b->{type}
1306 } @_
1297 } @_ }, 1307 },
1298 weight => sub { sort { 1308 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1309 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1310 or $a->{type} <=> $b->{type}
1301 } @_ }, 1311 } @_ },
1302); 1312);
… …
1327 #TODO# update to weigh/maxweight 1337 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1338 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1339
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1340 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1341 $sw1->add ($INV = new CFPlus::UI::Inventory);
1342 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1343
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1344 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1345
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1346 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1347
… …
1353 $PL_WINDOW->show; 1364 $PL_WINDOW->show;
1354 } 1365 }
1355} 1366}
1356 1367
1357sub player_window { 1368sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1369 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1370 x => "center",
1360 y => "center", 1371 y => "center",
1361 force_w => $WIDTH * 9/10, 1372 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1373 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1374 title => "Player",
… …
1376 $ntb->add ( 1387 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1388 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1389 "Shows all your Skills."
1379 ); 1390 );
1380 1391
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1392 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1393 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1394 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1395 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1396 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1397 );
1387 $ntb->add ( 1398 $ntb->add (
… …
1394 1405
1395 $plwin->add ($ntb); 1406 $plwin->add ($ntb);
1396 $plwin 1407 $plwin
1397} 1408}
1398 1409
1399sub update_bindings {
1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1401}
1402
1403sub keyboard_setup { 1410sub keyboard_setup {
1404 my $binding_list = new CFPlus::UI::VBox; 1411 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} 1412}
1510 1413
1511sub help_window { 1414sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1415 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1416 x => 'center',
1514 y => 'center', 1417 y => 'center',
1515 z => 2, 1418 z => 4,
1516 name => 'doc_browser', 1419 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1420 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1421 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1422 title => "Help Browser",
1520 has_close_button => 1; 1423 has_close_button => 1;
1521 1424
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1425 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1426
1427 $vbox->add (new CFPlus::UI::FancyFrame
1428 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1429 child => (my $buttons = new CFPlus::UI::HBox),
1430 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1431 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1432 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1433
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1434 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1435 my @future;
1530 value => undef, 1436 my $curnode;
1531 options => [ 1437
1532 [intro => "Introduction"], 1438 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1439 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1440
1535 [command_help => "Command Reference"], 1441 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1442
1537 [COPYING => "License Terms"], 1443 $buttons->add (new CFPlus::UI::Button
1444 text => "⇤",
1445 tooltip => "back to the starting page",
1446 on_activate => sub {
1447 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1448 unshift @future, @history;
1449 @history = ();
1450 $load_node->(@{shift @future});
1451 },
1452 );
1453
1454 if (@history) {
1455 $buttons->add (new CFPlus::UI::Button
1456 text => "⋘",
1457 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1458 on_activate => sub {
1459 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1460 $load_node->(@{pop @history});
1461 },
1462 );
1538 ], 1463 }
1539 on_changed => sub {
1540 my ($self, $pod) = @_;
1541 1464
1465 if (@future) {
1466 $buttons->add (new CFPlus::UI::Button
1467 text => "⋙",
1468 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1469 on_activate => sub {
1470 push @history, [$curnode, $viewer->current_paragraph];
1471 $load_node->(@{shift @future});
1472 },
1473 );
1474 }
1475
1476 $buttons->add (new CFPlus::UI::Label text => " ");
1477
1478 my @path = CFPlus::Pod::full_path_of $node;
1479 pop @path; # drop current node
1480
1481 for my $node (@path) {
1482 $buttons->add (new CFPlus::UI::Button
1483 text => $node->{kw}[0],
1484 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1485 on_activate => sub {
1486 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1487 $load_node->($node);
1488 },
1489 );
1490 $buttons->add (new CFPlus::UI::Label text => "/");
1491 }
1492
1493 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1494
1495 $curnode = $node;
1496
1542 $viewer->clear; 1497 $viewer->clear;
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1498 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1544 $viewer->set_offset (0); 1499 $viewer->scroll_to ($para);
1500 };
1545 1501
1502 $load_node->(CFPlus::Pod::find pod => "mainpage");
1503
1504 $CFPlus::Pod::goto_document = sub {
1505 my (@path) = @_;
1506
1507 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1508
1509 $load_node->((CFPlus::Pod::find @path)[0]);
1510 $win->show;
1511 };
1512
1513 $win
1514}
1515
1516sub open_string_query {
1517 my ($title, $cb, $txt, $tooltip) = @_;
1518 my $dialog = new CFPlus::UI::Toplevel
1519 x => "center",
1520 y => "center",
1521 z => 50,
1522 force_w => $WIDTH * 4/5,
1523 title => $title;
1524
1525 $dialog->add (
1526 my $e = new CFPlus::UI::Entry
1527 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1528 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1529 tooltip => $tooltip
1530 );
1531
1532 $e->grab_focus;
1533 $e->set_text ($txt) if $txt;
1534 $dialog->show;
1535}
1536
1537sub open_quit_dialog {
1538 unless ($QUIT_DIALOG) {
1539 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1540 x => "center",
1541 y => "center",
1542 z => 50,
1543 title => "Really Quit?",
1544 on_key_down => sub {
1545 my ($dialog, $ev) = @_;
1546 $ev->{sym} == 27 and $dialog->hide;
1546 0 1547 }
1548 ;
1549
1550 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1551
1552 $vb->add (new CFPlus::UI::Label
1553 text => "You should find a savebed and apply it first!",
1554 max_w => $WIDTH * 0.25,
1555 ellipsize => 0,
1556 );
1557 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1558 $hb->add (new CFPlus::UI::Button
1559 text => "Ok",
1560 expand => 1,
1561 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1562 );
1563 $hb->add (new CFPlus::UI::Button
1564 text => "Quit anyway",
1565 expand => 1,
1566 on_activate => sub { exit },
1567 );
1568 }
1569
1570 $QUIT_DIALOG->show;
1571 $QUIT_DIALOG->grab_focus;
1572}
1573
1574sub show_tip_of_the_day {
1575 # find all tips
1576 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1577
1578 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1579 $todindex = 0 if $todindex >= @tod;
1580 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1581
1582 # create dialog
1583 my $dialog;
1584
1585 my $close = sub {
1586 $dialog->destroy;
1587 };
1588
1589 $dialog = new CFPlus::UI::Toplevel
1590 x => "center",
1591 y => "center",
1592 z => 3,
1593 name => 'tip_of_the_day',
1594 force_w => int $WIDTH * 4/9,
1595 force_h => int $WIDTH * 2/9,
1596 title => "Tip of the day #" . (1 + $todindex),
1597 child => my $vbox = new CFPlus::UI::VBox,
1598 has_close_button => 1,
1599 on_delete => $close,
1600 ;
1601
1602 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1603 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1604 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1605
1606 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1607
1608 $table->add (0, 0, new CFPlus::UI::Button
1609 text => "Close",
1610 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>.",
1611 on_activate => $close,
1612 );
1613
1614 $table->add (2, 0, new CFPlus::UI::Button
1615 text => "Next",
1616 tooltip => "Show the next <b>Tip of the day</b>.",
1617 on_activate => sub {
1618 $close->();
1619 &show_tip_of_the_day;
1547 }, 1620 },
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 ); 1621 );
1556 1622
1557 $win 1623 $dialog->show;
1558} 1624}
1559 1625
1560sub sdl_init { 1626sub sdl_init {
1561 CFPlus::SDL_Init 1627 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1628 and die "SDL::Init failed!\n";
… …
1597 z => 100, 1663 z => 100,
1598 force_x => "max", 1664 force_x => "max",
1599 force_y => 0; 1665 force_y => 0;
1600 $DEBUG_STATUS->show; 1666 $DEBUG_STATUS->show;
1601 1667
1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1603
1604 $STATUSBOX = new CFPlus::UI::Statusbox; 1668 $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]); 1669 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1606 1670
1607 (new CFPlus::UI::Frame 1671 (new CFPlus::UI::Frame
1608 bg => [0, 0, 0, 0.4], 1672 bg => [0, 0, 0, 0.4],
1609 force_x => 0, 1673 force_x => 0,
1610 force_y => "max", 1674 force_y => "max",
1611 child => $STATUSBOX, 1675 child => $STATUSBOX,
1612 )->show; 1676 )->show;
1613 1677
1614 CFPlus::UI::FancyFrame->new ( 1678 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1679 title => "Map",
1616 name => "mapmap", 1680 name => "mapmap",
1617 x => 0, 1681 x => 0,
1618 y => $FONTSIZE + 8, 1682 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1683 border_bg => [1, 1, 1, 192/255],
… …
1647 can_hover => 1, 1711 can_hover => 1,
1648 can_events => 1, 1712 can_events => 1,
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1713 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1650 ; 1714 ;
1651 1715
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1716 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1717 title => "Setup",
1654 name => "setup_dialog", 1718 name => "setup_dialog",
1655 x => 'center', 1719 x => 'center',
1656 y => 'center', 1720 y => 'center',
1657 z => 2, 1721 z => 2,
… …
1708 ); 1772 );
1709 1773
1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1774 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1711 tooltip => "View Documentation"); 1775 tooltip => "View Documentation");
1712 1776
1777
1713 $BUTTONBAR->add (new CFPlus::UI::Button 1778 $BUTTONBAR->add (new CFPlus::UI::Button
1714 text => "Quit", 1779 text => "Quit",
1715 tooltip => "Terminates the program", 1780 tooltip => "Terminates the program",
1716 on_activate => sub { 1781 on_activate => sub {
1717 if ($CONN) { 1782 if ($CONN) {
… …
1728 } 1793 }
1729 1794
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1795 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1731} 1796}
1732 1797
1798sub setup_build_button {
1799 my ($enabled) = @_;
1800 if ($enabled) {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 $BUILD_BUTTON ||= new CFPlus::UI::Button
1803 text => "Build",
1804 tooltip => "Opens the ingame builder",
1805 on_activate => sub {
1806 if ($CONN) {
1807 $CONN->send_ext_req (builder_player_items => sub {
1808 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1809 });
1810 }
1811 0
1812 };
1813 $BUTTONBAR->add ($BUILD_BUTTON);
1814 } else {
1815 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1816 }
1817}
1818
1819sub open_ingame_editor {
1820 my ($msg) = @_;
1821
1822 my $win = new CFPlus::UI::Toplevel
1823 x => 0,
1824 y => 'center',
1825 z => 4,
1826 name => 'builder_window',
1827 force_w => int $WIDTH * 1/4,
1828 force_h => int $HEIGHT * 3/4,
1829 title => "In game builder",
1830 has_close_button => 1;
1831
1832 my $r = new CFPlus::UI::ScrolledWindow (
1833 expand => 1,
1834 scroll_y => 1
1835 );
1836 $r->add (my $vb = new CFPlus::UI::VBox);
1837 $win->add ($r);
1838
1839
1840 $vb->add (
1841 new CFPlus::UI::Button
1842 text => "Disable build mode",
1843 on_activate => sub { $::IN_BUILD_MODE = undef }
1844 );
1845 $vb->add (
1846 new CFPlus::UI::Button
1847 text => "ERASE",
1848 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1849 );
1850
1851 for my $itemarchname (
1852 sort {
1853 $msg->{items}->{$a}->{build_arch_name}
1854 cmp $msg->{items}->{$b}->{build_arch_name}
1855 } keys %{$msg->{items}}
1856 ) {
1857 my $info = $msg->{items}->{$itemarchname};
1858 $vb->add (
1859 new CFPlus::UI::Button text => $info->{build_arch_name},
1860 on_activate => sub {
1861 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1862
1863 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1864 build_mode_query_arch_info ();
1865 }
1866 }
1867 );
1868 }
1869
1870 $win->show;
1871}
1872
1873sub build_mode_query_arch_info {
1874 my ($iteminfo) = $::IN_BUILD_MODE;
1875 my $itemarchname = $iteminfo->{item};
1876 my $info = $iteminfo->{info};
1877
1878 my $dialog = new CFPlus::UI::Toplevel
1879 x => "center",
1880 y => "center",
1881 z => 50,
1882 force_w => int $WIDTH * 1/2,
1883 title => "Enter information for placement of '$itemarchname'",
1884 has_close_button => 1;
1885
1886 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1887
1888 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1889 my $row = 0;
1890 if ($info->{has_name}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1892 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1893 }
1894 if ($info->{has_text}) {
1895 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1896 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1897 }
1898 if ($info->{has_connection}) {
1899 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1900 $table->add (1, $row++,
1901 new CFPlus::UI::Entry
1902 expand => 1,
1903 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1904 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1905 );
1906 }
1907
1908 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1909 $hb->add (new CFPlus::UI::Button
1910 text => "Close",
1911 expand => 1,
1912 on_activate => sub { $dialog->hide; 0 },
1913 );
1914 $dialog->show;
1915}
1916
1733sub video_shutdown { 1917sub video_shutdown {
1734 CFPlus::OpenGL::shutdown; 1918 CFPlus::OpenGL::shutdown;
1735 1919
1736 undef $SDL_ACTIVE; 1920 undef $SDL_ACTIVE;
1737} 1921}
… …
1768 CFPlus::Mix_AllocateChannels 8; 1952 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1953 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 1954
1771 audio_music_finished; 1955 audio_music_finished;
1772 1956
1957 local $_;
1773 while (<$fh>) { 1958 while (<$fh>) {
1774 next if /^\s*#/; 1959 next if /^\s*#/;
1775 next if /^\s*$/; 1960 next if /^\s*$/;
1776 1961
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 1962 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1862 }, 2047 },
1863 CFPlus::SDL_VIDEOEXPOSE => sub { 2048 CFPlus::SDL_VIDEOEXPOSE => sub {
1864 CFPlus::UI::full_refresh; 2049 CFPlus::UI::full_refresh;
1865 }, 2050 },
1866 CFPlus::SDL_ACTIVEEVENT => sub { 2051 CFPlus::SDL_ACTIVEEVENT => sub {
1867# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2052# not useful, as APPACTIVE include sonly iconified state, not unmapped
2053# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2054# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2055# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2056# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1868 }, 2057 },
1869 CFPlus::SDL_KEYDOWN => sub { 2058 CFPlus::SDL_KEYDOWN => sub {
1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2059 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1871 # alt-enter 2060 # alt-enter
1872 $FULLSCREEN_ENABLE->toggle; 2061 $FULLSCREEN_ENABLE->toggle;
… …
1911 log_fontsize => 0.7, 2100 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2101 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2102 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2103 stat_fontsize => 0.7,
1915 mapsize => 100, 2104 mapsize => 100,
1916 say_command => 'say', 2105 say_command => 'chat',
1917 audio_enable => 1, 2106 audio_enable => 1,
1918 bgm_enable => 1, 2107 bgm_enable => 1,
1919 bgm_volume => 0.25, 2108 bgm_volume => 0.25,
1920 face_prefetch => 0, 2109 face_prefetch => 0,
1921 output_sync => 1, 2110 output_sync => 1,
1922 output_count => 1, 2111 output_count => 1,
2112 output_rate => "",
1923 pickup => 0, 2113 pickup => 0,
1924 inv_sort => "mtime", 2114 inv_sort => "mtime",
1925 default => "profile", # default profile 2115 default => "profile", # default profile
2116 show_tips => 1,
1926 ); 2117 );
1927 2118
1928 while (my ($k, $v) = each %DEF_CFG) { 2119 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2120 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2121 }
1931 2122
1932 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2123 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2124 $PROFILE = $CFG->{profile}{default};
2125
2126 # convert old bindings (only default profile matters)
2127 if (my $bindings = delete $PROFILE->{bindings}) {
2128 while (my ($mod, $syms) = each %$bindings) {
2129 while (my ($sym, $cmds) = each %$syms) {
2130 push @{ $PROFILE->{macro} }, {
2131 accelkey => [$mod*1, $sym*1],
2132 action => $cmds,
2133 };
2134 }
2135 }
2136 }
1933 2137
1934 sdl_init; 2138 sdl_init;
1935 2139
1936 @SDL_MODES = reverse 2140 @SDL_MODES = reverse
1937 grep $_->[0] >= 640 && $_->[1] >= 480, 2141 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1974# } 2178# }
1975# my $t2 = Time::HiRes::time; 2179# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2180# warn $t2-$t1;
1977# } 2181# }
1978 2182
2183 $startup_done->();
2184
1979 video_init; 2185 video_init;
1980 audio_init; 2186 audio_init;
1981} 2187}
2188
2189show_tip_of_the_day if $CFG->{show_tips};
1982 2190
1983Event::loop; 2191Event::loop;
1984#CFPlus::SDL_Quit; 2192#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2193#CFPlus::_exit 0;
1986 2194

Diff Legend

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