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.163 by root, Thu Jul 12 17:56:51 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 { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN { 5BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 } 9 }
30# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
31BEGIN { 29BEGIN {
32 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
33 @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
34 32
35 my $tmp = $ENV{PAR_TEMP}; 33 my $root = $ENV{PAR_TEMP};
36 34
37 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
38 for ($zip->memberNames) { 36 for ($zip->memberNames) {
39 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
40 $zip->extractMember ($_, "$tmp/$1") 38 $zip->extractMember ($_, "$root/$1")
41 unless -e "$tmp/$1"; 39 unless -e "$root/$1";
42 } 40 }
43 } 41 }
44 42
45 if ($^O eq "MSWin32") { 43 if ($^O eq "MSWin32") {
46 # relocatable 44 # pango is relocatable on win32
47 } else { 45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
48 # unix, need to patch pango rc file 49 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!"; 51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/; 52 local $/;
52 my $rc = <$fh>; 53 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
54 55
55 mkdir "$tmp/pango-modules"; 56 mkdir "$root/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" 57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!"; 58 or die "$root/pango-modules/pango.modules: $!";
58 print $fh $rc; 59 print $fh $rc;
59 60
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!"; 63 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; 64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
64 } 65 }
65 66
66 unshift @INC, $tmp; 67 unshift @INC, $root;
67 } 68 }
68} 69}
69 70
70# 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
71unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 73 if %PAR::LibCache;
73 74
74use Time::HiRes 'time'; 75use Time::HiRes 'time';
75use Event; 76use Event;
77use List::Util qw(max min);
76 78
77use Crossfire; 79use Crossfire;
78use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
79 81
80use Compress::LZF; 82use Compress::LZF;
82use CFPlus; 84use CFPlus;
83use CFPlus::OpenGL (); 85use CFPlus::OpenGL ();
84use CFPlus::Protocol; 86use CFPlus::Protocol;
85use CFPlus::DB; 87use CFPlus::DB;
86use CFPlus::UI; 88use CFPlus::UI;
89use CFPlus::UI::Canvas;
87use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
89use CFPlus::Pod; 95use CFPlus::Pod;
90use CFPlus::MapWidget; 96use CFPlus::MapWidget;
91use CFPlus::Macro; 97use CFPlus::Macro;
92 98
93$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
110our $CONN; 116our $CONN;
111our $PROFILE; # current profile 117our $PROFILE; # current profile
112our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
113 119
114our $WANT_REFRESH; 120our $WANT_REFRESH;
115our $CAN_REFRESH;
116 121
117our @SDL_MODES; 122our @SDL_MODES;
118our $WIDTH; 123our $WIDTH;
119our $HEIGHT; 124our $HEIGHT;
120our $FULLSCREEN; 125our $FULLSCREEN;
124our $FONT_FIXED; 129our $FONT_FIXED;
125 130
126our $MAP; 131our $MAP;
127our $MAPMAP; 132our $MAPMAP;
128our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
129our $BUTTONBAR; 135our $BUTTONBAR;
130our $LOGVIEW;
131our $CONSOLE;
132our $METASERVER; 136our $METASERVER;
133our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 138our $QUIT_DIALOG;
135our $HOST_ENTRY; 139our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE; 140our $FULLSCREEN_ENABLE;
143our $SETUP_KEYBOARD; 147our $SETUP_KEYBOARD;
144 148
145our $PL_NOTEBOOK; 149our $PL_NOTEBOOK;
146our $PL_WINDOW; 150our $PL_WINDOW;
147 151
152our $MUSIC_PLAYING_WIDGET;
153our $LICENSE_WIDGET;
154
155our $PICKUP_PAGE;
148our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
149our $STATS_PAGE; 157our $STATS_PAGE;
150our $SKILL_PAGE; 158our $SKILL_PAGE;
151our $SPELL_PAGE; 159our $SPELL_PAGE;
152our $SPELL_LIST; 160our $SPELL_LIST;
158our $STATWIDS; 166our $STATWIDS;
159 167
160our $SDL_ACTIVE; 168our $SDL_ACTIVE;
161our %SDL_CB; 169our %SDL_CB;
162 170
163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_PLAYING;
167our $MUSIC_PLAYER;
168our @SOUNDS; # event => file mapping
169our %AUDIO_CHUNKS; # audio files
170
171our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
172our $STATUSBOX; 172our $STATUSBOX;
173our $DEBUG_STATUS; 173our $DEBUG_STATUS;
174 174
175our $INV; 175our $INV;
176our $INVR; 176our $INVR;
177our $INV_RIGHT_HB; 177our $INVR_HB;
178 178
179our $PICKUP_CFG; 179#############################################################################
180
181our $IN_BUILD_MODE;
182our $BUILD_BUTTON;
183 180
184sub status { 181sub status {
185 $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]);
186} 183}
187 184
188sub debug { 185sub debug {
189 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
190} 187}
191 188
192sub 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($) {
193 my ($para) = @_; 218 my ($face) = @_;
194 219
195 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 220 $CFG->{effects_enable}
221 or return;
196 222
197 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 223 $AUDIO_PLAY{$face}
224 or return;
198 225
199 $LOGVIEW->add_paragraph ($para); 226 if (my $chunk = $AUDIO_CHUNK{$face}) {
200 $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 }
201} 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#############################################################################
202 449
203sub destroy_query_dialog { 450sub destroy_query_dialog {
204 (delete $_[0]{query_dialog})->destroy 451 (delete $_[0]{query_dialog})->destroy
205 if $_[0]{query_dialog}; 452 if $_[0]{query_dialog};
206} 453}
270 ellipsise => 0, 517 ellipsise => 0,
271 markup => "\nOr use your keyboard and the text entry below:\n"; 518 markup => "\nOr use your keyboard and the text entry below:\n";
272 519
273 unshift @dialog, my $table = new CFPlus::UI::Table; 520 unshift @dialog, my $table = new CFPlus::UI::Table;
274 521
275 $table->add (0, 0, new CFPlus::UI::Button 522 $table->add_at (0, 0, new CFPlus::UI::Button
276 text => "Next Race", 523 text => "Next Race",
277 on_activate => sub { 524 on_activate => sub {
278 $conn->send ("reply n"); 525 $conn->send ("reply n");
279 destroy_query_dialog $conn; 526 destroy_query_dialog $conn;
280 0 527 0
281 }, 528 },
282 ); 529 );
283 $table->add (2, 0, new CFPlus::UI::Button 530 $table->add_at (2, 0, new CFPlus::UI::Button
284 text => "Accept", 531 text => "Accept",
285 on_activate => sub { 532 on_activate => sub {
286 $conn->send ("reply d"); 533 $conn->send ("reply d");
287 destroy_query_dialog $conn; 534 destroy_query_dialog $conn;
288 0 535 0
323 $conn->send ("reply $stat"); 570 $conn->send ("reply $stat");
324 destroy_query_dialog $conn; 571 destroy_query_dialog $conn;
325 return; 572 return;
326 } 573 }
327 574
328 $STATS_PAGE->show;
329 $MESSAGE_WINDOW->hide;
330
331 unshift @dialog, new CFPlus::UI::Label 575 unshift @dialog, new CFPlus::UI::Label
332 max_w => $::WIDTH * 0.4, 576 max_w => $::WIDTH * 0.4,
333 ellipsise => 0, 577 ellipsise => 0,
334 markup => "\nOr use your keyboard and the text entry below:\n"; 578 markup => "\nOr use your keyboard and the text entry below:\n";
335 579
336 unshift @dialog, my $table = new CFPlus::UI::Table; 580 unshift @dialog, my $table = new CFPlus::UI::Table;
337 581
338 # left: re-roll 582 # left: re-roll
339 $table->add (0, 0, new CFPlus::UI::Button 583 $table->add_at (0, 0, new CFPlus::UI::Button
340 text => "Roll Again", 584 text => "Roll Again",
341 on_activate => sub { 585 on_activate => sub {
342 $conn->send ("reply y"); 586 $conn->send ("reply y");
343 destroy_query_dialog $conn; 587 destroy_query_dialog $conn;
344 0 588 0
358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 602 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 603 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
360 ], 604 ],
361 ), 1 .. 2; 605 ), 1 .. 2;
362 606
363 $table->add (2, 0, new CFPlus::UI::Button 607 $table->add_at (2, 0, new CFPlus::UI::Button
364 text => "Swap Stats", 608 text => "Swap Stats",
365 on_activate => sub { 609 on_activate => sub {
366 $conn->{stat_change_with} = $sw2->{value}; 610 $conn->{stat_change_with} = $sw2->{value};
367 $conn->send ("reply $sw1->{value}"); 611 $conn->send ("reply $sw1->{value}");
368 destroy_query_dialog $conn; 612 destroy_query_dialog $conn;
369 0 613 0
370 }, 614 },
371 ); 615 );
372 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 616 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
373 617
374 # right: accept 618 # right: accept
375 $table->add (4, 0, new CFPlus::UI::Button 619 $table->add_at (4, 0, new CFPlus::UI::Button
376 text => "Accept", 620 text => "Accept",
377 on_activate => sub { 621 on_activate => sub {
378 $conn->send ("reply n"); 622 $conn->send ("reply n");
379 $STATS_PAGE->hide; 623 $STATS_PAGE->hide;
380 destroy_query_dialog $conn; 624 destroy_query_dialog $conn;
461 maph => $mapsize, 705 maph => $mapsize,
462 706
463 client => "cfplus $CFPlus::VERSION $] $^O", 707 client => "cfplus $CFPlus::VERSION $] $^O",
464 708
465 map_widget => $MAPWIDGET, 709 map_widget => $MAPWIDGET,
466 logview => $LOGVIEW,
467 statusbox => $STATUSBOX, 710 statusbox => $STATUSBOX,
468 map => $MAP, 711 map => $MAP,
469 mapmap => $MAPMAP, 712 mapmap => $MAPMAP,
470 query => \&server_query, 713 query => \&server_query,
471 714
472 setup_req => { 715 setup_req => {
473 smoothing => $CFG->{map_smoothing}*1, 716 smoothing => $CFG->{map_smoothing}*1,
474 },
475
476 sound_play => sub {
477 my ($x, $y, $soundnum, $type) = @_;
478
479 $SDL_MIXER
480 or return;
481
482 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
483 or return;
484
485 $chunk->play;
486 }, 717 },
487 }; 718 };
488 719
489 if ($CONN) { 720 if ($CONN) {
490 CFPlus::lowdelay fileno $CONN->{fh}; 721 CFPlus::lowdelay fileno $CONN->{fh};
502 $SETUP_DIALOG->show; 733 $SETUP_DIALOG->show;
503 $PL_WINDOW->hide; 734 $PL_WINDOW->hide;
504 $SPELL_LIST->clear_spells; 735 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 736 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
506 737
738 &audio_music_set_ambient ([]);
739
507 return unless $CONN; 740 return unless $CONN;
508 741
509 status "connection closed"; 742 status "connection closed";
510 743
511 destroy_query_dialog $CONN; 744 destroy_query_dialog $CONN;
520 753
521 $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]);
522 755
523 my $row = 0; 756 my $row = 0;
524 757
525 $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");
526 $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,
527 can_events => 1, 760 can_events => 1,
528 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 761 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
529 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
530 $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");
531 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 768 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
532 769
770 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
533 $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],
534 $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);
535 776
536 $mode_slider->connect (changed => sub { 777 $mode_slider->connect (changed => sub {
537 my ($self, $value) = @_; 778 my ($self, $value) = @_;
538 779
539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 780 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
540 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 781 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
541 }); 782 });
542 $mode_slider->emit (changed => $mode_slider->{range}[0]); 783 $mode_slider->emit (changed => $mode_slider->{range}[0]);
543 784
544 $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");
545 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 786 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
546 state => $CFG->{fullscreen}, 787 state => $CFG->{fullscreen},
547 tooltip => "Bring the client into fullscreen mode.", 788 tooltip => "Bring the client into fullscreen mode.",
548 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 789 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
549 ); 790 );
550 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
551 $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");
552 $table->add (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
553 state => $CFG->{fast}, 816 state => $CFG->{fast},
554 tooltip => "Lower the visual quality considerably to speed up rendering.", 817 tooltip => "Lower the visual quality considerably to speed up rendering.",
555 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
556 ); 819 );
557 820
558 $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");
559 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
560 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 823 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
561 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.",
562 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 825 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
563 ); 826 );
564 827
565 $table->add (1, $row++, new CFPlus::UI::Button 828 $table->add_at (1, $row++, new CFPlus::UI::Button
566 expand => 1, align => 0, text => "Apply", 829 expand => 1, align => 0, text => "Apply",
567 tooltip => "Apply the video settings above.", 830 tooltip => "Apply the video settings above.",
568 on_activate => sub { 831 on_activate => sub {
569 video_shutdown (); 832 video_shutdown ();
570 video_init (); 833 video_init ();
571 0 834 0
572 } 835 }
573 ); 836 );
574 837
575 $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");
576 $table->add (1, $row++, new CFPlus::UI::Slider 839 $table->add_at (1, $row++, new CFPlus::UI::Slider
577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 840 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 841 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
579 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 }
580 ); 843 );
581 844
582 $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");
583 $table->add (1, $row++, new CFPlus::UI::CheckBox 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
584 state => $CFG->{map_smoothing}, 847 state => $CFG->{map_smoothing},
585 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. "
586 . "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. "
587 . "Changes take effect at next connection only.", 850 . "Changes take effect at next login only.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 851 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
589 ); 852 );
590 853
591 $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");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox 855 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{fow_enable}, 856 state => $CFG->{fow_enable},
594 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.",
595 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 858 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
596 ); 859 );
597 860
598 $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");
599 $table->add (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
600 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 863 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
601 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.",
602 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 865 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
603 ); 866 );
604 867
605 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
606 $table->add (1, $row++, new CFPlus::UI::CheckBox
607 state => $CFG->{fow_smooth},
608 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
609 on_changed => sub {
610 my ($self, $value) = @_;
611 $CFG->{fow_smooth} = $value;
612 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
613 0
614 }
615 );
616
617 $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");
618 $table->add (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
619 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 870 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
620 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.",
621 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 873 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
622 ); 874 );
623 875
624 $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");
625 $table->add (1, $row++, new CFPlus::UI::Slider 877 $table->add_at (1, $row++, new CFPlus::UI::Slider
626 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 878 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
627 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.",
628 on_changed => sub { 880 on_changed => sub {
629 $CFG->{gauge_fontsize} = $_[1]; 881 $CFG->{gauge_fontsize} = $_[1];
630 &set_gauge_window_fontsize; 882 &set_gauge_window_fontsize;
631 0 883 0
632 } 884 }
633 ); 885 );
634 886
635 $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");
636 $table->add (1, $row++, new CFPlus::UI::Slider 888 $table->add_at (1, $row++, new CFPlus::UI::Slider
637 range => [$CFG->{gauge_size}, 0.2, 0.8], 889 range => [$CFG->{gauge_size}, 0.2, 0.8],
638 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.",
639 on_changed => sub { 891 on_changed => sub {
640 $CFG->{gauge_size} = $_[1]; 892 $CFG->{gauge_size} = $_[1];
641 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 893 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
644 ); 896 );
645 897
646 $vbox 898 $vbox
647} 899}
648 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
649sub audio_setup { 924sub audio_setup {
650 my $vbox = new CFPlus::UI::VBox; 925 my $vbox = new CFPlus::UI::VBox;
651 926
652 $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]);
653 928
654 my $row = 0; 929 my $row = 0;
655 930
656 $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");
657 $table->add (1, $row++, new CFPlus::UI::CheckBox 932 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
658 state => $CFG->{audio_enable}, 933 state => $CFG->{audio_enable},
659 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.",
660 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 935 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
661 ); 936 );
937
662# $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");
663# $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 {
664# $CFG->{effects_volume} = $_[1]; 943 $CFG->{effects_enable} = $_[1];
665# }); 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
666 $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");
667 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
668 $hbox->add (new CFPlus::UI::CheckBox 956 $table->add_at (1, $row, new CFPlus::UI::CheckBox
669 expand => 1, state => $CFG->{bgm_enable}, 957 expand => 1, state => $CFG->{bgm_enable},
670 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.",
671 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 }
672 ); 965 );
673 $hbox->add (new CFPlus::UI::Slider 966 $table->add_at (2, $row++, new CFPlus::UI::Slider
674 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 967 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
675 tooltip => "The volume of the background music. Changes are instant.", 968 tooltip => "The volume of the background music. Changes are instant.",
676 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 }
677 ); 970 );
678 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
679 $table->add (1, $row++, new CFPlus::UI::Button 1039 $table->add_at (1, $row++, new CFPlus::UI::Button
680 expand => 1, align => 0, text => "Apply", 1040 c_colspan => 2, expand => 1, align => 0, text => "Apply",
681 tooltip => "Apply the audio settings", 1041 tooltip => "Apply the audio settings",
682 on_activate => sub { 1042 on_activate => sub {
683 audio_shutdown (); 1043 audio_shutdown ();
684 audio_init (); 1044 audio_init ();
685 0 1045 0
686 } 1046 }
687 ); 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;
688 1056
689 $vbox 1057 $vbox
690} 1058}
691 1059
692sub set_gauge_window_fontsize { 1060sub set_gauge_window_fontsize {
727 $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");
728 $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");
729 $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");
730 $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");
731 1099
732 $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);
733 $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");
734 1104
735 $GAUGES = { 1105 $GAUGES = {
1106 exp => $exp, prg => $prg, sklprg => $sklprg,
736 exp => $exp, win => $win, range => $rng, 1107 win => $win, range => $rng,
737 food => $fg, mana => $mg, hp => $hg, grace => $gg 1108 hp => $hg, mana => $mg, grace => $gg, food => $fg,
738 }; 1109 };
739 1110
740 &set_gauge_window_fontsize; 1111 &set_gauge_window_fontsize;
741 1112
742 $win 1113 $win
743} 1114}
744 1115
745sub debug_setup { 1116sub debug_setup {
746 my $table = new CFPlus::UI::Table; 1117 my $table = new CFPlus::UI::Table;
747 1118
748 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1119 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
749 $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 });
750 $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");
751 $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 });
752 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1123 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
753 $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 });
754 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1125 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
755 $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 });
756 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1127 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
757 1128
758 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
759
760 for my $x (0..2) {
761 for my $y (0 .. 2) {
762 $table->add ($x + 3, $y,
763 new CFPlus::UI::Entry
764 text => $default_smooth[$x * 3 + $y],
765 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
766 );
767 }
768 }
769
770 $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 });
771 1163
772 $table 1164 $table
773} 1165}
774 1166
775sub stats_window { 1167sub stats_window {
823 [2, 4, st_spd => "Spd", 10.54], 1215 [2, 4, st_spd => "Spd", 10.54],
824 [2, 5, st_wspd => "WSp", 10.54], 1216 [2, 5, st_wspd => "WSp", 10.54],
825 ) { 1217 ) {
826 my ($col, $row, $id, $label, $template) = @$_; 1218 my ($col, $row, $id, $label, $template) = @$_;
827 1219
828 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1220 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
829 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1221 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
830 align => +1, template => $template, tooltip => "#stat_$label"); 1222 align => +1, template => $template, tooltip => "#stat_$label");
831 $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
832 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,
833 align => -1, text => $label, tooltip => "#stat_$label"); 1225 align => -1, text => $label, tooltip => "#stat_$label");
834 } 1226 }
835 1227
836 $vb->add (new CFPlus::UI::FancyFrame 1228 $vb->add (new CFPlus::UI::FancyFrame
877 cold => ["Cold", 1269 cold => ["Cold",
878 "<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, ...)"],
879 ghit => ["Ghost hit", 1271 ghit => ["Ghost hit",
880 "<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)"],
881 ); 1273 );
1274
882 for (qw/slow holyw conf fire depl magic 1275 for (qw/slow holyw conf fire depl magic
883 drain acid pois para deat phys 1276 drain acid pois para deat phys
884 blind fear tund elec cold ghit/) 1277 blind fear tund elec cold ghit/)
885 { 1278 {
886 $tbl2->add ($col, $row, 1279 $tbl2->add_at ($col, $row,
887 $STATWIDS->{"res_$_"} = 1280 $STATWIDS->{"res_$_"} =
888 new CFPlus::UI::Label 1281 new CFPlus::UI::Label
889 font => $FONT_FIXED, 1282 font => $FONT_FIXED,
890 template => "-100%", 1283 template => "-100%",
891 align => +1, 1284 align => +1,
892 valign => 0, 1285 valign => 0,
893 can_events => 1, 1286 can_events => 1,
894 can_hover => 1, 1287 can_hover => 1,
895 tooltip => $resist_names{$_}->[1], 1288 tooltip => $resist_names{$_}->[1],
896 ); 1289 );
897 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1290 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
898 font => $FONT_FIXED, 1291 font => $FONT_FIXED,
899 can_hover => 1, 1292 can_hover => 1,
900 can_events => 1, 1293 can_events => 1,
901 path => "ui/resist/resist_$_.png", 1294 path => "ui/resist/resist_$_.png",
902 tooltip => $resist_names{$_}->[1], 1295 tooltip => $resist_names{$_}->[1],
903 ); 1296 );
904 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1297 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
905 text => $resist_names{$_}->[0], 1298 text => $resist_names{$_}->[0],
906 font => $FONT_FIXED, 1299 font => $FONT_FIXED,
907 can_hover => 1, 1300 can_hover => 1,
908 can_events => 1, 1301 can_events => 1,
909 tooltip => $resist_names{$_}->[1], 1302 tooltip => $resist_names{$_}->[1],
921 $r 1314 $r
922} 1315}
923 1316
924sub skill_window { 1317sub skill_window {
925 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1318 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1319
926 $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
927 $sw 1322 $sw
928} 1323}
929 1324
930sub formsep($) { 1325sub formsep($) {
931 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1326 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
942 return if $METASERVER_ATIME > time; 1337 return if $METASERVER_ATIME > time;
943 $METASERVER_ATIME = time + 60; 1338 $METASERVER_ATIME = time + 60;
944 1339
945 my $table = $METASERVER->{table}; 1340 my $table = $METASERVER->{table};
946 $table->clear; 1341 $table->clear;
947 $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...");
948 1343
949 my $ok = 0; 1344 my $ok = 0;
950 1345
951 CFPlus::background { 1346 CFPlus::background {
952 my $ua = CFPlus::lwp_useragent; 1347 my $ua = CFPlus::lwp_useragent;
963 "The time this server has been running without being restarted.", 1358 "The time this server has been running without being restarted.",
964 "The server software version - a '+' indicates a Crossfire+ server.", 1359 "The server software version - a '+' indicates a Crossfire+ server.",
965 "Short information about this server provided by its admins.", 1360 "Short information about this server provided by its admins.",
966 ); 1361 );
967 my @col = qw(#Users Host Uptime Version Description); 1362 my @col = qw(#Users Host Uptime Version Description);
968 $table->add ($_, 0, new CFPlus::UI::Label 1363 $table->add_at ($_, 0, new CFPlus::UI::Label
969 can_hover => 1, can_events => 1, 1364 can_hover => 1, can_events => 1,
970 align => 0, fg => [1, 1, 0], 1365 align => 0, fg => [1, 1, 0],
971 text => $col[$_], tooltip => $tip[$_]) 1366 text => $col[$_], tooltip => $tip[$_])
972 for 0 .. $#col; 1367 for 0 .. $#col;
973 1368
995 1390
996 $m = [$users, $host, $uptime, $version, $desc]; 1391 $m = [$users, $host, $uptime, $version, $desc];
997 1392
998 $y++; 1393 $y++;
999 1394
1000 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1395 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1001 (new CFPlus::UI::Button 1396 (new CFPlus::UI::Button
1002 text => "Use", 1397 text => "Use",
1003 tooltip => "Put this server into the <b>Host:Port</b> field", 1398 tooltip => "Put this server into the <b>Host:Port</b> field",
1004 on_activate => sub { 1399 on_activate => sub {
1005 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1400 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1008 }, 1403 },
1009 ), 1404 ),
1010 (new CFPlus::UI::Empty expand => 1), 1405 (new CFPlus::UI::Empty expand => 1),
1011 ]); 1406 ]);
1012 1407
1013 $table->add ($_, $y, new CFPlus::UI::Label 1408 $table->add_at ($_, $y, new CFPlus::UI::Label
1014 max_w => $::WIDTH * 0.4, 1409 max_w => $::WIDTH * 0.4,
1015 ellipsise => 0, 1410 ellipsise => 0,
1016 align => $align[$_], 1411 align => $align[$_],
1017 text => $m->[$_], 1412 text => $m->[$_],
1018 tooltip => $tip[$_], 1413 tooltip => $tip[$_],
1059 1454
1060 $vbox->add (new CFPlus::UI::FancyFrame 1455 $vbox->add (new CFPlus::UI::FancyFrame
1061 label => "Connection Settings", 1456 label => "Connection Settings",
1062 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]),
1063 ); 1458 );
1064 $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");
1065 1460
1066 { 1461 {
1067 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1462 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1068 1463
1069 $vbox->add ( 1464 $vbox->add (
1070 $HOST_ENTRY = new CFPlus::UI::Entry 1465 $HOST_ENTRY = new CFPlus::UI::Entry
1071 expand => 1, 1466 expand => 1,
1072 text => $CFG->{profile}{default}{host}, 1467 text => $CFG->{profile}{default}{host},
1073 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",
1074 on_changed => sub { 1469 on_changed => sub {
1075 my ($self, $value) = @_; 1470 my ($self, $value) = @_;
1076 $CFG->{profile}{default}{host} = $value; 1471 $CFG->{profile}{default}{host} = $value;
1077 0 1472 1
1078 } 1473 }
1079 ); 1474 );
1080 1475
1081 $vbox->add (new CFPlus::UI::Button 1476 $vbox->add (new CFPlus::UI::Button
1082 expand => 1, 1477 expand => 1,
1083 text => "Server List", 1478 text => "Server List",
1084 other => $METASERVER, 1479 other => $METASERVER,
1085 tooltip => "Show a list of available crossfire servers", 1480 tooltip => "Show a list of available crossfire servers",
1086 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1481 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1087 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1482 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1088 ); 1483 );
1089 } 1484 }
1090 1485
1091 $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");
1092 $table->add (1, 4, new CFPlus::UI::Entry 1487 $table->add_at (1, 4, new CFPlus::UI::Entry
1093 text => $CFG->{profile}{default}{user}, 1488 text => $CFG->{profile}{default}{user},
1094 tooltip => "The name of your character on the server", 1489 tooltip => "The name of your character on the server",
1095 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1490 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1096 ); 1491 );
1097 1492
1098 $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");
1099 $table->add (1, 5, new CFPlus::UI::Entry 1494 $table->add_at (1, 5, new CFPlus::UI::Entry
1100 text => $CFG->{profile}{default}{password}, 1495 text => $CFG->{profile}{default}{password},
1101 hidden => 1, 1496 hidden => 1,
1102 tooltip => "The password for your character", 1497 tooltip => "The password for your character",
1103 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1498 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1104 ); 1499 );
1105 1500
1106 $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");
1107 $table->add (1, 7, new CFPlus::UI::Slider 1502 $table->add_at (1, 7, new CFPlus::UI::Slider
1108 force_w => 100, 1503 force_w => 100,
1109 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1504 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1110 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. "
1111 . "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, "
1112 . "but you also increase bandwidth requirements and latency. " 1507 . "but you also increase bandwidth requirements and latency. "
1113 . "This option is only used once at log-in.", 1508 . "This option is only used once at log-in.",
1114 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 },
1115 ); 1510 );
1116 1511
1117 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1118 $table->add (1, 8, new CFPlus::UI::CheckBox
1119 state => $CFG->{face_prefetch},
1120 tooltip => "<b>Background Image Prefetch</b>\n\n"
1121 . "If enabled, the client automatically pre-fetches images from the server. "
1122 . "This might increase or create lag, but increases the chances "
1123 . "of faces being ready for display when you encounter them. "
1124 . "It also uses up server bandwidth on every connect, "
1125 . "so only set it if you really need to prefetch images. "
1126 . "This option can be set and unset any time.",
1127 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1128 );
1129
1130 $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");
1131 $table->add (1, 9, new CFPlus::UI::Entry 1513 $table->add_at (1, 8, new CFPlus::UI::Entry
1132 text => $CFG->{output_rate}, 1514 text => $CFG->{output_rate},
1133 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 "
1134 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1516 . "when sending data. When 0 or unset, the server "
1135 . "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.",
1136 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1519 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1137 ); 1520 );
1138 1521
1139 $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");
1140 $table->add (1, 10, new CFPlus::UI::Entry 1523 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_count}, 1524 text => $CFG->{output_count},
1142 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.",
1143 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1526 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1144 ); 1527 );
1145 1528
1146 $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");
1147 $table->add (1, 11, new CFPlus::UI::Entry 1530 $table->add_at (1, 10, new CFPlus::UI::Entry
1148 text => $CFG->{output_sync}, 1531 text => $CFG->{output_sync},
1149 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.",
1150 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1533 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1151 ); 1534 );
1152 1535
1153 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1536 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1154 expand => 1, 1537 expand => 1,
1155 align => 0, 1538 align => 0,
1156 text => "Login", 1539 text => "Login",
1157 on_activate => sub { 1540 on_activate => sub {
1158 $CONN ? stop_game 1541 $CONN ? stop_game
1159 : start_game; 1542 : start_game;
1160 0 1543 1
1161 }, 1544 },
1162 ); 1545 );
1163 1546
1164 $vbox->add (new CFPlus::UI::FancyFrame 1547 $vbox->add (new CFPlus::UI::FancyFrame
1165 label => "Server Info", 1548 label => "Server Info",
1172sub client_setup { 1555sub client_setup {
1173 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];
1174 1557
1175 my $row = 0; 1558 my $row = 0;
1176 1559
1177 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1178 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1179 text => $CFG->{say_command},
1180 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. "
1181 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1182 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1183 on_changed => sub {
1184 my ($self, $value) = @_;
1185 $CFG->{say_command} = $value;
1186 0
1187 }
1188 );
1189
1190 $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");
1191 $table->add (1, $row++, new CFPlus::UI::CheckBox 1561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1192 state => $CFG->{show_tips}, 1562 state => $CFG->{show_tips},
1193 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?",
1194 on_changed => sub { 1564 on_changed => sub {
1195 my ($self, $value) = @_; 1565 my ($self, $value) = @_;
1196 $CFG->{show_tips} = $value; 1566 $CFG->{show_tips} = $value;
1197 0 1567 0
1198 } 1568 }
1199 ); 1569 );
1200 1570
1201 $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");
1202 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1572 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1203 text => $CFG->{logview_max_par}, 1573 text => $CFG->{logview_max_par},
1204 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 "
1205 . "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 "
1206 . "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.",
1207 on_changed => sub { 1577 on_changed => sub {
1208 my ($self, $value) = @_; 1578 my ($self, $value) = @_;
1209 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1579 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1210 0 1580 0
1211 }, 1581 },
1212 ); 1582 );
1213 1583
1214 $table 1584 $table
1215} 1585}
1216 1586
1217sub message_window {
1218 my $window = new CFPlus::UI::Toplevel
1219 name => "message_window",
1220 title => "Messages",
1221 border_bg => [1, 1, 1, 1],
1222 x => "max",
1223 y => 0,
1224 force_w => $::WIDTH * 0.4,
1225 force_h => $::HEIGHT * 0.5,
1226 child => (my $vbox = new CFPlus::UI::VBox),
1227 has_close_button => 1;
1228
1229 $vbox->add ($LOGVIEW);
1230
1231 $vbox->add (my $input = new CFPlus::UI::Entry
1232 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1233 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1234 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1235 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1236 on_focus_in => sub {
1237 my ($input, $prev_focus) = @_;
1238
1239 delete $input->{refocus_map};
1240
1241 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1242 $input->{refocus_map} = 1;
1243 }
1244 delete $input->{auto_activated};
1245
1246 0
1247 },
1248 on_activate => sub {
1249 my ($input, $text) = @_;
1250 $input->set_text ('');
1251
1252 if ($text =~ /^\/(.*)/) {
1253 $::CONN->user_send ($1);
1254 } else {
1255 my $say_cmd = $::CFG->{say_command} || 'say';
1256 $::CONN->user_send ("$say_cmd $text");
1257 }
1258 if ($input->{refocus_map}) {
1259 delete $input->{refocus_map};
1260 $MAPWIDGET->focus_in
1261 }
1262
1263 0
1264 },
1265 on_escape => sub {
1266 $MAPWIDGET->grab_focus;
1267
1268 0
1269 },
1270 );
1271
1272 $CONSOLE = {
1273 window => $window,
1274 input => $input,
1275 };
1276
1277 $window
1278}
1279
1280sub autopickup_setup { 1587sub autopickup_setup {
1588 my $r = new CFPlus::UI::ScrolledWindow (
1589 expand => 1,
1590 scroll_y => 1
1591 );
1281 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 );
1282 1596
1283 for ( 1597 for (
1284 ["General", 0, 0, 1598 ["General", 0, 0,
1285 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1599 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1286 ["Inhibit autopickup" => PICKUP_INHIBIT], 1600 ["Inhibit autopickup" => PICKUP_INHIBIT],
1321 ], 1635 ],
1322 ["Weight/Value ratio", 2, 17] 1636 ["Weight/Value ratio", 2, 17]
1323 ) 1637 )
1324 { 1638 {
1325 my ($title, $x, $y, @bits) = @$_; 1639 my ($title, $x, $y, @bits) = @$_;
1326 $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]);
1327 1641
1328 for (@bits) { 1642 for (@bits) {
1329 ++$y; 1643 ++$y;
1330 1644
1331 my $mask = $_->[1]; 1645 my $mask = $_->[1];
1332 $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);
1333 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1647 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1334 state => $::CFG->{pickup} & $mask, 1648 state => $::CFG->{pickup} & $mask,
1335 on_changed => sub { 1649 on_changed => sub {
1336 my ($box, $value) = @_; 1650 my ($box, $value) = @_;
1337 1651
1338 if ($value) { 1652 if ($value) {
1349 1663
1350 ${$_->[2]} = $checkbox if $_->[2]; 1664 ${$_->[2]} = $checkbox if $_->[2];
1351 } 1665 }
1352 } 1666 }
1353 1667
1354 $table->add (2, 18, new CFPlus::UI::ValSlider 1668 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1355 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1669 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1356 template => ">= 99", 1670 template => ">= 99",
1357 to_value => sub { ">= " . 5 * $_[0] }, 1671 to_value => sub { ">= " . 5 * $_[0] },
1358 on_changed => sub { 1672 on_changed => sub {
1359 my ($slider, $value) = @_; 1673 my ($slider, $value) = @_;
1362 $::CFG->{pickup} |= int $value 1676 $::CFG->{pickup} |= int $value
1363 if $value; 1677 if $value;
1364 1; 1678 1;
1365 }); 1679 });
1366 1680
1367 $table->add (3, 18, new CFPlus::UI::Button 1681 $table->add_at (3, 18, new CFPlus::UI::Button
1368 text => "set", 1682 text => "set",
1369 on_activate => sub { 1683 on_activate => sub {
1370 $::CONN->send_command ("pickup $::CFG->{pickup}") 1684 $::CONN->send_command ("pickup $::CFG->{pickup}")
1371 if defined $::CONN; 1685 if defined $::CONN;
1372 0 1686 0
1373 }); 1687 });
1374 1688
1375 $table 1689 $r
1376} 1690}
1377 1691
1378my %SORT_ORDER = ( 1692my %SORT_ORDER = (
1379 type => undef, 1693 type => undef,
1380 mtime => sub { 1694 mtime => sub {
1424 $sw1->add ($INV = new CFPlus::UI::Inventory); 1738 $sw1->add ($INV = new CFPlus::UI::Inventory);
1425 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1739 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1426 1740
1427 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1741 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1428 1742
1429 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1743 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1430 1744
1431 $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);
1432 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1746 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1433 1747
1434 # XXX: Call after $INVR = ... because set_opencont sets the items 1748 # XXX: Call after $INVR = ... because set_opencont sets the items
1435 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1749 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1436 1750
1437 $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;
1438} 1792}
1439 1793
1440sub toggle_player_page { 1794sub toggle_player_page {
1441 my ($widget) = @_; 1795 my ($widget) = @_;
1442 1796
1461 1815
1462 my $ntb = 1816 my $ntb =
1463 $PL_NOTEBOOK = 1817 $PL_NOTEBOOK =
1464 new CFPlus::UI::Notebook expand => 1; 1818 new CFPlus::UI::Notebook expand => 1;
1465 1819
1466 $ntb->add ( 1820 $ntb->add_tab (
1467 "Statistics (F2)" => $STATS_PAGE = stats_window, 1821 "Statistics (F2)" => $STATS_PAGE = stats_window,
1468 "Shows statistics, where all your Stats and Resistances are shown." 1822 "Shows statistics, where all your Stats and Resistances are shown."
1469 ); 1823 );
1470 $ntb->add ( 1824 $ntb->add_tab (
1471 "Skills (F3)" => $SKILL_PAGE = skill_window, 1825 "Skills (F3)" => $SKILL_PAGE = skill_window,
1472 "Shows all your Skills." 1826 "Shows all your Skills."
1473 ); 1827 );
1474 1828
1475 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);
1476 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1830 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1477 $ntb->add ( 1831 $ntb->add_tab (
1478 "Spellbook (F4)" => $spellsw, 1832 "Spellbook (F4)" => $spellsw,
1479 "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."
1480 ); 1834 );
1481 $ntb->add ( 1835 $ntb->add_tab (
1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1836 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1483 "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 :). "
1484 . "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."
1485 ); 1839 );
1486 $ntb->add (Pickup => autopickup_setup, 1840 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 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.");
1488 1845
1489 $ntb->set_current_page ($INVENTORY_PAGE); 1846 $ntb->set_current_page ($INVENTORY_PAGE);
1490 1847
1491 $plwin->add ($ntb); 1848 $plwin->add ($ntb);
1492 $plwin 1849 $plwin
1646 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2003 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1647 ); 2004 );
1648 $hb->add (new CFPlus::UI::Button 2005 $hb->add (new CFPlus::UI::Button
1649 text => "Quit anyway", 2006 text => "Quit anyway",
1650 expand => 1, 2007 expand => 1,
1651 on_activate => sub { exit }, 2008 on_activate => sub { Event::unloop_all },
1652 ); 2009 );
1653 } 2010 }
1654 2011
1655 $QUIT_DIALOG->show; 2012 $QUIT_DIALOG->show;
1656 $QUIT_DIALOG->grab_focus; 2013 $QUIT_DIALOG->grab_focus;
1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2046 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1690 $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]);
1691 2048
1692 $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]);
1693 2050
1694 $table->add (0, 0, new CFPlus::UI::Button 2051 $table->add_at (0, 0, new CFPlus::UI::Button
1695 text => "Close", 2052 text => "Close",
1696 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>.",
1697 on_activate => $close, 2054 on_activate => $close,
1698 ); 2055 );
1699 2056
1700 $table->add (2, 0, new CFPlus::UI::Button 2057 $table->add_at (2, 0, new CFPlus::UI::Button
1701 text => "Next", 2058 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.", 2059 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub { 2060 on_activate => sub {
1704 $close->(); 2061 $close->();
1705 &show_tip_of_the_day; 2062 &show_tip_of_the_day;
1714 CFPlus::SDL_Init 2071 CFPlus::SDL_Init
1715 and die "SDL::Init failed!\n"; 2072 and die "SDL::Init failed!\n";
1716} 2073}
1717 2074
1718sub video_init { 2075sub video_init {
1719 sdl_init;
1720
1721 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2076 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1722 2077
1723 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2078 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1724 2079
1725 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2080 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1726 $FULLSCREEN = $CFG->{fullscreen}; 2081 $FULLSCREEN = $CFG->{fullscreen};
1727 $FAST = $CFG->{fast}; 2082 $FAST = $CFG->{fast};
1728 2083
1729 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 2084 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1730 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2085 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1731 2086
1732 $SDL_ACTIVE = 1; 2087 $SDL_ACTIVE = 1;
1733 $LAST_REFRESH = time - 0.01; 2088 $LAST_REFRESH = time - 0.01;
1734 2089
1735 CFPlus::OpenGL::init; 2090 CFPlus::OpenGL::init;
2091 CFPlus::Macro::init;
1736 2092
1737 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2093 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1738 2094
1739 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2095 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1740 2096
1741 ############################################################################# 2097 #############################################################################
1742 2098
1743 if ($DEBUG_STATUS) { 2099 if ($DEBUG_STATUS) {
1744 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2100 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1745 } else { 2101 } else {
1746 # 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 });
1747 2115
1748 $DEBUG_STATUS = new CFPlus::UI::Label 2116 $DEBUG_STATUS = new CFPlus::UI::Label
1749 padding => 0, 2117 padding => 0,
1750 z => 100, 2118 z => 100,
1751 force_x => "max", 2119 force_x => "max",
1776 2144
1777 $MAPWIDGET = new CFPlus::MapWidget; 2145 $MAPWIDGET = new CFPlus::MapWidget;
1778 $MAPWIDGET->connect (activate_console => sub { 2146 $MAPWIDGET->connect (activate_console => sub {
1779 my ($mapwidget, $preset) = @_; 2147 my ($mapwidget, $preset) = @_;
1780 2148
1781 if ($CONSOLE) { 2149 $MESSAGE_WINDOW->activate_console ($preset)
1782 $CONSOLE->{input}->{auto_activated} = 1; 2150 if $MESSAGE_WINDOW;
1783 $CONSOLE->{input}->grab_focus;
1784
1785 if ($preset && $CONSOLE->{input}->get_text eq '') {
1786 $CONSOLE->{input}->set_text ($preset);
1787 }
1788 }
1789 }); 2151 });
1790 $MAPWIDGET->show; 2152 $MAPWIDGET->show;
1791 $MAPWIDGET->grab_focus; 2153 $MAPWIDGET->grab_focus;
1792 2154
1793 $LOGVIEW = new CFPlus::UI::TextScroller 2155 $COMPLETER = new CFPlus::MapWidget::Command::
1794 expand => 1, 2156 command => { },
1795 font => $FONT_FIXED, 2157 tooltip => "#completer_help",
1796 fontsize => $::CFG->{log_fontsize},
1797 indent => -4,
1798 can_hover => 1,
1799 can_events => 1,
1800 max_par => $CFG->{logview_max_par},
1801 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1802 ; 2158 ;
1803 2159
1804 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2160 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1805 title => "Setup", 2161 title => "Setup",
1806 name => "setup_dialog", 2162 name => "setup_dialog",
1811 force_h => $::HEIGHT * 0.6, 2167 force_h => $::HEIGHT * 0.6,
1812 has_close_button => 1, 2168 has_close_button => 1,
1813 ; 2169 ;
1814 2170
1815 $METASERVER = metaserver_dialog; 2171 $METASERVER = metaserver_dialog;
2172 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1816 2173
1817 $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,
1818 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2175 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1819 2176
1820 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2177 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1821 "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.");
1822 $SETUP_NOTEBOOK->add (Client => client_setup, 2179 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1823 "Configure various client-specific settings."); 2180 "Configure various client-specific settings.");
1824 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2181 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1825 "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.");
1826 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2183 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1827 "Configure the use of audio, sound effects and background music."); 2184 "Configure the use of audio, sound effects and background music.");
1828 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2185 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1829 "Lets you define, edit and delete key bindings." 2186 "Lets you define, edit and delete key bindings."
1830 . "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 "
1831 . "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 "
1832 . "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. "
1833 . "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 "
1834 . "binding editor closes"); 2191 . "binding editor closes");
1835 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2192 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1836 "Some debuggin' options. Do not ask."); 2193 "Some debuggin' options. Do not ask.");
1837 2194
1838 $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
1839 2196
1840 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2197 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1841 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.");
1842 2199
1843 $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,
1844 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.");
1845 2202
1846 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
1847 2204
1848 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2205 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1868 tooltip => "Terminates the program", 2225 tooltip => "Terminates the program",
1869 on_activate => sub { 2226 on_activate => sub {
1870 if ($CONN) { 2227 if ($CONN) {
1871 open_quit_dialog; 2228 open_quit_dialog;
1872 } else { 2229 } else {
1873 exit; 2230 Event::unloop_all;
1874 } 2231 }
1875 0 2232 0
1876 }, 2233 },
1877 ); 2234 );
1878 2235
1879 $BUTTONBAR->show; 2236 $BUTTONBAR->show;
1880 $SETUP_DIALOG->show; 2237 $SETUP_DIALOG->show;
2238 $MESSAGE_WINDOW->show;
1881 } 2239 }
1882 2240
1883 $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]);
1884}
1885
1886sub setup_build_button {
1887 my ($enabled) = @_;
1888 if ($enabled) {
1889 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1890 $BUILD_BUTTON ||= new CFPlus::UI::Button
1891 text => "Build",
1892 tooltip => "Opens the ingame builder",
1893 on_activate => sub {
1894 if ($CONN) {
1895 $CONN->send_ext_req (builder_player_items => sub {
1896 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1897 });
1898 }
1899 0
1900 };
1901 $BUTTONBAR->add ($BUILD_BUTTON);
1902 } else {
1903 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1904 }
1905}
1906
1907sub open_ingame_editor {
1908 my ($msg) = @_;
1909
1910 my $win = new CFPlus::UI::Toplevel
1911 x => 0,
1912 y => 'center',
1913 z => 4,
1914 name => 'builder_window',
1915 force_w => int $WIDTH * 1/4,
1916 force_h => int $HEIGHT * 3/4,
1917 title => "In game builder",
1918 has_close_button => 1;
1919
1920 my $r = new CFPlus::UI::ScrolledWindow (
1921 expand => 1,
1922 scroll_y => 1
1923 );
1924 $r->add (my $vb = new CFPlus::UI::VBox);
1925 $win->add ($r);
1926
1927
1928 $vb->add (
1929 new CFPlus::UI::Button
1930 text => "Disable build mode",
1931 on_activate => sub { $::IN_BUILD_MODE = undef }
1932 );
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "ERASE",
1936 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1937 );
1938
1939 for my $itemarchname (
1940 sort {
1941 $msg->{items}->{$a}->{build_arch_name}
1942 cmp $msg->{items}->{$b}->{build_arch_name}
1943 } keys %{$msg->{items}}
1944 ) {
1945 my $info = $msg->{items}->{$itemarchname};
1946 $vb->add (
1947 new CFPlus::UI::Button text => $info->{build_arch_name},
1948 on_activate => sub {
1949 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1950
1951 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1952 build_mode_query_arch_info ();
1953 }
1954 }
1955 );
1956 }
1957
1958 $win->show;
1959}
1960
1961sub build_mode_query_arch_info {
1962 my ($iteminfo) = $::IN_BUILD_MODE;
1963 my $itemarchname = $iteminfo->{item};
1964 my $info = $iteminfo->{info};
1965
1966 my $dialog = new CFPlus::UI::Toplevel
1967 x => "center",
1968 y => "center",
1969 z => 50,
1970 force_w => int $WIDTH * 1/2,
1971 title => "Enter information for placement of '$itemarchname'",
1972 has_close_button => 1;
1973
1974 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1975
1976 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1977 my $row = 0;
1978 if ($info->{has_name}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1981 }
1982 if ($info->{has_text}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1985 }
1986 if ($info->{has_connection}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1988 $table->add (1, $row++,
1989 new CFPlus::UI::Entry
1990 expand => 1,
1991 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1992 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1993 );
1994 }
1995
1996 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1997 $hb->add (new CFPlus::UI::Button
1998 text => "Close",
1999 expand => 1,
2000 on_activate => sub { $dialog->hide; 0 },
2001 );
2002 $dialog->show;
2003} 2242}
2004 2243
2005sub video_shutdown { 2244sub video_shutdown {
2006 CFPlus::OpenGL::shutdown; 2245 CFPlus::OpenGL::shutdown;
2007 2246
2008 undef $SDL_ACTIVE; 2247 undef $SDL_ACTIVE;
2009} 2248}
2010 2249
2011sub audio_channel_finished {
2012 my ($channel) = @_;
2013
2014 #warn "channel $channel finished\n";#d#
2015}
2016
2017sub audio_music_set {
2018 my ($songs) = @_;
2019
2020 my $count = @$songs;
2021 my @meta;
2022
2023 for my $name (@$songs) {
2024 CFPlus::DB::get resmap => $name, sub {
2025 my ($data) = @_;
2026
2027 if ($data) {
2028 $data = JSON::XS->new->utf8->decode ($data);
2029 $data->{path} = CFPlus::DB::path_of $name;
2030 push @meta, $data;
2031 }
2032
2033 unless (--$count) {
2034 if (@meta) {
2035 @MUSIC_WANT = @meta;
2036 &audio_music_changed ();
2037 }
2038 }
2039 };
2040 }
2041}
2042
2043sub audio_music_changed {
2044 return unless $CFG->{bgm_enable};
2045
2046 # default MUSIC_WANT, undef/0 == MUSIC_DEFAULT
2047 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2048
2049 # if the currently playing song is acceptable, let it continue
2050 return if grep $MUSIC_PLAYING eq $_->{path}, @MUSIC_WANT;
2051
2052 if (defined $MUSIC_PLAYING) {
2053 warn "fade out";
2054 CFPlus::MixMusic::fade_out 2000;
2055 } else {
2056 warn "new music\n";
2057
2058 my $music = $MUSIC_WANT [rand @MUSIC_WANT];
2059
2060 $MUSIC_PLAYING = $music->{path};
2061
2062 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path};
2063 $MUSIC_PLAYER->play (0);
2064 }
2065}
2066
2067sub audio_music_finished {
2068 $MUSIC_PLAYING = undef;
2069 undef $MUSIC_PLAYER;
2070
2071 audio_music_changed;
2072}
2073
2074sub audio_init {
2075 if ($CFG->{audio_enable}) {
2076 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2077 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2078
2079 unless ($SDL_MIXER) {
2080 status "Unable to open sound device: there will be no sound";
2081 return;
2082 }
2083
2084 CFPlus::Mix_AllocateChannels 8;
2085 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2086
2087 audio_music_finished;
2088
2089 local $_;
2090 while (<$fh>) {
2091 next if /^\s*#/;
2092 next if /^\s*$/;
2093
2094 my ($file, $volume, $event) = split /\s+/, $_, 3;
2095
2096 push @SOUNDS, "$volume,$file";
2097
2098 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2099 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2100 $chunk->volume ($volume * 128 / 100);
2101 $chunk
2102 };
2103 }
2104 } else {
2105 status "unable to open sound config: $!";
2106 }
2107 }
2108}
2109
2110sub audio_shutdown {
2111 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2112 undef $SDL_MIXER;
2113 @SOUNDS = ();
2114 %AUDIO_CHUNKS = ();
2115}
2116
2117my %animate_object; 2250my %animate_object;
2118my $animate_timer; 2251my $animate_timer;
2119 2252
2120my $fps = 9; 2253my $fps = 9;
2121 2254
2122my %demo;#d#
2123
2124sub force_refresh { 2255sub force_refresh {
2256 if ($ENV{CFPLUS_DEBUG} & 4) {
2125 $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;
2126 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2258 debug sprintf "%3.2f", $fps;
2259 }
2127 2260
2128 $CFPlus::UI::ROOT->draw; 2261 $CFPlus::UI::ROOT->draw;
2129 2262 CFPlus::SDL_GL_SwapBuffers;
2130 $WANT_REFRESH = 0;
2131 $CAN_REFRESH = 0;
2132 $LAST_REFRESH = $NOW; 2263 $LAST_REFRESH = $NOW;
2133 2264 $WANT_REFRESH->stop;
2134 CFPlus::SDL_GL_SwapBuffers;
2135} 2265}
2136 2266
2267$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2268
2137my $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 {
2138 $NOW = time; 2270 $NOW = time;
2139 2271
2140 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2272 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2141 for CFPlus::SDL_PollEvent; 2273 for CFPlus::poll_events;
2142 2274
2143 if (%animate_object) { 2275 if (%animate_object) {
2144 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2276 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2145 $WANT_REFRESH++; 2277 $WANT_REFRESH->start;
2146 }
2147
2148 if ($WANT_REFRESH) {
2149 force_refresh;
2150 } else {
2151 $CAN_REFRESH = 1;
2152 } 2278 }
2153}); 2279});
2154 2280
2155sub animation_start { 2281sub animation_start {
2156 my ($widget) = @_; 2282 my ($widget) = @_;
2160sub animation_stop { 2286sub animation_stop {
2161 my ($widget) = @_; 2287 my ($widget) = @_;
2162 delete $animate_object{$widget}; 2288 delete $animate_object{$widget};
2163} 2289}
2164 2290
2165# check once/second for faces that need to be prefetched
2166# this should, of course, only run on demand, but
2167# SDL forces worse things on us....
2168
2169Event->timer (after => 1, interval => 0.25, cb => sub {
2170 $CONN->face_prefetch
2171 if $CONN;
2172});
2173
2174%SDL_CB = ( 2291%SDL_CB = (
2175 CFPlus::SDL_QUIT => sub { 2292 CFPlus::SDL_QUIT => sub {
2176 exit; 2293 Event::unloop_all;
2177 }, 2294 },
2178 CFPlus::SDL_VIDEORESIZE => sub { 2295 CFPlus::SDL_VIDEORESIZE => sub {
2179 }, 2296 },
2180 CFPlus::SDL_VIDEOEXPOSE => sub { 2297 CFPlus::SDL_VIDEOEXPOSE => sub {
2181 CFPlus::UI::full_refresh; 2298 CFPlus::UI::full_refresh;
2182 }, 2299 },
2183 CFPlus::SDL_ACTIVEEVENT => sub { 2300 CFPlus::SDL_ACTIVEEVENT => sub {
2184# not useful, as APPACTIVE include sonly iconified state, not unmapped 2301# not useful, as APPACTIVE include sonly iconified state, not unmapped
2185# 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#
2186# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2304# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2187# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2305# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2188# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2306# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2189 }, 2307 },
2190 CFPlus::SDL_KEYDOWN => sub { 2308 CFPlus::SDL_KEYDOWN => sub {
2219 CFPlus::DB::Server::run; 2337 CFPlus::DB::Server::run;
2220 2338
2221 CFPlus::UI::set_layout ($::CFG->{layout}); 2339 CFPlus::UI::set_layout ($::CFG->{layout});
2222 2340
2223 my %DEF_CFG = ( 2341 my %DEF_CFG = (
2224 sdl_mode => 0, 2342 sdl_mode => 0,
2225 width => 640,
2226 height => 480,
2227 fullscreen => 0, 2343 fullscreen => 0,
2228 fast => 0, 2344 fast => 0,
2345 force_opengl11 => undef,
2346 texture_compression => 1,
2229 map_scale => 1, 2347 map_scale => 1,
2230 fow_enable => 1, 2348 fow_enable => 1,
2231 fow_intensity => 0.45, 2349 fow_intensity => 0,
2232 fow_smooth => 0,
2233 map_smoothing => 1, 2350 map_smoothing => 1,
2234 gui_fontsize => 1, 2351 gui_fontsize => 1,
2235 log_fontsize => 0.7, 2352 log_fontsize => 0.7,
2236 gauge_fontsize => 1, 2353 gauge_fontsize => 1,
2237 gauge_size => 0.35, 2354 gauge_size => 0.35,
2238 stat_fontsize => 0.7, 2355 stat_fontsize => 0.7,
2239 mapsize => 100, 2356 mapsize => 100,
2240 say_command => 'chat',
2241 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,
2242 bgm_enable => 1, 2364 bgm_enable => 1,
2243 bgm_volume => 0.25, 2365 bgm_volume => 0.5,
2244 face_prefetch => 0,
2245 output_sync => 1, 2366 output_sync => 1,
2246 output_count => 1, 2367 output_count => 1,
2247 output_rate => "", 2368 output_rate => "",
2248 pickup => 0, 2369 pickup => 0,
2249 inv_sort => "mtime", 2370 inv_sort => "mtime",
2250 default => "profile", # default profile 2371 default => "profile", # default profile
2251 show_tips => 1, 2372 show_tips => 1,
2252 logview_max_par => 1000, 2373 logview_max_par => 1000,
2253 ); 2374 );
2254 2375
2255 while (my ($k, $v) = each %DEF_CFG) { 2376 while (my ($k, $v) = each %DEF_CFG) {
2256 $CFG->{$k} = $v unless exists $CFG->{$k}; 2377 $CFG->{$k} = $v unless exists $CFG->{$k};
2257 } 2378 }
2271 } 2392 }
2272 } 2393 }
2273 2394
2274 sdl_init; 2395 sdl_init;
2275 2396
2276 @SDL_MODES = reverse 2397 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2277 grep $_->[0] >= 640 && $_->[1] >= 480, 2398 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2278 CFPlus::SDL_ListModes;
2279
2280 @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;
2281 2402
2282 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2403 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2283 2404
2284 { 2405 {
2285 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2406 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2314# } 2435# }
2315# my $t2 = Time::HiRes::time; 2436# my $t2 = Time::HiRes::time;
2316# warn $t2-$t1; 2437# warn $t2-$t1;
2317# } 2438# }
2318 2439
2319 $startup_done->();
2320
2321 video_init; 2440 video_init;
2322 audio_init; 2441 audio_init;
2323} 2442}
2324 2443
2325show_tip_of_the_day if $CFG->{show_tips}; 2444show_tip_of_the_day if $CFG->{show_tips};
2326 2445
2446Event->idle (cb => sub {
2447 $_[0]->w->cancel;
2448 $startup_done->();
2449});
2450
2327Event::loop; 2451Event::loop;
2452
2453#video_shutdown;
2454#audio_shutdown;
2328#CFPlus::SDL_Quit; 2455CFPlus::SDL_Quit;
2329#CFPlus::_exit 0;
2330
2331END {
2332 CFPlus::SDL_Quit;
2333 CFPlus::DB::Server::stop; 2456CFPlus::DB::Server::stop;
2334}
2335 2457
2336=head1 NAME 2458=head1 NAME
2337 2459
2338cfplus - A Crossfire+ and Crossfire game client 2460cfplus - A Crossfire TRT and Crossfire game client
2339 2461
2340=head1 SYNOPSIS 2462=head1 SYNOPSIS
2341 2463
2342Just run it - no commandline arguments are supported. 2464Just run it - no commandline arguments are supported.
2343 2465
2344=head1 USAGE 2466=head1 USAGE
2345 2467
2346cfplus 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
2347fullscreen and interactively. 2469be used in fullscreen mode and interactively.
2348 2470
2349=head1 DEBUGGING 2471=head1 DEBUGGING
2350 2472
2351 2473
2352CFPLUS_DEBUG - environment variable 2474CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines