ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.106 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.168 by root, Sat Jul 14 12:05:53 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFPlus; 82use CFPlus;
38use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
39use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
41use CFPlus::Pod; 89use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
44 92
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
47 95
48$Event::Eval = 0; 96$Event::Eval = 1;
49$Event::DIED = sub { 97$Event::DIED = sub {
50 # TODO: display dialog box or so 98 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 99};
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 100
66my $MAX_FPS = 60; 101my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
68 103
69our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 105
71our $LAST_REFRESH; 106our $LAST_REFRESH;
72our $NOW; 107our $NOW;
73 108
74our $CFG; 109our $CFG;
75our $CONN; 110our $CONN;
111our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 112our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 113
78our $WANT_REFRESH; 114our $WANT_REFRESH;
79our $CAN_REFRESH; 115our $CAN_REFRESH;
80 116
111 147
112our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
113our $STATS_PAGE; 149our $STATS_PAGE;
114our $SKILL_PAGE; 150our $SKILL_PAGE;
115our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
116 153
117our $HELP_WINDOW; 154our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
119our $FLOORBOX; 156our $FLOORBOX;
120our $GAUGES; 157our $GAUGES;
122 159
123our $SDL_ACTIVE; 160our $SDL_ACTIVE;
124our %SDL_CB; 161our %SDL_CB;
125 162
126our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
127our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
129 172
130our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 174our $STATUSBOX;
133 176
134our $INV; 177our $INV;
135our $INVR; 178our $INVR;
136our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
137 180
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
142 185
143sub status { 186sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 188}
146 189
147sub debug { 190sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
192}
193
194sub message {
195 my ($para) = @_;
196
197 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
198
199 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
200
201 $LOGVIEW->add_paragraph ($para);
202 $LOGVIEW->scroll_to_bottom;
149} 203}
150 204
151sub destroy_query_dialog { 205sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 206 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 207 if $_[0]{query_dialog};
154} 208}
155 209
210# FIXME: a very ugly hack to wait for stat update look below! #d#
211our $QUERY_TIMER; #d#
212
156# server query dialog 213# server query dialog
157sub server_query { 214sub server_query {
158 my ($conn, $flags, $prompt) = @_; 215 my ($conn, $flags, $prompt) = @_;
159 216
217 # FIXME: a very ugly hack to wait for stat update #d#
218 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
219 unless ($QUERY_TIMER) {
220 $QUERY_TIMER =
221 Event->timer (
222 after => 1,
223 cb => sub {
224 server_query ($conn, $flags, $prompt, 1);
225 $QUERY_TIMER = undef
226 }
227 );
228 return;
229 }
230 }
231
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 232 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 233 x => "center",
162 y => "center", 234 y => "center",
163 title => "Server Query", 235 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
165 ; 237 ;
166 238
167 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 241 ellipsise => 0,
170 text => $prompt; 242 text => $prompt;
171 243
172 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
190 ); 262 );
191 263
192 $dialog->grab_focus; 264 $dialog->grab_focus;
193 265
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
199 269
200 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 272 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
204 274
205 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
206 276
219 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
220 0 290 0
221 }, 291 },
222 ); 292 );
223 293
294 if ($conn->{chargen_race_description}) {
295 unshift @dialog, new CFPlus::UI::Label
296 max_w => $::WIDTH * 0.8,
297 ellipsise => 0,
298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
299 ;
300 }
301
302 unshift @dialog, new CFPlus::UI::Face
303 face => $conn->{player}{face},
304 bg => [.2, .2, .2, 1],
305 min_w => 64,
306 min_h => 64,
307 ;
308
309 if ($conn->{chargen_race_title}) {
310 unshift @dialog, new CFPlus::UI::Label
311 allign => 1,
312 ellipsise => 0,
313 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
314 ;
315 }
316
224 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 319 ellipsise => 0,
227 markup => 320 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 ; 321 ;
236 322
237 } elsif ($prompt =~ /roll new stats/) { 323 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 324 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 399 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0, 400 align => 0,
315 expand => 1, 401 expand => 1,
316 can_events => 1, 402 can_events => 1,
317 can_hover => 1, 403 can_hover => 1,
318 tooltip => $CFPlus::STAT_TOOLTIP{$name}, 404 tooltip => "#stat_$name",
319 ); 405 );
320 } 406 }
321 407
322 unshift @dialog, new CFPlus::UI::Label 408 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 409 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 410 ellipsise => 0,
325 markup => 411 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 ; 412 ;
332 } 413 }
333 414
334 push @dialog, my $entry = new CFPlus::UI::Entry 415 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 416 on_changed => sub {
366 $LOGIN_BUTTON->set_text ("Logout"); 447 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 448 $SETUP_DIALOG->hide;
368 449
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 450 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 451
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 452 my ($host, $port) = split /:/, $PROFILE->{host};
372 453
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 454 $MAP = new CFPlus::Map;
374 455
375 $CONN = eval { 456 $CONN = eval {
376 new CFPlus::Protocol 457 new CFPlus::Protocol
377 host => $host, 458 host => $host,
378 port => $port || 13327, 459 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 460 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 461 pass => $PROFILE->{password},
381 mapw => $mapsize, 462 mapw => $mapsize,
382 maph => $mapsize, 463 maph => $mapsize,
464
465 client => "cfplus $CFPlus::VERSION $] $^O",
383 466
384 map_widget => $MAPWIDGET, 467 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 468 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
387 map => $MAP, 470 map => $MAP,
388 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
389 query => \&server_query, 472 query => \&server_query,
390 473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
477
391 sound_play => sub { 478 sound_play => sub {
392 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
393 480
394 $SDL_MIXER 481 $SDL_MIXER
395 or return; 482 or return;
414sub stop_game { 501sub stop_game {
415 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
418 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
419 $SPELL_PAGE->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
420 510
421 return unless $CONN; 511 return unless $CONN;
422 512
423 status "connection closed"; 513 status "connection closed";
424 514
432sub graphics_setup { 522sub graphics_setup {
433 my $vbox = new CFPlus::UI::VBox; 523 my $vbox = new CFPlus::UI::VBox;
434 524
435 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
436 526
527 my $row = 0;
528
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533
437 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 534 $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); 535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
439 536
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]); 537 $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"); 538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
442 539
443 $mode_slider->connect (changed => sub { 540 $mode_slider->connect (changed => sub {
445 542
446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
447 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
448 }); 545 });
449 $mode_slider->emit (changed => $mode_slider->{range}[0]); 546 $mode_slider->emit (changed => $mode_slider->{range}[0]);
450
451 my $row = 1;
452 547
453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 548 $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 549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455 state => $CFG->{fullscreen}, 550 state => $CFG->{fullscreen},
456 tooltip => "Bring the client into fullscreen mode.", 551 tooltip => "Bring the client into fullscreen mode.",
462 state => $CFG->{fast}, 557 state => $CFG->{fast},
463 tooltip => "Lower the visual quality considerably to speed up rendering.", 558 tooltip => "Lower the visual quality considerably to speed up rendering.",
464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
465 ); 560 );
466 561
562 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
563 $table->add (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 );
568
569 $table->add (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.",
572 on_activate => sub {
573 video_shutdown ();
574 video_init ();
575 0
576 }
577 );
578
467 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 579 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
468 $table->add (1, $row++, new CFPlus::UI::Slider 580 $table->add (1, $row++, new CFPlus::UI::Slider
469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
471 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
584 );
585
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing},
589 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
590 . "This increases load on the graphics subsystem and works only with 2.x servers. "
591 . "Changes take effect at next connection only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
472 ); 593 );
473 594
474 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
475 $table->add (1, $row++, new CFPlus::UI::CheckBox 596 $table->add (1, $row++, new CFPlus::UI::CheckBox
476 state => $CFG->{fow_enable}, 597 state => $CFG->{fow_enable},
495 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
496 0 617 0
497 } 618 }
498 ); 619 );
499 620
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
501 $table->add (1, $row++, new CFPlus::UI::Slider
502 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
503 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
504 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
505 );
506
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
508 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add (1, $row++, new CFPlus::UI::Slider
509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
510 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 624 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
527 range => [$CFG->{gauge_size}, 0.2, 0.8], 641 range => [$CFG->{gauge_size}, 0.2, 0.8],
528 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 642 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
529 on_changed => sub { 643 on_changed => sub {
530 $CFG->{gauge_size} = $_[1]; 644 $CFG->{gauge_size} = $_[1];
531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
532 0
533 }
534 );
535
536 $table->add (1, $row++, new CFPlus::UI::Button
537 expand => 1, align => 0, text => "Apply",
538 tooltip => "Apply the video settings",
539 on_activate => sub {
540 video_shutdown ();
541 video_init ();
542 0 646 0
543 } 647 }
544 ); 648 );
545 649
546 $vbox 650 $vbox
622 (new CFPlus::UI::Empty expand => 1), 726 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 727 (my $hb = new CFPlus::UI::HBox),
624 ], 728 ],
625 ); 729 );
626 730
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 731 $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', 732 $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', 733 $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', 734 $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 735
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 736 $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, 737 $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 738
641 $GAUGES = { 739 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 740 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 741 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 742 };
657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 755 $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"); 756 $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 }); 757 $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"); 758 $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 }); 759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
662 761
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 763
665 for my $x (0..2) { 764 for my $x (0..2) {
666 for my $y (0 .. 2) { 765 for my $y (0 .. 2) {
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 769 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 ); 770 );
672 } 771 }
673 } 772 }
674 773
774 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
675 775
676 $table 776 $table
677} 777}
678 778
679sub stats_window { 779sub stats_window {
681 expand => 1, 781 expand => 1,
682 scroll_y => 1 782 scroll_y => 1
683 ); 783 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 784 $r->add (my $vb = new CFPlus::UI::VBox);
685 785
786 $vb->add (new CFPlus::UI::FancyFrame
787 label => "Player",
788 child => (my $pi = new CFPlus::UI::VBox),
789 );
790
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 791 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 792 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."); 793 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, 794 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 795 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 796 tooltip => "The map you are currently on (if supported by the server).");
692 797
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 798 $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, 799 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 800 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 801 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, 802 $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, 803 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 804 tooltip => "The weight limit: you cannot carry more than this.");
700 805
806 $vb->add (new CFPlus::UI::FancyFrame
807 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 808 child => (my $hb = new CFPlus::UI::HBox expand => 1),
809 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 810 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 811
704 my $color2 = [1, 1, 0]; 812 my $color2 = [1, 1, 0];
705 813
706 for ( 814 for (
721 ) { 829 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 830 my ($col, $row, $id, $label, $template) = @$_;
723 831
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 832 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 833 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 834 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 835 $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, 836 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 837 align => -1, text => $label, tooltip => "#stat_$label");
730 } 838 }
731 839
840 $vb->add (new CFPlus::UI::FancyFrame
841 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 842 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
843 );
733 844
734 my $row = 0; 845 my $row = 0;
735 my $col = 0; 846 my $col = 0;
736 847
737 my %resist_names = ( 848 my %resist_names = (
837 948
838 my $table = $METASERVER->{table}; 949 my $table = $METASERVER->{table};
839 $table->clear; 950 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 951 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 952
842 my $buf; 953 my $ok = 0;
843 954
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 955 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent;
845 957
846 unless ($fh) { 958 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 959 } sub {
848 return; 960 my ($msg) = @_;
849 } 961 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; 962 $table->clear;
864 963
865 my @tip = ( 964 my @tip = (
866 "The current number of users logged in on the server.", 965 "The current number of users logged in on the server.",
867 "The hostname of the server.", 966 "The hostname of the server.",
877 for 0 .. $#col; 976 for 0 .. $#col;
878 977
879 my @align = qw(1 0 1 1 -1); 978 my @align = qw(1 0 1 1 -1);
880 979
881 my $y = 0; 980 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 981 for my $m (@{ $msg->{servers} }) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 982 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
983 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
884 984
885 for ($desc) { 985 for ($desc) {
886 s/<br>/\n/gi; 986 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 987 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 988 s/<.*?>//sgi;
889 s/&/&amp;/g; 989 s/&amp;/&/g;
890 s/</&lt;/g; 990 s/&lt;/</g;
891 s/>/&gt;/g; 991 s/&gt;/>/g;
892 } 992 }
893 993
894 $uptime = sprintf "%dd %02d:%02d:%02d", 994 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 995 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 996 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 997 (int $uptime / 60) % 60,
898 $m->[8] % 60; 998 $uptime % 60;
899 999
900 $m = [$users, $host, $uptime, $version, $desc]; 1000 $m = [$users, $host, $uptime, $version, $desc];
901 1001
902 $y++; 1002 $y++;
903 1003
913 ), 1013 ),
914 (new CFPlus::UI::Empty expand => 1), 1014 (new CFPlus::UI::Empty expand => 1),
915 ]); 1015 ]);
916 1016
917 $table->add ($_, $y, new CFPlus::UI::Label 1017 $table->add ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 1019 ellipsise => 0,
919 align => $align[$_], 1020 align => $align[$_],
920 text => $m->[$_], 1021 text => $m->[$_],
921 tooltip => $tip[$_], 1022 tooltip => $tip[$_],
1023 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 1024 can_hover => 1,
923 can_events => 1, 1025 can_events => 1,
924 fontsize => 0.8) 1026 fontsize => 0.8)
925 for 0 .. $#$m; 1027 for 0 .. $#$m;
926 } 1028 }
1029 } else {
1030 $ok or $label->set_text ("error while contacting metaserver");
927 } 1031 }
928 }); 1032 };
1033
929} 1034}
930 1035
931sub metaserver_dialog { 1036sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 1037 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 1038 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1039 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 1040
936 my $dialog = new CFPlus::UI::FancyFrame 1041 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 1042 title => "Server List",
938 name => 'metaserver_dialog', 1043 name => 'metaserver_dialog',
939 x => 'center', 1044 x => 'center',
940 y => 'center', 1045 y => 'center',
941 z => 3, 1046 z => 3,
1047 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 1048 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 1049 child => $vbox,
944 has_close_button => 1, 1050 has_close_button => 1,
945 table => $table, 1051 table => $table,
946 on_visibility_change => sub { 1052 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 1053 update_metaserver ($_[0]) if $_[1];
953} 1059}
954 1060
955sub server_setup { 1061sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 1062 my $vbox = new CFPlus::UI::VBox;
957 1063
1064 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1066 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1067 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1068 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 1069
961 { 1070 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 1072
1020 . "so only set it if you really need to prefetch images. " 1129 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1130 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1132 );
1024 1133
1025 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1134 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1026 $table->add (1, 9, new CFPlus::UI::Entry 1135 $table->add (1, 9, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate},
1137 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1138 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1139 . "default will be used, which is usually around 100kb/s.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1141 );
1142
1143 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1144 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1145 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.", 1146 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 }, 1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1148 );
1031 1149
1032 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1150 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFPlus::UI::Entry 1151 $table->add (1, 11, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1152 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.", 1153 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 }, 1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1155 );
1038 1156
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1158 expand => 1,
1041 align => 0, 1159 align => 0,
1042 text => "Login", 1160 text => "Login",
1043 on_activate => sub { 1161 on_activate => sub {
1044 $CONN ? stop_game 1162 $CONN ? stop_game
1045 : start_game; 1163 : start_game;
1046 0 1164 0
1047 }, 1165 },
1048 ); 1166 );
1049 1167
1168 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info",
1170 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1171 );
1172
1173 $vbox
1174}
1175
1176sub client_setup {
1177 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1178
1179 my $row = 0;
1180
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1181 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1183 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. " 1184 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. " 1185 . "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.", 1186 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1187 on_changed => sub {
1057 my ($self, $value) = @_; 1188 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1189 $CFG->{say_command} = $value;
1059 0 1190 0
1060 } 1191 }
1061 ); 1192 );
1062 1193
1063 $vbox->add (new CFPlus::UI::Label 1194 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1064 text => "Server Info", 1195 $table->add (1, $row++, new CFPlus::UI::CheckBox
1065 fontsize => 1.2, 1196 state => $CFG->{show_tips},
1066 padding_y => 8, 1197 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1067 fg => [1, 1, 0, 1], 1198 on_changed => sub {
1199 my ($self, $value) = @_;
1200 $CFG->{show_tips} = $value;
1201 0
1202 }
1068 ); 1203 );
1069 1204
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1205 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1207 text => $CFG->{logview_max_par},
1208 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1209 . "sends more messages than this number, older messages get removed to save memory and "
1210 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1211 on_changed => sub {
1212 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1214 0
1215 },
1216 );
1071 1217
1072 $vbox 1218 $table
1073} 1219}
1074 1220
1075sub message_window { 1221sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1222 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1223 name => "message_window",
1078 title => "Messages", 1224 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1225 border_bg => [1, 1, 1, 1],
1080 x => "max", 1226 x => "max",
1081 y => 0, 1227 y => 0,
1131 window => $window, 1277 window => $window,
1132 input => $input, 1278 input => $input,
1133 }; 1279 };
1134 1280
1135 $window 1281 $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} 1282}
1193 1283
1194sub autopickup_setup { 1284sub autopickup_setup {
1195 my $table = new CFPlus::UI::Table; 1285 my $table = new CFPlus::UI::Table;
1196 1286
1214 ["Boots" => PICKUP_BOOTS], 1304 ["Boots" => PICKUP_BOOTS],
1215 ["Gloves" => PICKUP_GLOVES], 1305 ["Gloves" => PICKUP_GLOVES],
1216 ["Cloaks" => PICKUP_CLOAK], 1306 ["Cloaks" => PICKUP_CLOAK],
1217 ], 1307 ],
1218 1308
1219 ["Readables", 2, 2, 1309 ["Readables", 2, 0,
1220 ["Spellbooks" => PICKUP_SPELLBOOK], 1310 ["Spellbooks" => PICKUP_SPELLBOOK],
1221 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1311 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1222 ["Normal Books/Scrolls" => PICKUP_READABLES], 1312 ["Normal Books/Scrolls" => PICKUP_READABLES],
1223 ], 1313 ],
1224 ["Misc", 2, 7, 1314 ["Misc", 2, 5,
1225 ["Food" => PICKUP_FOOD], 1315 ["Food" => PICKUP_FOOD],
1226 ["Drinks" => PICKUP_DRINK], 1316 ["Drinks" => PICKUP_DRINK],
1227 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1317 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1228 ["Keys" => PICKUP_KEY], 1318 ["Keys" => PICKUP_KEY],
1229 ["Magical Items" => PICKUP_MAGICAL], 1319 ["Magical Items" => PICKUP_MAGICAL],
1230 ["Potions" => PICKUP_POTION], 1320 ["Potions" => PICKUP_POTION],
1231 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1321 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1232 ["Ignore cursed" => PICKUP_NOT_CURSED], 1322 ["Ignore cursed" => PICKUP_NOT_CURSED],
1233 ["Jewelery" => PICKUP_JEWELS], 1323 ["Jewelery" => PICKUP_JEWELS],
1324 ["Flesh" => PICKUP_FLESH],
1234 ], 1325 ],
1235 ["Weight/Value ratio", 2, 17] 1326 ["Weight/Value ratio", 2, 17]
1236 ) 1327 )
1237 { 1328 {
1238 my ($title, $x, $y, @bits) = @$_; 1329 my ($title, $x, $y, @bits) = @$_;
1288 $table 1379 $table
1289} 1380}
1290 1381
1291my %SORT_ORDER = ( 1382my %SORT_ORDER = (
1292 type => undef, 1383 type => undef,
1293 mtime => sub { sort { 1384 mtime => sub {
1385 my $NOW = time;
1386 sort {
1387 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1388 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1389
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1390 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1391 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1392 or $a->{type} <=> $b->{type}
1393 } @_
1297 } @_ }, 1394 },
1298 weight => sub { sort { 1395 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1396 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1397 or $a->{type} <=> $b->{type}
1301 } @_ }, 1398 } @_ },
1302); 1399);
1327 #TODO# update to weigh/maxweight 1424 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1425 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1426
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1427 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1428 $sw1->add ($INV = new CFPlus::UI::Inventory);
1429 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1430
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1431 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1432
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1433 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1434
1353 $PL_WINDOW->show; 1451 $PL_WINDOW->show;
1354 } 1452 }
1355} 1453}
1356 1454
1357sub player_window { 1455sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1456 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1457 x => "center",
1360 y => "center", 1458 y => "center",
1361 force_w => $WIDTH * 9/10, 1459 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1460 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1461 title => "Player",
1365 has_close_button => 1 1463 has_close_button => 1
1366 ; 1464 ;
1367 1465
1368 my $ntb = 1466 my $ntb =
1369 $PL_NOTEBOOK = 1467 $PL_NOTEBOOK =
1370 new CFPlus::UI::Notebook expand => 1, debug => 1; 1468 new CFPlus::UI::Notebook expand => 1;
1371 1469
1372 $ntb->add ( 1470 $ntb->add (
1373 "Statistics (F2)" => $STATS_PAGE = stats_window, 1471 "Statistics (F2)" => $STATS_PAGE = stats_window,
1374 "Shows statistics, where all your Stats and Resistances are shown." 1472 "Shows statistics, where all your Stats and Resistances are shown."
1375 ); 1473 );
1376 $ntb->add ( 1474 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1475 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1476 "Shows all your Skills."
1379 ); 1477 );
1380 1478
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1479 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1480 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1481 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1482 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1483 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1484 );
1387 $ntb->add ( 1485 $ntb->add (
1388 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1486 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1389 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1487 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1390 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1488 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1391 ); 1489 );
1490 $ntb->add (Pickup => autopickup_setup,
1491 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1392 1492
1393 $ntb->set_current_page ($INVENTORY_PAGE); 1493 $ntb->set_current_page ($INVENTORY_PAGE);
1394 1494
1395 $plwin->add ($ntb); 1495 $plwin->add ($ntb);
1396 $plwin 1496 $plwin
1397} 1497}
1398 1498
1399sub update_bindings {
1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1401}
1402
1403sub keyboard_setup { 1499sub keyboard_setup {
1404 my $binding_list = new CFPlus::UI::VBox; 1500 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} 1501}
1510 1502
1511sub help_window { 1503sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1504 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1505 x => 'center',
1514 y => 'center', 1506 y => 'center',
1515 z => 2, 1507 z => 4,
1516 name => 'doc_browser', 1508 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1509 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1510 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1511 title => "Help Browser",
1520 has_close_button => 1; 1512 has_close_button => 1;
1521 1513
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1514 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1515
1516 $vbox->add (new CFPlus::UI::FancyFrame
1517 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1518 child => (my $buttons = new CFPlus::UI::HBox),
1519 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1520 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1521 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1522
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1523 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1524 my @future;
1530 value => undef, 1525 my $curnode;
1531 options => [ 1526
1532 [intro => "Introduction"], 1527 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1528 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1529
1535 [command_help => "Command Reference"], 1530 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1531
1537 [COPYING => "License Terms"], 1532 $buttons->add (new CFPlus::UI::Button
1538 ], 1533 text => "⇤",
1534 tooltip => "back to the starting page",
1539 on_changed => sub { 1535 on_activate => sub {
1540 my ($self, $pod) = @_; 1536 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1541 1537 unshift @future, @history;
1542 $viewer->clear; 1538 @history = ();
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1539 $load_node->(@{shift @future});
1544 $viewer->set_offset (0);
1545
1546 0 1540 },
1541 );
1542
1543 if (@history) {
1544 $buttons->add (new CFPlus::UI::Button
1545 text => "⋘",
1546 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1547 on_activate => sub {
1548 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1549 $load_node->(@{pop @history});
1550 },
1551 );
1547 }, 1552 }
1548 on_visibility_change => sub { 1553
1549 my ($self, $visible) = @_; 1554 if (@future) {
1550 return unless $visible; 1555 $buttons->add (new CFPlus::UI::Button
1551 return if $self->{value}; 1556 text => "⋙",
1552 $self->set_value ("intro"); 1557 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1558 on_activate => sub {
1559 push @history, [$curnode, $viewer->current_paragraph];
1560 $load_node->(@{shift @future});
1561 },
1553 0 1562 );
1554 }, 1563 }
1564
1565 $buttons->add (new CFPlus::UI::Label text => " ");
1566
1567 my @path = CFPlus::Pod::full_path_of $node;
1568 pop @path; # drop current node
1569
1570 for my $node (@path) {
1571 $buttons->add (new CFPlus::UI::Button
1572 text => $node->{kw}[0],
1573 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1574 on_activate => sub {
1575 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1576 $load_node->($node);
1577 },
1578 );
1579 $buttons->add (new CFPlus::UI::Label text => "/");
1580 }
1581
1582 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1583
1584 $curnode = $node;
1585
1586 $viewer->clear;
1587 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1588 $viewer->scroll_to ($para);
1555 ); 1589 };
1590
1591 $load_node->(CFPlus::Pod::find pod => "mainpage");
1592
1593 $CFPlus::Pod::goto_document = sub {
1594 my (@path) = @_;
1595
1596 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1597
1598 $load_node->((CFPlus::Pod::find @path)[0]);
1599 $win->show;
1600 };
1556 1601
1557 $win 1602 $win
1603}
1604
1605sub open_string_query {
1606 my ($title, $cb, $txt, $tooltip) = @_;
1607 my $dialog = new CFPlus::UI::Toplevel
1608 x => "center",
1609 y => "center",
1610 z => 50,
1611 force_w => $WIDTH * 4/5,
1612 title => $title;
1613
1614 $dialog->add (
1615 my $e = new CFPlus::UI::Entry
1616 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1617 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1618 tooltip => $tooltip
1619 );
1620
1621 $e->grab_focus;
1622 $e->set_text ($txt) if $txt;
1623 $dialog->show;
1624}
1625
1626sub open_quit_dialog {
1627 unless ($QUIT_DIALOG) {
1628 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1629 x => "center",
1630 y => "center",
1631 z => 50,
1632 title => "Really Quit?",
1633 on_key_down => sub {
1634 my ($dialog, $ev) = @_;
1635 $ev->{sym} == 27 and $dialog->hide;
1636 }
1637 ;
1638
1639 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1640
1641 $vb->add (new CFPlus::UI::Label
1642 text => "You should find a savebed and apply it first!",
1643 max_w => $WIDTH * 0.25,
1644 ellipsize => 0,
1645 );
1646 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1647 $hb->add (new CFPlus::UI::Button
1648 text => "Ok",
1649 expand => 1,
1650 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1651 );
1652 $hb->add (new CFPlus::UI::Button
1653 text => "Quit anyway",
1654 expand => 1,
1655 on_activate => sub { exit },
1656 );
1657 }
1658
1659 $QUIT_DIALOG->show;
1660 $QUIT_DIALOG->grab_focus;
1661}
1662
1663sub show_tip_of_the_day {
1664 # find all tips
1665 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1666
1667 CFPlus::DB::get state => "tip_of_the_day", sub {
1668 my ($todindex) = @_;
1669 $todindex = 0 if $todindex >= @tod;
1670 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1671
1672 # create dialog
1673 my $dialog;
1674
1675 my $close = sub {
1676 $dialog->destroy;
1677 };
1678
1679 $dialog = new CFPlus::UI::Toplevel
1680 x => "center",
1681 y => "center",
1682 z => 3,
1683 name => 'tip_of_the_day',
1684 force_w => int $WIDTH * 4/9,
1685 force_h => int $WIDTH * 2/9,
1686 title => "Tip of the day #" . (1 + $todindex),
1687 child => my $vbox = new CFPlus::UI::VBox,
1688 has_close_button => 1,
1689 on_delete => $close,
1690 ;
1691
1692 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1693 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1694 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1695
1696 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1697
1698 $table->add (0, 0, new CFPlus::UI::Button
1699 text => "Close",
1700 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>.",
1701 on_activate => $close,
1702 );
1703
1704 $table->add (2, 0, new CFPlus::UI::Button
1705 text => "Next",
1706 tooltip => "Show the next <b>Tip of the day</b>.",
1707 on_activate => sub {
1708 $close->();
1709 &show_tip_of_the_day;
1710 },
1711 );
1712
1713 $dialog->show;
1714 };
1558} 1715}
1559 1716
1560sub sdl_init { 1717sub sdl_init {
1561 CFPlus::SDL_Init 1718 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1719 and die "SDL::Init failed!\n";
1597 z => 100, 1754 z => 100,
1598 force_x => "max", 1755 force_x => "max",
1599 force_y => 0; 1756 force_y => 0;
1600 $DEBUG_STATUS->show; 1757 $DEBUG_STATUS->show;
1601 1758
1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1603
1604 $STATUSBOX = new CFPlus::UI::Statusbox; 1759 $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]); 1760 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1606 1761
1607 (new CFPlus::UI::Frame 1762 (new CFPlus::UI::Frame
1608 bg => [0, 0, 0, 0.4], 1763 bg => [0, 0, 0, 0.4],
1609 force_x => 0, 1764 force_x => 0,
1610 force_y => "max", 1765 force_y => "max",
1611 child => $STATUSBOX, 1766 child => $STATUSBOX,
1612 )->show; 1767 )->show;
1613 1768
1614 CFPlus::UI::FancyFrame->new ( 1769 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1770 title => "Map",
1616 name => "mapmap", 1771 name => "mapmap",
1617 x => 0, 1772 x => 0,
1618 y => $FONTSIZE + 8, 1773 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1774 border_bg => [1, 1, 1, 192/255],
1644 font => $FONT_FIXED, 1799 font => $FONT_FIXED,
1645 fontsize => $::CFG->{log_fontsize}, 1800 fontsize => $::CFG->{log_fontsize},
1646 indent => -4, 1801 indent => -4,
1647 can_hover => 1, 1802 can_hover => 1,
1648 can_events => 1, 1803 can_events => 1,
1804 max_par => $CFG->{logview_max_par},
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1805 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1650 ; 1806 ;
1651 1807
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1808 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1809 title => "Setup",
1654 name => "setup_dialog", 1810 name => "setup_dialog",
1655 x => 'center', 1811 x => 'center',
1656 y => 'center', 1812 y => 'center',
1657 z => 2, 1813 z => 2,
1665 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1821 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1666 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1822 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1667 1823
1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1824 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1669 "Configure the server to play on, your username, password and other server-related options."); 1825 "Configure the server to play on, your username, password and other server-related options.");
1670 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1826 $SETUP_NOTEBOOK->add (Client => client_setup,
1671 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1827 "Configure various client-specific settings.");
1672 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1828 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1673 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1829 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1674 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1830 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1675 "Configure the use of audio, sound effects and background music."); 1831 "Configure the use of audio, sound effects and background music.");
1676 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1832 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1708 ); 1864 );
1709 1865
1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1866 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1711 tooltip => "View Documentation"); 1867 tooltip => "View Documentation");
1712 1868
1869
1713 $BUTTONBAR->add (new CFPlus::UI::Button 1870 $BUTTONBAR->add (new CFPlus::UI::Button
1714 text => "Quit", 1871 text => "Quit",
1715 tooltip => "Terminates the program", 1872 tooltip => "Terminates the program",
1716 on_activate => sub { 1873 on_activate => sub {
1717 if ($CONN) { 1874 if ($CONN) {
1728 } 1885 }
1729 1886
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1887 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1731} 1888}
1732 1889
1890sub setup_build_button {
1891 my ($enabled) = @_;
1892 if ($enabled) {
1893 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build",
1896 tooltip => "Opens the ingame builder",
1897 on_activate => sub {
1898 if ($CONN) {
1899 $CONN->send_ext_req (builder_player_items => sub {
1900 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1901 });
1902 }
1903 0
1904 };
1905 $BUTTONBAR->add ($BUILD_BUTTON);
1906 } else {
1907 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1908 }
1909}
1910
1911sub open_ingame_editor {
1912 my ($msg) = @_;
1913
1914 my $win = new CFPlus::UI::Toplevel
1915 x => 0,
1916 y => 'center',
1917 z => 4,
1918 name => 'builder_window',
1919 force_w => int $WIDTH * 1/4,
1920 force_h => int $HEIGHT * 3/4,
1921 title => "In game builder",
1922 has_close_button => 1;
1923
1924 my $r = new CFPlus::UI::ScrolledWindow (
1925 expand => 1,
1926 scroll_y => 1
1927 );
1928 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r);
1930
1931
1932 $vb->add (
1933 new CFPlus::UI::Button
1934 text => "Disable build mode",
1935 on_activate => sub { $::IN_BUILD_MODE = undef }
1936 );
1937 $vb->add (
1938 new CFPlus::UI::Button
1939 text => "ERASE",
1940 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1941 );
1942
1943 for my $itemarchname (
1944 sort {
1945 $msg->{items}->{$a}->{build_arch_name}
1946 cmp $msg->{items}->{$b}->{build_arch_name}
1947 } keys %{$msg->{items}}
1948 ) {
1949 my $info = $msg->{items}->{$itemarchname};
1950 $vb->add (
1951 new CFPlus::UI::Button text => $info->{build_arch_name},
1952 on_activate => sub {
1953 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1954
1955 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1956 build_mode_query_arch_info ();
1957 }
1958 }
1959 );
1960 }
1961
1962 $win->show;
1963}
1964
1965sub build_mode_query_arch_info {
1966 my ($iteminfo) = $::IN_BUILD_MODE;
1967 my $itemarchname = $iteminfo->{item};
1968 my $info = $iteminfo->{info};
1969
1970 my $dialog = new CFPlus::UI::Toplevel
1971 x => "center",
1972 y => "center",
1973 z => 50,
1974 force_w => int $WIDTH * 1/2,
1975 title => "Enter information for placement of '$itemarchname'",
1976 has_close_button => 1;
1977
1978 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1979
1980 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1981 my $row = 0;
1982 if ($info->{has_name}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1985 }
1986 if ($info->{has_text}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1988 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1989 }
1990 if ($info->{has_connection}) {
1991 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1992 $table->add (1, $row++,
1993 new CFPlus::UI::Entry
1994 expand => 1,
1995 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1996 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1997 );
1998 }
1999
2000 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2001 $hb->add (new CFPlus::UI::Button
2002 text => "Close",
2003 expand => 1,
2004 on_activate => sub { $dialog->hide; 0 },
2005 );
2006 $dialog->show;
2007}
2008
1733sub video_shutdown { 2009sub video_shutdown {
1734 CFPlus::OpenGL::shutdown; 2010 CFPlus::OpenGL::shutdown;
1735 2011
1736 undef $SDL_ACTIVE; 2012 undef $SDL_ACTIVE;
1737} 2013}
1738 2014
1739my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1740my $bgmusic;#TODO#hack#d#
1741
1742sub audio_channel_finished { 2015sub audio_channel_finished {
1743 my ($channel) = @_; 2016 my ($channel) = @_;
1744 2017
1745 #warn "channel $channel finished\n";#d# 2018 #warn "channel $channel finished\n";#d#
1746} 2019}
1747 2020
2021sub audio_music_set {
2022 my ($songs) = @_;
2023
2024 my @want =
2025 grep $_,
2026 map $CONN->{music_meta}{$_},
2027 @$songs;
2028
2029 if (@want) {
2030 @MUSIC_WANT = @want;
2031 &audio_music_changed ();
2032 }
2033}
2034
2035sub audio_music_start {
2036 my $path = $MUSIC_PLAYING->{path}
2037 or return;
2038
2039 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2040 # music might have changed...
2041 $path eq $MUSIC_PLAYING->{path}
2042 or return &audio_music_start ();
2043
2044 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2045
2046 my $NOW = time;
2047
2048 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2049 my $pos = $MUSIC_PLAYING->{stop_pos};
2050 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2051 $MUSIC_START = time - $pos;
2052 } else {
2053 $MUSIC_PLAYER->play (0);
2054 $MUSIC_START = time;
2055 }
2056
2057 delete $MUSIC_PLAYING->{stop_time};
2058 delete $MUSIC_PLAYING->{stop_pos};
2059 }
2060}
2061
2062sub audio_music_changed {
2063 return unless $CFG->{bgm_enable};
2064
2065 # default MUSIC_WANT == MUSIC_DEFAULT
2066 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2067
2068 # if the currently playing song is acceptable, let it continue
2069 return if $MUSIC_PLAYING
2070 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2071
2072 my $NOW = time;
2073
2074 if ($MUSIC_PLAYING) {
2075 $MUSIC_PLAYING->{stop_time} = $NOW;
2076 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2077 CFPlus::MixMusic::fade_out 1000;
2078 } else {
2079 # sort by stop time, oldest first
2080 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2081
2082 # if the most recently-played piece played very recently,
2083 # resume it, else choose the oldest piece for rotation.
2084 $MUSIC_PLAYING =
2085 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2086 ? $MUSIC_WANT[-1]
2087 : $MUSIC_WANT[0];
2088
2089 audio_music_start;
2090 }
2091}
2092
1748sub audio_music_finished { 2093sub audio_music_finished {
1749 return unless $CFG->{bgm_enable}; 2094 $MUSIC_PLAYING = undef;
2095 undef $MUSIC_PLAYER;
1750 2096
1751 # TODO: hack, do play loop and mood music 2097 audio_music_changed;
1752 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1753 $bgmusic->play (0);
1754
1755 push @bgmusic, shift @bgmusic;
1756} 2098}
1757 2099
1758sub audio_init { 2100sub audio_init {
1759 if ($CFG->{audio_enable}) { 2101 if ($CFG->{audio_enable}) {
1760 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2102 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1768 CFPlus::Mix_AllocateChannels 8; 2110 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2111 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 2112
1771 audio_music_finished; 2113 audio_music_finished;
1772 2114
2115 local $_;
1773 while (<$fh>) { 2116 while (<$fh>) {
1774 next if /^\s*#/; 2117 next if /^\s*#/;
1775 next if /^\s*$/; 2118 next if /^\s*$/;
1776 2119
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 2120 my ($file, $volume, $event) = split /\s+/, $_, 3;
1854 if $CONN; 2197 if $CONN;
1855}); 2198});
1856 2199
1857%SDL_CB = ( 2200%SDL_CB = (
1858 CFPlus::SDL_QUIT => sub { 2201 CFPlus::SDL_QUIT => sub {
1859 Event::unloop -1; 2202 exit;
1860 }, 2203 },
1861 CFPlus::SDL_VIDEORESIZE => sub { 2204 CFPlus::SDL_VIDEORESIZE => sub {
1862 }, 2205 },
1863 CFPlus::SDL_VIDEOEXPOSE => sub { 2206 CFPlus::SDL_VIDEOEXPOSE => sub {
1864 CFPlus::UI::full_refresh; 2207 CFPlus::UI::full_refresh;
1865 }, 2208 },
1866 CFPlus::SDL_ACTIVEEVENT => sub { 2209 CFPlus::SDL_ACTIVEEVENT => sub {
1867# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2210# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2212# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2213# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2214# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1868 }, 2215 },
1869 CFPlus::SDL_KEYDOWN => sub { 2216 CFPlus::SDL_KEYDOWN => sub {
1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2217 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1871 # alt-enter 2218 # alt-enter
1872 $FULLSCREEN_ENABLE->toggle; 2219 $FULLSCREEN_ENABLE->toggle;
1893 2240
1894$SIG{INT} = $SIG{TERM} = sub { exit }; 2241$SIG{INT} = $SIG{TERM} = sub { exit };
1895 2242
1896{ 2243{
1897 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2244 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2245 CFPlus::DB::Server::run;
2246
1898 CFPlus::UI::set_layout ($::CFG->{layout}); 2247 CFPlus::UI::set_layout ($::CFG->{layout});
1899 2248
1900 my %DEF_CFG = ( 2249 my %DEF_CFG = (
1901 sdl_mode => 0, 2250 sdl_mode => 0,
1902 width => 640, 2251 width => 640,
1903 height => 480, 2252 height => 480,
1904 fullscreen => 0, 2253 fullscreen => 0,
1905 fast => 0, 2254 fast => 0,
1906 map_scale => 1, 2255 map_scale => 1,
1907 fow_enable => 1, 2256 fow_enable => 1,
1908 fow_intensity => 0.45, 2257 fow_intensity => 0.45,
1909 fow_smooth => 0, 2258 fow_smooth => 0,
2259 map_smoothing => 1,
1910 gui_fontsize => 1, 2260 gui_fontsize => 1,
1911 log_fontsize => 0.7, 2261 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2262 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2263 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2264 stat_fontsize => 0.7,
1915 mapsize => 100, 2265 mapsize => 100,
1916 say_command => 'say', 2266 say_command => 'chat',
1917 audio_enable => 1, 2267 audio_enable => 1,
1918 bgm_enable => 1, 2268 bgm_enable => 1,
1919 bgm_volume => 0.25, 2269 bgm_volume => 0.25,
1920 face_prefetch => 0, 2270 face_prefetch => 0,
1921 output_sync => 1, 2271 output_sync => 1,
1922 output_count => 1, 2272 output_count => 1,
2273 output_rate => "",
1923 pickup => 0, 2274 pickup => 0,
1924 inv_sort => "mtime", 2275 inv_sort => "mtime",
1925 default => "profile", # default profile 2276 default => "profile", # default profile
2277 show_tips => 1,
2278 logview_max_par => 1000,
1926 ); 2279 );
1927 2280
1928 while (my ($k, $v) = each %DEF_CFG) { 2281 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2282 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2283 }
1931 2284
1932 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2285 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2286 $PROFILE = $CFG->{profile}{default};
2287
2288 # convert old bindings (only default profile matters)
2289 if (my $bindings = delete $PROFILE->{bindings}) {
2290 while (my ($mod, $syms) = each %$bindings) {
2291 while (my ($sym, $cmds) = each %$syms) {
2292 push @{ $PROFILE->{macro} }, {
2293 accelkey => [$mod*1, $sym*1],
2294 action => $cmds,
2295 };
2296 }
2297 }
2298 }
1933 2299
1934 sdl_init; 2300 sdl_init;
1935 2301
1936 @SDL_MODES = reverse 2302 @SDL_MODES = reverse
1937 grep $_->[0] >= 640 && $_->[1] >= 480, 2303 grep $_->[0] >= 640 && $_->[1] >= 480,
1974# } 2340# }
1975# my $t2 = Time::HiRes::time; 2341# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2342# warn $t2-$t1;
1977# } 2343# }
1978 2344
2345 $startup_done->();
2346
1979 video_init; 2347 video_init;
1980 audio_init; 2348 audio_init;
1981} 2349}
2350
2351show_tip_of_the_day if $CFG->{show_tips};
1982 2352
1983Event::loop; 2353Event::loop;
1984#CFPlus::SDL_Quit; 2354#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2355#CFPlus::_exit 0;
1986 2356
2357END {
1987END { CFPlus::SDL_Quit } 2358 CFPlus::SDL_Quit;
2359 CFPlus::DB::Server::stop;
2360}
1988 2361
1989=head1 NAME 2362=head1 NAME
1990 2363
1991cfplus - A Crossfire+ and Crossfire game client 2364cfplus - A Crossfire+ and Crossfire game client
1992 2365

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines