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.154 by root, Wed May 9 11:46:49 2007 UTC vs.
Revision 1.230 by root, Mon Oct 8 17:05:29 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3# do splash-screen thingy on win32
3my $startup_done = sub { }; 4my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN { 5BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 } 9 }
… …
29# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
30BEGIN { 29BEGIN {
31 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 32
34 my $tmp = $ENV{PAR_TEMP}; 33 my $root = $ENV{PAR_TEMP};
35 34
36 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
37 for ($zip->memberNames) { 36 for ($zip->memberNames) {
38 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
39 $zip->extractMember ($_, "$tmp/$1") 38 $zip->extractMember ($_, "$root/$1")
40 unless -e "$tmp/$1"; 39 unless -e "$root/$1";
41 } 40 }
42 } 41 }
43 42
44 if ($^O eq "MSWin32") { 43 if ($^O eq "MSWin32") {
45 # relocatable 44 # pango is relocatable on win32
46 } else { 45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
47 # unix, need to patch pango rc file 49 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules" 50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!"; 51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
50 local $/; 52 local $/;
51 my $rc = <$fh>; 53 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
53 55
54 mkdir "$tmp/pango-modules"; 56 mkdir "$root/pango-modules";
55 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" 57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
56 or die "$tmp/pango-modules/pango.modules: $!"; 58 or die "$root/pango-modules/pango.modules: $!";
57 print $fh $rc; 59 print $fh $rc;
58 60
59 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
60 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
61 or die "$ENV{PANGO_RC_FILE}: $!"; 63 or die "$ENV{PANGO_RC_FILE}: $!";
62 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; 64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
63 } 65 }
64 66
65 unshift @INC, $tmp; 67 unshift @INC, $root;
66 } 68 }
67} 69}
68 70
69# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
70unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
71 if %PAR::LibCache; 73 if %PAR::LibCache;
72 74
73use Time::HiRes 'time'; 75use Time::HiRes 'time';
74use Event; 76use Event;
77use List::Util qw(max min);
75 78
76use Crossfire; 79use Crossfire;
77use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
78 81
79use Compress::LZF; 82use Compress::LZF;
… …
81use CFPlus; 84use CFPlus;
82use CFPlus::OpenGL (); 85use CFPlus::OpenGL ();
83use CFPlus::Protocol; 86use CFPlus::Protocol;
84use CFPlus::DB; 87use CFPlus::DB;
85use CFPlus::UI; 88use CFPlus::UI;
89use CFPlus::UI::Canvas;
86use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
87use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
88use CFPlus::Pod; 95use CFPlus::Pod;
89use CFPlus::MapWidget; 96use CFPlus::MapWidget;
90use CFPlus::Macro; 97use CFPlus::Macro;
91 98
92$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
109our $CONN; 116our $CONN;
110our $PROFILE; # current profile 117our $PROFILE; # current profile
111our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
112 119
113our $WANT_REFRESH; 120our $WANT_REFRESH;
114our $CAN_REFRESH;
115 121
116our @SDL_MODES; 122our @SDL_MODES;
117our $WIDTH; 123our $WIDTH;
118our $HEIGHT; 124our $HEIGHT;
119our $FULLSCREEN; 125our $FULLSCREEN;
… …
123our $FONT_FIXED; 129our $FONT_FIXED;
124 130
125our $MAP; 131our $MAP;
126our $MAPMAP; 132our $MAPMAP;
127our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
128our $BUTTONBAR; 135our $BUTTONBAR;
129our $LOGVIEW;
130our $CONSOLE;
131our $METASERVER; 136our $METASERVER;
132our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
133our $QUIT_DIALOG; 138our $QUIT_DIALOG;
134our $HOST_ENTRY; 139our $HOST_ENTRY;
135our $FULLSCREEN_ENABLE; 140our $FULLSCREEN_ENABLE;
… …
142our $SETUP_KEYBOARD; 147our $SETUP_KEYBOARD;
143 148
144our $PL_NOTEBOOK; 149our $PL_NOTEBOOK;
145our $PL_WINDOW; 150our $PL_WINDOW;
146 151
152our $MUSIC_PLAYING_WIDGET;
153our $LICENSE_WIDGET;
154
155our $PICKUP_PAGE;
147our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
148our $STATS_PAGE; 157our $STATS_PAGE;
149our $SKILL_PAGE; 158our $SKILL_PAGE;
150our $SPELL_PAGE; 159our $SPELL_PAGE;
151our $SPELL_LIST; 160our $SPELL_LIST;
… …
157our $STATWIDS; 166our $STATWIDS;
158 167
159our $SDL_ACTIVE; 168our $SDL_ACTIVE;
160our %SDL_CB; 169our %SDL_CB;
161 170
162our $SDL_MIXER;
163our @SOUNDS; # event => file mapping
164our %AUDIO_CHUNKS; # audio files
165
166our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
167our $STATUSBOX; 172our $STATUSBOX;
168our $DEBUG_STATUS; 173our $DEBUG_STATUS;
169 174
170our $INV; 175our $INV;
171our $INVR; 176our $INVR;
172our $INV_RIGHT_HB; 177our $INVR_HB;
173 178
174our $PICKUP_CFG; 179#############################################################################
175
176our $IN_BUILD_MODE;
177our $BUILD_BUTTON;
178 180
179sub status { 181sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 182 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
181} 183}
182 184
183sub debug { 185sub debug {
184 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
185} 187}
186 188
187sub message { 189sub message {
190 $MESSAGE_WINDOW->message (@_);
191}
192
193#############################################################################
194#TODO: maybe move into own audio module...
195
196our $SDL_MIXER;
197
198our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
199our $MUSIC_WANT; # arryref of ambient music we want to play
200our @MUSIC_HAVE; # ambient music we have on disk
201our $MUSIC_START;
202our @MUSIC_JINGLE; # which jingles to play next
203our $MUSIC_PLAYING_DATA;
204our $MUSIC_PLAYING_META;
205our $MUSIC_PLAYER;
206our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
207
208our %AUDIO_CHUNK; # audio "files"
209our %AUDIO_PLAY; # which audio faces should be played
210
211sub audio_channel_finished {
212 my ($channel) = @_;
213
214# warn "channel $channel finished\n";#d#
215}
216
217sub audio_sound_push($) {
188 my ($para) = @_; 218 my ($face) = @_;
189 219
190 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 220 $CFG->{effects_enable}
221 or return;
191 222
192 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 223 $AUDIO_PLAY{$face}
224 or return;
193 225
194 $LOGVIEW->add_paragraph ($para); 226 if (my $chunk = $AUDIO_CHUNK{$face}) {
195 $LOGVIEW->scroll_to_bottom; 227 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
228 my (undef, $dx, $dy, $vol) = @$_;
229
230 my $channel = CFPlus::Channel::find;
231 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
232 $channel->set_position_r ($dx, $dy, 20);
233 $chunk->play ($channel);
234 }
235 } else {
236 # sound_meta not set means data is in flight either way
237 my $meta = $CONN->{face}[$face]
238 or return;
239
240 $meta->{data}
241 or return;
242
243 # if its a jingle, play it as ambient music
244 if ($meta->{data}{jingle}) {
245 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
246 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
247 &audio_music_push ($face);
248 }
249 } else {
250 # fetch from database
251 CFPlus::DB::get res_data => $meta->{name}, sub {
252 my $rwops = new CFPlus::RW $_[0];
253 my $chunk = new CFPlus::MixChunk $rwops
254 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
255 $chunk->volume (($meta->{data}{volume} || 1) * 128);
256 $AUDIO_CHUNK{$face} = $chunk;
257
258 audio_sound_push ($face);
259 };
260 }
261 }
196} 262}
263
264sub audio_sound_play {
265 my ($face, $dx, $dy, $vol) = @_;
266
267 $SDL_MIXER
268 or return;
269 $CFG->{effects_enable}
270 or return;
271
272 my $queue = $AUDIO_PLAY{$face} ||= [];
273 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
274 audio_sound_push $face
275 unless @$queue > 1;
276}
277
278sub audio_music_set_meta {
279 my ($meta) = @_;
280
281 $MUSIC_PLAYING_META = $meta;
282 $MUSIC_PLAYING_WIDGET->set_markup (
283 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
284 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
285 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
286 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
287 );
288}
289
290sub audio_music_update_volume {
291 return unless $MUSIC_PLAYING_META;
292 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
293 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
294 CFPlus::MixMusic::volume $base * $volume * 128;
295}
296
297sub audio_music_start {
298 my $meta = $MUSIC_PLAYING_META;
299
300 CFPlus::DB::get res_data => $meta->{name}, sub {
301 return unless $SDL_MIXER;
302
303 # music might have changed...
304 $meta eq $MUSIC_PLAYING_META
305 or return &audio_music_start ();
306
307 audio_music_update_volume;
308
309 $MUSIC_PLAYING_DATA = \$_[0];
310
311 my $rwops = $meta->{path}
312 ? new_from_file CFPlus::RW $meta->{path}
313 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
314
315 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
316 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
317
318 my $NOW = time;
319
320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
323 $MUSIC_START = time - $pos;
324 } else {
325 $MUSIC_PLAYER->play (0);
326 $MUSIC_START = time;
327 }
328
329 delete $meta->{stop_time};
330 delete $meta->{stop_pos};
331 }
332}
333
334sub audio_music_push {
335 return unless $SDL_MIXER;
336
337 my $fade_out;
338
339 if (@MUSIC_JINGLE) {
340 @MUSIC_HAVE = $MUSIC_JINGLE[0];
341 $fade_out = 333;
342 } else {
343 return unless $CFG->{bgm_enable};
344
345 my @have =
346 grep $_ && $_->{data},
347 map $CONN->{face}[$_],
348 @$MUSIC_WANT;
349
350 # randomize music a bit so that the order is not always the same
351 $_->{stop_time} ||= rand for @have;
352
353 @MUSIC_HAVE = @have
354 if @have;
355
356 # default MUSIC_HAVE == MUSIC_DEFAULT
357 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
358 $fade_out = 700;
359 }
360
361 # if the currently playing song is acceptable, let it continue
362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
363
364 my $NOW = time;
365
366 if ($MUSIC_PLAYING_META) {
367 $MUSIC_PLAYING_META->{stop_time} = $NOW;
368 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
369 CFPlus::MixMusic::fade_out $fade_out;
370 } else {
371 # sort by stop time, oldest first
372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
373
374 # if the most recently-played piece played very recently,
375 # resume it, else choose the oldest piece for rotation.
376 audio_music_set_meta
377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
378 ? $MUSIC_HAVE[-1]
379 : $MUSIC_HAVE[0];
380
381 audio_music_start;
382 }
383}
384
385sub audio_music_set_ambient {
386 my ($songs) = @_;
387
388 $MUSIC_WANT = $songs;
389 audio_music_push;
390}
391
392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
397 # we compress multiple jingles of the same type
398 shift @MUSIC_JINGLE
399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
400
401 $MUSIC_PLAYING_WIDGET->clear;
402
403 undef $MUSIC_PLAYER;
404 undef $MUSIC_PLAYING_META;
405 undef $MUSIC_PLAYING_DATA;
406
407 audio_music_push;
408}
409
410sub audio_init {
411 if ($CFG->{audio_enable}) {
412 $ENV{MIX_EFFECTSMAXSPEED} = 1;
413 $SDL_MIXER = !CFPlus::Mix_OpenAudio
414 $CFG->{audio_hw_frequency},
415 CFPlus::MIX_DEFAULT_FORMAT,
416 $CFG->{audio_hw_channels},
417 $CFG->{audio_hw_chunksize};
418
419 if ($SDL_MIXER) {
420 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
421
422 audio_music_finished;
423 } else {
424 status "Unable to open sound device: there will be no sound";
425 }
426 } else {
427 undef $SDL_MIXER;
428 }
429
430 sub audio_tab_update;
431 audio_tab_update;
432}
433
434sub audio_shutdown {
435 undef $MUSIC_PLAYER;
436 undef $MUSIC_PLAYING_META;
437 undef $MUSIC_PLAYING_DATA;
438
439 $MUSIC_WANT = [];
440 @MUSIC_JINGLE = ();
441 %AUDIO_PLAY = ();
442 %AUDIO_CHUNK = ();
443
444 CFPlus::Mix_CloseAudio if $SDL_MIXER;
445 undef $SDL_MIXER;
446}
447
448#############################################################################
197 449
198sub destroy_query_dialog { 450sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 451 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 452 if $_[0]{query_dialog};
201} 453}
… …
265 ellipsise => 0, 517 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 518 markup => "\nOr use your keyboard and the text entry below:\n";
267 519
268 unshift @dialog, my $table = new CFPlus::UI::Table; 520 unshift @dialog, my $table = new CFPlus::UI::Table;
269 521
270 $table->add (0, 0, new CFPlus::UI::Button 522 $table->add_at (0, 0, new CFPlus::UI::Button
271 text => "Next Race", 523 text => "Next Race",
272 on_activate => sub { 524 on_activate => sub {
273 $conn->send ("reply n"); 525 $conn->send ("reply n");
274 destroy_query_dialog $conn; 526 destroy_query_dialog $conn;
275 0 527 0
276 }, 528 },
277 ); 529 );
278 $table->add (2, 0, new CFPlus::UI::Button 530 $table->add_at (2, 0, new CFPlus::UI::Button
279 text => "Accept", 531 text => "Accept",
280 on_activate => sub { 532 on_activate => sub {
281 $conn->send ("reply d"); 533 $conn->send ("reply d");
282 destroy_query_dialog $conn; 534 destroy_query_dialog $conn;
283 0 535 0
… …
318 $conn->send ("reply $stat"); 570 $conn->send ("reply $stat");
319 destroy_query_dialog $conn; 571 destroy_query_dialog $conn;
320 return; 572 return;
321 } 573 }
322 574
323 $STATS_PAGE->show;
324 $MESSAGE_WINDOW->hide;
325
326 unshift @dialog, new CFPlus::UI::Label 575 unshift @dialog, new CFPlus::UI::Label
327 max_w => $::WIDTH * 0.4, 576 max_w => $::WIDTH * 0.4,
328 ellipsise => 0, 577 ellipsise => 0,
329 markup => "\nOr use your keyboard and the text entry below:\n"; 578 markup => "\nOr use your keyboard and the text entry below:\n";
330 579
331 unshift @dialog, my $table = new CFPlus::UI::Table; 580 unshift @dialog, my $table = new CFPlus::UI::Table;
332 581
333 # left: re-roll 582 # left: re-roll
334 $table->add (0, 0, new CFPlus::UI::Button 583 $table->add_at (0, 0, new CFPlus::UI::Button
335 text => "Roll Again", 584 text => "Roll Again",
336 on_activate => sub { 585 on_activate => sub {
337 $conn->send ("reply y"); 586 $conn->send ("reply y");
338 destroy_query_dialog $conn; 587 destroy_query_dialog $conn;
339 0 588 0
… …
353 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 602 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
354 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 603 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
355 ], 604 ],
356 ), 1 .. 2; 605 ), 1 .. 2;
357 606
358 $table->add (2, 0, new CFPlus::UI::Button 607 $table->add_at (2, 0, new CFPlus::UI::Button
359 text => "Swap Stats", 608 text => "Swap Stats",
360 on_activate => sub { 609 on_activate => sub {
361 $conn->{stat_change_with} = $sw2->{value}; 610 $conn->{stat_change_with} = $sw2->{value};
362 $conn->send ("reply $sw1->{value}"); 611 $conn->send ("reply $sw1->{value}");
363 destroy_query_dialog $conn; 612 destroy_query_dialog $conn;
364 0 613 0
365 }, 614 },
366 ); 615 );
367 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 616 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
368 617
369 # right: accept 618 # right: accept
370 $table->add (4, 0, new CFPlus::UI::Button 619 $table->add_at (4, 0, new CFPlus::UI::Button
371 text => "Accept", 620 text => "Accept",
372 on_activate => sub { 621 on_activate => sub {
373 $conn->send ("reply n"); 622 $conn->send ("reply n");
374 $STATS_PAGE->hide; 623 $STATS_PAGE->hide;
375 destroy_query_dialog $conn; 624 destroy_query_dialog $conn;
… …
456 maph => $mapsize, 705 maph => $mapsize,
457 706
458 client => "cfplus $CFPlus::VERSION $] $^O", 707 client => "cfplus $CFPlus::VERSION $] $^O",
459 708
460 map_widget => $MAPWIDGET, 709 map_widget => $MAPWIDGET,
461 logview => $LOGVIEW,
462 statusbox => $STATUSBOX, 710 statusbox => $STATUSBOX,
463 map => $MAP, 711 map => $MAP,
464 mapmap => $MAPMAP, 712 mapmap => $MAPMAP,
465 query => \&server_query, 713 query => \&server_query,
466 714
467 setup_req => { 715 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1, 716 smoothing => $CFG->{map_smoothing}*1,
469 },
470
471 sound_play => sub {
472 my ($x, $y, $soundnum, $type) = @_;
473
474 $SDL_MIXER
475 or return;
476
477 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
478 or return;
479
480 $chunk->play;
481 }, 717 },
482 }; 718 };
483 719
484 if ($CONN) { 720 if ($CONN) {
485 CFPlus::lowdelay fileno $CONN->{fh}; 721 CFPlus::lowdelay fileno $CONN->{fh};
… …
495 $LOGIN_BUTTON->set_text ("Login"); 731 $LOGIN_BUTTON->set_text ("Login");
496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 732 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
497 $SETUP_DIALOG->show; 733 $SETUP_DIALOG->show;
498 $PL_WINDOW->hide; 734 $PL_WINDOW->hide;
499 $SPELL_LIST->clear_spells; 735 $SPELL_LIST->clear_spells;
736 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
737
738 &audio_music_set_ambient ([]);
500 739
501 return unless $CONN; 740 return unless $CONN;
502 741
503 status "connection closed"; 742 status "connection closed";
504 743
… …
514 753
515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 754 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
516 755
517 my $row = 0; 756 my $row = 0;
518 757
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 758 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 759 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1, 760 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 761 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523 762
763 my $vidmode_tooltip =
764 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
765 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
766
524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 767 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 768 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
526 769
770 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
527 $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]); 771 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
528 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 772 tooltip => $vidmode_tooltip);
773 $hbox->add (my $mode_label = new CFPlus::UI::Label
774 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
775 can_events => 1, tooltip => $vidmode_tooltip);
529 776
530 $mode_slider->connect (changed => sub { 777 $mode_slider->connect (changed => sub {
531 my ($self, $value) = @_; 778 my ($self, $value) = @_;
532 779
533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 780 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 781 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
535 }); 782 });
536 $mode_slider->emit (changed => $mode_slider->{range}[0]); 783 $mode_slider->emit (changed => $mode_slider->{range}[0]);
537 784
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 785 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 786 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
540 state => $CFG->{fullscreen}, 787 state => $CFG->{fullscreen},
541 tooltip => "Bring the client into fullscreen mode.", 788 tooltip => "Bring the client into fullscreen mode.",
542 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 789 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
543 ); 790 );
544 791
792 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
793 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
794 state => $CFG->{force_opengl11},
795 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
796 . "higher memory usage and slower performance. It will, however, help tremendously on "
797 . "cards that claim to support a feature but fall back to software rendering. "
798 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
799 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
800 . "experience extremely low framerates and your card should do better, try this option.</b>",
801 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
802 );
803
804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
805 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
806 state => $CFG->{texture_compression},
807 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
808 . "will save a lot of memory and increase performance. The compression algorithm "
809 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
810 . "forced OpenGL 1.1 mode.",
811 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
812 );
813
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
546 $table->add (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
547 state => $CFG->{fast}, 816 state => $CFG->{fast},
548 tooltip => "Lower the visual quality considerably to speed up rendering.", 817 tooltip => "Lower the visual quality considerably to speed up rendering.",
549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
550 ); 819 );
551 820
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 823 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 824 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
556 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 825 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 ); 826 );
558 827
559 $table->add (1, $row++, new CFPlus::UI::Button 828 $table->add_at (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply", 829 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.", 830 tooltip => "Apply the video settings above.",
562 on_activate => sub { 831 on_activate => sub {
563 video_shutdown (); 832 video_shutdown ();
564 video_init (); 833 video_init ();
565 0 834 0
566 } 835 }
567 ); 836 );
568 837
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 838 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
570 $table->add (1, $row++, new CFPlus::UI::Slider 839 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 840 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 841 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 842 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 ); 843 );
575 844
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 845 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing}, 847 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 848 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. " 849 . "This increases load on the graphics subsystem and works only with TRT servers. "
581 . "Changes take effect at next connection only.", 850 . "Changes take effect at next login only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 851 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
583 ); 852 );
584 853
585 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 854 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
586 $table->add (1, $row++, new CFPlus::UI::CheckBox 855 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
587 state => $CFG->{fow_enable}, 856 state => $CFG->{fow_enable},
588 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 857 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
589 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 858 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
590 ); 859 );
591 860
592 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 861 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
593 $table->add (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 863 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
595 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 864 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
596 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 865 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
597 ); 866 );
598 867
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
600 $table->add (1, $row++, new CFPlus::UI::CheckBox
601 state => $CFG->{fow_smooth},
602 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
603 on_changed => sub {
604 my ($self, $value) = @_;
605 $CFG->{fow_smooth} = $value;
606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
607 0
608 }
609 );
610
611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 868 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
612 $table->add (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
613 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 870 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
614 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 871 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
872 . "but you still need to press apply to correctly re-layout the widget.",
615 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 873 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
616 ); 874 );
617 875
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 876 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
619 $table->add (1, $row++, new CFPlus::UI::Slider 877 $table->add_at (1, $row++, new CFPlus::UI::Slider
620 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 878 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
621 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 879 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
622 on_changed => sub { 880 on_changed => sub {
623 $CFG->{gauge_fontsize} = $_[1]; 881 $CFG->{gauge_fontsize} = $_[1];
624 &set_gauge_window_fontsize; 882 &set_gauge_window_fontsize;
625 0 883 0
626 } 884 }
627 ); 885 );
628 886
629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 887 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
630 $table->add (1, $row++, new CFPlus::UI::Slider 888 $table->add_at (1, $row++, new CFPlus::UI::Slider
631 range => [$CFG->{gauge_size}, 0.2, 0.8], 889 range => [$CFG->{gauge_size}, 0.2, 0.8],
632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 890 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
633 on_changed => sub { 891 on_changed => sub {
634 $CFG->{gauge_size} = $_[1]; 892 $CFG->{gauge_size} = $_[1];
635 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 893 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
638 ); 896 );
639 897
640 $vbox 898 $vbox
641} 899}
642 900
901our $AUDIO_HW_CHUNKSIZE;
902our $AUDIO_INFO;
903
904sub audio_tab_update {
905 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
906
907 $AUDIO_HW_CHUNKSIZE->set_options ([
908 [0, "default", "Use System Default"],
909 map {
910 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
911 [$_, $ms, "$ms ($_ samples)"],
912 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
913 ]);
914
915 my $text = !$freq
916 ? "audio is off"
917 : "audio is enabled\n"
918 . "frequency (Hz): $freq\n"
919 . "channels: $chans";
920
921 $AUDIO_INFO->set_text ($text);
922}
923
643sub audio_setup { 924sub audio_setup {
644 my $vbox = new CFPlus::UI::VBox; 925 my $vbox = new CFPlus::UI::VBox;
645 926
646 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 927 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
647 928
648 my $row = 0; 929 my $row = 0;
649 930
650 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 931 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
651 $table->add (1, $row++, new CFPlus::UI::CheckBox 932 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
652 state => $CFG->{audio_enable}, 933 state => $CFG->{audio_enable},
653 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.", 934 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.",
654 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 935 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
655 ); 936 );
937
656# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 938 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
657# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 939 $table->add_at (1, $row, new CFPlus::UI::CheckBox
940 expand => 1, state => $CFG->{effects_enable},
941 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
942 on_changed => sub {
658# $CFG->{effects_volume} = $_[1]; 943 $CFG->{effects_enable} = $_[1];
659# }); 944 $CONN->update_fx_want if $CONN;
945 1
946 }
947 );
948 $table->add_at (2, $row++, new CFPlus::UI::Slider
949 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
950 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
951 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
952 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
953 );
954
660 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 955 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
661 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
662 $hbox->add (new CFPlus::UI::CheckBox 956 $table->add_at (1, $row, new CFPlus::UI::CheckBox
663 expand => 1, state => $CFG->{bgm_enable}, 957 expand => 1, state => $CFG->{bgm_enable},
664 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 958 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
665 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 959 on_changed => sub {
960 $CFG->{bgm_enable} = $_[1];
961 $CONN->update_fx_want if $CONN;
962 audio_music_push;
963 1
964 }
666 ); 965 );
667 $hbox->add (new CFPlus::UI::Slider 966 $table->add_at (2, $row++, new CFPlus::UI::Slider
668 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 967 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
669 tooltip => "The volume of the background music. Changes are instant.", 968 tooltip => "The volume of the background music. Changes are instant.",
670 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 969 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
671 ); 970 );
672 971
972 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
973 $table->add_at (1, $row++, new CFPlus::UI::Selector
974 c_colspan => 2, expand => 1,
975 value => $CFG->{audio_hw_frequency},
976 options => [
977 [ 0, "default" , "Use System Default"],
978 [11025, "11 kHz" , "11kHz (low quality)"],
979 [22050, "22 kHz" , "22kHz (reduced quality)"],
980 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
981 [48000, "48 kHz" , "48kHz (studio quality)"],
982 ],
983 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
984 on_changed => sub {
985 $CFG->{audio_hw_frequency} = $_[1];
986 audio_tab_update;
987 1
988 }
989 );
990
991 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
992 $table->add_at (1, $row++, new CFPlus::UI::Selector
993 c_colspan => 2, expand => 1,
994 value => $CFG->{audio_hw_channels},
995 options => [
996 [0, "default" , "Use System Default"],
997 [1, "Mono" , "Mono (single channel, low quality)"],
998 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
999 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
1000 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
1001 ],
1002 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1003 on_changed => sub {
1004 $CFG->{audio_hw_channels} = $_[1];
1005 audio_tab_update;
1006 1
1007 }
1008 );
1009
1010 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1011 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1012 c_colspan => 2, expand => 1,
1013 value => $CFG->{audio_hw_chunksize},
1014 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1015 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1016 on_changed => sub {
1017 $CFG->{audio_hw_chunksize} = $_[1];
1018 audio_tab_update;
1019 1
1020 }
1021 );
1022
1023 # should really be a slider
1024 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1025 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1026 c_colspan => 2, expand => 1,
1027 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1028 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1029 template => ">= 99",
1030 on_changed => sub {
1031 my ($slider, $value) = @_;
1032
1033 $CFG->{audio_mix_channels} = $value
1034 if $value;
1035 1;
1036 }
1037 );
1038
673 $table->add (1, $row++, new CFPlus::UI::Button 1039 $table->add_at (1, $row++, new CFPlus::UI::Button
674 expand => 1, align => 0, text => "Apply", 1040 c_colspan => 2, expand => 1, align => 0, text => "Apply",
675 tooltip => "Apply the audio settings", 1041 tooltip => "Apply the audio settings",
676 on_activate => sub { 1042 on_activate => sub {
677 audio_shutdown (); 1043 audio_shutdown ();
678 audio_init (); 1044 audio_init ();
679 0 1045 0
680 } 1046 }
681 ); 1047 );
1048
1049 $vbox->add (new CFPlus::UI::FancyFrame
1050 expand => 1,
1051 label => "Audio Info",
1052 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1053 );
1054
1055 audio_tab_update;
682 1056
683 $vbox 1057 $vbox
684} 1058}
685 1059
686sub set_gauge_window_fontsize { 1060sub set_gauge_window_fontsize {
… …
721 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1095 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
722 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1096 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
723 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1097 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
724 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1098 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
725 1099
726 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1100 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1101 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1102 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
727 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1103 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
728 1104
729 $GAUGES = { 1105 $GAUGES = {
1106 exp => $exp, prg => $prg, sklprg => $sklprg,
730 exp => $exp, win => $win, range => $rng, 1107 win => $win, range => $rng,
731 food => $fg, mana => $mg, hp => $hg, grace => $gg 1108 hp => $hg, mana => $mg, grace => $gg, food => $fg,
732 }; 1109 };
733 1110
734 &set_gauge_window_fontsize; 1111 &set_gauge_window_fontsize;
735 1112
736 $win 1113 $win
737} 1114}
738 1115
739sub debug_setup { 1116sub debug_setup {
740 my $table = new CFPlus::UI::Table; 1117 my $table = new CFPlus::UI::Table;
741 1118
742 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1119 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
743 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1120 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
744 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1121 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
745 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1122 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
746 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1123 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
747 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1124 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
748 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1125 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
749 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1126 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
750 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 1127 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
751 1128
752 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
753
754 for my $x (0..2) {
755 for my $y (0 .. 2) {
756 $table->add ($x + 3, $y,
757 new CFPlus::UI::Entry
758 text => $default_smooth[$x * 3 + $y],
759 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
760 );
761 }
762 }
763
764 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1129 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1130
1131 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1132 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1133 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1134 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1135 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1136 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1137
1138 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1139
1140 $c->add_items ({
1141 type => "line_loop",
1142 color => [0, 1, 0],
1143 width => 9,
1144 coord_mode => "abs",
1145 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1146 });
1147
1148 $c->add_items ({
1149 type => "lines",
1150 color => [1, 1, 0],
1151 width => 2,
1152 coord_mode => "rel",
1153 coord => [[0,0], [1,1], [1,0], [0,1]],
1154 });
1155
1156 $c->add_items ({
1157 type => "polygon",
1158 color => [0, 0.43, 0],
1159 width => 2,
1160 coord_mode => "rel",
1161 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1162 });
765 1163
766 $table 1164 $table
767} 1165}
768 1166
769sub stats_window { 1167sub stats_window {
… …
817 [2, 4, st_spd => "Spd", 10.54], 1215 [2, 4, st_spd => "Spd", 10.54],
818 [2, 5, st_wspd => "WSp", 10.54], 1216 [2, 5, st_wspd => "WSp", 10.54],
819 ) { 1217 ) {
820 my ($col, $row, $id, $label, $template) = @$_; 1218 my ($col, $row, $id, $label, $template) = @$_;
821 1219
822 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1220 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
823 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1221 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
824 align => +1, template => $template, tooltip => "#stat_$label"); 1222 align => +1, template => $template, tooltip => "#stat_$label");
825 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1223 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
826 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1224 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
827 align => -1, text => $label, tooltip => "#stat_$label"); 1225 align => -1, text => $label, tooltip => "#stat_$label");
828 } 1226 }
829 1227
830 $vb->add (new CFPlus::UI::FancyFrame 1228 $vb->add (new CFPlus::UI::FancyFrame
… …
871 cold => ["Cold", 1269 cold => ["Cold",
872 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1270 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
873 ghit => ["Ghost hit", 1271 ghit => ["Ghost hit",
874 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1272 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
875 ); 1273 );
1274
876 for (qw/slow holyw conf fire depl magic 1275 for (qw/slow holyw conf fire depl magic
877 drain acid pois para deat phys 1276 drain acid pois para deat phys
878 blind fear tund elec cold ghit/) 1277 blind fear tund elec cold ghit/)
879 { 1278 {
880 $tbl2->add ($col, $row, 1279 $tbl2->add_at ($col, $row,
881 $STATWIDS->{"res_$_"} = 1280 $STATWIDS->{"res_$_"} =
882 new CFPlus::UI::Label 1281 new CFPlus::UI::Label
883 font => $FONT_FIXED, 1282 font => $FONT_FIXED,
884 template => "-100%", 1283 template => "-100%",
885 align => +1, 1284 align => +1,
886 valign => 0, 1285 valign => 0,
887 can_events => 1, 1286 can_events => 1,
888 can_hover => 1, 1287 can_hover => 1,
889 tooltip => $resist_names{$_}->[1], 1288 tooltip => $resist_names{$_}->[1],
890 ); 1289 );
891 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1290 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
892 font => $FONT_FIXED, 1291 font => $FONT_FIXED,
893 can_hover => 1, 1292 can_hover => 1,
894 can_events => 1, 1293 can_events => 1,
895 path => "ui/resist/resist_$_.png", 1294 path => "ui/resist/resist_$_.png",
896 tooltip => $resist_names{$_}->[1], 1295 tooltip => $resist_names{$_}->[1],
897 ); 1296 );
898 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1297 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
899 text => $resist_names{$_}->[0], 1298 text => $resist_names{$_}->[0],
900 font => $FONT_FIXED, 1299 font => $FONT_FIXED,
901 can_hover => 1, 1300 can_hover => 1,
902 can_events => 1, 1301 can_events => 1,
903 tooltip => $resist_names{$_}->[1], 1302 tooltip => $resist_names{$_}->[1],
… …
915 $r 1314 $r
916} 1315}
917 1316
918sub skill_window { 1317sub skill_window {
919 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1318 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1319
920 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1320 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1321
921 $sw 1322 $sw
922} 1323}
923 1324
924sub formsep($) { 1325sub formsep($) {
925 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1326 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
936 return if $METASERVER_ATIME > time; 1337 return if $METASERVER_ATIME > time;
937 $METASERVER_ATIME = time + 60; 1338 $METASERVER_ATIME = time + 60;
938 1339
939 my $table = $METASERVER->{table}; 1340 my $table = $METASERVER->{table};
940 $table->clear; 1341 $table->clear;
941 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1342 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
942 1343
943 my $ok = 0; 1344 my $ok = 0;
944 1345
945 CFPlus::background { 1346 CFPlus::background {
946 my $ua = CFPlus::lwp_useragent; 1347 my $ua = CFPlus::lwp_useragent;
… …
957 "The time this server has been running without being restarted.", 1358 "The time this server has been running without being restarted.",
958 "The server software version - a '+' indicates a Crossfire+ server.", 1359 "The server software version - a '+' indicates a Crossfire+ server.",
959 "Short information about this server provided by its admins.", 1360 "Short information about this server provided by its admins.",
960 ); 1361 );
961 my @col = qw(#Users Host Uptime Version Description); 1362 my @col = qw(#Users Host Uptime Version Description);
962 $table->add ($_, 0, new CFPlus::UI::Label 1363 $table->add_at ($_, 0, new CFPlus::UI::Label
963 can_hover => 1, can_events => 1, 1364 can_hover => 1, can_events => 1,
964 align => 0, fg => [1, 1, 0], 1365 align => 0, fg => [1, 1, 0],
965 text => $col[$_], tooltip => $tip[$_]) 1366 text => $col[$_], tooltip => $tip[$_])
966 for 0 .. $#col; 1367 for 0 .. $#col;
967 1368
… …
989 1390
990 $m = [$users, $host, $uptime, $version, $desc]; 1391 $m = [$users, $host, $uptime, $version, $desc];
991 1392
992 $y++; 1393 $y++;
993 1394
994 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1395 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
995 (new CFPlus::UI::Button 1396 (new CFPlus::UI::Button
996 text => "Use", 1397 text => "Use",
997 tooltip => "Put this server into the <b>Host:Port</b> field", 1398 tooltip => "Put this server into the <b>Host:Port</b> field",
998 on_activate => sub { 1399 on_activate => sub {
999 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1400 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1002 }, 1403 },
1003 ), 1404 ),
1004 (new CFPlus::UI::Empty expand => 1), 1405 (new CFPlus::UI::Empty expand => 1),
1005 ]); 1406 ]);
1006 1407
1007 $table->add ($_, $y, new CFPlus::UI::Label 1408 $table->add_at ($_, $y, new CFPlus::UI::Label
1008 max_w => $::WIDTH * 0.4, 1409 max_w => $::WIDTH * 0.4,
1009 ellipsise => 0, 1410 ellipsise => 0,
1010 align => $align[$_], 1411 align => $align[$_],
1011 text => $m->[$_], 1412 text => $m->[$_],
1012 tooltip => $tip[$_], 1413 tooltip => $tip[$_],
… …
1053 1454
1054 $vbox->add (new CFPlus::UI::FancyFrame 1455 $vbox->add (new CFPlus::UI::FancyFrame
1055 label => "Connection Settings", 1456 label => "Connection Settings",
1056 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1457 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1057 ); 1458 );
1058 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1459 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1059 1460
1060 { 1461 {
1061 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1462 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1062 1463
1063 $vbox->add ( 1464 $vbox->add (
1064 $HOST_ENTRY = new CFPlus::UI::Entry 1465 $HOST_ENTRY = new CFPlus::UI::Entry
1065 expand => 1, 1466 expand => 1,
1066 text => $CFG->{profile}{default}{host}, 1467 text => $CFG->{profile}{default}{host},
1067 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1468 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1068 on_changed => sub { 1469 on_changed => sub {
1069 my ($self, $value) = @_; 1470 my ($self, $value) = @_;
1070 $CFG->{profile}{default}{host} = $value; 1471 $CFG->{profile}{default}{host} = $value;
1071 0 1472 1
1072 } 1473 }
1073 ); 1474 );
1074 1475
1075 $vbox->add (new CFPlus::UI::Button 1476 $vbox->add (new CFPlus::UI::Button
1076 expand => 1, 1477 expand => 1,
1077 text => "Server List", 1478 text => "Server List",
1078 other => $METASERVER, 1479 other => $METASERVER,
1079 tooltip => "Show a list of available crossfire servers", 1480 tooltip => "Show a list of available crossfire servers",
1080 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1481 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1081 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1482 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1082 ); 1483 );
1083 } 1484 }
1084 1485
1085 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1486 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1086 $table->add (1, 4, new CFPlus::UI::Entry 1487 $table->add_at (1, 4, new CFPlus::UI::Entry
1087 text => $CFG->{profile}{default}{user}, 1488 text => $CFG->{profile}{default}{user},
1088 tooltip => "The name of your character on the server", 1489 tooltip => "The name of your character on the server",
1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1490 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1090 ); 1491 );
1091 1492
1092 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1493 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1093 $table->add (1, 5, new CFPlus::UI::Entry 1494 $table->add_at (1, 5, new CFPlus::UI::Entry
1094 text => $CFG->{profile}{default}{password}, 1495 text => $CFG->{profile}{default}{password},
1095 hidden => 1, 1496 hidden => 1,
1096 tooltip => "The password for your character", 1497 tooltip => "The password for your character",
1097 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1498 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1098 ); 1499 );
1099 1500
1100 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1501 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1101 $table->add (1, 7, new CFPlus::UI::Slider 1502 $table->add_at (1, 7, new CFPlus::UI::Slider
1102 force_w => 100, 1503 force_w => 100,
1103 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1504 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1104 tooltip => "This is the size of the portion of the map update the server sends you. " 1505 tooltip => "This is the size of the portion of the map update the server sends you. "
1105 . "If you set this to a high value you will be able to see further, " 1506 . "If you set this to a high value you will be able to see further, "
1106 . "but you also increase bandwidth requirements and latency. " 1507 . "but you also increase bandwidth requirements and latency. "
1107 . "This option is only used once at log-in.", 1508 . "This option is only used once at log-in.",
1108 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1509 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1109 ); 1510 );
1110 1511
1111 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1112 $table->add (1, 8, new CFPlus::UI::CheckBox
1113 state => $CFG->{face_prefetch},
1114 tooltip => "<b>Background Image Prefetch</b>\n\n"
1115 . "If enabled, the client automatically pre-fetches images from the server. "
1116 . "This might increase or create lag, but increases the chances "
1117 . "of faces being ready for display when you encounter them. "
1118 . "It also uses up server bandwidth on every connect, "
1119 . "so only set it if you really need to prefetch images. "
1120 . "This option can be set and unset any time.",
1121 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1122 );
1123
1124 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1512 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1125 $table->add (1, 9, new CFPlus::UI::Entry 1513 $table->add_at (1, 8, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate}, 1514 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1515 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1128 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1516 . "when sending data. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.", 1517 . "default will be used, which is usually around 100kb/s. Most servers will "
1518 . "dynamically find an optimal rate, so adjust this only when necessary.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1519 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1131 ); 1520 );
1132 1521
1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1522 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1134 $table->add (1, 10, new CFPlus::UI::Entry 1523 $table->add_at (1, 9, new CFPlus::UI::Entry
1135 text => $CFG->{output_count}, 1524 text => $CFG->{output_count},
1136 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1525 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1137 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1526 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1138 ); 1527 );
1139 1528
1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1529 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1141 $table->add (1, 11, new CFPlus::UI::Entry 1530 $table->add_at (1, 10, new CFPlus::UI::Entry
1142 text => $CFG->{output_sync}, 1531 text => $CFG->{output_sync},
1143 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1532 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1144 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1533 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1145 ); 1534 );
1146 1535
1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1536 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1148 expand => 1, 1537 expand => 1,
1149 align => 0, 1538 align => 0,
1150 text => "Login", 1539 text => "Login",
1151 on_activate => sub { 1540 on_activate => sub {
1152 $CONN ? stop_game 1541 $CONN ? stop_game
1153 : start_game; 1542 : start_game;
1154 0 1543 1
1155 }, 1544 },
1156 ); 1545 );
1157 1546
1158 $vbox->add (new CFPlus::UI::FancyFrame 1547 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info", 1548 label => "Server Info",
… …
1166sub client_setup { 1555sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1556 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168 1557
1169 my $row = 0; 1558 my $row = 0;
1170 1559
1171 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1172 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1173 text => $CFG->{say_command},
1174 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. "
1175 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1176 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1177 on_changed => sub {
1178 my ($self, $value) = @_;
1179 $CFG->{say_command} = $value;
1180 0
1181 }
1182 );
1183
1184 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1185 $table->add (1, $row++, new CFPlus::UI::CheckBox 1561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1186 state => $CFG->{show_tips}, 1562 state => $CFG->{show_tips},
1187 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1563 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1188 on_changed => sub { 1564 on_changed => sub {
1189 my ($self, $value) = @_; 1565 my ($self, $value) = @_;
1190 $CFG->{show_tips} = $value; 1566 $CFG->{show_tips} = $value;
1191 0 1567 0
1192 } 1568 }
1193 ); 1569 );
1194 1570
1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1571 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1196 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1572 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1197 text => $CFG->{logview_max_par}, 1573 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1574 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1199 . "sends more messages than this number, older messages get removed to save memory and " 1575 . "sends more messages than this number, older messages get removed to save memory and "
1200 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1576 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub { 1577 on_changed => sub {
1202 my ($self, $value) = @_; 1578 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1579 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1204 0 1580 0
1205 }, 1581 },
1206 ); 1582 );
1207 1583
1208 $table 1584 $table
1209} 1585}
1210 1586
1211sub message_window {
1212 my $window = new CFPlus::UI::Toplevel
1213 name => "message_window",
1214 title => "Messages",
1215 border_bg => [1, 1, 1, 1],
1216 x => "max",
1217 y => 0,
1218 force_w => $::WIDTH * 0.4,
1219 force_h => $::HEIGHT * 0.5,
1220 child => (my $vbox = new CFPlus::UI::VBox),
1221 has_close_button => 1;
1222
1223 $vbox->add ($LOGVIEW);
1224
1225 $vbox->add (my $input = new CFPlus::UI::Entry
1226 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1227 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1228 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1229 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1230 on_focus_in => sub {
1231 my ($input, $prev_focus) = @_;
1232
1233 delete $input->{refocus_map};
1234
1235 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1236 $input->{refocus_map} = 1;
1237 }
1238 delete $input->{auto_activated};
1239
1240 0
1241 },
1242 on_activate => sub {
1243 my ($input, $text) = @_;
1244 $input->set_text ('');
1245
1246 if ($text =~ /^\/(.*)/) {
1247 $::CONN->user_send ($1);
1248 } else {
1249 my $say_cmd = $::CFG->{say_command} || 'say';
1250 $::CONN->user_send ("$say_cmd $text");
1251 }
1252 if ($input->{refocus_map}) {
1253 delete $input->{refocus_map};
1254 $MAPWIDGET->focus_in
1255 }
1256
1257 0
1258 },
1259 on_escape => sub {
1260 $MAPWIDGET->grab_focus;
1261
1262 0
1263 },
1264 );
1265
1266 $CONSOLE = {
1267 window => $window,
1268 input => $input,
1269 };
1270
1271 $window
1272}
1273
1274sub autopickup_setup { 1587sub autopickup_setup {
1588 my $r = new CFPlus::UI::ScrolledWindow (
1589 expand => 1,
1590 scroll_y => 1
1591 );
1275 my $table = new CFPlus::UI::Table; 1592 $r->add (my $table = new CFPlus::UI::Table
1593 row_expand => [0],
1594 col_expand => [0, 1, 0, 1],
1595 );
1276 1596
1277 for ( 1597 for (
1278 ["General", 0, 0, 1598 ["General", 0, 0,
1279 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1599 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1280 ["Inhibit autopickup" => PICKUP_INHIBIT], 1600 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1315 ], 1635 ],
1316 ["Weight/Value ratio", 2, 17] 1636 ["Weight/Value ratio", 2, 17]
1317 ) 1637 )
1318 { 1638 {
1319 my ($title, $x, $y, @bits) = @$_; 1639 my ($title, $x, $y, @bits) = @$_;
1320 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1640 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1321 1641
1322 for (@bits) { 1642 for (@bits) {
1323 ++$y; 1643 ++$y;
1324 1644
1325 my $mask = $_->[1]; 1645 my $mask = $_->[1];
1326 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1646 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1327 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1647 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1328 state => $::CFG->{pickup} & $mask, 1648 state => $::CFG->{pickup} & $mask,
1329 on_changed => sub { 1649 on_changed => sub {
1330 my ($box, $value) = @_; 1650 my ($box, $value) = @_;
1331 1651
1332 if ($value) { 1652 if ($value) {
… …
1343 1663
1344 ${$_->[2]} = $checkbox if $_->[2]; 1664 ${$_->[2]} = $checkbox if $_->[2];
1345 } 1665 }
1346 } 1666 }
1347 1667
1348 $table->add (2, 18, new CFPlus::UI::ValSlider 1668 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1349 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1669 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1350 template => ">= 99", 1670 template => ">= 99",
1351 to_value => sub { ">= " . 5 * $_[0] }, 1671 to_value => sub { ">= " . 5 * $_[0] },
1352 on_changed => sub { 1672 on_changed => sub {
1353 my ($slider, $value) = @_; 1673 my ($slider, $value) = @_;
… …
1356 $::CFG->{pickup} |= int $value 1676 $::CFG->{pickup} |= int $value
1357 if $value; 1677 if $value;
1358 1; 1678 1;
1359 }); 1679 });
1360 1680
1361 $table->add (3, 18, new CFPlus::UI::Button 1681 $table->add_at (3, 18, new CFPlus::UI::Button
1362 text => "set", 1682 text => "set",
1363 on_activate => sub { 1683 on_activate => sub {
1364 $::CONN->send_command ("pickup $::CFG->{pickup}") 1684 $::CONN->send_command ("pickup $::CFG->{pickup}")
1365 if defined $::CONN; 1685 if defined $::CONN;
1366 0 1686 0
1367 }); 1687 });
1368 1688
1369 $table 1689 $r
1370} 1690}
1371 1691
1372my %SORT_ORDER = ( 1692my %SORT_ORDER = (
1373 type => undef, 1693 type => undef,
1374 mtime => sub { 1694 mtime => sub {
… …
1418 $sw1->add ($INV = new CFPlus::UI::Inventory); 1738 $sw1->add ($INV = new CFPlus::UI::Inventory);
1419 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1739 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1420 1740
1421 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1741 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1422 1742
1423 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1743 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1424 1744
1425 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1745 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1426 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1746 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1427 1747
1428 # XXX: Call after $INVR = ... because set_opencont sets the items 1748 # XXX: Call after $INVR = ... because set_opencont sets the items
1429 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1749 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1430 1750
1431 $hb 1751 $hb
1752}
1753
1754sub media_window {
1755 my $vb = new CFPlus::UI::VBox;
1756
1757 $vb->add (new CFPlus::UI::FancyFrame
1758 label => "Currently playing music",
1759 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1760 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1761 );
1762
1763 $vb->add (new CFPlus::UI::FancyFrame
1764 label => "Other media used in this session",
1765 expand => 1,
1766 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1767 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1768 );
1769
1770 $vb
1771}
1772
1773sub add_license {
1774 my ($meta) = @_;
1775
1776 $meta = $meta->{data}
1777 or return;
1778
1779 $meta->{license} || $meta->{author} || $meta->{source}
1780 or return;
1781
1782 $LICENSE_WIDGET->add_paragraph ({
1783 fg => [1, 1, 1, 1],
1784 markup => "<small>"
1785 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1786 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1787 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1788 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1789 . "</small>",
1790 });
1791 $LICENSE_WIDGET->scroll_to_bottom;
1432} 1792}
1433 1793
1434sub toggle_player_page { 1794sub toggle_player_page {
1435 my ($widget) = @_; 1795 my ($widget) = @_;
1436 1796
… …
1453 has_close_button => 1 1813 has_close_button => 1
1454 ; 1814 ;
1455 1815
1456 my $ntb = 1816 my $ntb =
1457 $PL_NOTEBOOK = 1817 $PL_NOTEBOOK =
1458 new CFPlus::UI::Notebook expand => 1, debug => 1; 1818 new CFPlus::UI::Notebook expand => 1;
1459 1819
1460 $ntb->add ( 1820 $ntb->add_tab (
1461 "Statistics (F2)" => $STATS_PAGE = stats_window, 1821 "Statistics (F2)" => $STATS_PAGE = stats_window,
1462 "Shows statistics, where all your Stats and Resistances are shown." 1822 "Shows statistics, where all your Stats and Resistances are shown."
1463 ); 1823 );
1464 $ntb->add ( 1824 $ntb->add_tab (
1465 "Skills (F3)" => $SKILL_PAGE = skill_window, 1825 "Skills (F3)" => $SKILL_PAGE = skill_window,
1466 "Shows all your Skills." 1826 "Shows all your Skills."
1467 ); 1827 );
1468 1828
1469 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1829 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1470 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1830 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1471 $ntb->add ( 1831 $ntb->add_tab (
1472 "Spellbook (F4)" => $spellsw, 1832 "Spellbook (F4)" => $spellsw,
1473 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1833 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1474 ); 1834 );
1475 $ntb->add ( 1835 $ntb->add_tab (
1476 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1836 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1477 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1837 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1478 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1838 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1479 ); 1839 );
1840 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1841 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1842
1843 $ntb->add_tab (Media => media_window,
1844 "License, Author and Source info for media sent by the server.");
1480 1845
1481 $ntb->set_current_page ($INVENTORY_PAGE); 1846 $ntb->set_current_page ($INVENTORY_PAGE);
1482 1847
1483 $plwin->add ($ntb); 1848 $plwin->add ($ntb);
1484 $plwin 1849 $plwin
… …
1638 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2003 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1639 ); 2004 );
1640 $hb->add (new CFPlus::UI::Button 2005 $hb->add (new CFPlus::UI::Button
1641 text => "Quit anyway", 2006 text => "Quit anyway",
1642 expand => 1, 2007 expand => 1,
1643 on_activate => sub { exit }, 2008 on_activate => sub { Event::unloop_all },
1644 ); 2009 );
1645 } 2010 }
1646 2011
1647 $QUIT_DIALOG->show; 2012 $QUIT_DIALOG->show;
1648 $QUIT_DIALOG->grab_focus; 2013 $QUIT_DIALOG->grab_focus;
… …
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2046 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 2047 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683 2048
1684 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 2049 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685 2050
1686 $table->add (0, 0, new CFPlus::UI::Button 2051 $table->add_at (0, 0, new CFPlus::UI::Button
1687 text => "Close", 2052 text => "Close",
1688 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>.", 2053 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>.",
1689 on_activate => $close, 2054 on_activate => $close,
1690 ); 2055 );
1691 2056
1692 $table->add (2, 0, new CFPlus::UI::Button 2057 $table->add_at (2, 0, new CFPlus::UI::Button
1693 text => "Next", 2058 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.", 2059 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub { 2060 on_activate => sub {
1696 $close->(); 2061 $close->();
1697 &show_tip_of_the_day; 2062 &show_tip_of_the_day;
… …
1706 CFPlus::SDL_Init 2071 CFPlus::SDL_Init
1707 and die "SDL::Init failed!\n"; 2072 and die "SDL::Init failed!\n";
1708} 2073}
1709 2074
1710sub video_init { 2075sub video_init {
1711 sdl_init;
1712
1713 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2076 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1714 2077
1715 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2078 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1716 2079
1717 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2080 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1718 $FULLSCREEN = $CFG->{fullscreen}; 2081 $FULLSCREEN = $CFG->{fullscreen};
1719 $FAST = $CFG->{fast}; 2082 $FAST = $CFG->{fast};
1720 2083
1721 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 2084 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1722 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2085 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1723 2086
1724 $SDL_ACTIVE = 1; 2087 $SDL_ACTIVE = 1;
1725 $LAST_REFRESH = time - 0.01; 2088 $LAST_REFRESH = time - 0.01;
1726 2089
1727 CFPlus::OpenGL::init; 2090 CFPlus::OpenGL::init;
2091 CFPlus::Macro::init;
1728 2092
1729 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2093 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1730 2094
1731 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2095 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1732 2096
1733 ############################################################################# 2097 #############################################################################
1734 2098
1735 if ($DEBUG_STATUS) { 2099 if ($DEBUG_STATUS) {
1736 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2100 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1737 } else { 2101 } else {
1738 # create the widgets 2102 # create/configure the widgets
2103
2104 $CFPlus::UI::ROOT->connect (key_down => sub {
2105 my (undef, $ev) = @_;
2106
2107 if (my @macros = CFPlus::Macro::find $ev) {
2108 CFPlus::Macro::execute $_ for @macros;
2109
2110 return 1;
2111 }
2112
2113 0
2114 });
1739 2115
1740 $DEBUG_STATUS = new CFPlus::UI::Label 2116 $DEBUG_STATUS = new CFPlus::UI::Label
1741 padding => 0, 2117 padding => 0,
1742 z => 100, 2118 z => 100,
1743 force_x => "max", 2119 force_x => "max",
… …
1768 2144
1769 $MAPWIDGET = new CFPlus::MapWidget; 2145 $MAPWIDGET = new CFPlus::MapWidget;
1770 $MAPWIDGET->connect (activate_console => sub { 2146 $MAPWIDGET->connect (activate_console => sub {
1771 my ($mapwidget, $preset) = @_; 2147 my ($mapwidget, $preset) = @_;
1772 2148
1773 if ($CONSOLE) { 2149 $MESSAGE_WINDOW->activate_console ($preset)
1774 $CONSOLE->{input}->{auto_activated} = 1; 2150 if $MESSAGE_WINDOW;
1775 $CONSOLE->{input}->grab_focus;
1776
1777 if ($preset && $CONSOLE->{input}->get_text eq '') {
1778 $CONSOLE->{input}->set_text ($preset);
1779 }
1780 }
1781 }); 2151 });
1782 $MAPWIDGET->show; 2152 $MAPWIDGET->show;
1783 $MAPWIDGET->grab_focus; 2153 $MAPWIDGET->grab_focus;
1784 2154
1785 $LOGVIEW = new CFPlus::UI::TextScroller 2155 $COMPLETER = new CFPlus::MapWidget::Command::
1786 expand => 1, 2156 command => { },
1787 font => $FONT_FIXED, 2157 tooltip => "#completer_help",
1788 fontsize => $::CFG->{log_fontsize},
1789 indent => -4,
1790 can_hover => 1,
1791 can_events => 1,
1792 max_par => $CFG->{logview_max_par},
1793 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1794 ; 2158 ;
1795 2159
1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2160 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1797 title => "Setup", 2161 title => "Setup",
1798 name => "setup_dialog", 2162 name => "setup_dialog",
… …
1803 force_h => $::HEIGHT * 0.6, 2167 force_h => $::HEIGHT * 0.6,
1804 has_close_button => 1, 2168 has_close_button => 1,
1805 ; 2169 ;
1806 2170
1807 $METASERVER = metaserver_dialog; 2171 $METASERVER = metaserver_dialog;
2172 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1808 2173
1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2174 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2175 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1811 2176
1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2177 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1813 "Configure the server to play on, your username, password and other server-related options."); 2178 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Client => client_setup, 2179 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1815 "Configure various client-specific settings."); 2180 "Configure various client-specific settings.");
1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2181 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1819 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2182 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1820 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2183 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1821 "Configure the use of audio, sound effects and background music."); 2184 "Configure the use of audio, sound effects and background music.");
1822 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2185 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1823 "Lets you define, edit and delete key bindings." 2186 "Lets you define, edit and delete key bindings."
1824 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2187 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1825 . "with nothing set and the recording started. After doing the actions you " 2188 . "with nothing set and the recording started. After doing the actions you "
1826 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2189 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1827 . "After pressing the combo the binding will be saved automatically and the " 2190 . "After pressing the combo the binding will be saved automatically and the "
1828 . "binding editor closes"); 2191 . "binding editor closes");
1829 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2192 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1830 "Some debuggin' options. Do not ask."); 2193 "Some debuggin' options. Do not ask.");
1831 2194
1832 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2195 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1833 2196
1834 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2197 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1835 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2198 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1836 2199
1837 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2200 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1838 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2201 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1839 2202
1840 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 2203 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
1841 2204
1842 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2205 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1862 tooltip => "Terminates the program", 2225 tooltip => "Terminates the program",
1863 on_activate => sub { 2226 on_activate => sub {
1864 if ($CONN) { 2227 if ($CONN) {
1865 open_quit_dialog; 2228 open_quit_dialog;
1866 } else { 2229 } else {
1867 exit; 2230 Event::unloop_all;
1868 } 2231 }
1869 0 2232 0
1870 }, 2233 },
1871 ); 2234 );
1872 2235
1873 $BUTTONBAR->show; 2236 $BUTTONBAR->show;
1874 $SETUP_DIALOG->show; 2237 $SETUP_DIALOG->show;
2238 $MESSAGE_WINDOW->show;
1875 } 2239 }
1876 2240
1877 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2241 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1878}
1879
1880sub setup_build_button {
1881 my ($enabled) = @_;
1882 if ($enabled) {
1883 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1884 $BUILD_BUTTON ||= new CFPlus::UI::Button
1885 text => "Build",
1886 tooltip => "Opens the ingame builder",
1887 on_activate => sub {
1888 if ($CONN) {
1889 $CONN->send_ext_req (builder_player_items => sub {
1890 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1891 });
1892 }
1893 0
1894 };
1895 $BUTTONBAR->add ($BUILD_BUTTON);
1896 } else {
1897 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1898 }
1899}
1900
1901sub open_ingame_editor {
1902 my ($msg) = @_;
1903
1904 my $win = new CFPlus::UI::Toplevel
1905 x => 0,
1906 y => 'center',
1907 z => 4,
1908 name => 'builder_window',
1909 force_w => int $WIDTH * 1/4,
1910 force_h => int $HEIGHT * 3/4,
1911 title => "In game builder",
1912 has_close_button => 1;
1913
1914 my $r = new CFPlus::UI::ScrolledWindow (
1915 expand => 1,
1916 scroll_y => 1
1917 );
1918 $r->add (my $vb = new CFPlus::UI::VBox);
1919 $win->add ($r);
1920
1921
1922 $vb->add (
1923 new CFPlus::UI::Button
1924 text => "Disable build mode",
1925 on_activate => sub { $::IN_BUILD_MODE = undef }
1926 );
1927 $vb->add (
1928 new CFPlus::UI::Button
1929 text => "ERASE",
1930 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1931 );
1932
1933 for my $itemarchname (
1934 sort {
1935 $msg->{items}->{$a}->{build_arch_name}
1936 cmp $msg->{items}->{$b}->{build_arch_name}
1937 } keys %{$msg->{items}}
1938 ) {
1939 my $info = $msg->{items}->{$itemarchname};
1940 $vb->add (
1941 new CFPlus::UI::Button text => $info->{build_arch_name},
1942 on_activate => sub {
1943 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1944
1945 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1946 build_mode_query_arch_info ();
1947 }
1948 }
1949 );
1950 }
1951
1952 $win->show;
1953}
1954
1955sub build_mode_query_arch_info {
1956 my ($iteminfo) = $::IN_BUILD_MODE;
1957 my $itemarchname = $iteminfo->{item};
1958 my $info = $iteminfo->{info};
1959
1960 my $dialog = new CFPlus::UI::Toplevel
1961 x => "center",
1962 y => "center",
1963 z => 50,
1964 force_w => int $WIDTH * 1/2,
1965 title => "Enter information for placement of '$itemarchname'",
1966 has_close_button => 1;
1967
1968 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1969
1970 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1971 my $row = 0;
1972 if ($info->{has_name}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1975 }
1976 if ($info->{has_text}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1979 }
1980 if ($info->{has_connection}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1982 $table->add (1, $row++,
1983 new CFPlus::UI::Entry
1984 expand => 1,
1985 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1986 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1987 );
1988 }
1989
1990 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1991 $hb->add (new CFPlus::UI::Button
1992 text => "Close",
1993 expand => 1,
1994 on_activate => sub { $dialog->hide; 0 },
1995 );
1996 $dialog->show;
1997} 2242}
1998 2243
1999sub video_shutdown { 2244sub video_shutdown {
2000 CFPlus::OpenGL::shutdown; 2245 CFPlus::OpenGL::shutdown;
2001 2246
2002 undef $SDL_ACTIVE; 2247 undef $SDL_ACTIVE;
2003} 2248}
2004 2249
2005my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2006my $bgmusic;#TODO#hack#d#
2007
2008sub audio_channel_finished {
2009 my ($channel) = @_;
2010
2011 #warn "channel $channel finished\n";#d#
2012}
2013
2014sub audio_music_finished {
2015 return unless $CFG->{bgm_enable};
2016
2017 # TODO: hack, do play loop and mood music
2018 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2019 $bgmusic->play (0);
2020
2021 push @bgmusic, shift @bgmusic;
2022}
2023
2024sub audio_init {
2025 if ($CFG->{audio_enable}) {
2026 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2027 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2028
2029 unless ($SDL_MIXER) {
2030 status "Unable to open sound device: there will be no sound";
2031 return;
2032 }
2033
2034 CFPlus::Mix_AllocateChannels 8;
2035 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2036
2037 audio_music_finished;
2038
2039 local $_;
2040 while (<$fh>) {
2041 next if /^\s*#/;
2042 next if /^\s*$/;
2043
2044 my ($file, $volume, $event) = split /\s+/, $_, 3;
2045
2046 push @SOUNDS, "$volume,$file";
2047
2048 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2049 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2050 $chunk->volume ($volume * 128 / 100);
2051 $chunk
2052 };
2053 }
2054 } else {
2055 status "unable to open sound config: $!";
2056 }
2057 }
2058}
2059
2060sub audio_shutdown {
2061 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2062 undef $SDL_MIXER;
2063 @SOUNDS = ();
2064 %AUDIO_CHUNKS = ();
2065}
2066
2067my %animate_object; 2250my %animate_object;
2068my $animate_timer; 2251my $animate_timer;
2069 2252
2070my $fps = 9; 2253my $fps = 9;
2071 2254
2072my %demo;#d#
2073
2074sub force_refresh { 2255sub force_refresh {
2256 if ($ENV{CFPLUS_DEBUG} & 4) {
2075 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2257 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2076 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2258 debug sprintf "%3.2f", $fps;
2259 }
2077 2260
2078 $CFPlus::UI::ROOT->draw; 2261 $CFPlus::UI::ROOT->draw;
2079 2262 CFPlus::SDL_GL_SwapBuffers;
2080 $WANT_REFRESH = 0;
2081 $CAN_REFRESH = 0;
2082 $LAST_REFRESH = $NOW; 2263 $LAST_REFRESH = $NOW;
2083 2264 $WANT_REFRESH->stop;
2084 CFPlus::SDL_GL_SwapBuffers;
2085} 2265}
2086 2266
2267$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2268
2087my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2269my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2088 $NOW = time; 2270 $NOW = time;
2089 2271
2090 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2272 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2091 for CFPlus::SDL_PollEvent; 2273 for CFPlus::poll_events;
2092 2274
2093 if (%animate_object) { 2275 if (%animate_object) {
2094 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2276 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2095 $WANT_REFRESH++; 2277 $WANT_REFRESH->start;
2096 }
2097
2098 if ($WANT_REFRESH) {
2099 force_refresh;
2100 } else {
2101 $CAN_REFRESH = 1;
2102 } 2278 }
2103}); 2279});
2104 2280
2105sub animation_start { 2281sub animation_start {
2106 my ($widget) = @_; 2282 my ($widget) = @_;
… …
2110sub animation_stop { 2286sub animation_stop {
2111 my ($widget) = @_; 2287 my ($widget) = @_;
2112 delete $animate_object{$widget}; 2288 delete $animate_object{$widget};
2113} 2289}
2114 2290
2115# check once/second for faces that need to be prefetched
2116# this should, of course, only run on demand, but
2117# SDL forces worse things on us....
2118
2119Event->timer (after => 1, interval => 0.25, cb => sub {
2120 $CONN->face_prefetch
2121 if $CONN;
2122});
2123
2124%SDL_CB = ( 2291%SDL_CB = (
2125 CFPlus::SDL_QUIT => sub { 2292 CFPlus::SDL_QUIT => sub {
2126 exit; 2293 Event::unloop_all;
2127 }, 2294 },
2128 CFPlus::SDL_VIDEORESIZE => sub { 2295 CFPlus::SDL_VIDEORESIZE => sub {
2129 }, 2296 },
2130 CFPlus::SDL_VIDEOEXPOSE => sub { 2297 CFPlus::SDL_VIDEOEXPOSE => sub {
2131 CFPlus::UI::full_refresh; 2298 CFPlus::UI::full_refresh;
2132 }, 2299 },
2133 CFPlus::SDL_ACTIVEEVENT => sub { 2300 CFPlus::SDL_ACTIVEEVENT => sub {
2134# not useful, as APPACTIVE include sonly iconified state, not unmapped 2301# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2302# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2303# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2304# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2305# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2306# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2139 }, 2307 },
2140 CFPlus::SDL_KEYDOWN => sub { 2308 CFPlus::SDL_KEYDOWN => sub {
… …
2169 CFPlus::DB::Server::run; 2337 CFPlus::DB::Server::run;
2170 2338
2171 CFPlus::UI::set_layout ($::CFG->{layout}); 2339 CFPlus::UI::set_layout ($::CFG->{layout});
2172 2340
2173 my %DEF_CFG = ( 2341 my %DEF_CFG = (
2174 sdl_mode => 0, 2342 sdl_mode => 0,
2175 width => 640,
2176 height => 480,
2177 fullscreen => 0, 2343 fullscreen => 0,
2178 fast => 0, 2344 fast => 0,
2345 force_opengl11 => undef,
2346 texture_compression => 1,
2179 map_scale => 1, 2347 map_scale => 1,
2180 fow_enable => 1, 2348 fow_enable => 1,
2181 fow_intensity => 0.45, 2349 fow_intensity => 0,
2182 fow_smooth => 0,
2183 map_smoothing => 1, 2350 map_smoothing => 1,
2184 gui_fontsize => 1, 2351 gui_fontsize => 1,
2185 log_fontsize => 0.7, 2352 log_fontsize => 0.7,
2186 gauge_fontsize => 1, 2353 gauge_fontsize => 1,
2187 gauge_size => 0.35, 2354 gauge_size => 0.35,
2188 stat_fontsize => 0.7, 2355 stat_fontsize => 0.7,
2189 mapsize => 100, 2356 mapsize => 100,
2190 say_command => 'chat',
2191 audio_enable => 1, 2357 audio_enable => 1,
2358 audio_hw_channels => 0,
2359 audio_hw_frequency => 0,
2360 audio_hw_chunksize => 0,
2361 audio_mix_channels => 8,
2362 effects_enable => 1,
2363 effects_volume => 1,
2192 bgm_enable => 1, 2364 bgm_enable => 1,
2193 bgm_volume => 0.25, 2365 bgm_volume => 0.5,
2194 face_prefetch => 0,
2195 output_sync => 1, 2366 output_sync => 1,
2196 output_count => 1, 2367 output_count => 1,
2197 output_rate => "", 2368 output_rate => "",
2198 pickup => 0, 2369 pickup => 0,
2199 inv_sort => "mtime", 2370 inv_sort => "mtime",
2200 default => "profile", # default profile 2371 default => "profile", # default profile
2201 show_tips => 1, 2372 show_tips => 1,
2202 logview_max_par => 1000, 2373 logview_max_par => 1000,
2203 ); 2374 );
2204 2375
2205 while (my ($k, $v) = each %DEF_CFG) { 2376 while (my ($k, $v) = each %DEF_CFG) {
2206 $CFG->{$k} = $v unless exists $CFG->{$k}; 2377 $CFG->{$k} = $v unless exists $CFG->{$k};
2207 } 2378 }
… …
2221 } 2392 }
2222 } 2393 }
2223 2394
2224 sdl_init; 2395 sdl_init;
2225 2396
2226 @SDL_MODES = reverse 2397 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2227 grep $_->[0] >= 640 && $_->[1] >= 480, 2398 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2228 CFPlus::SDL_ListModes;
2229
2230 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2399 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2400
2401 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2231 2402
2232 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2403 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2233 2404
2234 { 2405 {
2235 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2406 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2264# } 2435# }
2265# my $t2 = Time::HiRes::time; 2436# my $t2 = Time::HiRes::time;
2266# warn $t2-$t1; 2437# warn $t2-$t1;
2267# } 2438# }
2268 2439
2269 $startup_done->();
2270
2271 video_init; 2440 video_init;
2272 audio_init; 2441 audio_init;
2273} 2442}
2274 2443
2275show_tip_of_the_day if $CFG->{show_tips}; 2444show_tip_of_the_day if $CFG->{show_tips};
2276 2445
2446Event->idle (cb => sub {
2447 $_[0]->w->cancel;
2448 $startup_done->();
2449});
2450
2277Event::loop; 2451Event::loop;
2452
2453#video_shutdown;
2454#audio_shutdown;
2278#CFPlus::SDL_Quit; 2455CFPlus::SDL_Quit;
2279#CFPlus::_exit 0;
2280
2281END {
2282 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop; 2456CFPlus::DB::Server::stop;
2284}
2285 2457
2286=head1 NAME 2458=head1 NAME
2287 2459
2288cfplus - A Crossfire+ and Crossfire game client 2460cfplus - A Crossfire TRT and Crossfire game client
2289 2461
2290=head1 SYNOPSIS 2462=head1 SYNOPSIS
2291 2463
2292Just run it - no commandline arguments are supported. 2464Just run it - no commandline arguments are supported.
2293 2465
2294=head1 USAGE 2466=head1 USAGE
2295 2467
2296cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2468cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2297fullscreen and interactively. 2469be used in fullscreen mode and interactively.
2298 2470
2299=head1 DEBUGGING 2471=head1 DEBUGGING
2300 2472
2301 2473
2302CFPLUS_DEBUG - environment variable 2474CFPLUS_DEBUG - environment variable

Diff Legend

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