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.171 by root, Sun Jul 15 21:42:02 2007 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

… …
71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
… …
82use CFPlus; 83use CFPlus;
83use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
84use CFPlus::Protocol; 85use CFPlus::Protocol;
85use CFPlus::DB; 86use CFPlus::DB;
86use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
87use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
89use CFPlus::Pod; 92use CFPlus::Pod;
90use CFPlus::MapWidget; 93use CFPlus::MapWidget;
91use CFPlus::Macro; 94use CFPlus::Macro;
92 95
93$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
125 128
126our $MAP; 129our $MAP;
127our $MAPMAP; 130our $MAPMAP;
128our $MAPWIDGET; 131our $MAPWIDGET;
129our $BUTTONBAR; 132our $BUTTONBAR;
130our $LOGVIEW;
131our $CONSOLE;
132our $METASERVER; 133our $METASERVER;
133our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 135our $QUIT_DIALOG;
135our $HOST_ENTRY; 136our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
143our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
144 145
145our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
146our $PL_WINDOW; 147our $PL_WINDOW;
147 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
148our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
149our $STATS_PAGE; 153our $STATS_PAGE;
150our $SKILL_PAGE; 154our $SKILL_PAGE;
151our $SPELL_PAGE; 155our $SPELL_PAGE;
152our $SPELL_LIST; 156our $SPELL_LIST;
… …
158our $STATWIDS; 162our $STATWIDS;
159 163
160our $SDL_ACTIVE; 164our $SDL_ACTIVE;
161our %SDL_CB; 165our %SDL_CB;
162 166
163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170our @SOUNDS; # event => file mapping
171our %AUDIO_CHUNKS; # audio files
172
173our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
174our $STATUSBOX; 168our $STATUSBOX;
175our $DEBUG_STATUS; 169our $DEBUG_STATUS;
176 170
177our $INV; 171our $INV;
178our $INVR; 172our $INVR;
179our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
180 174
181our $PICKUP_CFG; 175our $PICKUP_CFG;
182 176
183our $IN_BUILD_MODE; 177#############################################################################
184our $BUILD_BUTTON;
185 178
186sub status { 179sub status {
187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
188} 181}
189 182
… …
191 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
192} 185}
193 186
194sub message { 187sub message {
195 my ($para) = @_; 188 my ($para) = @_;
196 189 $MESSAGE_WINDOW->message ($para);
197 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
198
199 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
200
201 $LOGVIEW->add_paragraph ($para);
202 $LOGVIEW->scroll_to_bottom;
203} 190}
191
192#############################################################################
193#TODO: maybe move into own audio module...
194
195our $SDL_MIXER;
196
197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
198our $MUSIC_WANT; # arryref of ambient music we want to play
199our @MUSIC_HAVE; # ambient music we have on disk
200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
202our $MUSIC_PLAYING_DATA;
203our $MUSIC_PLAYING_META;
204our $MUSIC_PLAYER;
205our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
206
207our %AUDIO_CHUNK; # audio "files"
208our %AUDIO_PLAY; # which audio faces should be played
209
210sub audio_channel_finished {
211 my ($channel) = @_;
212
213# warn "channel $channel finished\n";#d#
214}
215
216sub audio_sound_push($) {
217 my ($face) = @_;
218
219 $CFG->{effects_enable}
220 or return;
221
222 $AUDIO_PLAY{$face}
223 or return;
224
225 if (my $chunk = $AUDIO_CHUNK{$face}) {
226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_;
228
229 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $dx = $dx / 10 * 255;
232 $channel->set_panning (255 - $dx, 255 + $dx);
233
234# my $angle = $dx ? : $dx < 0 ?
235# my $distance = -$vol;
236# $channel->set_position ($angle, $distance);
237
238 $chunk->play ($channel);
239 }
240 } else {
241 # sound_meta not set means data is in flight either way
242 my $meta = $CONN->{sound_meta}{$face}
243 or return;
244
245 # if its a jingle, play it as ambient music
246 if ($meta->{meta}{jingle}) {
247 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
248 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
249 &audio_music_push ($face);
250 }
251 } else {
252 # fetch from database
253 CFPlus::DB::get res_data => $meta->{name}, sub {
254 my $rwops = new CFPlus::RW $_[0];
255 my $chunk = new CFPlus::MixChunk $rwops
256 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
257 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
258 $AUDIO_CHUNK{$face} = $chunk;
259
260 audio_sound_push ($face);
261 };
262 }
263 }
264}
265
266sub audio_sound_play {
267 my ($face, $dx, $dy, $vol) = @_;
268
269 $SDL_MIXER
270 or return;
271 $CFG->{effects_enable}
272 or return;
273
274 my $queue = $AUDIO_PLAY{$face} ||= [];
275 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
276 audio_sound_push $face
277 unless @$queue > 1;
278}
279
280sub audio_music_set_meta {
281 my ($meta) = @_;
282
283 $MUSIC_PLAYING_META = $meta;
284 $MUSIC_PLAYING_WIDGET->set_markup (
285 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
286 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
287 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
288 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
289 );
290}
291
292sub audio_music_update_volume {
293 return unless $MUSIC_PLAYING_META;
294 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
295 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
296 CFPlus::MixMusic::volume $base * $volume * 128;
297}
298
299sub audio_music_start {
300 my $meta = $MUSIC_PLAYING_META;
301
302 CFPlus::DB::get res_data => $meta->{name}, sub {
303 return unless $SDL_MIXER;
304
305 # music might have changed...
306 $meta eq $MUSIC_PLAYING_META
307 or return &audio_music_start ();
308
309 audio_music_update_volume;
310
311 $MUSIC_PLAYING_DATA = \$_[0];
312
313 my $rwops = $meta->{path}
314 ? new_from_file CFPlus::RW $meta->{path}
315 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
316
317 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
318 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
319
320 my $NOW = time;
321
322 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
323 my $pos = $MUSIC_PLAYING_META->{stop_pos};
324 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
325 $MUSIC_START = time - $pos;
326 } else {
327 $MUSIC_PLAYER->play (0);
328 $MUSIC_START = time;
329 }
330
331 delete $meta->{stop_time};
332 delete $meta->{stop_pos};
333 }
334}
335
336sub audio_music_push {
337 return unless $SDL_MIXER;
338
339 my $fade_out;
340
341 if (@MUSIC_JINGLE) {
342 @MUSIC_HAVE = $MUSIC_JINGLE[0];
343 $fade_out = 333;
344 } else {
345 return unless $CFG->{bgm_enable};
346
347 my @have =
348 grep $_,
349 map $CONN->{music_meta}{$_},
350 @$MUSIC_WANT;
351
352 @MUSIC_HAVE = @have
353 if @have;
354
355 # default MUSIC_HAVE == MUSIC_DEFAULT
356 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
357 $fade_out = 1000;
358 }
359
360 # if the currently playing song is acceptable, let it continue
361 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
362
363 my $NOW = time;
364
365 if ($MUSIC_PLAYING_META) {
366 $MUSIC_PLAYING_META->{stop_time} = $NOW;
367 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
368 CFPlus::MixMusic::fade_out $fade_out;
369 } else {
370 # sort by stop time, oldest first
371 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
372
373 # if the most recently-played piece played very recently,
374 # resume it, else choose the oldest piece for rotation.
375 audio_music_set_meta
376 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
377 ? $MUSIC_HAVE[-1]
378 : $MUSIC_HAVE[0];
379
380 audio_music_start;
381 }
382}
383
384sub audio_music_set_ambient {
385 my ($songs) = @_;
386
387 $MUSIC_WANT = $songs;
388 audio_music_push;
389}
390
391sub audio_music_finished {
392 # we compress multiple jingles of the same type
393 shift @MUSIC_JINGLE
394 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
395
396 $MUSIC_PLAYING_WIDGET->clear;
397
398 undef $MUSIC_PLAYER;
399 undef $MUSIC_PLAYING_META;
400 undef $MUSIC_PLAYING_DATA;
401
402 audio_music_push;
403}
404
405sub audio_init {
406 if ($CFG->{audio_enable}) {
407 $ENV{MIX_EFFECTSMAXSPEED} = 1;
408 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
409
410 unless ($SDL_MIXER) {
411 status "Unable to open sound device: there will be no sound";
412 return;
413 }
414
415 CFPlus::Mix_AllocateChannels 16;
416
417 audio_music_finished;
418 } else {
419 undef $SDL_MIXER;
420 }
421}
422
423sub audio_shutdown {
424 undef $MUSIC_PLAYER;
425 undef $MUSIC_PLAYING_META;
426 undef $MUSIC_PLAYING_DATA;
427
428 $MUSIC_WANT = [];
429 @MUSIC_JINGLE = ();
430 %AUDIO_PLAY = ();
431 %AUDIO_CHUNK = ();
432
433 CFPlus::Mix_CloseAudio if $SDL_MIXER;
434 undef $SDL_MIXER;
435}
436
437#############################################################################
204 438
205sub destroy_query_dialog { 439sub destroy_query_dialog {
206 (delete $_[0]{query_dialog})->destroy 440 (delete $_[0]{query_dialog})->destroy
207 if $_[0]{query_dialog}; 441 if $_[0]{query_dialog};
208} 442}
… …
272 ellipsise => 0, 506 ellipsise => 0,
273 markup => "\nOr use your keyboard and the text entry below:\n"; 507 markup => "\nOr use your keyboard and the text entry below:\n";
274 508
275 unshift @dialog, my $table = new CFPlus::UI::Table; 509 unshift @dialog, my $table = new CFPlus::UI::Table;
276 510
277 $table->add (0, 0, new CFPlus::UI::Button 511 $table->add_at (0, 0, new CFPlus::UI::Button
278 text => "Next Race", 512 text => "Next Race",
279 on_activate => sub { 513 on_activate => sub {
280 $conn->send ("reply n"); 514 $conn->send ("reply n");
281 destroy_query_dialog $conn; 515 destroy_query_dialog $conn;
282 0 516 0
283 }, 517 },
284 ); 518 );
285 $table->add (2, 0, new CFPlus::UI::Button 519 $table->add_at (2, 0, new CFPlus::UI::Button
286 text => "Accept", 520 text => "Accept",
287 on_activate => sub { 521 on_activate => sub {
288 $conn->send ("reply d"); 522 $conn->send ("reply d");
289 destroy_query_dialog $conn; 523 destroy_query_dialog $conn;
290 0 524 0
… …
325 $conn->send ("reply $stat"); 559 $conn->send ("reply $stat");
326 destroy_query_dialog $conn; 560 destroy_query_dialog $conn;
327 return; 561 return;
328 } 562 }
329 563
330 $STATS_PAGE->show;
331 $MESSAGE_WINDOW->hide;
332
333 unshift @dialog, new CFPlus::UI::Label 564 unshift @dialog, new CFPlus::UI::Label
334 max_w => $::WIDTH * 0.4, 565 max_w => $::WIDTH * 0.4,
335 ellipsise => 0, 566 ellipsise => 0,
336 markup => "\nOr use your keyboard and the text entry below:\n"; 567 markup => "\nOr use your keyboard and the text entry below:\n";
337 568
338 unshift @dialog, my $table = new CFPlus::UI::Table; 569 unshift @dialog, my $table = new CFPlus::UI::Table;
339 570
340 # left: re-roll 571 # left: re-roll
341 $table->add (0, 0, new CFPlus::UI::Button 572 $table->add_at (0, 0, new CFPlus::UI::Button
342 text => "Roll Again", 573 text => "Roll Again",
343 on_activate => sub { 574 on_activate => sub {
344 $conn->send ("reply y"); 575 $conn->send ("reply y");
345 destroy_query_dialog $conn; 576 destroy_query_dialog $conn;
346 0 577 0
… …
360 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 591 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
361 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 592 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
362 ], 593 ],
363 ), 1 .. 2; 594 ), 1 .. 2;
364 595
365 $table->add (2, 0, new CFPlus::UI::Button 596 $table->add_at (2, 0, new CFPlus::UI::Button
366 text => "Swap Stats", 597 text => "Swap Stats",
367 on_activate => sub { 598 on_activate => sub {
368 $conn->{stat_change_with} = $sw2->{value}; 599 $conn->{stat_change_with} = $sw2->{value};
369 $conn->send ("reply $sw1->{value}"); 600 $conn->send ("reply $sw1->{value}");
370 destroy_query_dialog $conn; 601 destroy_query_dialog $conn;
371 0 602 0
372 }, 603 },
373 ); 604 );
374 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 605 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
375 606
376 # right: accept 607 # right: accept
377 $table->add (4, 0, new CFPlus::UI::Button 608 $table->add_at (4, 0, new CFPlus::UI::Button
378 text => "Accept", 609 text => "Accept",
379 on_activate => sub { 610 on_activate => sub {
380 $conn->send ("reply n"); 611 $conn->send ("reply n");
381 $STATS_PAGE->hide; 612 $STATS_PAGE->hide;
382 destroy_query_dialog $conn; 613 destroy_query_dialog $conn;
… …
463 maph => $mapsize, 694 maph => $mapsize,
464 695
465 client => "cfplus $CFPlus::VERSION $] $^O", 696 client => "cfplus $CFPlus::VERSION $] $^O",
466 697
467 map_widget => $MAPWIDGET, 698 map_widget => $MAPWIDGET,
468 logview => $LOGVIEW,
469 statusbox => $STATUSBOX, 699 statusbox => $STATUSBOX,
470 map => $MAP, 700 map => $MAP,
471 mapmap => $MAPMAP, 701 mapmap => $MAPMAP,
472 query => \&server_query, 702 query => \&server_query,
473 703
474 setup_req => { 704 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1, 705 smoothing => $CFG->{map_smoothing}*1,
476 },
477
478 sound_play => sub {
479 my ($x, $y, $soundnum, $type) = @_;
480
481 $SDL_MIXER
482 or return;
483
484 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
485 or return;
486
487 $chunk->play;
488 }, 706 },
489 }; 707 };
490 708
491 if ($CONN) { 709 if ($CONN) {
492 CFPlus::lowdelay fileno $CONN->{fh}; 710 CFPlus::lowdelay fileno $CONN->{fh};
… …
504 $SETUP_DIALOG->show; 722 $SETUP_DIALOG->show;
505 $PL_WINDOW->hide; 723 $PL_WINDOW->hide;
506 $SPELL_LIST->clear_spells; 724 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 725 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508 726
509 &audio_music_set ([]); 727 &audio_music_set_ambient ([]);
510 728
511 return unless $CONN; 729 return unless $CONN;
512 730
513 status "connection closed"; 731 status "connection closed";
514 732
… …
524 742
525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 743 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
526 744
527 my $row = 0; 745 my $row = 0;
528 746
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 748 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1, 749 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 750 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533 751
752 my $vidmode_tooltip =
753 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
754 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
755
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 756 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 757 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
536 758
759 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
537 $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]); 760 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 761 tooltip => $vidmode_tooltip);
762 $hbox->add (my $mode_label = new CFPlus::UI::Label
763 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
764 can_events => 1, tooltip => $vidmode_tooltip);
539 765
540 $mode_slider->connect (changed => sub { 766 $mode_slider->connect (changed => sub {
541 my ($self, $value) = @_; 767 my ($self, $value) = @_;
542 768
543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 769 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 770 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
545 }); 771 });
546 $mode_slider->emit (changed => $mode_slider->{range}[0]); 772 $mode_slider->emit (changed => $mode_slider->{range}[0]);
547 773
548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 775 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
550 state => $CFG->{fullscreen}, 776 state => $CFG->{fullscreen},
551 tooltip => "Bring the client into fullscreen mode.", 777 tooltip => "Bring the client into fullscreen mode.",
552 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
553 ); 779 );
554 780
555 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 781 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox 782 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{fast}, 783 state => $CFG->{fast},
558 tooltip => "Lower the visual quality considerably to speed up rendering.", 784 tooltip => "Lower the visual quality considerably to speed up rendering.",
559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 785 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
560 ); 786 );
561 787
562 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 788 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
563 $table->add (1, $row++, new CFPlus::UI::Slider 789 $table->add_at (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 790 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 791 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 792 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 ); 793 );
568 794
569 $table->add (1, $row++, new CFPlus::UI::Button 795 $table->add_at (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply", 796 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.", 797 tooltip => "Apply the video settings above.",
572 on_activate => sub { 798 on_activate => sub {
573 video_shutdown (); 799 video_shutdown ();
574 video_init (); 800 video_init ();
575 0 801 0
576 } 802 }
577 ); 803 );
578 804
579 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
580 $table->add (1, $row++, new CFPlus::UI::Slider 806 $table->add_at (1, $row++, new CFPlus::UI::Slider
581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 807 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 808 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 809 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
584 ); 810 );
585 811
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 812 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox 813 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing}, 814 state => $CFG->{map_smoothing},
589 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 815 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
590 . "This increases load on the graphics subsystem and works only with 2.x servers. " 816 . "This increases load on the graphics subsystem and works only with 2.x servers. "
591 . "Changes take effect at next connection only.", 817 . "Changes take effect at next connection only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
593 ); 819 );
594 820
595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
596 $table->add (1, $row++, new CFPlus::UI::CheckBox 822 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
597 state => $CFG->{fow_enable}, 823 state => $CFG->{fow_enable},
598 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 824 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
599 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
600 ); 826 );
601 827
602 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
603 $table->add (1, $row++, new CFPlus::UI::Slider 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
604 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 830 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
605 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 831 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
606 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 832 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
607 ); 833 );
608 834
609 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
610 $table->add (1, $row++, new CFPlus::UI::CheckBox
611 state => $CFG->{fow_smooth},
612 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
613 on_changed => sub {
614 my ($self, $value) = @_;
615 $CFG->{fow_smooth} = $value;
616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
617 0
618 }
619 );
620
621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 835 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
622 $table->add (1, $row++, new CFPlus::UI::Slider 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 837 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
624 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 838 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 839 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
626 ); 840 );
627 841
628 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 842 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
629 $table->add (1, $row++, new CFPlus::UI::Slider 843 $table->add_at (1, $row++, new CFPlus::UI::Slider
630 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 844 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
631 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 845 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
632 on_changed => sub { 846 on_changed => sub {
633 $CFG->{gauge_fontsize} = $_[1]; 847 $CFG->{gauge_fontsize} = $_[1];
634 &set_gauge_window_fontsize; 848 &set_gauge_window_fontsize;
635 0 849 0
636 } 850 }
637 ); 851 );
638 852
639 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 853 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
640 $table->add (1, $row++, new CFPlus::UI::Slider 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
641 range => [$CFG->{gauge_size}, 0.2, 0.8], 855 range => [$CFG->{gauge_size}, 0.2, 0.8],
642 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 856 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
643 on_changed => sub { 857 on_changed => sub {
644 $CFG->{gauge_size} = $_[1]; 858 $CFG->{gauge_size} = $_[1];
645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 859 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
651} 865}
652 866
653sub audio_setup { 867sub audio_setup {
654 my $vbox = new CFPlus::UI::VBox; 868 my $vbox = new CFPlus::UI::VBox;
655 869
656 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 870 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
657 871
658 my $row = 0; 872 my $row = 0;
659 873
660 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 874 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
661 $table->add (1, $row++, new CFPlus::UI::CheckBox 875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
662 state => $CFG->{audio_enable}, 876 state => $CFG->{audio_enable},
663 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.", 877 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.",
664 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 878 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
665 ); 879 );
666# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 880# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
667# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 881# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
668# $CFG->{effects_volume} = $_[1]; 882# $CFG->{effects_volume} = $_[1];
669# }); 883# });
884
885 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
886 $table->add_at (1, $row, new CFPlus::UI::CheckBox
887 expand => 1, state => $CFG->{effects_enable},
888 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
889 on_changed => sub {
890 $CFG->{effects_enable} = $_[1];
891 $CONN->update_fx_want if $CONN;
892 0
893 }
894 );
895 $table->add_at (2, $row++, new CFPlus::UI::Slider
896 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
897 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
898 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
899 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
900 );
901
670 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
671 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
672 $hbox->add (new CFPlus::UI::CheckBox 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
673 expand => 1, state => $CFG->{bgm_enable}, 904 expand => 1, state => $CFG->{bgm_enable},
674 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 905 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
675 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 906 on_changed => sub {
907 $CFG->{bgm_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
676 ); 911 );
677 $hbox->add (new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
678 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
679 tooltip => "The volume of the background music. Changes are instant.", 914 tooltip => "The volume of the background music. Changes are instant.",
680 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 915 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
681 ); 916 );
682 917
683 $table->add (1, $row++, new CFPlus::UI::Button 918 $table->add_at (1, $row++, new CFPlus::UI::Button
684 expand => 1, align => 0, text => "Apply", 919 c_colspan => 2, expand => 1, align => 0, text => "Apply",
685 tooltip => "Apply the audio settings", 920 tooltip => "Apply the audio settings",
686 on_activate => sub { 921 on_activate => sub {
687 audio_shutdown (); 922 audio_shutdown ();
688 audio_init (); 923 audio_init ();
689 0 924 0
… …
747} 982}
748 983
749sub debug_setup { 984sub debug_setup {
750 my $table = new CFPlus::UI::Table; 985 my $table = new CFPlus::UI::Table;
751 986
752 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 987 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
753 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 988 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
754 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 989 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
755 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 990 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 991 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
757 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 992 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 993 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 994 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 995 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
761 996
762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
763
764 for my $x (0..2) {
765 for my $y (0 .. 2) {
766 $table->add ($x + 3, $y,
767 new CFPlus::UI::Entry
768 text => $default_smooth[$x * 3 + $y],
769 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
770 );
771 }
772 }
773
774 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 997 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
998
999 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1000 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1001 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1002 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1003 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1004 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1005
1006 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1007
1008 $c->add_items ({
1009 type => "line_loop",
1010 color => [0, 1, 0],
1011 width => 9,
1012 coord_mode => "abs",
1013 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1014 });
1015
1016 $c->add_items ({
1017 type => "lines",
1018 color => [1, 1, 0],
1019 width => 2,
1020 coord_mode => "rel",
1021 coord => [[0,0], [1,1], [1,0], [0,1]],
1022 });
1023
1024 $c->add_items ({
1025 type => "polygon",
1026 color => [0, 0.43, 0],
1027 width => 2,
1028 coord_mode => "rel",
1029 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1030 });
775 1031
776 $table 1032 $table
777} 1033}
778 1034
779sub stats_window { 1035sub stats_window {
… …
827 [2, 4, st_spd => "Spd", 10.54], 1083 [2, 4, st_spd => "Spd", 10.54],
828 [2, 5, st_wspd => "WSp", 10.54], 1084 [2, 5, st_wspd => "WSp", 10.54],
829 ) { 1085 ) {
830 my ($col, $row, $id, $label, $template) = @$_; 1086 my ($col, $row, $id, $label, $template) = @$_;
831 1087
832 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1088 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
833 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1089 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
834 align => +1, template => $template, tooltip => "#stat_$label"); 1090 align => +1, template => $template, tooltip => "#stat_$label");
835 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1091 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
836 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1092 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
837 align => -1, text => $label, tooltip => "#stat_$label"); 1093 align => -1, text => $label, tooltip => "#stat_$label");
838 } 1094 }
839 1095
840 $vb->add (new CFPlus::UI::FancyFrame 1096 $vb->add (new CFPlus::UI::FancyFrame
… …
881 cold => ["Cold", 1137 cold => ["Cold",
882 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1138 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
883 ghit => ["Ghost hit", 1139 ghit => ["Ghost hit",
884 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1140 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
885 ); 1141 );
1142
886 for (qw/slow holyw conf fire depl magic 1143 for (qw/slow holyw conf fire depl magic
887 drain acid pois para deat phys 1144 drain acid pois para deat phys
888 blind fear tund elec cold ghit/) 1145 blind fear tund elec cold ghit/)
889 { 1146 {
890 $tbl2->add ($col, $row, 1147 $tbl2->add_at ($col, $row,
891 $STATWIDS->{"res_$_"} = 1148 $STATWIDS->{"res_$_"} =
892 new CFPlus::UI::Label 1149 new CFPlus::UI::Label
893 font => $FONT_FIXED, 1150 font => $FONT_FIXED,
894 template => "-100%", 1151 template => "-100%",
895 align => +1, 1152 align => +1,
896 valign => 0, 1153 valign => 0,
897 can_events => 1, 1154 can_events => 1,
898 can_hover => 1, 1155 can_hover => 1,
899 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
900 ); 1157 );
901 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1158 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
902 font => $FONT_FIXED, 1159 font => $FONT_FIXED,
903 can_hover => 1, 1160 can_hover => 1,
904 can_events => 1, 1161 can_events => 1,
905 path => "ui/resist/resist_$_.png", 1162 path => "ui/resist/resist_$_.png",
906 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
907 ); 1164 );
908 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1165 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
909 text => $resist_names{$_}->[0], 1166 text => $resist_names{$_}->[0],
910 font => $FONT_FIXED, 1167 font => $FONT_FIXED,
911 can_hover => 1, 1168 can_hover => 1,
912 can_events => 1, 1169 can_events => 1,
913 tooltip => $resist_names{$_}->[1], 1170 tooltip => $resist_names{$_}->[1],
… …
946 return if $METASERVER_ATIME > time; 1203 return if $METASERVER_ATIME > time;
947 $METASERVER_ATIME = time + 60; 1204 $METASERVER_ATIME = time + 60;
948 1205
949 my $table = $METASERVER->{table}; 1206 my $table = $METASERVER->{table};
950 $table->clear; 1207 $table->clear;
951 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1208 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
952 1209
953 my $ok = 0; 1210 my $ok = 0;
954 1211
955 CFPlus::background { 1212 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent; 1213 my $ua = CFPlus::lwp_useragent;
… …
967 "The time this server has been running without being restarted.", 1224 "The time this server has been running without being restarted.",
968 "The server software version - a '+' indicates a Crossfire+ server.", 1225 "The server software version - a '+' indicates a Crossfire+ server.",
969 "Short information about this server provided by its admins.", 1226 "Short information about this server provided by its admins.",
970 ); 1227 );
971 my @col = qw(#Users Host Uptime Version Description); 1228 my @col = qw(#Users Host Uptime Version Description);
972 $table->add ($_, 0, new CFPlus::UI::Label 1229 $table->add_at ($_, 0, new CFPlus::UI::Label
973 can_hover => 1, can_events => 1, 1230 can_hover => 1, can_events => 1,
974 align => 0, fg => [1, 1, 0], 1231 align => 0, fg => [1, 1, 0],
975 text => $col[$_], tooltip => $tip[$_]) 1232 text => $col[$_], tooltip => $tip[$_])
976 for 0 .. $#col; 1233 for 0 .. $#col;
977 1234
… …
999 1256
1000 $m = [$users, $host, $uptime, $version, $desc]; 1257 $m = [$users, $host, $uptime, $version, $desc];
1001 1258
1002 $y++; 1259 $y++;
1003 1260
1004 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1261 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1005 (new CFPlus::UI::Button 1262 (new CFPlus::UI::Button
1006 text => "Use", 1263 text => "Use",
1007 tooltip => "Put this server into the <b>Host:Port</b> field", 1264 tooltip => "Put this server into the <b>Host:Port</b> field",
1008 on_activate => sub { 1265 on_activate => sub {
1009 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1266 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1012 }, 1269 },
1013 ), 1270 ),
1014 (new CFPlus::UI::Empty expand => 1), 1271 (new CFPlus::UI::Empty expand => 1),
1015 ]); 1272 ]);
1016 1273
1017 $table->add ($_, $y, new CFPlus::UI::Label 1274 $table->add_at ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4, 1275 max_w => $::WIDTH * 0.4,
1019 ellipsise => 0, 1276 ellipsise => 0,
1020 align => $align[$_], 1277 align => $align[$_],
1021 text => $m->[$_], 1278 text => $m->[$_],
1022 tooltip => $tip[$_], 1279 tooltip => $tip[$_],
… …
1063 1320
1064 $vbox->add (new CFPlus::UI::FancyFrame 1321 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings", 1322 label => "Connection Settings",
1066 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1323 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1067 ); 1324 );
1068 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1325 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1069 1326
1070 { 1327 {
1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1328 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1072 1329
1073 $vbox->add ( 1330 $vbox->add (
1074 $HOST_ENTRY = new CFPlus::UI::Entry 1331 $HOST_ENTRY = new CFPlus::UI::Entry
1075 expand => 1, 1332 expand => 1,
1076 text => $CFG->{profile}{default}{host}, 1333 text => $CFG->{profile}{default}{host},
1077 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1334 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1078 on_changed => sub { 1335 on_changed => sub {
1079 my ($self, $value) = @_; 1336 my ($self, $value) = @_;
1080 $CFG->{profile}{default}{host} = $value; 1337 $CFG->{profile}{default}{host} = $value;
1081 0 1338 1
1082 } 1339 }
1083 ); 1340 );
1084 1341
1085 $vbox->add (new CFPlus::UI::Button 1342 $vbox->add (new CFPlus::UI::Button
1086 expand => 1, 1343 expand => 1,
1087 text => "Server List", 1344 text => "Server List",
1088 other => $METASERVER, 1345 other => $METASERVER,
1089 tooltip => "Show a list of available crossfire servers", 1346 tooltip => "Show a list of available crossfire servers",
1090 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1347 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1091 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1348 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1092 ); 1349 );
1093 } 1350 }
1094 1351
1095 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1352 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1096 $table->add (1, 4, new CFPlus::UI::Entry 1353 $table->add_at (1, 4, new CFPlus::UI::Entry
1097 text => $CFG->{profile}{default}{user}, 1354 text => $CFG->{profile}{default}{user},
1098 tooltip => "The name of your character on the server", 1355 tooltip => "The name of your character on the server",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1356 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1100 ); 1357 );
1101 1358
1102 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1359 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1103 $table->add (1, 5, new CFPlus::UI::Entry 1360 $table->add_at (1, 5, new CFPlus::UI::Entry
1104 text => $CFG->{profile}{default}{password}, 1361 text => $CFG->{profile}{default}{password},
1105 hidden => 1, 1362 hidden => 1,
1106 tooltip => "The password for your character", 1363 tooltip => "The password for your character",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1108 ); 1365 );
1109 1366
1110 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1367 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1111 $table->add (1, 7, new CFPlus::UI::Slider 1368 $table->add_at (1, 7, new CFPlus::UI::Slider
1112 force_w => 100, 1369 force_w => 100,
1113 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1370 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1114 tooltip => "This is the size of the portion of the map update the server sends you. " 1371 tooltip => "This is the size of the portion of the map update the server sends you. "
1115 . "If you set this to a high value you will be able to see further, " 1372 . "If you set this to a high value you will be able to see further, "
1116 . "but you also increase bandwidth requirements and latency. " 1373 . "but you also increase bandwidth requirements and latency. "
1117 . "This option is only used once at log-in.", 1374 . "This option is only used once at log-in.",
1118 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1375 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1119 ); 1376 );
1120 1377
1121 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1122 $table->add (1, 8, new CFPlus::UI::CheckBox
1123 state => $CFG->{face_prefetch},
1124 tooltip => "<b>Background Image Prefetch</b>\n\n"
1125 . "If enabled, the client automatically pre-fetches images from the server. "
1126 . "This might increase or create lag, but increases the chances "
1127 . "of faces being ready for display when you encounter them. "
1128 . "It also uses up server bandwidth on every connect, "
1129 . "so only set it if you really need to prefetch images. "
1130 . "This option can be set and unset any time.",
1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1132 );
1133
1134 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1378 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1135 $table->add (1, 9, new CFPlus::UI::Entry 1379 $table->add_at (1, 8, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate}, 1380 text => $CFG->{output_rate},
1137 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1381 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1138 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1382 . "when sending data. When 0 or unset, the server "
1139 . "default will be used, which is usually around 100kb/s.", 1383 . "default will be used, which is usually around 100kb/s. Most servers will "
1384 . "dynamically find an optimal rate, so adjust this only when necessary.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1141 ); 1386 );
1142 1387
1143 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1388 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1144 $table->add (1, 10, new CFPlus::UI::Entry 1389 $table->add_at (1, 9, new CFPlus::UI::Entry
1145 text => $CFG->{output_count}, 1390 text => $CFG->{output_count},
1146 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1391 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1148 ); 1393 );
1149 1394
1150 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1395 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1151 $table->add (1, 11, new CFPlus::UI::Entry 1396 $table->add_at (1, 10, new CFPlus::UI::Entry
1152 text => $CFG->{output_sync}, 1397 text => $CFG->{output_sync},
1153 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1398 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1155 ); 1400 );
1156 1401
1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1158 expand => 1, 1403 expand => 1,
1159 align => 0, 1404 align => 0,
1160 text => "Login", 1405 text => "Login",
1161 on_activate => sub { 1406 on_activate => sub {
1162 $CONN ? stop_game 1407 $CONN ? stop_game
1163 : start_game; 1408 : start_game;
1164 0 1409 1
1165 }, 1410 },
1166 ); 1411 );
1167 1412
1168 $vbox->add (new CFPlus::UI::FancyFrame 1413 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info", 1414 label => "Server Info",
… …
1176sub client_setup { 1421sub client_setup {
1177 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1422 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1178 1423
1179 my $row = 0; 1424 my $row = 0;
1180 1425
1181 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1183 text => $CFG->{say_command},
1184 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. "
1185 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1186 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1187 on_changed => sub {
1188 my ($self, $value) = @_;
1189 $CFG->{say_command} = $value;
1190 0
1191 }
1192 );
1193
1194 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1426 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1195 $table->add (1, $row++, new CFPlus::UI::CheckBox 1427 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1196 state => $CFG->{show_tips}, 1428 state => $CFG->{show_tips},
1197 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1429 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1198 on_changed => sub { 1430 on_changed => sub {
1199 my ($self, $value) = @_; 1431 my ($self, $value) = @_;
1200 $CFG->{show_tips} = $value; 1432 $CFG->{show_tips} = $value;
1201 0 1433 0
1202 } 1434 }
1203 ); 1435 );
1204 1436
1205 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1437 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1438 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1207 text => $CFG->{logview_max_par}, 1439 text => $CFG->{logview_max_par},
1208 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1440 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1209 . "sends more messages than this number, older messages get removed to save memory and " 1441 . "sends more messages than this number, older messages get removed to save memory and "
1210 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1442 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1211 on_changed => sub { 1443 on_changed => sub {
1212 my ($self, $value) = @_; 1444 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1445 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1214 0 1446 0
1215 }, 1447 },
1216 ); 1448 );
1217 1449
1218 $table 1450 $table
1219}
1220
1221sub message_window {
1222 my $window = new CFPlus::UI::Toplevel
1223 name => "message_window",
1224 title => "Messages",
1225 border_bg => [1, 1, 1, 1],
1226 x => "max",
1227 y => 0,
1228 force_w => $::WIDTH * 0.4,
1229 force_h => $::HEIGHT * 0.5,
1230 child => (my $vbox = new CFPlus::UI::VBox),
1231 has_close_button => 1;
1232
1233 $vbox->add ($LOGVIEW);
1234
1235 $vbox->add (my $input = new CFPlus::UI::Entry
1236 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1237 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1238 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1239 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1240 on_focus_in => sub {
1241 my ($input, $prev_focus) = @_;
1242
1243 delete $input->{refocus_map};
1244
1245 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1246 $input->{refocus_map} = 1;
1247 }
1248 delete $input->{auto_activated};
1249
1250 0
1251 },
1252 on_activate => sub {
1253 my ($input, $text) = @_;
1254 $input->set_text ('');
1255
1256 if ($text =~ /^\/(.*)/) {
1257 $::CONN->user_send ($1);
1258 } else {
1259 my $say_cmd = $::CFG->{say_command} || 'say';
1260 $::CONN->user_send ("$say_cmd $text");
1261 }
1262 if ($input->{refocus_map}) {
1263 delete $input->{refocus_map};
1264 $MAPWIDGET->focus_in
1265 }
1266
1267 0
1268 },
1269 on_escape => sub {
1270 $MAPWIDGET->grab_focus;
1271
1272 0
1273 },
1274 );
1275
1276 $CONSOLE = {
1277 window => $window,
1278 input => $input,
1279 };
1280
1281 $window
1282} 1451}
1283 1452
1284sub autopickup_setup { 1453sub autopickup_setup {
1285 my $r = new CFPlus::UI::ScrolledWindow ( 1454 my $r = new CFPlus::UI::ScrolledWindow (
1286 expand => 1, 1455 expand => 1,
… …
1332 ], 1501 ],
1333 ["Weight/Value ratio", 2, 17] 1502 ["Weight/Value ratio", 2, 17]
1334 ) 1503 )
1335 { 1504 {
1336 my ($title, $x, $y, @bits) = @$_; 1505 my ($title, $x, $y, @bits) = @$_;
1337 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1506 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1338 1507
1339 for (@bits) { 1508 for (@bits) {
1340 ++$y; 1509 ++$y;
1341 1510
1342 my $mask = $_->[1]; 1511 my $mask = $_->[1];
1343 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1512 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1344 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1513 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1345 state => $::CFG->{pickup} & $mask, 1514 state => $::CFG->{pickup} & $mask,
1346 on_changed => sub { 1515 on_changed => sub {
1347 my ($box, $value) = @_; 1516 my ($box, $value) = @_;
1348 1517
1349 if ($value) { 1518 if ($value) {
… …
1360 1529
1361 ${$_->[2]} = $checkbox if $_->[2]; 1530 ${$_->[2]} = $checkbox if $_->[2];
1362 } 1531 }
1363 } 1532 }
1364 1533
1365 $table->add (2, 18, new CFPlus::UI::ValSlider 1534 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1366 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1535 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1367 template => ">= 99", 1536 template => ">= 99",
1368 to_value => sub { ">= " . 5 * $_[0] }, 1537 to_value => sub { ">= " . 5 * $_[0] },
1369 on_changed => sub { 1538 on_changed => sub {
1370 my ($slider, $value) = @_; 1539 my ($slider, $value) = @_;
… …
1373 $::CFG->{pickup} |= int $value 1542 $::CFG->{pickup} |= int $value
1374 if $value; 1543 if $value;
1375 1; 1544 1;
1376 }); 1545 });
1377 1546
1378 $table->add (3, 18, new CFPlus::UI::Button 1547 $table->add_at (3, 18, new CFPlus::UI::Button
1379 text => "set", 1548 text => "set",
1380 on_activate => sub { 1549 on_activate => sub {
1381 $::CONN->send_command ("pickup $::CFG->{pickup}") 1550 $::CONN->send_command ("pickup $::CFG->{pickup}")
1382 if defined $::CONN; 1551 if defined $::CONN;
1383 0 1552 0
… …
1446 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1615 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1447 1616
1448 $hb 1617 $hb
1449} 1618}
1450 1619
1620sub media_window {
1621 my $vb = new CFPlus::UI::VBox;
1622
1623 $vb->add (new CFPlus::UI::FancyFrame
1624 label => "Currently playing music",
1625 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1626 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1627 );
1628
1629 $vb->add (new CFPlus::UI::FancyFrame
1630 label => "Other media used in this session",
1631 expand => 1,
1632 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1633 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1634 );
1635
1636 $vb
1637}
1638
1639sub add_license {
1640 my ($meta) = @_;
1641
1642 $meta = $meta->{meta}
1643 or return;
1644
1645 $meta->{license} || $meta->{author} || $meta->{source}
1646 or return;
1647
1648 $LICENSE_WIDGET->add_paragraph ({
1649 fg => [1, 1, 1, 1],
1650 markup => "<small>"
1651 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1652 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1653 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1654 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1655 . "</small>",
1656 });
1657 $LICENSE_WIDGET->scroll_to_bottom;
1658}
1659
1451sub toggle_player_page { 1660sub toggle_player_page {
1452 my ($widget) = @_; 1661 my ($widget) = @_;
1453 1662
1454 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1663 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1455 $PL_WINDOW->hide; 1664 $PL_WINDOW->hide;
… …
1472 1681
1473 my $ntb = 1682 my $ntb =
1474 $PL_NOTEBOOK = 1683 $PL_NOTEBOOK =
1475 new CFPlus::UI::Notebook expand => 1; 1684 new CFPlus::UI::Notebook expand => 1;
1476 1685
1477 $ntb->add ( 1686 $ntb->add_tab (
1478 "Statistics (F2)" => $STATS_PAGE = stats_window, 1687 "Statistics (F2)" => $STATS_PAGE = stats_window,
1479 "Shows statistics, where all your Stats and Resistances are shown." 1688 "Shows statistics, where all your Stats and Resistances are shown."
1480 ); 1689 );
1481 $ntb->add ( 1690 $ntb->add_tab (
1482 "Skills (F3)" => $SKILL_PAGE = skill_window, 1691 "Skills (F3)" => $SKILL_PAGE = skill_window,
1483 "Shows all your Skills." 1692 "Shows all your Skills."
1484 ); 1693 );
1485 1694
1486 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1695 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1487 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1696 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1488 $ntb->add ( 1697 $ntb->add_tab (
1489 "Spellbook (F4)" => $spellsw, 1698 "Spellbook (F4)" => $spellsw,
1490 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1699 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1491 ); 1700 );
1492 $ntb->add ( 1701 $ntb->add_tab (
1493 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1494 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1703 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1704 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1496 ); 1705 );
1497 $ntb->add (Pickup => autopickup_setup, 1706 $ntb->add_tab (Pickup => autopickup_setup,
1498 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1707 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1708
1709 $ntb->add_tab (Media => media_window,
1710 "License, Author and Source info for media sent by the server.");
1499 1711
1500 $ntb->set_current_page ($INVENTORY_PAGE); 1712 $ntb->set_current_page ($INVENTORY_PAGE);
1501 1713
1502 $plwin->add ($ntb); 1714 $plwin->add ($ntb);
1503 $plwin 1715 $plwin
… …
1700 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1912 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1701 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1913 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1702 1914
1703 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1915 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1704 1916
1705 $table->add (0, 0, new CFPlus::UI::Button 1917 $table->add_at (0, 0, new CFPlus::UI::Button
1706 text => "Close", 1918 text => "Close",
1707 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>.", 1919 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>.",
1708 on_activate => $close, 1920 on_activate => $close,
1709 ); 1921 );
1710 1922
1711 $table->add (2, 0, new CFPlus::UI::Button 1923 $table->add_at (2, 0, new CFPlus::UI::Button
1712 text => "Next", 1924 text => "Next",
1713 tooltip => "Show the next <b>Tip of the day</b>.", 1925 tooltip => "Show the next <b>Tip of the day</b>.",
1714 on_activate => sub { 1926 on_activate => sub {
1715 $close->(); 1927 $close->();
1716 &show_tip_of_the_day; 1928 &show_tip_of_the_day;
… …
1725 CFPlus::SDL_Init 1937 CFPlus::SDL_Init
1726 and die "SDL::Init failed!\n"; 1938 and die "SDL::Init failed!\n";
1727} 1939}
1728 1940
1729sub video_init { 1941sub video_init {
1730 sdl_init;
1731
1732 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1733 1943
1734 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1944 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1735 1945
1736 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1946 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1737 $FULLSCREEN = $CFG->{fullscreen}; 1947 $FULLSCREEN = $CFG->{fullscreen};
1738 $FAST = $CFG->{fast}; 1948 $FAST = $CFG->{fast};
1739 1949
1740 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1950 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1741 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1951 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1742 1952
1743 $SDL_ACTIVE = 1; 1953 $SDL_ACTIVE = 1;
1744 $LAST_REFRESH = time - 0.01; 1954 $LAST_REFRESH = time - 0.01;
1745 1955
… …
1787 1997
1788 $MAPWIDGET = new CFPlus::MapWidget; 1998 $MAPWIDGET = new CFPlus::MapWidget;
1789 $MAPWIDGET->connect (activate_console => sub { 1999 $MAPWIDGET->connect (activate_console => sub {
1790 my ($mapwidget, $preset) = @_; 2000 my ($mapwidget, $preset) = @_;
1791 2001
1792 if ($CONSOLE) { 2002 $MESSAGE_WINDOW->activate_console ($preset)
1793 $CONSOLE->{input}->{auto_activated} = 1; 2003 if $MESSAGE_WINDOW;
1794 $CONSOLE->{input}->grab_focus;
1795
1796 if ($preset && $CONSOLE->{input}->get_text eq '') {
1797 $CONSOLE->{input}->set_text ($preset);
1798 }
1799 }
1800 }); 2004 });
1801 $MAPWIDGET->show; 2005 $MAPWIDGET->show;
1802 $MAPWIDGET->grab_focus; 2006 $MAPWIDGET->grab_focus;
1803
1804 $LOGVIEW = new CFPlus::UI::TextScroller
1805 expand => 1,
1806 font => $FONT_FIXED,
1807 fontsize => $::CFG->{log_fontsize},
1808 indent => -4,
1809 can_hover => 1,
1810 can_events => 1,
1811 max_par => $CFG->{logview_max_par},
1812 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1813 ;
1814 2007
1815 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2008 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1816 title => "Setup", 2009 title => "Setup",
1817 name => "setup_dialog", 2010 name => "setup_dialog",
1818 x => 'center', 2011 x => 'center',
… …
1822 force_h => $::HEIGHT * 0.6, 2015 force_h => $::HEIGHT * 0.6,
1823 has_close_button => 1, 2016 has_close_button => 1,
1824 ; 2017 ;
1825 2018
1826 $METASERVER = metaserver_dialog; 2019 $METASERVER = metaserver_dialog;
2020 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1827 2021
1828 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2022 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1829 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2023 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1830 2024
1831 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2025 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1832 "Configure the server to play on, your username, password and other server-related options."); 2026 "Configure the server to play on, your username, password and other server-related options.");
1833 $SETUP_NOTEBOOK->add (Client => client_setup, 2027 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1834 "Configure various client-specific settings."); 2028 "Configure various client-specific settings.");
1835 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2029 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1836 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2030 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1837 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2031 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1838 "Configure the use of audio, sound effects and background music."); 2032 "Configure the use of audio, sound effects and background music.");
1839 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2033 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1840 "Lets you define, edit and delete key bindings." 2034 "Lets you define, edit and delete key bindings."
1841 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2035 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1842 . "with nothing set and the recording started. After doing the actions you " 2036 . "with nothing set and the recording started. After doing the actions you "
1843 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2037 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1844 . "After pressing the combo the binding will be saved automatically and the " 2038 . "After pressing the combo the binding will be saved automatically and the "
1845 . "binding editor closes"); 2039 . "binding editor closes");
1846 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2040 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1847 "Some debuggin' options. Do not ask."); 2041 "Some debuggin' options. Do not ask.");
1848 2042
1849 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2043 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1850 2044
1851 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2045 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1852 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2046 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1853 2047
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2048 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1855 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2049 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1856 2050
1857 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 2051 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
1858 2052
1859 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2053 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1892 } 2086 }
1893 2087
1894 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2088 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1895} 2089}
1896 2090
1897sub setup_build_button {
1898 my ($enabled) = @_;
1899 if ($enabled) {
1900 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1901 $BUILD_BUTTON ||= new CFPlus::UI::Button
1902 text => "Build",
1903 tooltip => "Opens the ingame builder",
1904 on_activate => sub {
1905 if ($CONN) {
1906 $CONN->send_ext_req (builder_player_items => sub {
1907 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1908 });
1909 }
1910 0
1911 };
1912 $BUTTONBAR->add ($BUILD_BUTTON);
1913 } else {
1914 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1915 }
1916}
1917
1918sub open_ingame_editor {
1919 my ($msg) = @_;
1920
1921 my $win = new CFPlus::UI::Toplevel
1922 x => 0,
1923 y => 'center',
1924 z => 4,
1925 name => 'builder_window',
1926 force_w => int $WIDTH * 1/4,
1927 force_h => int $HEIGHT * 3/4,
1928 title => "In game builder",
1929 has_close_button => 1;
1930
1931 my $r = new CFPlus::UI::ScrolledWindow (
1932 expand => 1,
1933 scroll_y => 1
1934 );
1935 $r->add (my $vb = new CFPlus::UI::VBox);
1936 $win->add ($r);
1937
1938
1939 $vb->add (
1940 new CFPlus::UI::Button
1941 text => "Disable build mode",
1942 on_activate => sub { $::IN_BUILD_MODE = undef }
1943 );
1944 $vb->add (
1945 new CFPlus::UI::Button
1946 text => "ERASE",
1947 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1948 );
1949
1950 for my $itemarchname (
1951 sort {
1952 $msg->{items}->{$a}->{build_arch_name}
1953 cmp $msg->{items}->{$b}->{build_arch_name}
1954 } keys %{$msg->{items}}
1955 ) {
1956 my $info = $msg->{items}->{$itemarchname};
1957 $vb->add (
1958 new CFPlus::UI::Button text => $info->{build_arch_name},
1959 on_activate => sub {
1960 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1961
1962 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1963 build_mode_query_arch_info ();
1964 }
1965 }
1966 );
1967 }
1968
1969 $win->show;
1970}
1971
1972sub build_mode_query_arch_info {
1973 my ($iteminfo) = $::IN_BUILD_MODE;
1974 my $itemarchname = $iteminfo->{item};
1975 my $info = $iteminfo->{info};
1976
1977 my $dialog = new CFPlus::UI::Toplevel
1978 x => "center",
1979 y => "center",
1980 z => 50,
1981 force_w => int $WIDTH * 1/2,
1982 title => "Enter information for placement of '$itemarchname'",
1983 has_close_button => 1;
1984
1985 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1986
1987 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1988 my $row = 0;
1989 if ($info->{has_name}) {
1990 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1991 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1992 }
1993 if ($info->{has_text}) {
1994 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1995 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1996 }
1997 if ($info->{has_connection}) {
1998 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1999 $table->add (1, $row++,
2000 new CFPlus::UI::Entry
2001 expand => 1,
2002 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
2003 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
2004 );
2005 }
2006
2007 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2008 $hb->add (new CFPlus::UI::Button
2009 text => "Close",
2010 expand => 1,
2011 on_activate => sub { $dialog->hide; 0 },
2012 );
2013 $dialog->show;
2014}
2015
2016sub video_shutdown { 2091sub video_shutdown {
2017 CFPlus::OpenGL::shutdown; 2092 CFPlus::OpenGL::shutdown;
2018 2093
2019 undef $SDL_ACTIVE; 2094 undef $SDL_ACTIVE;
2020} 2095}
2021 2096
2022sub audio_channel_finished {
2023 my ($channel) = @_;
2024
2025 #warn "channel $channel finished\n";#d#
2026}
2027
2028sub audio_music_set {
2029 my ($songs) = @_;
2030
2031 my @want =
2032 grep $_,
2033 map $CONN->{music_meta}{$_},
2034 @$songs;
2035
2036 if (@want) {
2037 @MUSIC_WANT = @want;
2038 &audio_music_changed ();
2039 }
2040}
2041
2042sub audio_music_start {
2043 my $path = $MUSIC_PLAYING->{path}
2044 or return;
2045
2046 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2047 # music might have changed...
2048 $path eq $MUSIC_PLAYING->{path}
2049 or return &audio_music_start ();
2050
2051 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2052
2053 my $NOW = time;
2054
2055 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2056 my $pos = $MUSIC_PLAYING->{stop_pos};
2057 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2058 $MUSIC_START = time - $pos;
2059 } else {
2060 $MUSIC_PLAYER->play (0);
2061 $MUSIC_START = time;
2062 }
2063
2064 delete $MUSIC_PLAYING->{stop_time};
2065 delete $MUSIC_PLAYING->{stop_pos};
2066 }
2067}
2068
2069sub audio_music_changed {
2070 return unless $CFG->{bgm_enable};
2071
2072 # default MUSIC_WANT == MUSIC_DEFAULT
2073 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2074
2075 # if the currently playing song is acceptable, let it continue
2076 return if $MUSIC_PLAYING
2077 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2078
2079 my $NOW = time;
2080
2081 if ($MUSIC_PLAYING) {
2082 $MUSIC_PLAYING->{stop_time} = $NOW;
2083 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2084 CFPlus::MixMusic::fade_out 1000;
2085 } else {
2086 # sort by stop time, oldest first
2087 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2088
2089 # if the most recently-played piece played very recently,
2090 # resume it, else choose the oldest piece for rotation.
2091 $MUSIC_PLAYING =
2092 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2093 ? $MUSIC_WANT[-1]
2094 : $MUSIC_WANT[0];
2095
2096 audio_music_start;
2097 }
2098}
2099
2100sub audio_music_finished {
2101 $MUSIC_PLAYING = undef;
2102 undef $MUSIC_PLAYER;
2103
2104 audio_music_changed;
2105}
2106
2107sub audio_init {
2108 if ($CFG->{audio_enable}) {
2109 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2110 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2111
2112 unless ($SDL_MIXER) {
2113 status "Unable to open sound device: there will be no sound";
2114 return;
2115 }
2116
2117 CFPlus::Mix_AllocateChannels 8;
2118 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2119
2120 audio_music_finished;
2121
2122 local $_;
2123 while (<$fh>) {
2124 next if /^\s*#/;
2125 next if /^\s*$/;
2126
2127 my ($file, $volume, $event) = split /\s+/, $_, 3;
2128
2129 push @SOUNDS, "$volume,$file";
2130
2131 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2132 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2133 $chunk->volume ($volume * 128 / 100);
2134 $chunk
2135 };
2136 }
2137 } else {
2138 status "unable to open sound config: $!";
2139 }
2140 }
2141}
2142
2143sub audio_shutdown {
2144 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2145 undef $SDL_MIXER;
2146 @SOUNDS = ();
2147 %AUDIO_CHUNKS = ();
2148}
2149
2150my %animate_object; 2097my %animate_object;
2151my $animate_timer; 2098my $animate_timer;
2152 2099
2153my $fps = 9; 2100my $fps = 9;
2154
2155my %demo;#d#
2156 2101
2157sub force_refresh { 2102sub force_refresh {
2158 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2103 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2159 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2160 2105
2161 $CFPlus::UI::ROOT->draw; 2106 $CFPlus::UI::ROOT->draw;
2162 2107
2163 $WANT_REFRESH = 0; 2108 $WANT_REFRESH = 0;
2164 $CAN_REFRESH = 0; 2109 $CAN_REFRESH = 0;
2165 $LAST_REFRESH = $NOW; 2110 $LAST_REFRESH = $NOW;
2166 2111
2167 CFPlus::SDL_GL_SwapBuffers; 2112 CFPlus::SDL_GL_SwapBuffers;
2168} 2113}
2169 2114
… …
2173 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2118 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2174 for CFPlus::poll_events; 2119 for CFPlus::poll_events;
2175 2120
2176 if (%animate_object) { 2121 if (%animate_object) {
2177 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2122 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2178 $WANT_REFRESH++; 2123 ++$WANT_REFRESH;
2179 } 2124 }
2180 2125
2181 if ($WANT_REFRESH) { 2126 if ($WANT_REFRESH) {
2182 force_refresh; 2127 force_refresh;
2183 } else { 2128 } else {
… …
2192 2137
2193sub animation_stop { 2138sub animation_stop {
2194 my ($widget) = @_; 2139 my ($widget) = @_;
2195 delete $animate_object{$widget}; 2140 delete $animate_object{$widget};
2196} 2141}
2197
2198# check once/second for faces that need to be prefetched
2199# this should, of course, only run on demand, but
2200# SDL forces worse things on us....
2201
2202Event->timer (after => 1, interval => 0.25, cb => sub {
2203 $CONN->face_prefetch
2204 if $CONN;
2205});
2206 2142
2207%SDL_CB = ( 2143%SDL_CB = (
2208 CFPlus::SDL_QUIT => sub { 2144 CFPlus::SDL_QUIT => sub {
2209 exit; 2145 exit;
2210 }, 2146 },
… …
2254 2190
2255 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2256 2192
2257 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2258 sdl_mode => 0, 2194 sdl_mode => 0,
2259 width => 640,
2260 height => 480,
2261 fullscreen => 0, 2195 fullscreen => 0,
2262 fast => 0, 2196 fast => 0,
2263 map_scale => 1, 2197 map_scale => 1,
2264 fow_enable => 1, 2198 fow_enable => 1,
2265 fow_intensity => 0.45, 2199 fow_intensity => 0,
2266 fow_smooth => 0,
2267 map_smoothing => 1, 2200 map_smoothing => 1,
2268 gui_fontsize => 1, 2201 gui_fontsize => 1,
2269 log_fontsize => 0.7, 2202 log_fontsize => 0.7,
2270 gauge_fontsize => 1, 2203 gauge_fontsize => 1,
2271 gauge_size => 0.35, 2204 gauge_size => 0.35,
2272 stat_fontsize => 0.7, 2205 stat_fontsize => 0.7,
2273 mapsize => 100, 2206 mapsize => 100,
2274 say_command => 'chat',
2275 audio_enable => 1, 2207 audio_enable => 1,
2208 effects_enable => 1,
2209 effects_volume => 1,
2276 bgm_enable => 1, 2210 bgm_enable => 1,
2277 bgm_volume => 0.25, 2211 bgm_volume => 0.5,
2278 face_prefetch => 0,
2279 output_sync => 1, 2212 output_sync => 1,
2280 output_count => 1, 2213 output_count => 1,
2281 output_rate => "", 2214 output_rate => "",
2282 pickup => 0, 2215 pickup => 0,
2283 inv_sort => "mtime", 2216 inv_sort => "mtime",
… …
2305 } 2238 }
2306 } 2239 }
2307 2240
2308 sdl_init; 2241 sdl_init;
2309 2242
2310 @SDL_MODES = reverse 2243 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2311 grep $_->[0] >= 640 && $_->[1] >= 480, 2244 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2312 CFPlus::SDL_ListModes;
2313
2314 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2245 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2246
2247 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2315 2248
2316 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2249 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2317 2250
2318 { 2251 {
2319 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2252 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2361Event::loop; 2294Event::loop;
2362#CFPlus::SDL_Quit; 2295#CFPlus::SDL_Quit;
2363#CFPlus::_exit 0; 2296#CFPlus::_exit 0;
2364 2297
2365END { 2298END {
2299 video_shutdown;
2300 audio_shutdown;
2366 CFPlus::SDL_Quit; 2301 CFPlus::SDL_Quit;
2367 CFPlus::DB::Server::stop; 2302 CFPlus::DB::Server::stop;
2368} 2303}
2369 2304
2370=head1 NAME 2305=head1 NAME
2371 2306
2372cfplus - A Crossfire+ and Crossfire game client 2307cfplus - A Crossfire TRT and Crossfire game client
2373 2308
2374=head1 SYNOPSIS 2309=head1 SYNOPSIS
2375 2310
2376Just run it - no commandline arguments are supported. 2311Just run it - no commandline arguments are supported.
2377 2312
2378=head1 USAGE 2313=head1 USAGE
2379 2314
2380cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2315cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2381fullscreen and interactively. 2316be used in fullscreen mode and interactively.
2382 2317
2383=head1 DEBUGGING 2318=head1 DEBUGGING
2384 2319
2385 2320
2386CFPLUS_DEBUG - environment variable 2321CFPLUS_DEBUG - environment variable

Diff Legend

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