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.111 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.173 by root, Tue Jul 17 17:39:08 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} = "#charcreation_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
218 $conn->send ("reply d"); 288 $conn->send ("reply d");
219 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
220 0 290 0
221 }, 291 },
222 ); 292 );
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 }
223 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 => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
354 $LOGIN_BUTTON->set_text ("Logout"); 447 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 448 $SETUP_DIALOG->hide;
356 449
357 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;
358 451
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 452 my ($host, $port) = split /:/, $PROFILE->{host};
360 453
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 454 $MAP = new CFPlus::Map;
362 455
363 $CONN = eval { 456 $CONN = eval {
364 new CFPlus::Protocol 457 new CFPlus::Protocol
365 host => $host, 458 host => $host,
366 port => $port || 13327, 459 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 460 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 461 pass => $PROFILE->{password},
369 mapw => $mapsize, 462 mapw => $mapsize,
370 maph => $mapsize, 463 maph => $mapsize,
464
465 client => "cfplus $CFPlus::VERSION $] $^O",
371 466
372 map_widget => $MAPWIDGET, 467 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 468 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
375 map => $MAP, 470 map => $MAP,
376 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
377 query => \&server_query, 472 query => \&server_query,
378 473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
477
379 sound_play => sub { 478 sound_play => sub {
380 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
381 480
382 $SDL_MIXER 481 $SDL_MIXER
383 or return; 482 or return;
402sub stop_game { 501sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
408 510
409 return unless $CONN; 511 return unless $CONN;
410 512
411 status "connection closed"; 513 status "connection closed";
412 514
420sub graphics_setup { 522sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 523 my $vbox = new CFPlus::UI::VBox;
422 524
423 $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]);
424 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
534 my $vidmode_tooltip =
535 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
536 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
537
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 540
541 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
428 $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]); 542 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 543 tooltip => $vidmode_tooltip);
544 $hbox->add (my $mode_label = new CFPlus::UI::Label
545 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
546 can_events => 1, tooltip => $vidmode_tooltip);
430 547
431 $mode_slider->connect (changed => sub { 548 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 549 my ($self, $value) = @_;
433 550
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 551 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 552 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 553 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 554 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438
439 my $row = 1;
440 555
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 557 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 558 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 559 tooltip => "Bring the client into fullscreen mode.",
450 state => $CFG->{fast}, 565 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 566 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 567 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 568 );
454 569
570 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
571 $table->add (1, $row++, new CFPlus::UI::Slider
572 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
573 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
574 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
575 );
576
577 $table->add (1, $row++, new CFPlus::UI::Button
578 expand => 1, align => 0, text => "Apply",
579 tooltip => "Apply the video settings above.",
580 on_activate => sub {
581 video_shutdown ();
582 video_init ();
583 0
584 }
585 );
586
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
456 $table->add (1, $row++, new CFPlus::UI::Slider 588 $table->add (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 589 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 590 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 591 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 592 );
461 593
594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
595 $table->add (1, $row++, new CFPlus::UI::CheckBox
596 state => $CFG->{map_smoothing},
597 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
598 . "This increases load on the graphics subsystem and works only with 2.x servers. "
599 . "Changes take effect at next connection only.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
601 );
602
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 603 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 604 $table->add (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 605 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 606 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 607 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 612 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
472 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 613 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 614 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 615 );
475 616
476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
477 $table->add (1, $row++, new CFPlus::UI::CheckBox 618 $table->add (1, $row++, new CFPlus::UI::CheckBox
478 state => $CFG->{fow_smooth}, 619 state => $CFG->{fow_smooth},
479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 620 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
480 on_changed => sub { 621 on_changed => sub {
481 my ($self, $value) = @_; 622 my ($self, $value) = @_;
482 $CFG->{fow_smooth} = $value; 623 $CFG->{fow_smooth} = $value;
483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0 624 0
485 } 625 }
486 );
487
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489 $table->add (1, $row++, new CFPlus::UI::Slider
490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493 ); 626 );
494 627
495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 628 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496 $table->add (1, $row++, new CFPlus::UI::Slider 629 $table->add (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 630 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 648 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 649 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 650 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 651 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 652 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0
521 }
522 );
523
524 $table->add (1, $row++, new CFPlus::UI::Button
525 expand => 1, align => 0, text => "Apply",
526 tooltip => "Apply the video settings",
527 on_activate => sub {
528 video_shutdown ();
529 video_init ();
530 0 653 0
531 } 654 }
532 ); 655 );
533 656
534 $vbox 657 $vbox
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 762 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 763 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 764 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 765 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 766 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
767 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 768
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 769 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646
647 for my $x (0..2) {
648 for my $y (0 .. 2) {
649 $table->add ($x + 3, $y,
650 new CFPlus::UI::Entry
651 text => $default_smooth[$x * 3 + $y],
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 );
654 }
655 }
656
657 770
658 $table 771 $table
659} 772}
660 773
661sub stats_window { 774sub stats_window {
663 expand => 1, 776 expand => 1,
664 scroll_y => 1 777 scroll_y => 1
665 ); 778 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 779 $r->add (my $vb = new CFPlus::UI::VBox);
667 780
781 $vb->add (new CFPlus::UI::FancyFrame
782 label => "Player",
783 child => (my $pi = new CFPlus::UI::VBox),
784 );
785
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 786 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 787 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 788 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 789 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 790 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 791 tooltip => "The map you are currently on (if supported by the server).");
674 792
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 793 $pi->add (my $hb0 = new CFPlus::UI::HBox);
676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 794 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 795 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 796 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 797 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 798 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 799 tooltip => "The weight limit: you cannot carry more than this.");
682 800
801 $vb->add (new CFPlus::UI::FancyFrame
802 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 803 child => (my $hb = new CFPlus::UI::HBox expand => 1),
804 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 805 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 806
686 my $color2 = [1, 1, 0]; 807 my $color2 = [1, 1, 0];
687 808
688 for ( 809 for (
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 830 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 831 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 832 align => -1, text => $label, tooltip => "#stat_$label");
712 } 833 }
713 834
835 $vb->add (new CFPlus::UI::FancyFrame
836 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 837 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
838 );
715 839
716 my $row = 0; 840 my $row = 0;
717 my $col = 0; 841 my $col = 0;
718 842
719 my %resist_names = ( 843 my %resist_names = (
819 943
820 my $table = $METASERVER->{table}; 944 my $table = $METASERVER->{table};
821 $table->clear; 945 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 946 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 947
824 my $buf; 948 my $ok = 0;
825 949
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 950 CFPlus::background {
951 my $ua = CFPlus::lwp_useragent;
827 952
828 unless ($fh) { 953 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 954 } sub {
830 return; 955 my ($msg) = @_;
831 } 956 if ($msg) {
832
833 Event->io (fd => $fh, poll => 'r', cb => sub {
834 my $res = sysread $fh, $buf, 8192, length $buf;
835
836 if (!defined $res) {
837 $_[0]->w->cancel;
838 $label->set_text ("error while retrieving server list: $!");
839 } elsif ($res == 0) {
840 $_[0]->w->cancel;
841 status "server list retrieved";
842
843 utf8::decode $buf if utf8::valid $buf;
844
845 $table->clear; 957 $table->clear;
846 958
847 my @tip = ( 959 my @tip = (
848 "The current number of users logged in on the server.", 960 "The current number of users logged in on the server.",
849 "The hostname of the server.", 961 "The hostname of the server.",
859 for 0 .. $#col; 971 for 0 .. $#col;
860 972
861 my @align = qw(1 0 1 1 -1); 973 my @align = qw(1 0 1 1 -1);
862 974
863 my $y = 0; 975 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 976 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 977 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
978 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 979
867 for ($desc) { 980 for ($desc) {
868 s/<br>/\n/gi; 981 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 982 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 983 s/<.*?>//sgi;
871 s/&/&amp;/g; 984 s/&amp;/&/g;
872 s/</&lt;/g; 985 s/&lt;/</g;
873 s/>/&gt;/g; 986 s/&gt;/>/g;
874 } 987 }
875 988
876 $uptime = sprintf "%dd %02d:%02d:%02d", 989 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 990 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 991 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 992 (int $uptime / 60) % 60,
880 $m->[8] % 60; 993 $uptime % 60;
881 994
882 $m = [$users, $host, $uptime, $version, $desc]; 995 $m = [$users, $host, $uptime, $version, $desc];
883 996
884 $y++; 997 $y++;
885 998
895 ), 1008 ),
896 (new CFPlus::UI::Empty expand => 1), 1009 (new CFPlus::UI::Empty expand => 1),
897 ]); 1010 ]);
898 1011
899 $table->add ($_, $y, new CFPlus::UI::Label 1012 $table->add ($_, $y, new CFPlus::UI::Label
1013 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1014 ellipsise => 0,
901 align => $align[$_], 1015 align => $align[$_],
902 text => $m->[$_], 1016 text => $m->[$_],
903 tooltip => $tip[$_], 1017 tooltip => $tip[$_],
1018 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1019 can_hover => 1,
905 can_events => 1, 1020 can_events => 1,
906 fontsize => 0.8) 1021 fontsize => 0.8)
907 for 0 .. $#$m; 1022 for 0 .. $#$m;
908 } 1023 }
1024 } else {
1025 $ok or $label->set_text ("error while contacting metaserver");
909 } 1026 }
910 }); 1027 };
1028
911} 1029}
912 1030
913sub metaserver_dialog { 1031sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1032 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1033 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1034 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1035
918 my $dialog = new CFPlus::UI::FancyFrame 1036 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1037 title => "Server List",
920 name => 'metaserver_dialog', 1038 name => 'metaserver_dialog',
921 x => 'center', 1039 x => 'center',
922 y => 'center', 1040 y => 'center',
923 z => 3, 1041 z => 3,
1042 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1043 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1044 child => $vbox,
926 has_close_button => 1, 1045 has_close_button => 1,
927 table => $table, 1046 table => $table,
928 on_visibility_change => sub { 1047 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1048 update_metaserver ($_[0]) if $_[1];
935} 1054}
936 1055
937sub server_setup { 1056sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1057 my $vbox = new CFPlus::UI::VBox;
939 1058
1059 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1061 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1062 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1063 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1064
943 { 1065 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1066 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1067
1002 . "so only set it if you really need to prefetch images. " 1124 . "so only set it if you really need to prefetch images. "
1003 . "This option can be set and unset any time.", 1125 . "This option can be set and unset any time.",
1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1126 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1005 ); 1127 );
1006 1128
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1129 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1008 $table->add (1, 9, new CFPlus::UI::Entry 1130 $table->add (1, 9, new CFPlus::UI::Entry
1131 text => $CFG->{output_rate},
1132 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1133 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1134 . "default will be used, which is usually around 100kb/s.",
1135 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1136 );
1137
1138 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1139 $table->add (1, 10, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1140 text => $CFG->{output_count},
1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1141 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1142 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1012 ); 1143 );
1013 1144
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1145 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1015 $table->add (1, 10, new CFPlus::UI::Entry 1146 $table->add (1, 11, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1147 text => $CFG->{output_sync},
1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1148 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1149 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1019 ); 1150 );
1020 1151
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1152 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1153 expand => 1,
1023 align => 0, 1154 align => 0,
1024 text => "Login", 1155 text => "Login",
1025 on_activate => sub { 1156 on_activate => sub {
1026 $CONN ? stop_game 1157 $CONN ? stop_game
1027 : start_game; 1158 : start_game;
1028 0 1159 0
1029 }, 1160 },
1030 ); 1161 );
1031 1162
1163 $vbox->add (new CFPlus::UI::FancyFrame
1164 label => "Server Info",
1165 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1166 );
1167
1168 $vbox
1169}
1170
1171sub client_setup {
1172 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1173
1174 my $row = 0;
1175
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1176 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1178 text => $CFG->{say_command},
1035 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. " 1179 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. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1180 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1181 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1182 on_changed => sub {
1039 my ($self, $value) = @_; 1183 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1184 $CFG->{say_command} = $value;
1041 0 1185 0
1042 } 1186 }
1043 ); 1187 );
1044 1188
1045 $vbox->add (new CFPlus::UI::Label 1189 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1046 text => "Server Info", 1190 $table->add (1, $row++, new CFPlus::UI::CheckBox
1047 fontsize => 1.2, 1191 state => $CFG->{show_tips},
1048 padding_y => 8, 1192 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1049 fg => [1, 1, 0, 1], 1193 on_changed => sub {
1194 my ($self, $value) = @_;
1195 $CFG->{show_tips} = $value;
1196 0
1197 }
1050 ); 1198 );
1051 1199
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1200 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1201 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1202 text => $CFG->{logview_max_par},
1203 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1204 . "sends more messages than this number, older messages get removed to save memory and "
1205 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1206 on_changed => sub {
1207 my ($self, $value) = @_;
1208 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1209 0
1210 },
1211 );
1053 1212
1054 $vbox 1213 $table
1055} 1214}
1056 1215
1057sub message_window { 1216sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1217 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1218 name => "message_window",
1060 title => "Messages", 1219 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1220 border_bg => [1, 1, 1, 1],
1062 x => "max", 1221 x => "max",
1063 y => 0, 1222 y => 0,
1115 }; 1274 };
1116 1275
1117 $window 1276 $window
1118} 1277}
1119 1278
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1139sub open_quit_dialog {
1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
1151
1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154 $vb->add (new CFPlus::UI::Label
1155 text => "You should find a savebed and apply it first!",
1156 max_w => $WIDTH * 0.25,
1157 ellipsize => 0,
1158 );
1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160 $hb->add (new CFPlus::UI::Button
1161 text => "Ok",
1162 expand => 1,
1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164 );
1165 $hb->add (new CFPlus::UI::Button
1166 text => "Quit anyway",
1167 expand => 1,
1168 on_activate => sub { exit },
1169 );
1170 }
1171
1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174}
1175
1176sub autopickup_setup { 1279sub autopickup_setup {
1280 my $r = new CFPlus::UI::ScrolledWindow (
1281 expand => 1,
1282 scroll_y => 1
1283 );
1177 my $table = new CFPlus::UI::Table; 1284 $r->add (my $table = new CFPlus::UI::Table
1285 row_expand => [0],
1286 col_expand => [0, 1, 0, 1],
1287 );
1178 1288
1179 for ( 1289 for (
1180 ["General", 0, 0, 1290 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1291 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1292 ["Inhibit autopickup" => PICKUP_INHIBIT],
1196 ["Boots" => PICKUP_BOOTS], 1306 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1307 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1308 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1309 ],
1200 1310
1201 ["Readables", 2, 2, 1311 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1312 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1313 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1314 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1315 ],
1206 ["Misc", 2, 7, 1316 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1317 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1318 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1319 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1320 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1321 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1322 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1323 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1324 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1325 ["Jewelery" => PICKUP_JEWELS],
1326 ["Flesh" => PICKUP_FLESH],
1216 ], 1327 ],
1217 ["Weight/Value ratio", 2, 17] 1328 ["Weight/Value ratio", 2, 17]
1218 ) 1329 )
1219 { 1330 {
1220 my ($title, $x, $y, @bits) = @$_; 1331 my ($title, $x, $y, @bits) = @$_;
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1376 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1377 if defined $::CONN;
1267 0 1378 0
1268 }); 1379 });
1269 1380
1270 $table 1381 $r
1271} 1382}
1272 1383
1273my %SORT_ORDER = ( 1384my %SORT_ORDER = (
1274 type => undef, 1385 type => undef,
1275 mtime => sub { sort { 1386 mtime => sub {
1387 my $NOW = time;
1388 sort {
1389 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1390 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1391
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1392 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1393 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1394 or $a->{type} <=> $b->{type}
1395 } @_
1279 } @_ }, 1396 },
1280 weight => sub { sort { 1397 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1398 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1399 or $a->{type} <=> $b->{type}
1283 } @_ }, 1400 } @_ },
1284); 1401);
1309 #TODO# update to weigh/maxweight 1426 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1427 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1428
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1429 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1430 $sw1->add ($INV = new CFPlus::UI::Inventory);
1431 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1432
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1433 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1434
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1435 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1436
1335 $PL_WINDOW->show; 1453 $PL_WINDOW->show;
1336 } 1454 }
1337} 1455}
1338 1456
1339sub player_window { 1457sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1458 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1459 x => "center",
1342 y => "center", 1460 y => "center",
1343 force_w => $WIDTH * 9/10, 1461 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1462 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1463 title => "Player",
1347 has_close_button => 1 1465 has_close_button => 1
1348 ; 1466 ;
1349 1467
1350 my $ntb = 1468 my $ntb =
1351 $PL_NOTEBOOK = 1469 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1470 new CFPlus::UI::Notebook expand => 1;
1353 1471
1354 $ntb->add ( 1472 $ntb->add (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1473 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1474 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1475 );
1358 $ntb->add ( 1476 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1477 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1478 "Shows all your Skills."
1361 ); 1479 );
1362 1480
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1481 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1482 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1483 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1484 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1485 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1486 );
1369 $ntb->add ( 1487 $ntb->add (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1488 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1489 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1372 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1490 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1491 );
1492 $ntb->add (Pickup => autopickup_setup,
1493 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1374 1494
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1495 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1496
1377 $plwin->add ($ntb); 1497 $plwin->add ($ntb);
1378 $plwin 1498 $plwin
1379} 1499}
1380 1500
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1501sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1502 CFPlus::Macro::keyboard_setup
1387
1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear ();
1391
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396
1397 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button
1401 text => "delete",
1402 tooltip => "Deletes the binding",
1403 on_activate => sub {
1404 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1407 });
1408
1409 $hb->add (new CFPlus::UI::Button
1410 text => "edit",
1411 tooltip => "Edits the binding",
1412 on_activate => sub {
1413 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1415 sub {
1416 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->();
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 },
1423 sub {
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 });
1427 $::BIND_EDITOR->show;
1428 $SETUP_DIALOG->hide;
1429 0
1430 });
1431
1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1434 }
1435 }
1436 };
1437
1438 my $vb = new CFPlus::UI::VBox;
1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1,
1443 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1445 on_changed => sub {
1446 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value;
1448 0
1449 });
1450
1451 $vb->add ($binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1503}
1492 1504
1493sub help_window { 1505sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1506 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1507 x => 'center',
1496 y => 'center', 1508 y => 'center',
1497 z => 2, 1509 z => 4,
1498 name => 'doc_browser', 1510 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1511 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1512 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1513 title => "Help Browser",
1502 has_close_button => 1; 1514 has_close_button => 1;
1503 1515
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1516 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1517
1518 $vbox->add (new CFPlus::UI::FancyFrame
1519 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1520 child => (my $buttons = new CFPlus::UI::HBox),
1521 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1522 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1523 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1524
1510 my @history; 1525 my @history;
1511 my @future; 1526 my @future;
1512 my $node; 1527 my $curnode;
1513 1528
1514 my $load_node; $load_node = sub { 1529 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1530 my ($node, $para) = @_;
1516 1531
1517 $buttons->clear; 1532 $buttons->clear;
1518 1533
1534 $buttons->add (new CFPlus::UI::Button
1535 text => "⇤",
1536 tooltip => "back to the starting page",
1537 on_activate => sub {
1538 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1539 unshift @future, @history;
1540 @history = ();
1541 $load_node->(@{shift @future});
1542 },
1543 );
1544
1519 if (@history) { 1545 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button label => "&lt;", on_activate => sub { 1546 $buttons->add (new CFPlus::UI::Button
1521 unshift @future, $node if $node; 1547 text => "⋘",
1548 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1549 on_activate => sub {
1550 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1522 $node = pop @history; 1551 $load_node->(@{pop @history});
1523 1552 },
1524 }); 1553 );
1525 } 1554 }
1555
1556 if (@future) {
1557 $buttons->add (new CFPlus::UI::Button
1558 text => "⋙",
1559 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1560 on_activate => sub {
1561 push @history, [$curnode, $viewer->current_paragraph];
1562 $load_node->(@{shift @future});
1563 },
1564 );
1565 }
1566
1567 $buttons->add (new CFPlus::UI::Label text => " ");
1568
1569 my @path = CFPlus::Pod::full_path_of $node;
1570 pop @path; # drop current node
1571
1572 for my $node (@path) {
1573 $buttons->add (new CFPlus::UI::Button
1574 text => $node->{kw}[0],
1575 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1576 on_activate => sub {
1577 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1578 $load_node->($node);
1579 },
1580 );
1581 $buttons->add (new CFPlus::UI::Label text => "/");
1582 }
1583
1584 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1585
1586 $curnode = $node;
1587
1526 $viewer->clear; 1588 $viewer->clear;
1527 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $node); 1589 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1528 $viewer->set_offset (0); 1590 $viewer->scroll_to ($para);
1529 }; 1591 };
1530 1592
1531 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1593 $load_node->(CFPlus::Pod::find pod => "mainpage");
1532 1594
1533 $CFPlus::Pod::on_link = sub { 1595 $CFPlus::Pod::goto_document = sub {
1534 my (@path) = @_; 1596 my (@path) = @_;
1535 1597
1536 push @history, $node if $node; 1598 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1537 @future = ();
1538 1599
1539 $load_node->(CFPlus::Pod::find @path); 1600 $load_node->((CFPlus::Pod::find @path)[0]);
1540 $win->show; 1601 $win->show;
1541 }; 1602 };
1542 1603
1543 $win 1604 $win
1605}
1606
1607sub open_string_query {
1608 my ($title, $cb, $txt, $tooltip) = @_;
1609 my $dialog = new CFPlus::UI::Toplevel
1610 x => "center",
1611 y => "center",
1612 z => 50,
1613 force_w => $WIDTH * 4/5,
1614 title => $title;
1615
1616 $dialog->add (
1617 my $e = new CFPlus::UI::Entry
1618 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1619 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1620 tooltip => $tooltip
1621 );
1622
1623 $e->grab_focus;
1624 $e->set_text ($txt) if $txt;
1625 $dialog->show;
1626}
1627
1628sub open_quit_dialog {
1629 unless ($QUIT_DIALOG) {
1630 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1631 x => "center",
1632 y => "center",
1633 z => 50,
1634 title => "Really Quit?",
1635 on_key_down => sub {
1636 my ($dialog, $ev) = @_;
1637 $ev->{sym} == 27 and $dialog->hide;
1638 }
1639 ;
1640
1641 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1642
1643 $vb->add (new CFPlus::UI::Label
1644 text => "You should find a savebed and apply it first!",
1645 max_w => $WIDTH * 0.25,
1646 ellipsize => 0,
1647 );
1648 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1649 $hb->add (new CFPlus::UI::Button
1650 text => "Ok",
1651 expand => 1,
1652 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1653 );
1654 $hb->add (new CFPlus::UI::Button
1655 text => "Quit anyway",
1656 expand => 1,
1657 on_activate => sub { exit },
1658 );
1659 }
1660
1661 $QUIT_DIALOG->show;
1662 $QUIT_DIALOG->grab_focus;
1663}
1664
1665sub show_tip_of_the_day {
1666 # find all tips
1667 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1668
1669 CFPlus::DB::get state => "tip_of_the_day", sub {
1670 my ($todindex) = @_;
1671 $todindex = 0 if $todindex >= @tod;
1672 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1673
1674 # create dialog
1675 my $dialog;
1676
1677 my $close = sub {
1678 $dialog->destroy;
1679 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 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>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1712 },
1713 );
1714
1715 $dialog->show;
1716 };
1544} 1717}
1545 1718
1546sub sdl_init { 1719sub sdl_init {
1547 CFPlus::SDL_Init 1720 CFPlus::SDL_Init
1548 and die "SDL::Init failed!\n"; 1721 and die "SDL::Init failed!\n";
1549} 1722}
1550 1723
1551sub video_init { 1724sub video_init {
1552 sdl_init;
1553
1554 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1555 1726
1556 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1557 1728
1558 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1729 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1559 $FULLSCREEN = $CFG->{fullscreen}; 1730 $FULLSCREEN = $CFG->{fullscreen};
1560 $FAST = $CFG->{fast}; 1731 $FAST = $CFG->{fast};
1561 1732
1562 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1563 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1564 1735
1565 $SDL_ACTIVE = 1; 1736 $SDL_ACTIVE = 1;
1566 $LAST_REFRESH = time - 0.01; 1737 $LAST_REFRESH = time - 0.01;
1567 1738
1583 z => 100, 1754 z => 100,
1584 force_x => "max", 1755 force_x => "max",
1585 force_y => 0; 1756 force_y => 0;
1586 $DEBUG_STATUS->show; 1757 $DEBUG_STATUS->show;
1587 1758
1588 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1589
1590 $STATUSBOX = new CFPlus::UI::Statusbox; 1759 $STATUSBOX = new CFPlus::UI::Statusbox;
1591 $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]);
1592 1761
1593 (new CFPlus::UI::Frame 1762 (new CFPlus::UI::Frame
1594 bg => [0, 0, 0, 0.4], 1763 bg => [0, 0, 0, 0.4],
1595 force_x => 0, 1764 force_x => 0,
1596 force_y => "max", 1765 force_y => "max",
1597 child => $STATUSBOX, 1766 child => $STATUSBOX,
1598 )->show; 1767 )->show;
1599 1768
1600 CFPlus::UI::FancyFrame->new ( 1769 CFPlus::UI::Toplevel->new (
1601 title => "Map", 1770 title => "Map",
1602 name => "mapmap", 1771 name => "mapmap",
1603 x => 0, 1772 x => 0,
1604 y => $FONTSIZE + 8, 1773 y => $FONTSIZE + 8,
1605 border_bg => [1, 1, 1, 192/255], 1774 border_bg => [1, 1, 1, 192/255],
1630 font => $FONT_FIXED, 1799 font => $FONT_FIXED,
1631 fontsize => $::CFG->{log_fontsize}, 1800 fontsize => $::CFG->{log_fontsize},
1632 indent => -4, 1801 indent => -4,
1633 can_hover => 1, 1802 can_hover => 1,
1634 can_events => 1, 1803 can_events => 1,
1804 max_par => $CFG->{logview_max_par},
1635 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.",
1636 ; 1806 ;
1637 1807
1638 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1808 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1639 title => "Setup", 1809 title => "Setup",
1640 name => "setup_dialog", 1810 name => "setup_dialog",
1641 x => 'center', 1811 x => 'center',
1642 y => 'center', 1812 y => 'center',
1643 z => 2, 1813 z => 2,
1651 $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,
1652 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1822 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1653 1823
1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1824 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1655 "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.");
1656 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1826 $SETUP_NOTEBOOK->add (Client => client_setup,
1657 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1827 "Configure various client-specific settings.");
1658 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1828 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1659 "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.");
1660 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1830 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1661 "Configure the use of audio, sound effects and background music."); 1831 "Configure the use of audio, sound effects and background music.");
1662 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1832 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1694 ); 1864 );
1695 1865
1696 $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,
1697 tooltip => "View Documentation"); 1867 tooltip => "View Documentation");
1698 1868
1869
1699 $BUTTONBAR->add (new CFPlus::UI::Button 1870 $BUTTONBAR->add (new CFPlus::UI::Button
1700 text => "Quit", 1871 text => "Quit",
1701 tooltip => "Terminates the program", 1872 tooltip => "Terminates the program",
1702 on_activate => sub { 1873 on_activate => sub {
1703 if ($CONN) { 1874 if ($CONN) {
1714 } 1885 }
1715 1886
1716 $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]);
1717} 1888}
1718 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
1719sub video_shutdown { 2009sub video_shutdown {
1720 CFPlus::OpenGL::shutdown; 2010 CFPlus::OpenGL::shutdown;
1721 2011
1722 undef $SDL_ACTIVE; 2012 undef $SDL_ACTIVE;
1723} 2013}
1724 2014
1725my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1726my $bgmusic;#TODO#hack#d#
1727
1728sub audio_channel_finished { 2015sub audio_channel_finished {
1729 my ($channel) = @_; 2016 my ($channel) = @_;
1730 2017
1731 #warn "channel $channel finished\n";#d# 2018 #warn "channel $channel finished\n";#d#
1732} 2019}
1733 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
1734sub audio_music_finished { 2093sub audio_music_finished {
1735 return unless $CFG->{bgm_enable}; 2094 $MUSIC_PLAYING = undef;
2095 undef $MUSIC_PLAYER;
1736 2096
1737 # TODO: hack, do play loop and mood music 2097 audio_music_changed;
1738 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1739 $bgmusic->play (0);
1740
1741 push @bgmusic, shift @bgmusic;
1742} 2098}
1743 2099
1744sub audio_init { 2100sub audio_init {
1745 if ($CFG->{audio_enable}) { 2101 if ($CFG->{audio_enable}) {
1746 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2102 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1754 CFPlus::Mix_AllocateChannels 8; 2110 CFPlus::Mix_AllocateChannels 8;
1755 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2111 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1756 2112
1757 audio_music_finished; 2113 audio_music_finished;
1758 2114
2115 local $_;
1759 while (<$fh>) { 2116 while (<$fh>) {
1760 next if /^\s*#/; 2117 next if /^\s*#/;
1761 next if /^\s*$/; 2118 next if /^\s*$/;
1762 2119
1763 my ($file, $volume, $event) = split /\s+/, $_, 3; 2120 my ($file, $volume, $event) = split /\s+/, $_, 3;
1805 2162
1806my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2163my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1807 $NOW = time; 2164 $NOW = time;
1808 2165
1809 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1810 for CFPlus::SDL_PollEvent; 2167 for CFPlus::poll_events;
1811 2168
1812 if (%animate_object) { 2169 if (%animate_object) {
1813 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1814 $WANT_REFRESH++; 2171 $WANT_REFRESH++;
1815 } 2172 }
1840 if $CONN; 2197 if $CONN;
1841}); 2198});
1842 2199
1843%SDL_CB = ( 2200%SDL_CB = (
1844 CFPlus::SDL_QUIT => sub { 2201 CFPlus::SDL_QUIT => sub {
1845 Event::unloop -1; 2202 exit;
1846 }, 2203 },
1847 CFPlus::SDL_VIDEORESIZE => sub { 2204 CFPlus::SDL_VIDEORESIZE => sub {
1848 }, 2205 },
1849 CFPlus::SDL_VIDEOEXPOSE => sub { 2206 CFPlus::SDL_VIDEOEXPOSE => sub {
1850 CFPlus::UI::full_refresh; 2207 CFPlus::UI::full_refresh;
1851 }, 2208 },
1852 CFPlus::SDL_ACTIVEEVENT => sub { 2209 CFPlus::SDL_ACTIVEEVENT => sub {
1853# 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 %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2212# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2213# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2214# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2215# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1854 }, 2216 },
1855 CFPlus::SDL_KEYDOWN => sub { 2217 CFPlus::SDL_KEYDOWN => sub {
1856 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2218 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1857 # alt-enter 2219 # alt-enter
1858 $FULLSCREEN_ENABLE->toggle; 2220 $FULLSCREEN_ENABLE->toggle;
1879 2241
1880$SIG{INT} = $SIG{TERM} = sub { exit }; 2242$SIG{INT} = $SIG{TERM} = sub { exit };
1881 2243
1882{ 2244{
1883 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2245 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2246 CFPlus::DB::Server::run;
2247
1884 CFPlus::UI::set_layout ($::CFG->{layout}); 2248 CFPlus::UI::set_layout ($::CFG->{layout});
1885 2249
1886 my %DEF_CFG = ( 2250 my %DEF_CFG = (
1887 sdl_mode => 0, 2251 sdl_mode => 0,
1888 width => 640, 2252 width => 640,
1889 height => 480, 2253 height => 480,
1890 fullscreen => 0, 2254 fullscreen => 0,
1891 fast => 0, 2255 fast => 0,
1892 map_scale => 1, 2256 map_scale => 1,
1893 fow_enable => 1, 2257 fow_enable => 1,
1894 fow_intensity => 0.45, 2258 fow_intensity => 0,
1895 fow_smooth => 0, 2259 fow_smooth => 1,
2260 map_smoothing => 1,
1896 gui_fontsize => 1, 2261 gui_fontsize => 1,
1897 log_fontsize => 0.7, 2262 log_fontsize => 0.7,
1898 gauge_fontsize => 1, 2263 gauge_fontsize => 1,
1899 gauge_size => 0.35, 2264 gauge_size => 0.35,
1900 stat_fontsize => 0.7, 2265 stat_fontsize => 0.7,
1901 mapsize => 100, 2266 mapsize => 100,
1902 say_command => 'say', 2267 say_command => 'chat',
1903 audio_enable => 1, 2268 audio_enable => 1,
1904 bgm_enable => 1, 2269 bgm_enable => 1,
1905 bgm_volume => 0.25, 2270 bgm_volume => 0.25,
1906 face_prefetch => 0, 2271 face_prefetch => 0,
1907 output_sync => 1, 2272 output_sync => 1,
1908 output_count => 1, 2273 output_count => 1,
2274 output_rate => "",
1909 pickup => 0, 2275 pickup => 0,
1910 inv_sort => "mtime", 2276 inv_sort => "mtime",
1911 default => "profile", # default profile 2277 default => "profile", # default profile
2278 show_tips => 1,
2279 logview_max_par => 1000,
1912 ); 2280 );
1913 2281
1914 while (my ($k, $v) = each %DEF_CFG) { 2282 while (my ($k, $v) = each %DEF_CFG) {
1915 $CFG->{$k} = $v unless exists $CFG->{$k}; 2283 $CFG->{$k} = $v unless exists $CFG->{$k};
1916 } 2284 }
1917 2285
1918 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2286 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2287 $PROFILE = $CFG->{profile}{default};
2288
2289 # convert old bindings (only default profile matters)
2290 if (my $bindings = delete $PROFILE->{bindings}) {
2291 while (my ($mod, $syms) = each %$bindings) {
2292 while (my ($sym, $cmds) = each %$syms) {
2293 push @{ $PROFILE->{macro} }, {
2294 accelkey => [$mod*1, $sym*1],
2295 action => $cmds,
2296 };
2297 }
2298 }
2299 }
1919 2300
1920 sdl_init; 2301 sdl_init;
1921 2302
1922 @SDL_MODES = reverse 2303 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1923 grep $_->[0] >= 640 && $_->[1] >= 480, 2304 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1924 CFPlus::SDL_ListModes;
1925
1926 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2305 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1927 2306
1928 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2307 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1929 2308
1930 { 2309 {
1960# } 2339# }
1961# my $t2 = Time::HiRes::time; 2340# my $t2 = Time::HiRes::time;
1962# warn $t2-$t1; 2341# warn $t2-$t1;
1963# } 2342# }
1964 2343
2344 $startup_done->();
2345
1965 video_init; 2346 video_init;
1966 audio_init; 2347 audio_init;
1967} 2348}
2349
2350show_tip_of_the_day if $CFG->{show_tips};
1968 2351
1969Event::loop; 2352Event::loop;
1970#CFPlus::SDL_Quit; 2353#CFPlus::SDL_Quit;
1971#CFPlus::_exit 0; 2354#CFPlus::_exit 0;
1972 2355
2356END {
1973END { CFPlus::SDL_Quit } 2357 CFPlus::SDL_Quit;
2358 CFPlus::DB::Server::stop;
2359}
1974 2360
1975=head1 NAME 2361=head1 NAME
1976 2362
1977cfplus - A Crossfire+ and Crossfire game client 2363cfplus - A Crossfire+ and Crossfire game client
1978 2364

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines