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.116 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 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}
27 if %PAR::LibCache; 72 if %PAR::LibCache;
28 73
29use Time::HiRes 'time'; 74use Time::HiRes 'time';
30use Event; 75use Event;
76use List::Util qw(max min);
31 77
32use Crossfire; 78use Crossfire;
33use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
34 80
35use Compress::LZF; 81use Compress::LZF;
36 82
37use CFPlus; 83use CFPlus;
38use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
39use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
40use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
41use CFPlus::Pod; 92use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
44 95
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 97$SIG{PIPE} = 'IGNORE';
47 98
48$Event::Eval = 0; 99$Event::Eval = 1;
49$Event::DIED = sub { 100$Event::DIED = sub {
50 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 102};
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 103
66my $MAX_FPS = 60; 104my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
68 106
69our $META_SERVER = "crossfire.real-time.com:13326"; 107our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 108
71our $LAST_REFRESH; 109our $LAST_REFRESH;
72our $NOW; 110our $NOW;
73 111
74our $CFG; 112our $CFG;
75our $CONN; 113our $CONN;
114our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 116
78our $WANT_REFRESH; 117our $WANT_REFRESH;
79our $CAN_REFRESH; 118our $CAN_REFRESH;
80 119
… …
89 128
90our $MAP; 129our $MAP;
91our $MAPMAP; 130our $MAPMAP;
92our $MAPWIDGET; 131our $MAPWIDGET;
93our $BUTTONBAR; 132our $BUTTONBAR;
94our $LOGVIEW;
95our $CONSOLE;
96our $METASERVER; 133our $METASERVER;
97our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
98our $QUIT_DIALOG; 135our $QUIT_DIALOG;
99our $HOST_ENTRY; 136our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
111 148
112our $INVENTORY_PAGE; 149our $INVENTORY_PAGE;
113our $STATS_PAGE; 150our $STATS_PAGE;
114our $SKILL_PAGE; 151our $SKILL_PAGE;
115our $SPELL_PAGE; 152our $SPELL_PAGE;
153our $SPELL_LIST;
116 154
117our $HELP_WINDOW; 155our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 156our $MESSAGE_WINDOW;
119our $FLOORBOX; 157our $FLOORBOX;
120our $GAUGES; 158our $GAUGES;
121our $STATWIDS; 159our $STATWIDS;
122 160
123our $SDL_ACTIVE; 161our $SDL_ACTIVE;
124our %SDL_CB; 162our %SDL_CB;
125 163
126our $SDL_MIXER;
127our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files
129
130our $ALT_ENTER_MESSAGE; 164our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 165our $STATUSBOX;
132our $DEBUG_STATUS; 166our $DEBUG_STATUS;
133 167
134our $INV; 168our $INV;
135our $INVR; 169our $INVR;
136our $INV_RIGHT_HB; 170our $INV_RIGHT_HB;
137 171
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 172our $PICKUP_CFG;
173
174#############################################################################
142 175
143sub status { 176sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 178}
146 179
147sub debug { 180sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
149} 182}
183
184sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para);
187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 if (my $chunk = $AUDIO_CHUNK{$face}) {
220 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
221 my (undef, $dx, $dy, $vol) = @$_;
222
223 my $channel = CFPlus::Channel::find;
224 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
225 $dx = $dx / 10 * 255;
226 $channel->set_panning (255 - $dx, 255 + $dx);
227
228# my $angle = $dx ? : $dx < 0 ?
229# my $distance = -$vol;
230# $channel->set_position ($angle, $distance);
231
232 $chunk->play ($channel);
233 }
234 } else {
235 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{jingle}) {
241 delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 } else {
245 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops;
249 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
250 $AUDIO_CHUNK{$face} = $chunk;
251
252 audio_sound_push ($face);
253 };
254 }
255 }
256}
257
258sub audio_sound_play {
259 my ($face, $dx, $dy, $vol) = @_;
260
261 $SDL_MIXER
262 or return;
263 $CFG->{effects_enable}
264 or return;
265
266 my $queue = $AUDIO_PLAY{$face} ||= [];
267 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
268 audio_sound_push $face
269 unless @$queue > 1;
270}
271
272sub audio_music_update_volume {
273 return unless $MUSIC_PLAYING_META;
274 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
275 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
276 CFPlus::MixMusic::volume $base * $volume * 128;
277}
278
279sub audio_music_start {
280 my $meta = $MUSIC_PLAYING_META;
281
282 CFPlus::DB::get res_data => $meta->{name}, sub {
283 return unless $SDL_MIXER;
284
285 # music might have changed...
286 $meta eq $MUSIC_PLAYING_META
287 or return &audio_music_start ();
288
289 audio_music_update_volume;
290
291 $MUSIC_PLAYING_DATA = \$_[0];
292
293 my $rwops = $meta->{path}
294 ? new_from_file CFPlus::RW $meta->{path}
295 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
296
297 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
298 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
299
300 my $NOW = time;
301
302 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
303 my $pos = $MUSIC_PLAYING_META->{stop_pos};
304 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
305 $MUSIC_START = time - $pos;
306 } else {
307 $MUSIC_PLAYER->play (0);
308 $MUSIC_START = time;
309 }
310
311 delete $MUSIC_PLAYING_META->{stop_time};
312 delete $MUSIC_PLAYING_META->{stop_pos};
313 }
314}
315
316sub audio_music_push {
317 return unless $SDL_MIXER;
318
319 my $fade_out;
320
321 if (@MUSIC_JINGLE) {
322 @MUSIC_HAVE = $MUSIC_JINGLE[0];
323 $fade_out = 333;
324 } else {
325 return unless $CFG->{bgm_enable};
326
327 my @have =
328 grep $_,
329 map $CONN->{music_meta}{$_},
330 @$MUSIC_WANT;
331
332 @MUSIC_HAVE = @have
333 if @have;
334
335 # default MUSIC_HAVE == MUSIC_DEFAULT
336 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
337 $fade_out = 1000;
338 }
339
340 # if the currently playing song is acceptable, let it continue
341 return if $MUSIC_PLAYING_META
342 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
343
344 my $NOW = time;
345
346 if ($MUSIC_PLAYING_META) {
347 $MUSIC_PLAYING_META->{stop_time} = $NOW;
348 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
349 CFPlus::MixMusic::fade_out $fade_out;
350 } else {
351 # sort by stop time, oldest first
352 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
353
354 # if the most recently-played piece played very recently,
355 # resume it, else choose the oldest piece for rotation.
356 $MUSIC_PLAYING_META =
357 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
358 ? $MUSIC_HAVE[-1]
359 : $MUSIC_HAVE[0];
360
361 audio_music_start;
362 }
363}
364
365sub audio_music_set_ambient {
366 my ($songs) = @_;
367
368 $MUSIC_WANT = $songs;
369 audio_music_push;
370}
371
372sub audio_music_finished {
373 # we compress multiple jingles of the same type
374 shift @MUSIC_JINGLE
375 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
376
377 undef $MUSIC_PLAYER;
378 undef $MUSIC_PLAYING_META;
379 undef $MUSIC_PLAYING_DATA;
380
381 audio_music_push;
382}
383
384sub audio_init {
385 if ($CFG->{audio_enable}) {
386 $ENV{MIX_EFFECTSMAXSPEED} = 1;
387 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
388
389 unless ($SDL_MIXER) {
390 status "Unable to open sound device: there will be no sound";
391 return;
392 }
393
394 CFPlus::Mix_AllocateChannels 16;
395
396 audio_music_finished;
397 } else {
398 undef $SDL_MIXER;
399 }
400}
401
402sub audio_shutdown {
403 undef $MUSIC_PLAYER;
404 undef $MUSIC_PLAYING_META;
405 undef $MUSIC_PLAYING_DATA;
406
407 $MUSIC_WANT = [];
408 @MUSIC_JINGLE = ();
409 %AUDIO_PLAY = ();
410 %AUDIO_CHUNK = ();
411
412 CFPlus::Mix_CloseAudio if $SDL_MIXER;
413 undef $SDL_MIXER;
414}
415
416#############################################################################
150 417
151sub destroy_query_dialog { 418sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 419 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 420 if $_[0]{query_dialog};
154} 421}
155 422
423# FIXME: a very ugly hack to wait for stat update look below! #d#
424our $QUERY_TIMER; #d#
425
156# server query dialog 426# server query dialog
157sub server_query { 427sub server_query {
158 my ($conn, $flags, $prompt) = @_; 428 my ($conn, $flags, $prompt) = @_;
429
430 # FIXME: a very ugly hack to wait for stat update #d#
431 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
432 unless ($QUERY_TIMER) {
433 $QUERY_TIMER =
434 Event->timer (
435 after => 1,
436 cb => sub {
437 server_query ($conn, $flags, $prompt, 1);
438 $QUERY_TIMER = undef
439 }
440 );
441 return;
442 }
443 }
159 444
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 445 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 446 x => "center",
162 y => "center", 447 y => "center",
163 title => "Server Query", 448 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 449 child => my $vbox = new CFPlus::UI::VBox,
165 ; 450 ;
166 451
167 my @dialog = my $label = new CFPlus::UI::Label 452 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 453 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 454 ellipsise => 0,
170 text => $prompt; 455 text => $prompt;
171 456
172 if ($flags & CS_QUERY_YESNO) { 457 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 458 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
190 ); 475 );
191 476
192 $dialog->grab_focus; 477 $dialog->grab_focus;
193 478
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 479 } 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) { 480 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 481 $dialog->{tooltip} = "#charcreation_focus";
199 482
200 unshift @dialog, new CFPlus::UI::Label 483 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 484 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 485 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 486 markup => "\nOr use your keyboard and the text entry below:\n";
204 487
205 unshift @dialog, my $table = new CFPlus::UI::Table; 488 unshift @dialog, my $table = new CFPlus::UI::Table;
206 489
207 $table->add (0, 0, new CFPlus::UI::Button 490 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 491 text => "Next Race",
209 on_activate => sub { 492 on_activate => sub {
210 $conn->send ("reply n"); 493 $conn->send ("reply n");
211 destroy_query_dialog $conn; 494 destroy_query_dialog $conn;
212 0 495 0
213 }, 496 },
214 ); 497 );
215 $table->add (2, 0, new CFPlus::UI::Button 498 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 499 text => "Accept",
217 on_activate => sub { 500 on_activate => sub {
218 $conn->send ("reply d"); 501 $conn->send ("reply d");
219 destroy_query_dialog $conn; 502 destroy_query_dialog $conn;
220 0 503 0
221 }, 504 },
222 ); 505 );
223 506
507 if ($conn->{chargen_race_description}) {
508 unshift @dialog, new CFPlus::UI::Label
509 max_w => $::WIDTH * 0.8,
510 ellipsise => 0,
511 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
512 ;
513 }
514
515 unshift @dialog, new CFPlus::UI::Face
516 face => $conn->{player}{face},
517 bg => [.2, .2, .2, 1],
518 min_w => 64,
519 min_h => 64,
520 ;
521
522 if ($conn->{chargen_race_title}) {
523 unshift @dialog, new CFPlus::UI::Label
524 allign => 1,
525 ellipsise => 0,
526 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
527 ;
528 }
529
224 unshift @dialog, new CFPlus::UI::Label 530 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 531 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 532 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 533 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 534 ;
… …
232 $conn->send ("reply $stat"); 538 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 539 destroy_query_dialog $conn;
234 return; 540 return;
235 } 541 }
236 542
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 543 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 544 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 545 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 546 markup => "\nOr use your keyboard and the text entry below:\n";
244 547
245 unshift @dialog, my $table = new CFPlus::UI::Table; 548 unshift @dialog, my $table = new CFPlus::UI::Table;
246 549
247 # left: re-roll 550 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 551 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 552 text => "Roll Again",
250 on_activate => sub { 553 on_activate => sub {
251 $conn->send ("reply y"); 554 $conn->send ("reply y");
252 destroy_query_dialog $conn; 555 destroy_query_dialog $conn;
253 0 556 0
… …
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 570 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 571 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 572 ],
270 ), 1 .. 2; 573 ), 1 .. 2;
271 574
272 $table->add (2, 0, new CFPlus::UI::Button 575 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 576 text => "Swap Stats",
274 on_activate => sub { 577 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 578 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 579 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 580 destroy_query_dialog $conn;
278 0 581 0
279 }, 582 },
280 ); 583 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 584 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 585
283 # right: accept 586 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 587 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 588 text => "Accept",
286 on_activate => sub { 589 on_activate => sub {
287 $conn->send ("reply n"); 590 $conn->send ("reply n");
288 $STATS_PAGE->hide; 591 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 592 destroy_query_dialog $conn;
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 657 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 658 $SETUP_DIALOG->hide;
356 659
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 660 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 661
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 662 my ($host, $port) = split /:/, $PROFILE->{host};
360 663
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 664 $MAP = new CFPlus::Map;
362 665
363 $CONN = eval { 666 $CONN = eval {
364 new CFPlus::Protocol 667 new CFPlus::Protocol
365 host => $host, 668 host => $host,
366 port => $port || 13327, 669 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 670 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 671 pass => $PROFILE->{password},
369 mapw => $mapsize, 672 mapw => $mapsize,
370 maph => $mapsize, 673 maph => $mapsize,
371 674
675 client => "cfplus $CFPlus::VERSION $] $^O",
676
372 map_widget => $MAPWIDGET, 677 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 678 statusbox => $STATUSBOX,
375 map => $MAP, 679 map => $MAP,
376 mapmap => $MAPMAP, 680 mapmap => $MAPMAP,
377 query => \&server_query, 681 query => \&server_query,
378 682
379 sound_play => sub { 683 setup_req => {
380 my ($x, $y, $soundnum, $type) = @_; 684 smoothing => $CFG->{map_smoothing}*1,
381
382 $SDL_MIXER
383 or return;
384
385 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
386 or return;
387
388 $chunk->play;
389 }, 685 },
390 }; 686 };
391 687
392 if ($CONN) { 688 if ($CONN) {
393 CFPlus::lowdelay fileno $CONN->{fh}; 689 CFPlus::lowdelay fileno $CONN->{fh};
… …
402sub stop_game { 698sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 699 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 700 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 701 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 702 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 703 $SPELL_LIST->clear_spells;
704 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
705
706 &audio_music_set_ambient ([]);
408 707
409 return unless $CONN; 708 return unless $CONN;
410 709
411 status "connection closed"; 710 status "connection closed";
412 711
… …
420sub graphics_setup { 719sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 720 my $vbox = new CFPlus::UI::VBox;
422 721
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 722 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 723
724 my $row = 0;
725
726 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
727 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
728 can_events => 1,
729 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
730
731 my $vidmode_tooltip =
732 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
733 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
734
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 735 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 736 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 737
738 $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]); 739 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"); 740 tooltip => $vidmode_tooltip);
741 $hbox->add (my $mode_label = new CFPlus::UI::Label
742 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
743 can_events => 1, tooltip => $vidmode_tooltip);
430 744
431 $mode_slider->connect (changed => sub { 745 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 746 my ($self, $value) = @_;
433 747
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 748 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 749 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 750 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 751 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 752
439 my $row = 1;
440
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 753 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 754 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 755 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 756 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 757 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 758 );
447 759
448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 760 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
449 $table->add (1, $row++, new CFPlus::UI::CheckBox 761 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 762 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 763 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 764 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 765 );
454 766
767 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
768 $table->add_at (1, $row++, new CFPlus::UI::Slider
769 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
770 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
771 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
772 );
773
774 $table->add_at (1, $row++, new CFPlus::UI::Button
775 expand => 1, align => 0, text => "Apply",
776 tooltip => "Apply the video settings above.",
777 on_activate => sub {
778 video_shutdown ();
779 video_init ();
780 0
781 }
782 );
783
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
456 $table->add (1, $row++, new CFPlus::UI::Slider 785 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 786 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 787 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 788 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 789 );
461 790
791 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
792 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
793 state => $CFG->{map_smoothing},
794 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
795 . "This increases load on the graphics subsystem and works only with 2.x servers. "
796 . "Changes take effect at next connection only.",
797 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
798 );
799
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 800 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 801 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 802 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 803 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 } 804 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 805 );
468 806
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 807 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
470 $table->add (1, $row++, new CFPlus::UI::Slider 808 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 809 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.", 810 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 } 811 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 812 );
475 813
476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
477 $table->add (1, $row++, new CFPlus::UI::CheckBox
478 state => $CFG->{fow_smooth},
479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
480 on_changed => sub {
481 my ($self, $value) = @_;
482 $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
485 }
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 );
494
495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496 $table->add (1, $row++, new CFPlus::UI::Slider 815 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 816 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 817 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 818 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 819 );
501 820
502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
503 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 823 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 824 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506 on_changed => sub { 825 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 826 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 827 &set_gauge_window_fontsize;
509 0 828 0
510 } 829 }
511 ); 830 );
512 831
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 832 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
514 $table->add (1, $row++, new CFPlus::UI::Slider 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 834 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 835 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 836 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 837 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 838 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 839 0
521 } 840 }
522 ); 841 );
523 842
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
531 }
532 );
533
534 $vbox 843 $vbox
535} 844}
536 845
537sub audio_setup { 846sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 847 my $vbox = new CFPlus::UI::VBox;
539 848
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 849 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
541 850
542 my $row = 0; 851 my $row = 0;
543 852
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 853 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
545 $table->add (1, $row++, new CFPlus::UI::CheckBox 854 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 855 state => $CFG->{audio_enable},
547 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 856 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 857 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 858 );
550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 859# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
551# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 860# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552# $CFG->{effects_volume} = $_[1]; 861# $CFG->{effects_volume} = $_[1];
553# }); 862# });
863
864 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
865 $table->add_at (1, $row, new CFPlus::UI::CheckBox
866 expand => 1, state => $CFG->{effects_enable},
867 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
868 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 }
869 );
870 $table->add_at (2, $row++, new CFPlus::UI::Slider
871 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
872 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
873 . "is set highest and you use your operating system volume setting. Changes are instant.",
874 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
875 );
876
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
556 $hbox->add (new CFPlus::UI::CheckBox 878 $table->add_at (1, $row, new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 879 expand => 1, state => $CFG->{bgm_enable},
558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 880 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 881 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
560 ); 882 );
561 $hbox->add (new CFPlus::UI::Slider 883 $table->add_at (2, $row++, new CFPlus::UI::Slider
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 884 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 885 tooltip => "The volume of the background music. Changes are instant.",
564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 886 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565 ); 887 );
566 888
567 $table->add (1, $row++, new CFPlus::UI::Button 889 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 890 c_colspan => 2, expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 891 tooltip => "Apply the audio settings",
570 on_activate => sub { 892 on_activate => sub {
571 audio_shutdown (); 893 audio_shutdown ();
572 audio_init (); 894 audio_init ();
573 0 895 0
… …
631} 953}
632 954
633sub debug_setup { 955sub debug_setup {
634 my $table = new CFPlus::UI::Table; 956 my $table = new CFPlus::UI::Table;
635 957
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 958 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
637 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 959 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
638 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 960 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 961 $table->add_at (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"); 962 $table->add_at (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 }); 963 $table->add_at (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"); 964 $table->add_at (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 }); 965 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
966 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 967
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 968 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 969
647 for my $x (0..2) { 970 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 971 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
649 $table->add ($x + 3, $y, 972 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
650 new CFPlus::UI::Entry 973 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
651 text => $default_smooth[$x * 3 + $y], 974 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 975 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 976
654 } 977 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
978
979 $c->add_items ({
980 type => "line_loop",
981 color => [0, 1, 0],
982 width => 9,
983 coord_mode => "abs",
984 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 985 });
656 986
987 $c->add_items ({
988 type => "lines",
989 color => [1, 1, 0],
990 width => 2,
991 coord_mode => "rel",
992 coord => [[0,0], [1,1], [1,0], [0,1]],
993 });
994
995 $c->add_items ({
996 type => "polygon",
997 color => [0, 0.43, 0],
998 width => 2,
999 coord_mode => "rel",
1000 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1001 });
657 1002
658 $table 1003 $table
659} 1004}
660 1005
661sub stats_window { 1006sub stats_window {
… …
709 [2, 4, st_spd => "Spd", 10.54], 1054 [2, 4, st_spd => "Spd", 10.54],
710 [2, 5, st_wspd => "WSp", 10.54], 1055 [2, 5, st_wspd => "WSp", 10.54],
711 ) { 1056 ) {
712 my ($col, $row, $id, $label, $template) = @$_; 1057 my ($col, $row, $id, $label, $template) = @$_;
713 1058
714 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1059 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
715 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1060 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
716 align => +1, template => $template, tooltip => "#stat_$label"); 1061 align => +1, template => $template, tooltip => "#stat_$label");
717 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1062 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
718 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1063 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
719 align => -1, text => $label, tooltip => "#stat_$label"); 1064 align => -1, text => $label, tooltip => "#stat_$label");
720 } 1065 }
721 1066
722 $vb->add (new CFPlus::UI::FancyFrame 1067 $vb->add (new CFPlus::UI::FancyFrame
… …
763 cold => ["Cold", 1108 cold => ["Cold",
764 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1109 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
765 ghit => ["Ghost hit", 1110 ghit => ["Ghost hit",
766 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1111 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
767 ); 1112 );
1113
768 for (qw/slow holyw conf fire depl magic 1114 for (qw/slow holyw conf fire depl magic
769 drain acid pois para deat phys 1115 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 1116 blind fear tund elec cold ghit/)
771 { 1117 {
772 $tbl2->add ($col, $row, 1118 $tbl2->add_at ($col, $row,
773 $STATWIDS->{"res_$_"} = 1119 $STATWIDS->{"res_$_"} =
774 new CFPlus::UI::Label 1120 new CFPlus::UI::Label
775 font => $FONT_FIXED, 1121 font => $FONT_FIXED,
776 template => "-100%", 1122 template => "-100%",
777 align => +1, 1123 align => +1,
778 valign => 0, 1124 valign => 0,
779 can_events => 1, 1125 can_events => 1,
780 can_hover => 1, 1126 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 1127 tooltip => $resist_names{$_}->[1],
782 ); 1128 );
783 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1129 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 1130 font => $FONT_FIXED,
785 can_hover => 1, 1131 can_hover => 1,
786 can_events => 1, 1132 can_events => 1,
787 path => "ui/resist/resist_$_.png", 1133 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 1134 tooltip => $resist_names{$_}->[1],
789 ); 1135 );
790 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1136 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 1137 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 1138 font => $FONT_FIXED,
793 can_hover => 1, 1139 can_hover => 1,
794 can_events => 1, 1140 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 1141 tooltip => $resist_names{$_}->[1],
… …
828 return if $METASERVER_ATIME > time; 1174 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 1175 $METASERVER_ATIME = time + 60;
830 1176
831 my $table = $METASERVER->{table}; 1177 my $table = $METASERVER->{table};
832 $table->clear; 1178 $table->clear;
833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1179 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 1180
835 my $buf; 1181 my $ok = 0;
836 1182
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1183 CFPlus::background {
1184 my $ua = CFPlus::lwp_useragent;
838 1185
839 unless ($fh) { 1186 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 1187 } sub {
841 return; 1188 my ($msg) = @_;
842 } 1189 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 1190 $table->clear;
857 1191
858 my @tip = ( 1192 my @tip = (
859 "The current number of users logged in on the server.", 1193 "The current number of users logged in on the server.",
860 "The hostname of the server.", 1194 "The hostname of the server.",
861 "The time this server has been running without being restarted.", 1195 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 1196 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 1197 "Short information about this server provided by its admins.",
864 ); 1198 );
865 my @col = qw(#Users Host Uptime Version Description); 1199 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFPlus::UI::Label 1200 $table->add_at ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 1201 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 1202 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 1203 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 1204 for 0 .. $#col;
871 1205
872 my @align = qw(1 0 1 1 -1); 1206 my @align = qw(1 0 1 1 -1);
873 1207
874 my $y = 0; 1208 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1209 for my $m (@{ $msg->{servers} }) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1210 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1211 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
877 1212
878 for ($desc) { 1213 for ($desc) {
879 s/<br>/\n/gi; 1214 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 1215 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 1216 s/<.*?>//sgi;
882 s/&/&amp;/g; 1217 s/&amp;/&/g;
883 s/</&lt;/g; 1218 s/&lt;/</g;
884 s/>/&gt;/g; 1219 s/&gt;/>/g;
885 } 1220 }
886 1221
887 $uptime = sprintf "%dd %02d:%02d:%02d", 1222 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 1223 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 1224 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 1225 (int $uptime / 60) % 60,
891 $m->[8] % 60; 1226 $uptime % 60;
892 1227
893 $m = [$users, $host, $uptime, $version, $desc]; 1228 $m = [$users, $host, $uptime, $version, $desc];
894 1229
895 $y++; 1230 $y++;
896 1231
897 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1232 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFPlus::UI::Button 1233 (new CFPlus::UI::Button
899 text => "Use", 1234 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 1235 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 1236 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1237 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
905 }, 1240 },
906 ), 1241 ),
907 (new CFPlus::UI::Empty expand => 1), 1242 (new CFPlus::UI::Empty expand => 1),
908 ]); 1243 ]);
909 1244
910 $table->add ($_, $y, new CFPlus::UI::Label 1245 $table->add_at ($_, $y, new CFPlus::UI::Label
1246 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 1247 ellipsise => 0,
912 align => $align[$_], 1248 align => $align[$_],
913 text => $m->[$_], 1249 text => $m->[$_],
914 tooltip => $tip[$_], 1250 tooltip => $tip[$_],
1251 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 1252 can_hover => 1,
916 can_events => 1, 1253 can_events => 1,
917 fontsize => 0.8) 1254 fontsize => 0.8)
918 for 0 .. $#$m; 1255 for 0 .. $#$m;
919 } 1256 }
1257 } else {
1258 $ok or $label->set_text ("error while contacting metaserver");
920 } 1259 }
921 }); 1260 };
1261
922} 1262}
923 1263
924sub metaserver_dialog { 1264sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 1265 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 1266 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 1270 title => "Server List",
931 name => 'metaserver_dialog', 1271 name => 'metaserver_dialog',
932 x => 'center', 1272 x => 'center',
933 y => 'center', 1273 y => 'center',
934 z => 3, 1274 z => 3,
1275 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 1276 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 1277 child => $vbox,
937 has_close_button => 1, 1278 has_close_button => 1,
938 table => $table, 1279 table => $table,
939 on_visibility_change => sub { 1280 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 1281 update_metaserver ($_[0]) if $_[1];
… …
950 1291
951 $vbox->add (new CFPlus::UI::FancyFrame 1292 $vbox->add (new CFPlus::UI::FancyFrame
952 label => "Connection Settings", 1293 label => "Connection Settings",
953 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1294 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
954 ); 1295 );
955 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1296 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
956 1297
957 { 1298 {
958 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1299 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
959 1300
960 $vbox->add ( 1301 $vbox->add (
961 $HOST_ENTRY = new CFPlus::UI::Entry 1302 $HOST_ENTRY = new CFPlus::UI::Entry
962 expand => 1, 1303 expand => 1,
963 text => $CFG->{profile}{default}{host}, 1304 text => $CFG->{profile}{default}{host},
964 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1305 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
965 on_changed => sub { 1306 on_changed => sub {
966 my ($self, $value) = @_; 1307 my ($self, $value) = @_;
967 $CFG->{profile}{default}{host} = $value; 1308 $CFG->{profile}{default}{host} = $value;
968 0 1309 1
969 } 1310 }
970 ); 1311 );
971 1312
972 $vbox->add (new CFPlus::UI::Button 1313 $vbox->add (new CFPlus::UI::Button
973 expand => 1, 1314 expand => 1,
974 text => "Server List", 1315 text => "Server List",
975 other => $METASERVER, 1316 other => $METASERVER,
976 tooltip => "Show a list of available crossfire servers", 1317 tooltip => "Show a list of available crossfire servers",
977 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1318 on_activate => sub { $METASERVER->toggle_visibility; 0 },
978 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1319 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
979 ); 1320 );
980 } 1321 }
981 1322
982 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1323 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
983 $table->add (1, 4, new CFPlus::UI::Entry 1324 $table->add_at (1, 4, new CFPlus::UI::Entry
984 text => $CFG->{profile}{default}{user}, 1325 text => $CFG->{profile}{default}{user},
985 tooltip => "The name of your character on the server", 1326 tooltip => "The name of your character on the server",
986 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1327 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
987 ); 1328 );
988 1329
989 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1330 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
990 $table->add (1, 5, new CFPlus::UI::Entry 1331 $table->add_at (1, 5, new CFPlus::UI::Entry
991 text => $CFG->{profile}{default}{password}, 1332 text => $CFG->{profile}{default}{password},
992 hidden => 1, 1333 hidden => 1,
993 tooltip => "The password for your character", 1334 tooltip => "The password for your character",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1335 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
995 ); 1336 );
996 1337
997 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1338 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
998 $table->add (1, 7, new CFPlus::UI::Slider 1339 $table->add_at (1, 7, new CFPlus::UI::Slider
999 force_w => 100, 1340 force_w => 100,
1000 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1341 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1001 tooltip => "This is the size of the portion of the map update the server sends you. " 1342 tooltip => "This is the size of the portion of the map update the server sends you. "
1002 . "If you set this to a high value you will be able to see further, " 1343 . "If you set this to a high value you will be able to see further, "
1003 . "but you also increase bandwidth requirements and latency. " 1344 . "but you also increase bandwidth requirements and latency. "
1004 . "This option is only used once at log-in.", 1345 . "This option is only used once at log-in.",
1005 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1346 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1006 ); 1347 );
1007 1348
1008 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1349 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1009 $table->add (1, 8, new CFPlus::UI::CheckBox 1350 $table->add_at (1, 8, new CFPlus::UI::Entry
1010 state => $CFG->{face_prefetch}, 1351 text => $CFG->{output_rate},
1011 tooltip => "<b>Background Image Prefetch</b>\n\n" 1352 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1012 . "If enabled, the client automatically pre-fetches images from the server. " 1353 . "when sending data. When 0 or unset, the server "
1013 . "This might increase or create lag, but increases the chances " 1354 . "default will be used, which is usually around 100kb/s. Most servers will "
1014 . "of faces being ready for display when you encounter them. " 1355 . "dynamically find an optimal rate, so adjust this only when necessary.",
1015 . "It also uses up server bandwidth on every connect, "
1016 . "so only set it if you really need to prefetch images. "
1017 . "This option can be set and unset any time.",
1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1356 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1019 ); 1357 );
1020 1358
1021 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1359 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1022 $table->add (1, 9, new CFPlus::UI::Entry 1360 $table->add_at (1, 9, new CFPlus::UI::Entry
1023 text => $CFG->{output_count}, 1361 text => $CFG->{output_count},
1024 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1362 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1363 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1026 ); 1364 );
1027 1365
1028 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1366 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1029 $table->add (1, 10, new CFPlus::UI::Entry 1367 $table->add_at (1, 10, new CFPlus::UI::Entry
1030 text => $CFG->{output_sync}, 1368 text => $CFG->{output_sync},
1031 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1369 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1370 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1033 ); 1371 );
1034 1372
1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1373 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1036 expand => 1, 1374 expand => 1,
1037 align => 0, 1375 align => 0,
1038 text => "Login", 1376 text => "Login",
1039 on_activate => sub { 1377 on_activate => sub {
1040 $CONN ? stop_game 1378 $CONN ? stop_game
1041 : start_game; 1379 : start_game;
1042 0 1380 1
1043 }, 1381 },
1044 );
1045
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command},
1049 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. "
1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub {
1053 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value;
1055 0
1056 }
1057 ); 1382 );
1058 1383
1059 $vbox->add (new CFPlus::UI::FancyFrame 1384 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Server Info", 1385 label => "Server Info",
1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1386 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062 ); 1387 );
1063 1388
1064 $vbox 1389 $vbox
1065} 1390}
1066 1391
1067sub message_window { 1392sub client_setup {
1068 my $window = new CFPlus::UI::Toplevel 1393 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1069 name => "message_window",
1070 title => "Messages",
1071 border_bg => [1, 1, 1, 1],
1072 x => "max",
1073 y => 0,
1074 force_w => $::WIDTH * 0.4,
1075 force_h => $::HEIGHT * 0.5,
1076 child => (my $vbox = new CFPlus::UI::VBox),
1077 has_close_button => 1;
1078 1394
1079 $vbox->add ($LOGVIEW); 1395 my $row = 0;
1080 1396
1081 $vbox->add (my $input = new CFPlus::UI::Entry 1397 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1398 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1399 state => $CFG->{show_tips},
1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1400 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086 on_focus_in => sub { 1401 on_changed => sub {
1087 my ($input, $prev_focus) = @_; 1402 my ($self, $value) = @_;
1088 1403 $CFG->{show_tips} = $value;
1089 delete $input->{refocus_map};
1090
1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1092 $input->{refocus_map} = 1;
1093 } 1404 0
1094 delete $input->{auto_activated}; 1405 }
1406 );
1095 1407
1408 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1409 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1410 text => $CFG->{logview_max_par},
1411 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1412 . "sends more messages than this number, older messages get removed to save memory and "
1413 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1414 on_changed => sub {
1415 my ($self, $value) = @_;
1416 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1096 0 1417 0
1097 }, 1418 },
1098 on_activate => sub {
1099 my ($input, $text) = @_;
1100 $input->set_text ('');
1101
1102 if ($text =~ /^\/(.*)/) {
1103 $::CONN->user_send ($1);
1104 } else {
1105 my $say_cmd = $::CFG->{say_command} || 'say';
1106 $::CONN->user_send ("$say_cmd $text");
1107 }
1108 if ($input->{refocus_map}) {
1109 delete $input->{refocus_map};
1110 $MAPWIDGET->focus_in
1111 }
1112
1113 0
1114 },
1115 on_escape => sub {
1116 $MAPWIDGET->grab_focus;
1117
1118 0
1119 },
1120 );
1121
1122 $CONSOLE = {
1123 window => $window,
1124 input => $input,
1125 }; 1419 );
1126 1420
1127 $window 1421 $table
1128}
1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1149sub open_quit_dialog {
1150 unless ($QUIT_DIALOG) {
1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1152 x => "center",
1153 y => "center",
1154 z => 50,
1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1160 ;
1161
1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1163
1164 $vb->add (new CFPlus::UI::Label
1165 text => "You should find a savebed and apply it first!",
1166 max_w => $WIDTH * 0.25,
1167 ellipsize => 0,
1168 );
1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1170 $hb->add (new CFPlus::UI::Button
1171 text => "Ok",
1172 expand => 1,
1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1174 );
1175 $hb->add (new CFPlus::UI::Button
1176 text => "Quit anyway",
1177 expand => 1,
1178 on_activate => sub { exit },
1179 );
1180 }
1181
1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1184} 1422}
1185 1423
1186sub autopickup_setup { 1424sub autopickup_setup {
1425 my $r = new CFPlus::UI::ScrolledWindow (
1426 expand => 1,
1427 scroll_y => 1
1428 );
1187 my $table = new CFPlus::UI::Table; 1429 $r->add (my $table = new CFPlus::UI::Table
1430 row_expand => [0],
1431 col_expand => [0, 1, 0, 1],
1432 );
1188 1433
1189 for ( 1434 for (
1190 ["General", 0, 0, 1435 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1436 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT], 1437 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1206 ["Boots" => PICKUP_BOOTS], 1451 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1452 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1453 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1454 ],
1210 1455
1211 ["Readables", 2, 2, 1456 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1457 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1458 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1459 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1460 ],
1216 ["Misc", 2, 7, 1461 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1462 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1463 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1464 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1465 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1466 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1467 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1468 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1469 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1470 ["Jewelery" => PICKUP_JEWELS],
1471 ["Flesh" => PICKUP_FLESH],
1226 ], 1472 ],
1227 ["Weight/Value ratio", 2, 17] 1473 ["Weight/Value ratio", 2, 17]
1228 ) 1474 )
1229 { 1475 {
1230 my ($title, $x, $y, @bits) = @$_; 1476 my ($title, $x, $y, @bits) = @$_;
1231 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1477 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1232 1478
1233 for (@bits) { 1479 for (@bits) {
1234 ++$y; 1480 ++$y;
1235 1481
1236 my $mask = $_->[1]; 1482 my $mask = $_->[1];
1237 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1483 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1238 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1484 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask, 1485 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub { 1486 on_changed => sub {
1241 my ($box, $value) = @_; 1487 my ($box, $value) = @_;
1242 1488
1243 if ($value) { 1489 if ($value) {
… …
1254 1500
1255 ${$_->[2]} = $checkbox if $_->[2]; 1501 ${$_->[2]} = $checkbox if $_->[2];
1256 } 1502 }
1257 } 1503 }
1258 1504
1259 $table->add (2, 18, new CFPlus::UI::ValSlider 1505 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1260 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1506 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1261 template => ">= 99", 1507 template => ">= 99",
1262 to_value => sub { ">= " . 5 * $_[0] }, 1508 to_value => sub { ">= " . 5 * $_[0] },
1263 on_changed => sub { 1509 on_changed => sub {
1264 my ($slider, $value) = @_; 1510 my ($slider, $value) = @_;
… …
1267 $::CFG->{pickup} |= int $value 1513 $::CFG->{pickup} |= int $value
1268 if $value; 1514 if $value;
1269 1; 1515 1;
1270 }); 1516 });
1271 1517
1272 $table->add (3, 18, new CFPlus::UI::Button 1518 $table->add_at (3, 18, new CFPlus::UI::Button
1273 text => "set", 1519 text => "set",
1274 on_activate => sub { 1520 on_activate => sub {
1275 $::CONN->send_command ("pickup $::CFG->{pickup}") 1521 $::CONN->send_command ("pickup $::CFG->{pickup}")
1276 if defined $::CONN; 1522 if defined $::CONN;
1277 0 1523 0
1278 }); 1524 });
1279 1525
1280 $table 1526 $r
1281} 1527}
1282 1528
1283my %SORT_ORDER = ( 1529my %SORT_ORDER = (
1284 type => undef, 1530 type => undef,
1285 mtime => sub { sort { 1531 mtime => sub {
1532 my $NOW = time;
1533 sort {
1534 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1535 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1536
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1537 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1538 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1539 or $a->{type} <=> $b->{type}
1540 } @_
1289 } @_ }, 1541 },
1290 weight => sub { sort { 1542 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1543 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1544 or $a->{type} <=> $b->{type}
1293 } @_ }, 1545 } @_ },
1294); 1546);
… …
1319 #TODO# update to weigh/maxweight 1571 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1572 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1573
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1574 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323 $sw1->add ($INV = new CFPlus::UI::Inventory); 1575 $sw1->add ($INV = new CFPlus::UI::Inventory);
1576 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324 1577
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1578 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1579
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1580 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1581
… …
1357 has_close_button => 1 1610 has_close_button => 1
1358 ; 1611 ;
1359 1612
1360 my $ntb = 1613 my $ntb =
1361 $PL_NOTEBOOK = 1614 $PL_NOTEBOOK =
1362 new CFPlus::UI::Notebook expand => 1, debug => 1; 1615 new CFPlus::UI::Notebook expand => 1;
1363 1616
1364 $ntb->add ( 1617 $ntb->add_tab (
1365 "Statistics (F2)" => $STATS_PAGE = stats_window, 1618 "Statistics (F2)" => $STATS_PAGE = stats_window,
1366 "Shows statistics, where all your Stats and Resistances are shown." 1619 "Shows statistics, where all your Stats and Resistances are shown."
1367 ); 1620 );
1368 $ntb->add ( 1621 $ntb->add_tab (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1622 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1623 "Shows all your Skills."
1371 ); 1624 );
1372 1625
1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1626 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1627 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1628 $ntb->add_tab (
1376 "Spellbook (F4)" => $spellsw, 1629 "Spellbook (F4)" => $spellsw,
1377 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1630 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1378 ); 1631 );
1379 $ntb->add ( 1632 $ntb->add_tab (
1380 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1633 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1381 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1634 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1382 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1635 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1383 ); 1636 );
1637 $ntb->add_tab (Pickup => autopickup_setup,
1638 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1384 1639
1385 $ntb->set_current_page ($INVENTORY_PAGE); 1640 $ntb->set_current_page ($INVENTORY_PAGE);
1386 1641
1387 $plwin->add ($ntb); 1642 $plwin->add ($ntb);
1388 $plwin 1643 $plwin
1389} 1644}
1390 1645
1391sub update_bindings {
1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1393}
1394
1395sub keyboard_setup { 1646sub keyboard_setup {
1396 my $binding_list = new CFPlus::UI::VBox; 1647 CFPlus::Macro::keyboard_setup
1397
1398 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear ();
1401
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406
1407 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button
1411 text => "delete",
1412 tooltip => "Deletes the binding",
1413 on_activate => sub {
1414 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1416 0
1417 });
1418
1419 $hb->add (new CFPlus::UI::Button
1420 text => "edit",
1421 tooltip => "Edits the binding",
1422 on_activate => sub {
1423 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1425 sub {
1426 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->();
1430 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1431 $SETUP_DIALOG->show;
1432 },
1433 sub {
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 });
1437 $::BIND_EDITOR->show;
1438 $SETUP_DIALOG->hide;
1439 0
1440 });
1441
1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1444 }
1445 }
1446 };
1447
1448 my $vb = new CFPlus::UI::VBox;
1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1454 $hb->add (new CFPlus::UI::CheckBox
1455 expand => 1,
1456 state => $CFG->{shift_fire_stop},
1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1458 on_changed => sub {
1459 my ($cbox, $value) = @_;
1460 $CFG->{shift_fire_stop} = $value;
1461 0
1462 });
1463
1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1468
1469 $hb->add (new CFPlus::UI::Button
1470 text => "record new",
1471 expand => 1,
1472 tooltip => "This button opens the binding editor with an empty binding.",
1473 on_activate => sub {
1474 $::BIND_EDITOR->set_binding (undef, undef, [],
1475 sub {
1476 my ($mod, $sym, $cmds) = @_;
1477 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1478 $refresh->();
1479 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1480 $SETUP_DIALOG->show;
1481 },
1482 sub {
1483 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1484 $SETUP_DIALOG->show;
1485 },
1486 );
1487 $SETUP_DIALOG->hide;
1488 $::BIND_EDITOR->show;
1489 0
1490 },
1491 );
1492
1493 $hb->add (new CFPlus::UI::Button
1494 text => "close",
1495 tooltip => "Closes the binding window",
1496 expand => 1,
1497 on_activate => sub {
1498 $SETUP_DIALOG->hide;
1499 0
1500 }
1501 );
1502
1503 $refresh->();
1504
1505 $vb
1506} 1648}
1507 1649
1508sub help_window { 1650sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1651 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1652 x => 'center',
1511 y => 'center', 1653 y => 'center',
1512 z => 2, 1654 z => 4,
1513 name => 'doc_browser', 1655 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1656 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1657 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1658 title => "Help Browser",
1517 has_close_button => 1; 1659 has_close_button => 1;
… …
1605 }; 1747 };
1606 1748
1607 $win 1749 $win
1608} 1750}
1609 1751
1752sub open_string_query {
1753 my ($title, $cb, $txt, $tooltip) = @_;
1754 my $dialog = new CFPlus::UI::Toplevel
1755 x => "center",
1756 y => "center",
1757 z => 50,
1758 force_w => $WIDTH * 4/5,
1759 title => $title;
1760
1761 $dialog->add (
1762 my $e = new CFPlus::UI::Entry
1763 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1764 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1765 tooltip => $tooltip
1766 );
1767
1768 $e->grab_focus;
1769 $e->set_text ($txt) if $txt;
1770 $dialog->show;
1771}
1772
1773sub open_quit_dialog {
1774 unless ($QUIT_DIALOG) {
1775 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1776 x => "center",
1777 y => "center",
1778 z => 50,
1779 title => "Really Quit?",
1780 on_key_down => sub {
1781 my ($dialog, $ev) = @_;
1782 $ev->{sym} == 27 and $dialog->hide;
1783 }
1784 ;
1785
1786 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1787
1788 $vb->add (new CFPlus::UI::Label
1789 text => "You should find a savebed and apply it first!",
1790 max_w => $WIDTH * 0.25,
1791 ellipsize => 0,
1792 );
1793 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1794 $hb->add (new CFPlus::UI::Button
1795 text => "Ok",
1796 expand => 1,
1797 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1798 );
1799 $hb->add (new CFPlus::UI::Button
1800 text => "Quit anyway",
1801 expand => 1,
1802 on_activate => sub { exit },
1803 );
1804 }
1805
1806 $QUIT_DIALOG->show;
1807 $QUIT_DIALOG->grab_focus;
1808}
1809
1810sub show_tip_of_the_day {
1811 # find all tips
1812 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1813
1814 CFPlus::DB::get state => "tip_of_the_day", sub {
1815 my ($todindex) = @_;
1816 $todindex = 0 if $todindex >= @tod;
1817 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1818
1819 # create dialog
1820 my $dialog;
1821
1822 my $close = sub {
1823 $dialog->destroy;
1824 };
1825
1826 $dialog = new CFPlus::UI::Toplevel
1827 x => "center",
1828 y => "center",
1829 z => 3,
1830 name => 'tip_of_the_day',
1831 force_w => int $WIDTH * 4/9,
1832 force_h => int $WIDTH * 2/9,
1833 title => "Tip of the day #" . (1 + $todindex),
1834 child => my $vbox = new CFPlus::UI::VBox,
1835 has_close_button => 1,
1836 on_delete => $close,
1837 ;
1838
1839 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1840 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1841 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1842
1843 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1844
1845 $table->add_at (0, 0, new CFPlus::UI::Button
1846 text => "Close",
1847 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>.",
1848 on_activate => $close,
1849 );
1850
1851 $table->add_at (2, 0, new CFPlus::UI::Button
1852 text => "Next",
1853 tooltip => "Show the next <b>Tip of the day</b>.",
1854 on_activate => sub {
1855 $close->();
1856 &show_tip_of_the_day;
1857 },
1858 );
1859
1860 $dialog->show;
1861 };
1862}
1863
1610sub sdl_init { 1864sub sdl_init {
1611 CFPlus::SDL_Init 1865 CFPlus::SDL_Init
1612 and die "SDL::Init failed!\n"; 1866 and die "SDL::Init failed!\n";
1613} 1867}
1614 1868
1615sub video_init { 1869sub video_init {
1616 sdl_init;
1617
1618 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1870 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1619 1871
1620 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1872 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1621 1873
1622 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1874 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1623 $FULLSCREEN = $CFG->{fullscreen}; 1875 $FULLSCREEN = $CFG->{fullscreen};
1624 $FAST = $CFG->{fast}; 1876 $FAST = $CFG->{fast};
1625 1877
1626 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1878 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1627 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1879 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1628 1880
1629 $SDL_ACTIVE = 1; 1881 $SDL_ACTIVE = 1;
1630 $LAST_REFRESH = time - 0.01; 1882 $LAST_REFRESH = time - 0.01;
1631 1883
… …
1646 padding => 0, 1898 padding => 0,
1647 z => 100, 1899 z => 100,
1648 force_x => "max", 1900 force_x => "max",
1649 force_y => 0; 1901 force_y => 0;
1650 $DEBUG_STATUS->show; 1902 $DEBUG_STATUS->show;
1651
1652 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1653 1903
1654 $STATUSBOX = new CFPlus::UI::Statusbox; 1904 $STATUSBOX = new CFPlus::UI::Statusbox;
1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1905 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1656 1906
1657 (new CFPlus::UI::Frame 1907 (new CFPlus::UI::Frame
… …
1675 1925
1676 $MAPWIDGET = new CFPlus::MapWidget; 1926 $MAPWIDGET = new CFPlus::MapWidget;
1677 $MAPWIDGET->connect (activate_console => sub { 1927 $MAPWIDGET->connect (activate_console => sub {
1678 my ($mapwidget, $preset) = @_; 1928 my ($mapwidget, $preset) = @_;
1679 1929
1680 if ($CONSOLE) { 1930 $MESSAGE_WINDOW->activate_console ($preset)
1681 $CONSOLE->{input}->{auto_activated} = 1; 1931 if $MESSAGE_WINDOW;
1682 $CONSOLE->{input}->grab_focus;
1683
1684 if ($preset && $CONSOLE->{input}->get_text eq '') {
1685 $CONSOLE->{input}->set_text ($preset);
1686 }
1687 }
1688 }); 1932 });
1689 $MAPWIDGET->show; 1933 $MAPWIDGET->show;
1690 $MAPWIDGET->grab_focus; 1934 $MAPWIDGET->grab_focus;
1691
1692 $LOGVIEW = new CFPlus::UI::TextScroller
1693 expand => 1,
1694 font => $FONT_FIXED,
1695 fontsize => $::CFG->{log_fontsize},
1696 indent => -4,
1697 can_hover => 1,
1698 can_events => 1,
1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1700 ;
1701 1935
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1936 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 1937 title => "Setup",
1704 name => "setup_dialog", 1938 name => "setup_dialog",
1705 x => 'center', 1939 x => 'center',
… …
1709 force_h => $::HEIGHT * 0.6, 1943 force_h => $::HEIGHT * 0.6,
1710 has_close_button => 1, 1944 has_close_button => 1,
1711 ; 1945 ;
1712 1946
1713 $METASERVER = metaserver_dialog; 1947 $METASERVER = metaserver_dialog;
1948 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1714 1949
1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1950 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1951 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1717 1952
1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1953 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1719 "Configure the server to play on, your username, password and other server-related options."); 1954 "Configure the server to play on, your username, password and other server-related options.");
1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1955 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1956 "Configure various client-specific settings.");
1722 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1957 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1723 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1958 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1724 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1959 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1725 "Configure the use of audio, sound effects and background music."); 1960 "Configure the use of audio, sound effects and background music.");
1726 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1961 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1727 "Lets you define, edit and delete key bindings." 1962 "Lets you define, edit and delete key bindings."
1728 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1963 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1729 . "with nothing set and the recording started. After doing the actions you " 1964 . "with nothing set and the recording started. After doing the actions you "
1730 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1965 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1731 . "After pressing the combo the binding will be saved automatically and the " 1966 . "After pressing the combo the binding will be saved automatically and the "
1732 . "binding editor closes"); 1967 . "binding editor closes");
1733 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1968 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1734 "Some debuggin' options. Do not ask."); 1969 "Some debuggin' options. Do not ask.");
1735 1970
1736 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1971 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1737 1972
1738 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1973 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1739 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1974 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1740 1975
1741 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1976 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1742 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1977 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1743 1978
1744 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1979 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1745 1980
1746 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1981 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1757 }, 1992 },
1758 ); 1993 );
1759 1994
1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1995 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1761 tooltip => "View Documentation"); 1996 tooltip => "View Documentation");
1997
1762 1998
1763 $BUTTONBAR->add (new CFPlus::UI::Button 1999 $BUTTONBAR->add (new CFPlus::UI::Button
1764 text => "Quit", 2000 text => "Quit",
1765 tooltip => "Terminates the program", 2001 tooltip => "Terminates the program",
1766 on_activate => sub { 2002 on_activate => sub {
… …
1784 CFPlus::OpenGL::shutdown; 2020 CFPlus::OpenGL::shutdown;
1785 2021
1786 undef $SDL_ACTIVE; 2022 undef $SDL_ACTIVE;
1787} 2023}
1788 2024
1789my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1790my $bgmusic;#TODO#hack#d#
1791
1792sub audio_channel_finished {
1793 my ($channel) = @_;
1794
1795 #warn "channel $channel finished\n";#d#
1796}
1797
1798sub audio_music_finished {
1799 return unless $CFG->{bgm_enable};
1800
1801 # TODO: hack, do play loop and mood music
1802 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1803 $bgmusic->play (0);
1804
1805 push @bgmusic, shift @bgmusic;
1806}
1807
1808sub audio_init {
1809 if ($CFG->{audio_enable}) {
1810 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1811 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1812
1813 unless ($SDL_MIXER) {
1814 status "Unable to open sound device: there will be no sound";
1815 return;
1816 }
1817
1818 CFPlus::Mix_AllocateChannels 8;
1819 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1820
1821 audio_music_finished;
1822
1823 while (<$fh>) {
1824 next if /^\s*#/;
1825 next if /^\s*$/;
1826
1827 my ($file, $volume, $event) = split /\s+/, $_, 3;
1828
1829 push @SOUNDS, "$volume,$file";
1830
1831 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1832 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1833 $chunk->volume ($volume * 128 / 100);
1834 $chunk
1835 };
1836 }
1837 } else {
1838 status "unable to open sound config: $!";
1839 }
1840 }
1841}
1842
1843sub audio_shutdown {
1844 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1845 undef $SDL_MIXER;
1846 @SOUNDS = ();
1847 %AUDIO_CHUNKS = ();
1848}
1849
1850my %animate_object; 2025my %animate_object;
1851my $animate_timer; 2026my $animate_timer;
1852 2027
1853my $fps = 9; 2028my $fps = 9;
1854
1855my %demo;#d#
1856 2029
1857sub force_refresh { 2030sub force_refresh {
1858 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2031 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1859 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2032 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1860 2033
1861 $CFPlus::UI::ROOT->draw; 2034 $CFPlus::UI::ROOT->draw;
1862 2035
1863 $WANT_REFRESH = 0; 2036 $WANT_REFRESH = 0;
1864 $CAN_REFRESH = 0; 2037 $CAN_REFRESH = 0;
1865 $LAST_REFRESH = $NOW; 2038 $LAST_REFRESH = $NOW;
1866 2039
1867 CFPlus::SDL_GL_SwapBuffers; 2040 CFPlus::SDL_GL_SwapBuffers;
1868} 2041}
1869 2042
1870my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2043my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1871 $NOW = time; 2044 $NOW = time;
1872 2045
1873 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2046 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1874 for CFPlus::SDL_PollEvent; 2047 for CFPlus::poll_events;
1875 2048
1876 if (%animate_object) { 2049 if (%animate_object) {
1877 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2050 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1878 $WANT_REFRESH++; 2051 ++$WANT_REFRESH;
1879 } 2052 }
1880 2053
1881 if ($WANT_REFRESH) { 2054 if ($WANT_REFRESH) {
1882 force_refresh; 2055 force_refresh;
1883 } else { 2056 } else {
… …
1893sub animation_stop { 2066sub animation_stop {
1894 my ($widget) = @_; 2067 my ($widget) = @_;
1895 delete $animate_object{$widget}; 2068 delete $animate_object{$widget};
1896} 2069}
1897 2070
1898# check once/second for faces that need to be prefetched
1899# this should, of course, only run on demand, but
1900# SDL forces worse things on us....
1901
1902Event->timer (after => 1, interval => 0.25, cb => sub {
1903 $CONN->face_prefetch
1904 if $CONN;
1905});
1906
1907%SDL_CB = ( 2071%SDL_CB = (
1908 CFPlus::SDL_QUIT => sub { 2072 CFPlus::SDL_QUIT => sub {
1909 Event::unloop -1; 2073 exit;
1910 }, 2074 },
1911 CFPlus::SDL_VIDEORESIZE => sub { 2075 CFPlus::SDL_VIDEORESIZE => sub {
1912 }, 2076 },
1913 CFPlus::SDL_VIDEOEXPOSE => sub { 2077 CFPlus::SDL_VIDEOEXPOSE => sub {
1914 CFPlus::UI::full_refresh; 2078 CFPlus::UI::full_refresh;
1915 }, 2079 },
1916 CFPlus::SDL_ACTIVEEVENT => sub { 2080 CFPlus::SDL_ACTIVEEVENT => sub {
1917# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2081# not useful, as APPACTIVE include sonly iconified state, not unmapped
2082# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2083# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2084# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2085# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2086# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1918 }, 2087 },
1919 CFPlus::SDL_KEYDOWN => sub { 2088 CFPlus::SDL_KEYDOWN => sub {
1920 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2089 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1921 # alt-enter 2090 # alt-enter
1922 $FULLSCREEN_ENABLE->toggle; 2091 $FULLSCREEN_ENABLE->toggle;
… …
1943 2112
1944$SIG{INT} = $SIG{TERM} = sub { exit }; 2113$SIG{INT} = $SIG{TERM} = sub { exit };
1945 2114
1946{ 2115{
1947 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2116 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2117 CFPlus::DB::Server::run;
2118
1948 CFPlus::UI::set_layout ($::CFG->{layout}); 2119 CFPlus::UI::set_layout ($::CFG->{layout});
1949 2120
1950 my %DEF_CFG = ( 2121 my %DEF_CFG = (
1951 sdl_mode => 0, 2122 sdl_mode => 0,
1952 width => 640,
1953 height => 480,
1954 fullscreen => 0, 2123 fullscreen => 0,
1955 fast => 0, 2124 fast => 0,
1956 map_scale => 1, 2125 map_scale => 1,
1957 fow_enable => 1, 2126 fow_enable => 1,
1958 fow_intensity => 0.45, 2127 fow_intensity => 0,
1959 fow_smooth => 0, 2128 map_smoothing => 1,
1960 gui_fontsize => 1, 2129 gui_fontsize => 1,
1961 log_fontsize => 0.7, 2130 log_fontsize => 0.7,
1962 gauge_fontsize => 1, 2131 gauge_fontsize => 1,
1963 gauge_size => 0.35, 2132 gauge_size => 0.35,
1964 stat_fontsize => 0.7, 2133 stat_fontsize => 0.7,
1965 mapsize => 100, 2134 mapsize => 100,
1966 say_command => 'say',
1967 audio_enable => 1, 2135 audio_enable => 1,
2136 effects_enable => 1,
2137 effects_volume => 1,
1968 bgm_enable => 1, 2138 bgm_enable => 1,
1969 bgm_volume => 0.25, 2139 bgm_volume => 0.5,
1970 face_prefetch => 0,
1971 output_sync => 1, 2140 output_sync => 1,
1972 output_count => 1, 2141 output_count => 1,
2142 output_rate => "",
1973 pickup => 0, 2143 pickup => 0,
1974 inv_sort => "mtime", 2144 inv_sort => "mtime",
1975 default => "profile", # default profile 2145 default => "profile", # default profile
2146 show_tips => 1,
2147 logview_max_par => 1000,
1976 ); 2148 );
1977 2149
1978 while (my ($k, $v) = each %DEF_CFG) { 2150 while (my ($k, $v) = each %DEF_CFG) {
1979 $CFG->{$k} = $v unless exists $CFG->{$k}; 2151 $CFG->{$k} = $v unless exists $CFG->{$k};
1980 } 2152 }
1981 2153
1982 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2154 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2155 $PROFILE = $CFG->{profile}{default};
2156
2157 # convert old bindings (only default profile matters)
2158 if (my $bindings = delete $PROFILE->{bindings}) {
2159 while (my ($mod, $syms) = each %$bindings) {
2160 while (my ($sym, $cmds) = each %$syms) {
2161 push @{ $PROFILE->{macro} }, {
2162 accelkey => [$mod*1, $sym*1],
2163 action => $cmds,
2164 };
2165 }
2166 }
2167 }
1983 2168
1984 sdl_init; 2169 sdl_init;
1985 2170
1986 @SDL_MODES = reverse 2171 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1987 grep $_->[0] >= 640 && $_->[1] >= 480, 2172 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1988 CFPlus::SDL_ListModes;
1989
1990 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2173 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2174
2175 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1991 2176
1992 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2177 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1993 2178
1994 { 2179 {
1995 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2180 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2024# } 2209# }
2025# my $t2 = Time::HiRes::time; 2210# my $t2 = Time::HiRes::time;
2026# warn $t2-$t1; 2211# warn $t2-$t1;
2027# } 2212# }
2028 2213
2214 $startup_done->();
2215
2029 video_init; 2216 video_init;
2030 audio_init; 2217 audio_init;
2031} 2218}
2219
2220show_tip_of_the_day if $CFG->{show_tips};
2032 2221
2033Event::loop; 2222Event::loop;
2034#CFPlus::SDL_Quit; 2223#CFPlus::SDL_Quit;
2035#CFPlus::_exit 0; 2224#CFPlus::_exit 0;
2036 2225
2226END {
2037END { CFPlus::SDL_Quit } 2227 CFPlus::SDL_Quit;
2228 CFPlus::DB::Server::stop;
2229}
2038 2230
2039=head1 NAME 2231=head1 NAME
2040 2232
2041cfplus - A Crossfire+ and Crossfire game client 2233cfplus - A Crossfire+ and Crossfire game client
2042 2234

Diff Legend

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