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.161 by root, Thu Jul 5 06:57:03 2007 UTC vs.
Revision 1.228 by root, Mon Oct 8 16:10:14 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 @SOUNDS; # event => file mapping
165our %AUDIO_CHUNKS; # audio files
166
167our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
168our $STATUSBOX; 172our $STATUSBOX;
169our $DEBUG_STATUS; 173our $DEBUG_STATUS;
170 174
171our $INV; 175our $INV;
172our $INVR; 176our $INVR;
173our $INV_RIGHT_HB; 177our $INVR_HB;
174 178
175our $PICKUP_CFG; 179#############################################################################
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
179 180
180sub status { 181sub status {
181 $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]);
182} 183}
183 184
184sub debug { 185sub debug {
185 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
186} 187}
187 188
188sub 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($) {
189 my ($para) = @_; 218 my ($face) = @_;
190 219
191 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 220 $CFG->{effects_enable}
221 or return;
192 222
193 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 223 $AUDIO_PLAY{$face}
224 or return;
194 225
195 $LOGVIEW->add_paragraph ($para); 226 if (my $chunk = $AUDIO_CHUNK{$face}) {
196 $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 }
197} 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#############################################################################
198 449
199sub destroy_query_dialog { 450sub destroy_query_dialog {
200 (delete $_[0]{query_dialog})->destroy 451 (delete $_[0]{query_dialog})->destroy
201 if $_[0]{query_dialog}; 452 if $_[0]{query_dialog};
202} 453}
… …
266 ellipsise => 0, 517 ellipsise => 0,
267 markup => "\nOr use your keyboard and the text entry below:\n"; 518 markup => "\nOr use your keyboard and the text entry below:\n";
268 519
269 unshift @dialog, my $table = new CFPlus::UI::Table; 520 unshift @dialog, my $table = new CFPlus::UI::Table;
270 521
271 $table->add (0, 0, new CFPlus::UI::Button 522 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Next Race", 523 text => "Next Race",
273 on_activate => sub { 524 on_activate => sub {
274 $conn->send ("reply n"); 525 $conn->send ("reply n");
275 destroy_query_dialog $conn; 526 destroy_query_dialog $conn;
276 0 527 0
277 }, 528 },
278 ); 529 );
279 $table->add (2, 0, new CFPlus::UI::Button 530 $table->add_at (2, 0, new CFPlus::UI::Button
280 text => "Accept", 531 text => "Accept",
281 on_activate => sub { 532 on_activate => sub {
282 $conn->send ("reply d"); 533 $conn->send ("reply d");
283 destroy_query_dialog $conn; 534 destroy_query_dialog $conn;
284 0 535 0
… …
319 $conn->send ("reply $stat"); 570 $conn->send ("reply $stat");
320 destroy_query_dialog $conn; 571 destroy_query_dialog $conn;
321 return; 572 return;
322 } 573 }
323 574
324 $STATS_PAGE->show;
325 $MESSAGE_WINDOW->hide;
326
327 unshift @dialog, new CFPlus::UI::Label 575 unshift @dialog, new CFPlus::UI::Label
328 max_w => $::WIDTH * 0.4, 576 max_w => $::WIDTH * 0.4,
329 ellipsise => 0, 577 ellipsise => 0,
330 markup => "\nOr use your keyboard and the text entry below:\n"; 578 markup => "\nOr use your keyboard and the text entry below:\n";
331 579
332 unshift @dialog, my $table = new CFPlus::UI::Table; 580 unshift @dialog, my $table = new CFPlus::UI::Table;
333 581
334 # left: re-roll 582 # left: re-roll
335 $table->add (0, 0, new CFPlus::UI::Button 583 $table->add_at (0, 0, new CFPlus::UI::Button
336 text => "Roll Again", 584 text => "Roll Again",
337 on_activate => sub { 585 on_activate => sub {
338 $conn->send ("reply y"); 586 $conn->send ("reply y");
339 destroy_query_dialog $conn; 587 destroy_query_dialog $conn;
340 0 588 0
… …
354 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 602 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
355 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 603 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
356 ], 604 ],
357 ), 1 .. 2; 605 ), 1 .. 2;
358 606
359 $table->add (2, 0, new CFPlus::UI::Button 607 $table->add_at (2, 0, new CFPlus::UI::Button
360 text => "Swap Stats", 608 text => "Swap Stats",
361 on_activate => sub { 609 on_activate => sub {
362 $conn->{stat_change_with} = $sw2->{value}; 610 $conn->{stat_change_with} = $sw2->{value};
363 $conn->send ("reply $sw1->{value}"); 611 $conn->send ("reply $sw1->{value}");
364 destroy_query_dialog $conn; 612 destroy_query_dialog $conn;
365 0 613 0
366 }, 614 },
367 ); 615 );
368 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 616 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
369 617
370 # right: accept 618 # right: accept
371 $table->add (4, 0, new CFPlus::UI::Button 619 $table->add_at (4, 0, new CFPlus::UI::Button
372 text => "Accept", 620 text => "Accept",
373 on_activate => sub { 621 on_activate => sub {
374 $conn->send ("reply n"); 622 $conn->send ("reply n");
375 $STATS_PAGE->hide; 623 $STATS_PAGE->hide;
376 destroy_query_dialog $conn; 624 destroy_query_dialog $conn;
… …
445 693
446 my ($host, $port) = split /:/, $PROFILE->{host}; 694 my ($host, $port) = split /:/, $PROFILE->{host};
447 695
448 $MAP = new CFPlus::Map; 696 $MAP = new CFPlus::Map;
449 697
450 warn "connecting...\n";#d#
451 $CONN = eval { 698 $CONN = eval {
452 new CFPlus::Protocol 699 new CFPlus::Protocol
453 host => $host, 700 host => $host,
454 port => $port || 13327, 701 port => $port || 13327,
455 user => $PROFILE->{user}, 702 user => $PROFILE->{user},
… …
458 maph => $mapsize, 705 maph => $mapsize,
459 706
460 client => "cfplus $CFPlus::VERSION $] $^O", 707 client => "cfplus $CFPlus::VERSION $] $^O",
461 708
462 map_widget => $MAPWIDGET, 709 map_widget => $MAPWIDGET,
463 logview => $LOGVIEW,
464 statusbox => $STATUSBOX, 710 statusbox => $STATUSBOX,
465 map => $MAP, 711 map => $MAP,
466 mapmap => $MAPMAP, 712 mapmap => $MAPMAP,
467 query => \&server_query, 713 query => \&server_query,
468 714
469 setup_req => { 715 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1, 716 smoothing => $CFG->{map_smoothing}*1,
471 }, 717 },
472
473 sound_play => sub {
474 my ($x, $y, $soundnum, $type) = @_;
475
476 $SDL_MIXER
477 or return;
478
479 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
480 or return;
481
482 $chunk->play;
483 },
484 }; 718 };
485 warn "connected<$CONN,$@>\n";#d#
486 719
487 if ($CONN) { 720 if ($CONN) {
488 CFPlus::lowdelay fileno $CONN->{fh}; 721 CFPlus::lowdelay fileno $CONN->{fh};
489 722
490 status "login successful"; 723 status "login successful";
… …
500 $SETUP_DIALOG->show; 733 $SETUP_DIALOG->show;
501 $PL_WINDOW->hide; 734 $PL_WINDOW->hide;
502 $SPELL_LIST->clear_spells; 735 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 736 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
504 737
738 &audio_music_set_ambient ([]);
739
505 return unless $CONN; 740 return unless $CONN;
506 741
507 status "connection closed"; 742 status "connection closed";
508 743
509 destroy_query_dialog $CONN; 744 destroy_query_dialog $CONN;
… …
518 753
519 $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]);
520 755
521 my $row = 0; 756 my $row = 0;
522 757
523 $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");
524 $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,
525 can_events => 1, 760 can_events => 1,
526 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 761 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
527 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
528 $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");
529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 768 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
530 769
770 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
531 $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],
532 $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);
533 776
534 $mode_slider->connect (changed => sub { 777 $mode_slider->connect (changed => sub {
535 my ($self, $value) = @_; 778 my ($self, $value) = @_;
536 779
537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 780 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 781 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
539 }); 782 });
540 $mode_slider->emit (changed => $mode_slider->{range}[0]); 783 $mode_slider->emit (changed => $mode_slider->{range}[0]);
541 784
542 $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");
543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 786 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
544 state => $CFG->{fullscreen}, 787 state => $CFG->{fullscreen},
545 tooltip => "Bring the client into fullscreen mode.", 788 tooltip => "Bring the client into fullscreen mode.",
546 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 789 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
547 ); 790 );
548 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
549 $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");
550 $table->add (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
551 state => $CFG->{fast}, 816 state => $CFG->{fast},
552 tooltip => "Lower the visual quality considerably to speed up rendering.", 817 tooltip => "Lower the visual quality considerably to speed up rendering.",
553 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
554 ); 819 );
555 820
556 $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");
557 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
558 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 823 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
559 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.",
560 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 825 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
561 ); 826 );
562 827
563 $table->add (1, $row++, new CFPlus::UI::Button 828 $table->add_at (1, $row++, new CFPlus::UI::Button
564 expand => 1, align => 0, text => "Apply", 829 expand => 1, align => 0, text => "Apply",
565 tooltip => "Apply the video settings above.", 830 tooltip => "Apply the video settings above.",
566 on_activate => sub { 831 on_activate => sub {
567 video_shutdown (); 832 video_shutdown ();
568 video_init (); 833 video_init ();
569 0 834 0
570 } 835 }
571 ); 836 );
572 837
573 $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");
574 $table->add (1, $row++, new CFPlus::UI::Slider 839 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 840 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 841 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
577 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 }
578 ); 843 );
579 844
580 $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");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{map_smoothing}, 847 state => $CFG->{map_smoothing},
583 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. "
584 . "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. "
585 . "Changes take effect at next connection only.", 850 . "Changes take effect at next login only.",
586 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 851 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
587 ); 852 );
588 853
589 $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");
590 $table->add (1, $row++, new CFPlus::UI::CheckBox 855 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{fow_enable}, 856 state => $CFG->{fow_enable},
592 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.",
593 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 858 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
594 ); 859 );
595 860
596 $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");
597 $table->add (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
598 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 863 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
599 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.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 865 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
601 ); 866 );
602 867
603 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
604 $table->add (1, $row++, new CFPlus::UI::CheckBox
605 state => $CFG->{fow_smooth},
606 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
607 on_changed => sub {
608 my ($self, $value) = @_;
609 $CFG->{fow_smooth} = $value;
610 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
611 0
612 }
613 );
614
615 $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");
616 $table->add (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 870 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
618 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.",
619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 873 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
620 ); 874 );
621 875
622 $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");
623 $table->add (1, $row++, new CFPlus::UI::Slider 877 $table->add_at (1, $row++, new CFPlus::UI::Slider
624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 878 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
625 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.",
626 on_changed => sub { 880 on_changed => sub {
627 $CFG->{gauge_fontsize} = $_[1]; 881 $CFG->{gauge_fontsize} = $_[1];
628 &set_gauge_window_fontsize; 882 &set_gauge_window_fontsize;
629 0 883 0
630 } 884 }
631 ); 885 );
632 886
633 $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");
634 $table->add (1, $row++, new CFPlus::UI::Slider 888 $table->add_at (1, $row++, new CFPlus::UI::Slider
635 range => [$CFG->{gauge_size}, 0.2, 0.8], 889 range => [$CFG->{gauge_size}, 0.2, 0.8],
636 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.",
637 on_changed => sub { 891 on_changed => sub {
638 $CFG->{gauge_size} = $_[1]; 892 $CFG->{gauge_size} = $_[1];
639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 893 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
642 ); 896 );
643 897
644 $vbox 898 $vbox
645} 899}
646 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 map {
909 my $ms = sprintf "%dms", 1000 * $_ / $CFG->{audio_hw_frequency};
910 [$_, $ms, "$ms ($_ samples)"],
911 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
912 ]);
913
914 my $text = !$freq
915 ? "audio is off"
916 : "Frequency (Hz): $freq\n"
917 . "Channels: $chans";
918
919 $AUDIO_INFO->set_text ($text);
920}
921
647sub audio_setup { 922sub audio_setup {
648 my $vbox = new CFPlus::UI::VBox; 923 my $vbox = new CFPlus::UI::VBox;
649 924
650 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 925 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
651 926
652 my $row = 0; 927 my $row = 0;
653 928
654 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 929 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
655 $table->add (1, $row++, new CFPlus::UI::CheckBox 930 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
656 state => $CFG->{audio_enable}, 931 state => $CFG->{audio_enable},
657 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.", 932 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.",
658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 933 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
659 ); 934 );
935
660# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 936 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
661# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 937 $table->add_at (1, $row, new CFPlus::UI::CheckBox
938 expand => 1, state => $CFG->{effects_enable},
939 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
940 on_changed => sub {
662# $CFG->{effects_volume} = $_[1]; 941 $CFG->{effects_enable} = $_[1];
663# }); 942 $CONN->update_fx_want if $CONN;
943 1
944 }
945 );
946 $table->add_at (2, $row++, new CFPlus::UI::Slider
947 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
948 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
949 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
950 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
951 );
952
664 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 953 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
665 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
666 $hbox->add (new CFPlus::UI::CheckBox 954 $table->add_at (1, $row, new CFPlus::UI::CheckBox
667 expand => 1, state => $CFG->{bgm_enable}, 955 expand => 1, state => $CFG->{bgm_enable},
668 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 956 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
669 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 957 on_changed => sub {
958 $CFG->{bgm_enable} = $_[1];
959 $CONN->update_fx_want if $CONN;
960 audio_music_push;
961 1
962 }
670 ); 963 );
671 $hbox->add (new CFPlus::UI::Slider 964 $table->add_at (2, $row++, new CFPlus::UI::Slider
672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 965 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
673 tooltip => "The volume of the background music. Changes are instant.", 966 tooltip => "The volume of the background music. Changes are instant.",
674 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 967 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
675 ); 968 );
676 969
970 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
971 $table->add_at (1, $row++, new CFPlus::UI::Selector
972 c_colspan => 2, expand => 1,
973 value => $CFG->{audio_hw_frequency},
974 options => [
975 [11025, "11 kHz" , "11kHz (low quality)"],
976 [22050, "22 kHz" , "22kHz (reduced quality)"],
977 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
978 [48000, "48 kHz" , "48kHz (studio quality)"],
979 ],
980 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
981 on_changed => sub {
982 $CFG->{audio_hw_frequency} = $_[1];
983 audio_tab_update;
984 1
985 }
986 );
987
988 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
989 $table->add_at (1, $row++, new CFPlus::UI::Selector
990 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_channels},
992 options => [
993 [1, "Mono" , "Mono (single channel, low quality)"],
994 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
995 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
996 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
997 ],
998 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
999 on_changed => sub {
1000 $CFG->{audio_hw_channels} = $_[1];
1001 audio_tab_update;
1002 1
1003 }
1004 );
1005
1006 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1007 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1008 c_colspan => 2, expand => 1,
1009 value => $CFG->{audio_hw_chunksize},
1010 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1011 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1012 on_changed => sub {
1013 $CFG->{audio_hw_chunksize} = $_[1]
1014 if $_[1];
1015 audio_tab_update;
1016 1
1017 }
1018 );
1019
1020 # should really be a slider
1021 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1022 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1023 c_colspan => 2, expand => 1,
1024 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1025 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1026 template => ">= 99",
1027 on_changed => sub {
1028 my ($slider, $value) = @_;
1029
1030 $CFG->{audio_mix_channels} = $value
1031 if $value;
1032 1;
1033 }
1034 );
1035
677 $table->add (1, $row++, new CFPlus::UI::Button 1036 $table->add_at (1, $row++, new CFPlus::UI::Button
678 expand => 1, align => 0, text => "Apply", 1037 c_colspan => 2, expand => 1, align => 0, text => "Apply",
679 tooltip => "Apply the audio settings", 1038 tooltip => "Apply the audio settings",
680 on_activate => sub { 1039 on_activate => sub {
681 audio_shutdown (); 1040 audio_shutdown ();
682 audio_init (); 1041 audio_init ();
683 0 1042 0
684 } 1043 }
685 ); 1044 );
1045
1046 $vbox->add (new CFPlus::UI::FancyFrame
1047 expand => 1,
1048 label => "Audio Info",
1049 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1050 );
1051
1052 audio_tab_update;
686 1053
687 $vbox 1054 $vbox
688} 1055}
689 1056
690sub set_gauge_window_fontsize { 1057sub set_gauge_window_fontsize {
… …
725 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1092 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
726 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1093 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
727 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1094 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
728 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1095 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
729 1096
730 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1097 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1098 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1099 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
731 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1100 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
732 1101
733 $GAUGES = { 1102 $GAUGES = {
1103 exp => $exp, prg => $prg, sklprg => $sklprg,
734 exp => $exp, win => $win, range => $rng, 1104 win => $win, range => $rng,
735 food => $fg, mana => $mg, hp => $hg, grace => $gg 1105 hp => $hg, mana => $mg, grace => $gg, food => $fg,
736 }; 1106 };
737 1107
738 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
739 1109
740 $win 1110 $win
741} 1111}
742 1112
743sub debug_setup { 1113sub debug_setup {
744 my $table = new CFPlus::UI::Table; 1114 my $table = new CFPlus::UI::Table;
745 1115
746 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1116 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
747 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1117 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
748 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1118 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
749 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1119 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
750 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1120 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
751 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1121 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
752 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1122 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
753 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1123 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
754 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1124 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
755 1125
756 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
757
758 for my $x (0..2) {
759 for my $y (0 .. 2) {
760 $table->add ($x + 3, $y,
761 new CFPlus::UI::Entry
762 text => $default_smooth[$x * 3 + $y],
763 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
764 );
765 }
766 }
767
768 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1126 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1127
1128 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1129 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1130 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1131 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1132 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1133 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1134
1135 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1136
1137 $c->add_items ({
1138 type => "line_loop",
1139 color => [0, 1, 0],
1140 width => 9,
1141 coord_mode => "abs",
1142 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1143 });
1144
1145 $c->add_items ({
1146 type => "lines",
1147 color => [1, 1, 0],
1148 width => 2,
1149 coord_mode => "rel",
1150 coord => [[0,0], [1,1], [1,0], [0,1]],
1151 });
1152
1153 $c->add_items ({
1154 type => "polygon",
1155 color => [0, 0.43, 0],
1156 width => 2,
1157 coord_mode => "rel",
1158 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1159 });
769 1160
770 $table 1161 $table
771} 1162}
772 1163
773sub stats_window { 1164sub stats_window {
… …
821 [2, 4, st_spd => "Spd", 10.54], 1212 [2, 4, st_spd => "Spd", 10.54],
822 [2, 5, st_wspd => "WSp", 10.54], 1213 [2, 5, st_wspd => "WSp", 10.54],
823 ) { 1214 ) {
824 my ($col, $row, $id, $label, $template) = @$_; 1215 my ($col, $row, $id, $label, $template) = @$_;
825 1216
826 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1217 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
827 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1218 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
828 align => +1, template => $template, tooltip => "#stat_$label"); 1219 align => +1, template => $template, tooltip => "#stat_$label");
829 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1220 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
830 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1221 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
831 align => -1, text => $label, tooltip => "#stat_$label"); 1222 align => -1, text => $label, tooltip => "#stat_$label");
832 } 1223 }
833 1224
834 $vb->add (new CFPlus::UI::FancyFrame 1225 $vb->add (new CFPlus::UI::FancyFrame
… …
875 cold => ["Cold", 1266 cold => ["Cold",
876 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1267 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
877 ghit => ["Ghost hit", 1268 ghit => ["Ghost hit",
878 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1269 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
879 ); 1270 );
1271
880 for (qw/slow holyw conf fire depl magic 1272 for (qw/slow holyw conf fire depl magic
881 drain acid pois para deat phys 1273 drain acid pois para deat phys
882 blind fear tund elec cold ghit/) 1274 blind fear tund elec cold ghit/)
883 { 1275 {
884 $tbl2->add ($col, $row, 1276 $tbl2->add_at ($col, $row,
885 $STATWIDS->{"res_$_"} = 1277 $STATWIDS->{"res_$_"} =
886 new CFPlus::UI::Label 1278 new CFPlus::UI::Label
887 font => $FONT_FIXED, 1279 font => $FONT_FIXED,
888 template => "-100%", 1280 template => "-100%",
889 align => +1, 1281 align => +1,
890 valign => 0, 1282 valign => 0,
891 can_events => 1, 1283 can_events => 1,
892 can_hover => 1, 1284 can_hover => 1,
893 tooltip => $resist_names{$_}->[1], 1285 tooltip => $resist_names{$_}->[1],
894 ); 1286 );
895 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1287 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
896 font => $FONT_FIXED, 1288 font => $FONT_FIXED,
897 can_hover => 1, 1289 can_hover => 1,
898 can_events => 1, 1290 can_events => 1,
899 path => "ui/resist/resist_$_.png", 1291 path => "ui/resist/resist_$_.png",
900 tooltip => $resist_names{$_}->[1], 1292 tooltip => $resist_names{$_}->[1],
901 ); 1293 );
902 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1294 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
903 text => $resist_names{$_}->[0], 1295 text => $resist_names{$_}->[0],
904 font => $FONT_FIXED, 1296 font => $FONT_FIXED,
905 can_hover => 1, 1297 can_hover => 1,
906 can_events => 1, 1298 can_events => 1,
907 tooltip => $resist_names{$_}->[1], 1299 tooltip => $resist_names{$_}->[1],
… …
919 $r 1311 $r
920} 1312}
921 1313
922sub skill_window { 1314sub skill_window {
923 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1315 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1316
924 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1317 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1318
925 $sw 1319 $sw
926} 1320}
927 1321
928sub formsep($) { 1322sub formsep($) {
929 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1323 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
940 return if $METASERVER_ATIME > time; 1334 return if $METASERVER_ATIME > time;
941 $METASERVER_ATIME = time + 60; 1335 $METASERVER_ATIME = time + 60;
942 1336
943 my $table = $METASERVER->{table}; 1337 my $table = $METASERVER->{table};
944 $table->clear; 1338 $table->clear;
945 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1339 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
946 1340
947 my $ok = 0; 1341 my $ok = 0;
948 1342
949 CFPlus::background { 1343 CFPlus::background {
950 my $ua = CFPlus::lwp_useragent; 1344 my $ua = CFPlus::lwp_useragent;
… …
961 "The time this server has been running without being restarted.", 1355 "The time this server has been running without being restarted.",
962 "The server software version - a '+' indicates a Crossfire+ server.", 1356 "The server software version - a '+' indicates a Crossfire+ server.",
963 "Short information about this server provided by its admins.", 1357 "Short information about this server provided by its admins.",
964 ); 1358 );
965 my @col = qw(#Users Host Uptime Version Description); 1359 my @col = qw(#Users Host Uptime Version Description);
966 $table->add ($_, 0, new CFPlus::UI::Label 1360 $table->add_at ($_, 0, new CFPlus::UI::Label
967 can_hover => 1, can_events => 1, 1361 can_hover => 1, can_events => 1,
968 align => 0, fg => [1, 1, 0], 1362 align => 0, fg => [1, 1, 0],
969 text => $col[$_], tooltip => $tip[$_]) 1363 text => $col[$_], tooltip => $tip[$_])
970 for 0 .. $#col; 1364 for 0 .. $#col;
971 1365
… …
993 1387
994 $m = [$users, $host, $uptime, $version, $desc]; 1388 $m = [$users, $host, $uptime, $version, $desc];
995 1389
996 $y++; 1390 $y++;
997 1391
998 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1392 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
999 (new CFPlus::UI::Button 1393 (new CFPlus::UI::Button
1000 text => "Use", 1394 text => "Use",
1001 tooltip => "Put this server into the <b>Host:Port</b> field", 1395 tooltip => "Put this server into the <b>Host:Port</b> field",
1002 on_activate => sub { 1396 on_activate => sub {
1003 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1397 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1006 }, 1400 },
1007 ), 1401 ),
1008 (new CFPlus::UI::Empty expand => 1), 1402 (new CFPlus::UI::Empty expand => 1),
1009 ]); 1403 ]);
1010 1404
1011 $table->add ($_, $y, new CFPlus::UI::Label 1405 $table->add_at ($_, $y, new CFPlus::UI::Label
1012 max_w => $::WIDTH * 0.4, 1406 max_w => $::WIDTH * 0.4,
1013 ellipsise => 0, 1407 ellipsise => 0,
1014 align => $align[$_], 1408 align => $align[$_],
1015 text => $m->[$_], 1409 text => $m->[$_],
1016 tooltip => $tip[$_], 1410 tooltip => $tip[$_],
… …
1057 1451
1058 $vbox->add (new CFPlus::UI::FancyFrame 1452 $vbox->add (new CFPlus::UI::FancyFrame
1059 label => "Connection Settings", 1453 label => "Connection Settings",
1060 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1454 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1061 ); 1455 );
1062 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1456 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1063 1457
1064 { 1458 {
1065 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1459 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1066 1460
1067 $vbox->add ( 1461 $vbox->add (
1068 $HOST_ENTRY = new CFPlus::UI::Entry 1462 $HOST_ENTRY = new CFPlus::UI::Entry
1069 expand => 1, 1463 expand => 1,
1070 text => $CFG->{profile}{default}{host}, 1464 text => $CFG->{profile}{default}{host},
1071 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1465 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1072 on_changed => sub { 1466 on_changed => sub {
1073 my ($self, $value) = @_; 1467 my ($self, $value) = @_;
1074 $CFG->{profile}{default}{host} = $value; 1468 $CFG->{profile}{default}{host} = $value;
1075 0 1469 1
1076 } 1470 }
1077 ); 1471 );
1078 1472
1079 $vbox->add (new CFPlus::UI::Button 1473 $vbox->add (new CFPlus::UI::Button
1080 expand => 1, 1474 expand => 1,
1081 text => "Server List", 1475 text => "Server List",
1082 other => $METASERVER, 1476 other => $METASERVER,
1083 tooltip => "Show a list of available crossfire servers", 1477 tooltip => "Show a list of available crossfire servers",
1084 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1478 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1085 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1479 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1086 ); 1480 );
1087 } 1481 }
1088 1482
1089 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1483 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1090 $table->add (1, 4, new CFPlus::UI::Entry 1484 $table->add_at (1, 4, new CFPlus::UI::Entry
1091 text => $CFG->{profile}{default}{user}, 1485 text => $CFG->{profile}{default}{user},
1092 tooltip => "The name of your character on the server", 1486 tooltip => "The name of your character on the server",
1093 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1094 ); 1488 );
1095 1489
1096 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1490 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1097 $table->add (1, 5, new CFPlus::UI::Entry 1491 $table->add_at (1, 5, new CFPlus::UI::Entry
1098 text => $CFG->{profile}{default}{password}, 1492 text => $CFG->{profile}{default}{password},
1099 hidden => 1, 1493 hidden => 1,
1100 tooltip => "The password for your character", 1494 tooltip => "The password for your character",
1101 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1495 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1102 ); 1496 );
1103 1497
1104 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1498 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1105 $table->add (1, 7, new CFPlus::UI::Slider 1499 $table->add_at (1, 7, new CFPlus::UI::Slider
1106 force_w => 100, 1500 force_w => 100,
1107 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1501 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1108 tooltip => "This is the size of the portion of the map update the server sends you. " 1502 tooltip => "This is the size of the portion of the map update the server sends you. "
1109 . "If you set this to a high value you will be able to see further, " 1503 . "If you set this to a high value you will be able to see further, "
1110 . "but you also increase bandwidth requirements and latency. " 1504 . "but you also increase bandwidth requirements and latency. "
1111 . "This option is only used once at log-in.", 1505 . "This option is only used once at log-in.",
1112 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1506 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1113 ); 1507 );
1114 1508
1115 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1116 $table->add (1, 8, new CFPlus::UI::CheckBox
1117 state => $CFG->{face_prefetch},
1118 tooltip => "<b>Background Image Prefetch</b>\n\n"
1119 . "If enabled, the client automatically pre-fetches images from the server. "
1120 . "This might increase or create lag, but increases the chances "
1121 . "of faces being ready for display when you encounter them. "
1122 . "It also uses up server bandwidth on every connect, "
1123 . "so only set it if you really need to prefetch images. "
1124 . "This option can be set and unset any time.",
1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1126 );
1127
1128 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1509 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1129 $table->add (1, 9, new CFPlus::UI::Entry 1510 $table->add_at (1, 8, new CFPlus::UI::Entry
1130 text => $CFG->{output_rate}, 1511 text => $CFG->{output_rate},
1131 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1512 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1132 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1513 . "when sending data. When 0 or unset, the server "
1133 . "default will be used, which is usually around 100kb/s.", 1514 . "default will be used, which is usually around 100kb/s. Most servers will "
1515 . "dynamically find an optimal rate, so adjust this only when necessary.",
1134 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1516 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1135 ); 1517 );
1136 1518
1137 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1519 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1138 $table->add (1, 10, new CFPlus::UI::Entry 1520 $table->add_at (1, 9, new CFPlus::UI::Entry
1139 text => $CFG->{output_count}, 1521 text => $CFG->{output_count},
1140 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1522 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1523 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1142 ); 1524 );
1143 1525
1144 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1526 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1145 $table->add (1, 11, new CFPlus::UI::Entry 1527 $table->add_at (1, 10, new CFPlus::UI::Entry
1146 text => $CFG->{output_sync}, 1528 text => $CFG->{output_sync},
1147 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1529 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1530 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1149 ); 1531 );
1150 1532
1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1533 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1152 expand => 1, 1534 expand => 1,
1153 align => 0, 1535 align => 0,
1154 text => "Login", 1536 text => "Login",
1155 on_activate => sub { 1537 on_activate => sub {
1156 $CONN ? stop_game 1538 $CONN ? stop_game
1157 : start_game; 1539 : start_game;
1158 0 1540 1
1159 }, 1541 },
1160 ); 1542 );
1161 1543
1162 $vbox->add (new CFPlus::UI::FancyFrame 1544 $vbox->add (new CFPlus::UI::FancyFrame
1163 label => "Server Info", 1545 label => "Server Info",
… …
1170sub client_setup { 1552sub client_setup {
1171 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1553 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1172 1554
1173 my $row = 0; 1555 my $row = 0;
1174 1556
1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1176 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1177 text => $CFG->{say_command},
1178 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1179 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1180 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1181 on_changed => sub {
1182 my ($self, $value) = @_;
1183 $CFG->{say_command} = $value;
1184 0
1185 }
1186 );
1187
1188 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1557 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1189 $table->add (1, $row++, new CFPlus::UI::CheckBox 1558 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1190 state => $CFG->{show_tips}, 1559 state => $CFG->{show_tips},
1191 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1560 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1192 on_changed => sub { 1561 on_changed => sub {
1193 my ($self, $value) = @_; 1562 my ($self, $value) = @_;
1194 $CFG->{show_tips} = $value; 1563 $CFG->{show_tips} = $value;
1195 0 1564 0
1196 } 1565 }
1197 ); 1566 );
1198 1567
1199 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1568 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1200 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1569 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1201 text => $CFG->{logview_max_par}, 1570 text => $CFG->{logview_max_par},
1202 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1571 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1203 . "sends more messages than this number, older messages get removed to save memory and " 1572 . "sends more messages than this number, older messages get removed to save memory and "
1204 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1573 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1205 on_changed => sub { 1574 on_changed => sub {
1206 my ($self, $value) = @_; 1575 my ($self, $value) = @_;
1207 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1576 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1208 0 1577 0
1209 }, 1578 },
1210 ); 1579 );
1211 1580
1212 $table 1581 $table
1213} 1582}
1214 1583
1215sub message_window {
1216 my $window = new CFPlus::UI::Toplevel
1217 name => "message_window",
1218 title => "Messages",
1219 border_bg => [1, 1, 1, 1],
1220 x => "max",
1221 y => 0,
1222 force_w => $::WIDTH * 0.4,
1223 force_h => $::HEIGHT * 0.5,
1224 child => (my $vbox = new CFPlus::UI::VBox),
1225 has_close_button => 1;
1226
1227 $vbox->add ($LOGVIEW);
1228
1229 $vbox->add (my $input = new CFPlus::UI::Entry
1230 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1231 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1232 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1233 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1234 on_focus_in => sub {
1235 my ($input, $prev_focus) = @_;
1236
1237 delete $input->{refocus_map};
1238
1239 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1240 $input->{refocus_map} = 1;
1241 }
1242 delete $input->{auto_activated};
1243
1244 0
1245 },
1246 on_activate => sub {
1247 my ($input, $text) = @_;
1248 $input->set_text ('');
1249
1250 if ($text =~ /^\/(.*)/) {
1251 $::CONN->user_send ($1);
1252 } else {
1253 my $say_cmd = $::CFG->{say_command} || 'say';
1254 $::CONN->user_send ("$say_cmd $text");
1255 }
1256 if ($input->{refocus_map}) {
1257 delete $input->{refocus_map};
1258 $MAPWIDGET->focus_in
1259 }
1260
1261 0
1262 },
1263 on_escape => sub {
1264 $MAPWIDGET->grab_focus;
1265
1266 0
1267 },
1268 );
1269
1270 $CONSOLE = {
1271 window => $window,
1272 input => $input,
1273 };
1274
1275 $window
1276}
1277
1278sub autopickup_setup { 1584sub autopickup_setup {
1585 my $r = new CFPlus::UI::ScrolledWindow (
1586 expand => 1,
1587 scroll_y => 1
1588 );
1279 my $table = new CFPlus::UI::Table; 1589 $r->add (my $table = new CFPlus::UI::Table
1590 row_expand => [0],
1591 col_expand => [0, 1, 0, 1],
1592 );
1280 1593
1281 for ( 1594 for (
1282 ["General", 0, 0, 1595 ["General", 0, 0,
1283 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1596 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1284 ["Inhibit autopickup" => PICKUP_INHIBIT], 1597 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1319 ], 1632 ],
1320 ["Weight/Value ratio", 2, 17] 1633 ["Weight/Value ratio", 2, 17]
1321 ) 1634 )
1322 { 1635 {
1323 my ($title, $x, $y, @bits) = @$_; 1636 my ($title, $x, $y, @bits) = @$_;
1324 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1637 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1325 1638
1326 for (@bits) { 1639 for (@bits) {
1327 ++$y; 1640 ++$y;
1328 1641
1329 my $mask = $_->[1]; 1642 my $mask = $_->[1];
1330 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1643 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1331 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1644 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1332 state => $::CFG->{pickup} & $mask, 1645 state => $::CFG->{pickup} & $mask,
1333 on_changed => sub { 1646 on_changed => sub {
1334 my ($box, $value) = @_; 1647 my ($box, $value) = @_;
1335 1648
1336 if ($value) { 1649 if ($value) {
… …
1347 1660
1348 ${$_->[2]} = $checkbox if $_->[2]; 1661 ${$_->[2]} = $checkbox if $_->[2];
1349 } 1662 }
1350 } 1663 }
1351 1664
1352 $table->add (2, 18, new CFPlus::UI::ValSlider 1665 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1353 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1666 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1354 template => ">= 99", 1667 template => ">= 99",
1355 to_value => sub { ">= " . 5 * $_[0] }, 1668 to_value => sub { ">= " . 5 * $_[0] },
1356 on_changed => sub { 1669 on_changed => sub {
1357 my ($slider, $value) = @_; 1670 my ($slider, $value) = @_;
… …
1360 $::CFG->{pickup} |= int $value 1673 $::CFG->{pickup} |= int $value
1361 if $value; 1674 if $value;
1362 1; 1675 1;
1363 }); 1676 });
1364 1677
1365 $table->add (3, 18, new CFPlus::UI::Button 1678 $table->add_at (3, 18, new CFPlus::UI::Button
1366 text => "set", 1679 text => "set",
1367 on_activate => sub { 1680 on_activate => sub {
1368 $::CONN->send_command ("pickup $::CFG->{pickup}") 1681 $::CONN->send_command ("pickup $::CFG->{pickup}")
1369 if defined $::CONN; 1682 if defined $::CONN;
1370 0 1683 0
1371 }); 1684 });
1372 1685
1373 $table 1686 $r
1374} 1687}
1375 1688
1376my %SORT_ORDER = ( 1689my %SORT_ORDER = (
1377 type => undef, 1690 type => undef,
1378 mtime => sub { 1691 mtime => sub {
… …
1422 $sw1->add ($INV = new CFPlus::UI::Inventory); 1735 $sw1->add ($INV = new CFPlus::UI::Inventory);
1423 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1736 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1424 1737
1425 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1738 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1426 1739
1427 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1740 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1428 1741
1429 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1742 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1430 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1743 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1431 1744
1432 # XXX: Call after $INVR = ... because set_opencont sets the items 1745 # XXX: Call after $INVR = ... because set_opencont sets the items
1433 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1746 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1434 1747
1435 $hb 1748 $hb
1749}
1750
1751sub media_window {
1752 my $vb = new CFPlus::UI::VBox;
1753
1754 $vb->add (new CFPlus::UI::FancyFrame
1755 label => "Currently playing music",
1756 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1757 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1758 );
1759
1760 $vb->add (new CFPlus::UI::FancyFrame
1761 label => "Other media used in this session",
1762 expand => 1,
1763 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1764 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1765 );
1766
1767 $vb
1768}
1769
1770sub add_license {
1771 my ($meta) = @_;
1772
1773 $meta = $meta->{data}
1774 or return;
1775
1776 $meta->{license} || $meta->{author} || $meta->{source}
1777 or return;
1778
1779 $LICENSE_WIDGET->add_paragraph ({
1780 fg => [1, 1, 1, 1],
1781 markup => "<small>"
1782 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1783 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1784 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1785 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1786 . "</small>",
1787 });
1788 $LICENSE_WIDGET->scroll_to_bottom;
1436} 1789}
1437 1790
1438sub toggle_player_page { 1791sub toggle_player_page {
1439 my ($widget) = @_; 1792 my ($widget) = @_;
1440 1793
… …
1459 1812
1460 my $ntb = 1813 my $ntb =
1461 $PL_NOTEBOOK = 1814 $PL_NOTEBOOK =
1462 new CFPlus::UI::Notebook expand => 1; 1815 new CFPlus::UI::Notebook expand => 1;
1463 1816
1464 $ntb->add ( 1817 $ntb->add_tab (
1465 "Statistics (F2)" => $STATS_PAGE = stats_window, 1818 "Statistics (F2)" => $STATS_PAGE = stats_window,
1466 "Shows statistics, where all your Stats and Resistances are shown." 1819 "Shows statistics, where all your Stats and Resistances are shown."
1467 ); 1820 );
1468 $ntb->add ( 1821 $ntb->add_tab (
1469 "Skills (F3)" => $SKILL_PAGE = skill_window, 1822 "Skills (F3)" => $SKILL_PAGE = skill_window,
1470 "Shows all your Skills." 1823 "Shows all your Skills."
1471 ); 1824 );
1472 1825
1473 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1826 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1474 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1827 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1475 $ntb->add ( 1828 $ntb->add_tab (
1476 "Spellbook (F4)" => $spellsw, 1829 "Spellbook (F4)" => $spellsw,
1477 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1830 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1478 ); 1831 );
1479 $ntb->add ( 1832 $ntb->add_tab (
1480 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1833 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1481 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1834 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1482 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1835 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1483 ); 1836 );
1484 $ntb->add (Pickup => autopickup_setup, 1837 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1485 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1838 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1839
1840 $ntb->add_tab (Media => media_window,
1841 "License, Author and Source info for media sent by the server.");
1486 1842
1487 $ntb->set_current_page ($INVENTORY_PAGE); 1843 $ntb->set_current_page ($INVENTORY_PAGE);
1488 1844
1489 $plwin->add ($ntb); 1845 $plwin->add ($ntb);
1490 $plwin 1846 $plwin
… …
1644 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2000 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1645 ); 2001 );
1646 $hb->add (new CFPlus::UI::Button 2002 $hb->add (new CFPlus::UI::Button
1647 text => "Quit anyway", 2003 text => "Quit anyway",
1648 expand => 1, 2004 expand => 1,
1649 on_activate => sub { exit }, 2005 on_activate => sub { Event::unloop_all },
1650 ); 2006 );
1651 } 2007 }
1652 2008
1653 $QUIT_DIALOG->show; 2009 $QUIT_DIALOG->show;
1654 $QUIT_DIALOG->grab_focus; 2010 $QUIT_DIALOG->grab_focus;
… …
1687 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2043 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1688 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 2044 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1689 2045
1690 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 2046 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1691 2047
1692 $table->add (0, 0, new CFPlus::UI::Button 2048 $table->add_at (0, 0, new CFPlus::UI::Button
1693 text => "Close", 2049 text => "Close",
1694 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>.", 2050 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>.",
1695 on_activate => $close, 2051 on_activate => $close,
1696 ); 2052 );
1697 2053
1698 $table->add (2, 0, new CFPlus::UI::Button 2054 $table->add_at (2, 0, new CFPlus::UI::Button
1699 text => "Next", 2055 text => "Next",
1700 tooltip => "Show the next <b>Tip of the day</b>.", 2056 tooltip => "Show the next <b>Tip of the day</b>.",
1701 on_activate => sub { 2057 on_activate => sub {
1702 $close->(); 2058 $close->();
1703 &show_tip_of_the_day; 2059 &show_tip_of_the_day;
… …
1712 CFPlus::SDL_Init 2068 CFPlus::SDL_Init
1713 and die "SDL::Init failed!\n"; 2069 and die "SDL::Init failed!\n";
1714} 2070}
1715 2071
1716sub video_init { 2072sub video_init {
1717 sdl_init;
1718
1719 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2073 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1720 2074
1721 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2075 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1722 2076
1723 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2077 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1724 $FULLSCREEN = $CFG->{fullscreen}; 2078 $FULLSCREEN = $CFG->{fullscreen};
1725 $FAST = $CFG->{fast}; 2079 $FAST = $CFG->{fast};
1726 2080
1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 2081 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2082 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1729 2083
1730 $SDL_ACTIVE = 1; 2084 $SDL_ACTIVE = 1;
1731 $LAST_REFRESH = time - 0.01; 2085 $LAST_REFRESH = time - 0.01;
1732 2086
1733 CFPlus::OpenGL::init; 2087 CFPlus::OpenGL::init;
2088 CFPlus::Macro::init;
1734 2089
1735 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2090 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1736 2091
1737 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2092 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1738 2093
1739 ############################################################################# 2094 #############################################################################
1740 2095
1741 if ($DEBUG_STATUS) { 2096 if ($DEBUG_STATUS) {
1742 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2097 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1743 } else { 2098 } else {
1744 # create the widgets 2099 # create/configure the widgets
2100
2101 $CFPlus::UI::ROOT->connect (key_down => sub {
2102 my (undef, $ev) = @_;
2103
2104 if (my @macros = CFPlus::Macro::find $ev) {
2105 CFPlus::Macro::execute $_ for @macros;
2106
2107 return 1;
2108 }
2109
2110 0
2111 });
1745 2112
1746 $DEBUG_STATUS = new CFPlus::UI::Label 2113 $DEBUG_STATUS = new CFPlus::UI::Label
1747 padding => 0, 2114 padding => 0,
1748 z => 100, 2115 z => 100,
1749 force_x => "max", 2116 force_x => "max",
… …
1774 2141
1775 $MAPWIDGET = new CFPlus::MapWidget; 2142 $MAPWIDGET = new CFPlus::MapWidget;
1776 $MAPWIDGET->connect (activate_console => sub { 2143 $MAPWIDGET->connect (activate_console => sub {
1777 my ($mapwidget, $preset) = @_; 2144 my ($mapwidget, $preset) = @_;
1778 2145
1779 if ($CONSOLE) { 2146 $MESSAGE_WINDOW->activate_console ($preset)
1780 $CONSOLE->{input}->{auto_activated} = 1; 2147 if $MESSAGE_WINDOW;
1781 $CONSOLE->{input}->grab_focus;
1782
1783 if ($preset && $CONSOLE->{input}->get_text eq '') {
1784 $CONSOLE->{input}->set_text ($preset);
1785 }
1786 }
1787 }); 2148 });
1788 $MAPWIDGET->show; 2149 $MAPWIDGET->show;
1789 $MAPWIDGET->grab_focus; 2150 $MAPWIDGET->grab_focus;
1790 2151
1791 $LOGVIEW = new CFPlus::UI::TextScroller 2152 $COMPLETER = new CFPlus::MapWidget::Command::
1792 expand => 1, 2153 command => { },
1793 font => $FONT_FIXED, 2154 tooltip => "#completer_help",
1794 fontsize => $::CFG->{log_fontsize},
1795 indent => -4,
1796 can_hover => 1,
1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1800 ; 2155 ;
1801 2156
1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2157 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1803 title => "Setup", 2158 title => "Setup",
1804 name => "setup_dialog", 2159 name => "setup_dialog",
… …
1809 force_h => $::HEIGHT * 0.6, 2164 force_h => $::HEIGHT * 0.6,
1810 has_close_button => 1, 2165 has_close_button => 1,
1811 ; 2166 ;
1812 2167
1813 $METASERVER = metaserver_dialog; 2168 $METASERVER = metaserver_dialog;
2169 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1814 2170
1815 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2171 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2172 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1817 2173
1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2174 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1819 "Configure the server to play on, your username, password and other server-related options."); 2175 "Configure the server to play on, your username, password and other server-related options.");
1820 $SETUP_NOTEBOOK->add (Client => client_setup, 2176 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1821 "Configure various client-specific settings."); 2177 "Configure various client-specific settings.");
1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2178 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1823 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2179 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1824 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2180 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1825 "Configure the use of audio, sound effects and background music."); 2181 "Configure the use of audio, sound effects and background music.");
1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2182 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1827 "Lets you define, edit and delete key bindings." 2183 "Lets you define, edit and delete key bindings."
1828 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2184 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1829 . "with nothing set and the recording started. After doing the actions you " 2185 . "with nothing set and the recording started. After doing the actions you "
1830 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2186 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1831 . "After pressing the combo the binding will be saved automatically and the " 2187 . "After pressing the combo the binding will be saved automatically and the "
1832 . "binding editor closes"); 2188 . "binding editor closes");
1833 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2189 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1834 "Some debuggin' options. Do not ask."); 2190 "Some debuggin' options. Do not ask.");
1835 2191
1836 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2192 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1837 2193
1838 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2194 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1839 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2195 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1840 2196
1841 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2197 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1842 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2198 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1843 2199
1844 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 2200 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
1845 2201
1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2202 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1866 tooltip => "Terminates the program", 2222 tooltip => "Terminates the program",
1867 on_activate => sub { 2223 on_activate => sub {
1868 if ($CONN) { 2224 if ($CONN) {
1869 open_quit_dialog; 2225 open_quit_dialog;
1870 } else { 2226 } else {
1871 exit; 2227 Event::unloop_all;
1872 } 2228 }
1873 0 2229 0
1874 }, 2230 },
1875 ); 2231 );
1876 2232
1877 $BUTTONBAR->show; 2233 $BUTTONBAR->show;
1878 $SETUP_DIALOG->show; 2234 $SETUP_DIALOG->show;
2235 $MESSAGE_WINDOW->show;
1879 } 2236 }
1880 2237
1881 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2238 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1882}
1883
1884sub setup_build_button {
1885 my ($enabled) = @_;
1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1889 text => "Build",
1890 tooltip => "Opens the ingame builder",
1891 on_activate => sub {
1892 if ($CONN) {
1893 $CONN->send_ext_req (builder_player_items => sub {
1894 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1895 });
1896 }
1897 0
1898 };
1899 $BUTTONBAR->add ($BUILD_BUTTON);
1900 } else {
1901 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1902 }
1903}
1904
1905sub open_ingame_editor {
1906 my ($msg) = @_;
1907
1908 my $win = new CFPlus::UI::Toplevel
1909 x => 0,
1910 y => 'center',
1911 z => 4,
1912 name => 'builder_window',
1913 force_w => int $WIDTH * 1/4,
1914 force_h => int $HEIGHT * 3/4,
1915 title => "In game builder",
1916 has_close_button => 1;
1917
1918 my $r = new CFPlus::UI::ScrolledWindow (
1919 expand => 1,
1920 scroll_y => 1
1921 );
1922 $r->add (my $vb = new CFPlus::UI::VBox);
1923 $win->add ($r);
1924
1925
1926 $vb->add (
1927 new CFPlus::UI::Button
1928 text => "Disable build mode",
1929 on_activate => sub { $::IN_BUILD_MODE = undef }
1930 );
1931 $vb->add (
1932 new CFPlus::UI::Button
1933 text => "ERASE",
1934 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1935 );
1936
1937 for my $itemarchname (
1938 sort {
1939 $msg->{items}->{$a}->{build_arch_name}
1940 cmp $msg->{items}->{$b}->{build_arch_name}
1941 } keys %{$msg->{items}}
1942 ) {
1943 my $info = $msg->{items}->{$itemarchname};
1944 $vb->add (
1945 new CFPlus::UI::Button text => $info->{build_arch_name},
1946 on_activate => sub {
1947 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1948
1949 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1950 build_mode_query_arch_info ();
1951 }
1952 }
1953 );
1954 }
1955
1956 $win->show;
1957}
1958
1959sub build_mode_query_arch_info {
1960 my ($iteminfo) = $::IN_BUILD_MODE;
1961 my $itemarchname = $iteminfo->{item};
1962 my $info = $iteminfo->{info};
1963
1964 my $dialog = new CFPlus::UI::Toplevel
1965 x => "center",
1966 y => "center",
1967 z => 50,
1968 force_w => int $WIDTH * 1/2,
1969 title => "Enter information for placement of '$itemarchname'",
1970 has_close_button => 1;
1971
1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1973
1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1975 my $row = 0;
1976 if ($info->{has_name}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1979 }
1980 if ($info->{has_text}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1982 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1983 }
1984 if ($info->{has_connection}) {
1985 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1986 $table->add (1, $row++,
1987 new CFPlus::UI::Entry
1988 expand => 1,
1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1991 );
1992 }
1993
1994 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1995 $hb->add (new CFPlus::UI::Button
1996 text => "Close",
1997 expand => 1,
1998 on_activate => sub { $dialog->hide; 0 },
1999 );
2000 $dialog->show;
2001} 2239}
2002 2240
2003sub video_shutdown { 2241sub video_shutdown {
2004 CFPlus::OpenGL::shutdown; 2242 CFPlus::OpenGL::shutdown;
2005 2243
2006 undef $SDL_ACTIVE; 2244 undef $SDL_ACTIVE;
2007} 2245}
2008 2246
2009my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2010my $bgmusic;#TODO#hack#d#
2011
2012sub audio_channel_finished {
2013 my ($channel) = @_;
2014
2015 #warn "channel $channel finished\n";#d#
2016}
2017
2018sub audio_music_finished {
2019 return unless $CFG->{bgm_enable};
2020
2021 # TODO: hack, do play loop and mood music
2022 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2023 $bgmusic->play (0);
2024
2025 push @bgmusic, shift @bgmusic;
2026}
2027
2028sub audio_init {
2029 if ($CFG->{audio_enable}) {
2030 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2031 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2032
2033 unless ($SDL_MIXER) {
2034 status "Unable to open sound device: there will be no sound";
2035 return;
2036 }
2037
2038 CFPlus::Mix_AllocateChannels 8;
2039 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2040
2041 audio_music_finished;
2042
2043 local $_;
2044 while (<$fh>) {
2045 next if /^\s*#/;
2046 next if /^\s*$/;
2047
2048 my ($file, $volume, $event) = split /\s+/, $_, 3;
2049
2050 push @SOUNDS, "$volume,$file";
2051
2052 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2053 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2054 $chunk->volume ($volume * 128 / 100);
2055 $chunk
2056 };
2057 }
2058 } else {
2059 status "unable to open sound config: $!";
2060 }
2061 }
2062}
2063
2064sub audio_shutdown {
2065 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2066 undef $SDL_MIXER;
2067 @SOUNDS = ();
2068 %AUDIO_CHUNKS = ();
2069}
2070
2071my %animate_object; 2247my %animate_object;
2072my $animate_timer; 2248my $animate_timer;
2073 2249
2074my $fps = 9; 2250my $fps = 9;
2075 2251
2076my %demo;#d#
2077
2078sub force_refresh { 2252sub force_refresh {
2253 if ($ENV{CFPLUS_DEBUG} & 4) {
2079 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2254 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2080 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2255 debug sprintf "%3.2f", $fps;
2256 }
2081 2257
2082 $CFPlus::UI::ROOT->draw; 2258 $CFPlus::UI::ROOT->draw;
2083 2259 CFPlus::SDL_GL_SwapBuffers;
2084 $WANT_REFRESH = 0;
2085 $CAN_REFRESH = 0;
2086 $LAST_REFRESH = $NOW; 2260 $LAST_REFRESH = $NOW;
2087 2261 $WANT_REFRESH->stop;
2088 CFPlus::SDL_GL_SwapBuffers;
2089} 2262}
2090 2263
2264$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2265
2091my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2266my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2092 $NOW = time; 2267 $NOW = time;
2093 2268
2094 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2269 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2095 for CFPlus::SDL_PollEvent; 2270 for CFPlus::poll_events;
2096 2271
2097 if (%animate_object) { 2272 if (%animate_object) {
2098 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2273 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2099 $WANT_REFRESH++; 2274 $WANT_REFRESH->start;
2100 }
2101
2102 if ($WANT_REFRESH) {
2103 force_refresh;
2104 } else {
2105 $CAN_REFRESH = 1;
2106 } 2275 }
2107}); 2276});
2108 2277
2109sub animation_start { 2278sub animation_start {
2110 my ($widget) = @_; 2279 my ($widget) = @_;
… …
2114sub animation_stop { 2283sub animation_stop {
2115 my ($widget) = @_; 2284 my ($widget) = @_;
2116 delete $animate_object{$widget}; 2285 delete $animate_object{$widget};
2117} 2286}
2118 2287
2119# check once/second for faces that need to be prefetched
2120# this should, of course, only run on demand, but
2121# SDL forces worse things on us....
2122
2123Event->timer (after => 1, interval => 0.25, cb => sub {
2124 $CONN->face_prefetch
2125 if $CONN;
2126});
2127
2128%SDL_CB = ( 2288%SDL_CB = (
2129 CFPlus::SDL_QUIT => sub { 2289 CFPlus::SDL_QUIT => sub {
2130 exit; 2290 Event::unloop_all;
2131 }, 2291 },
2132 CFPlus::SDL_VIDEORESIZE => sub { 2292 CFPlus::SDL_VIDEORESIZE => sub {
2133 }, 2293 },
2134 CFPlus::SDL_VIDEOEXPOSE => sub { 2294 CFPlus::SDL_VIDEOEXPOSE => sub {
2135 CFPlus::UI::full_refresh; 2295 CFPlus::UI::full_refresh;
2136 }, 2296 },
2137 CFPlus::SDL_ACTIVEEVENT => sub { 2297 CFPlus::SDL_ACTIVEEVENT => sub {
2138# not useful, as APPACTIVE include sonly iconified state, not unmapped 2298# not useful, as APPACTIVE include sonly iconified state, not unmapped
2139# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2299# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2300# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2140# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2301# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2141# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2302# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2142# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2303# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2143 }, 2304 },
2144 CFPlus::SDL_KEYDOWN => sub { 2305 CFPlus::SDL_KEYDOWN => sub {
… …
2173 CFPlus::DB::Server::run; 2334 CFPlus::DB::Server::run;
2174 2335
2175 CFPlus::UI::set_layout ($::CFG->{layout}); 2336 CFPlus::UI::set_layout ($::CFG->{layout});
2176 2337
2177 my %DEF_CFG = ( 2338 my %DEF_CFG = (
2178 sdl_mode => 0, 2339 sdl_mode => 0,
2179 width => 640,
2180 height => 480,
2181 fullscreen => 0, 2340 fullscreen => 0,
2182 fast => 0, 2341 fast => 0,
2342 force_opengl11 => undef,
2343 texture_compression => 1,
2183 map_scale => 1, 2344 map_scale => 1,
2184 fow_enable => 1, 2345 fow_enable => 1,
2185 fow_intensity => 0.45, 2346 fow_intensity => 0,
2186 fow_smooth => 0,
2187 map_smoothing => 1, 2347 map_smoothing => 1,
2188 gui_fontsize => 1, 2348 gui_fontsize => 1,
2189 log_fontsize => 0.7, 2349 log_fontsize => 0.7,
2190 gauge_fontsize => 1, 2350 gauge_fontsize => 1,
2191 gauge_size => 0.35, 2351 gauge_size => 0.35,
2192 stat_fontsize => 0.7, 2352 stat_fontsize => 0.7,
2193 mapsize => 100, 2353 mapsize => 100,
2194 say_command => 'chat',
2195 audio_enable => 1, 2354 audio_enable => 1,
2355 audio_hw_channels => 2,
2356 audio_hw_frequency => 22050,
2357 audio_hw_chunksize => 2048,
2358 audio_mix_channels => 8,
2359 effects_enable => 1,
2360 effects_volume => 1,
2196 bgm_enable => 1, 2361 bgm_enable => 1,
2197 bgm_volume => 0.25, 2362 bgm_volume => 0.5,
2198 face_prefetch => 0,
2199 output_sync => 1, 2363 output_sync => 1,
2200 output_count => 1, 2364 output_count => 1,
2201 output_rate => "", 2365 output_rate => "",
2202 pickup => 0, 2366 pickup => 0,
2203 inv_sort => "mtime", 2367 inv_sort => "mtime",
2204 default => "profile", # default profile 2368 default => "profile", # default profile
2205 show_tips => 1, 2369 show_tips => 1,
2206 logview_max_par => 1000, 2370 logview_max_par => 1000,
2207 ); 2371 );
2208 2372
2209 while (my ($k, $v) = each %DEF_CFG) { 2373 while (my ($k, $v) = each %DEF_CFG) {
2210 $CFG->{$k} = $v unless exists $CFG->{$k}; 2374 $CFG->{$k} = $v unless exists $CFG->{$k};
2211 } 2375 }
… …
2225 } 2389 }
2226 } 2390 }
2227 2391
2228 sdl_init; 2392 sdl_init;
2229 2393
2230 @SDL_MODES = reverse 2394 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2231 grep $_->[0] >= 640 && $_->[1] >= 480, 2395 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2232 CFPlus::SDL_ListModes;
2233
2234 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2396 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2397
2398 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2235 2399
2236 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2400 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2237 2401
2238 { 2402 {
2239 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2403 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2268# } 2432# }
2269# my $t2 = Time::HiRes::time; 2433# my $t2 = Time::HiRes::time;
2270# warn $t2-$t1; 2434# warn $t2-$t1;
2271# } 2435# }
2272 2436
2273 $startup_done->();
2274
2275 video_init; 2437 video_init;
2276 audio_init; 2438 audio_init;
2277} 2439}
2278 2440
2279show_tip_of_the_day if $CFG->{show_tips}; 2441show_tip_of_the_day if $CFG->{show_tips};
2280 2442
2443Event->idle (cb => sub {
2444 $_[0]->w->cancel;
2445 $startup_done->();
2446});
2447
2281Event::loop; 2448Event::loop;
2449
2450#video_shutdown;
2451#audio_shutdown;
2282#CFPlus::SDL_Quit; 2452CFPlus::SDL_Quit;
2283#CFPlus::_exit 0;
2284
2285END {
2286 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop; 2453CFPlus::DB::Server::stop;
2288}
2289 2454
2290=head1 NAME 2455=head1 NAME
2291 2456
2292cfplus - A Crossfire+ and Crossfire game client 2457cfplus - A Crossfire TRT and Crossfire game client
2293 2458
2294=head1 SYNOPSIS 2459=head1 SYNOPSIS
2295 2460
2296Just run it - no commandline arguments are supported. 2461Just run it - no commandline arguments are supported.
2297 2462
2298=head1 USAGE 2463=head1 USAGE
2299 2464
2300cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2465cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2301fullscreen and interactively. 2466be used in fullscreen mode and interactively.
2302 2467
2303=head1 DEBUGGING 2468=head1 DEBUGGING
2304 2469
2305 2470
2306CFPLUS_DEBUG - environment variable 2471CFPLUS_DEBUG - environment variable

Diff Legend

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