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

Diff Legend

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