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.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_PLAYING;
167our $MUSIC_PLAYER;
168our @SOUNDS; # event => file mapping
169our %AUDIO_CHUNKS; # audio files
170
171our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
172our $STATUSBOX; 168our $STATUSBOX;
173our $DEBUG_STATUS; 169our $DEBUG_STATUS;
174 170
175our $INV; 171our $INV;
176our $INVR; 172our $INVR;
177our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
178 174
179our $PICKUP_CFG; 175our $PICKUP_CFG;
180 176
181our $IN_BUILD_MODE; 177#############################################################################
182our $BUILD_BUTTON;
183 178
184sub status { 179sub status {
185 $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]);
186} 181}
187 182
… …
189 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
190} 185}
191 186
192sub message { 187sub message {
193 my ($para) = @_; 188 my ($para) = @_;
194 189 $MESSAGE_WINDOW->message ($para);
195 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
196
197 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
198
199 $LOGVIEW->add_paragraph ($para);
200 $LOGVIEW->scroll_to_bottom;
201} 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#############################################################################
202 438
203sub destroy_query_dialog { 439sub destroy_query_dialog {
204 (delete $_[0]{query_dialog})->destroy 440 (delete $_[0]{query_dialog})->destroy
205 if $_[0]{query_dialog}; 441 if $_[0]{query_dialog};
206} 442}
… …
270 ellipsise => 0, 506 ellipsise => 0,
271 markup => "\nOr use your keyboard and the text entry below:\n"; 507 markup => "\nOr use your keyboard and the text entry below:\n";
272 508
273 unshift @dialog, my $table = new CFPlus::UI::Table; 509 unshift @dialog, my $table = new CFPlus::UI::Table;
274 510
275 $table->add (0, 0, new CFPlus::UI::Button 511 $table->add_at (0, 0, new CFPlus::UI::Button
276 text => "Next Race", 512 text => "Next Race",
277 on_activate => sub { 513 on_activate => sub {
278 $conn->send ("reply n"); 514 $conn->send ("reply n");
279 destroy_query_dialog $conn; 515 destroy_query_dialog $conn;
280 0 516 0
281 }, 517 },
282 ); 518 );
283 $table->add (2, 0, new CFPlus::UI::Button 519 $table->add_at (2, 0, new CFPlus::UI::Button
284 text => "Accept", 520 text => "Accept",
285 on_activate => sub { 521 on_activate => sub {
286 $conn->send ("reply d"); 522 $conn->send ("reply d");
287 destroy_query_dialog $conn; 523 destroy_query_dialog $conn;
288 0 524 0
… …
323 $conn->send ("reply $stat"); 559 $conn->send ("reply $stat");
324 destroy_query_dialog $conn; 560 destroy_query_dialog $conn;
325 return; 561 return;
326 } 562 }
327 563
328 $STATS_PAGE->show;
329 $MESSAGE_WINDOW->hide;
330
331 unshift @dialog, new CFPlus::UI::Label 564 unshift @dialog, new CFPlus::UI::Label
332 max_w => $::WIDTH * 0.4, 565 max_w => $::WIDTH * 0.4,
333 ellipsise => 0, 566 ellipsise => 0,
334 markup => "\nOr use your keyboard and the text entry below:\n"; 567 markup => "\nOr use your keyboard and the text entry below:\n";
335 568
336 unshift @dialog, my $table = new CFPlus::UI::Table; 569 unshift @dialog, my $table = new CFPlus::UI::Table;
337 570
338 # left: re-roll 571 # left: re-roll
339 $table->add (0, 0, new CFPlus::UI::Button 572 $table->add_at (0, 0, new CFPlus::UI::Button
340 text => "Roll Again", 573 text => "Roll Again",
341 on_activate => sub { 574 on_activate => sub {
342 $conn->send ("reply y"); 575 $conn->send ("reply y");
343 destroy_query_dialog $conn; 576 destroy_query_dialog $conn;
344 0 577 0
… …
358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 591 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 592 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
360 ], 593 ],
361 ), 1 .. 2; 594 ), 1 .. 2;
362 595
363 $table->add (2, 0, new CFPlus::UI::Button 596 $table->add_at (2, 0, new CFPlus::UI::Button
364 text => "Swap Stats", 597 text => "Swap Stats",
365 on_activate => sub { 598 on_activate => sub {
366 $conn->{stat_change_with} = $sw2->{value}; 599 $conn->{stat_change_with} = $sw2->{value};
367 $conn->send ("reply $sw1->{value}"); 600 $conn->send ("reply $sw1->{value}");
368 destroy_query_dialog $conn; 601 destroy_query_dialog $conn;
369 0 602 0
370 }, 603 },
371 ); 604 );
372 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 605 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
373 606
374 # right: accept 607 # right: accept
375 $table->add (4, 0, new CFPlus::UI::Button 608 $table->add_at (4, 0, new CFPlus::UI::Button
376 text => "Accept", 609 text => "Accept",
377 on_activate => sub { 610 on_activate => sub {
378 $conn->send ("reply n"); 611 $conn->send ("reply n");
379 $STATS_PAGE->hide; 612 $STATS_PAGE->hide;
380 destroy_query_dialog $conn; 613 destroy_query_dialog $conn;
… …
461 maph => $mapsize, 694 maph => $mapsize,
462 695
463 client => "cfplus $CFPlus::VERSION $] $^O", 696 client => "cfplus $CFPlus::VERSION $] $^O",
464 697
465 map_widget => $MAPWIDGET, 698 map_widget => $MAPWIDGET,
466 logview => $LOGVIEW,
467 statusbox => $STATUSBOX, 699 statusbox => $STATUSBOX,
468 map => $MAP, 700 map => $MAP,
469 mapmap => $MAPMAP, 701 mapmap => $MAPMAP,
470 query => \&server_query, 702 query => \&server_query,
471 703
472 setup_req => { 704 setup_req => {
473 smoothing => $CFG->{map_smoothing}*1, 705 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 }, 706 },
487 }; 707 };
488 708
489 if ($CONN) { 709 if ($CONN) {
490 CFPlus::lowdelay fileno $CONN->{fh}; 710 CFPlus::lowdelay fileno $CONN->{fh};
… …
502 $SETUP_DIALOG->show; 722 $SETUP_DIALOG->show;
503 $PL_WINDOW->hide; 723 $PL_WINDOW->hide;
504 $SPELL_LIST->clear_spells; 724 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 725 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
506 726
507 &audio_music_set ([]); 727 &audio_music_set_ambient ([]);
508 728
509 return unless $CONN; 729 return unless $CONN;
510 730
511 status "connection closed"; 731 status "connection closed";
512 732
… …
522 742
523 $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]);
524 744
525 my $row = 0; 745 my $row = 0;
526 746
527 $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");
528 $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,
529 can_events => 1, 749 can_events => 1,
530 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 750 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
531 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
532 $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");
533 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 757 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
534 758
759 $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]); 760 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"); 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);
537 765
538 $mode_slider->connect (changed => sub { 766 $mode_slider->connect (changed => sub {
539 my ($self, $value) = @_; 767 my ($self, $value) = @_;
540 768
541 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 769 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
542 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 770 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
543 }); 771 });
544 $mode_slider->emit (changed => $mode_slider->{range}[0]); 772 $mode_slider->emit (changed => $mode_slider->{range}[0]);
545 773
546 $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");
547 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 775 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
548 state => $CFG->{fullscreen}, 776 state => $CFG->{fullscreen},
549 tooltip => "Bring the client into fullscreen mode.", 777 tooltip => "Bring the client into fullscreen mode.",
550 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
551 ); 779 );
552 780
553 $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");
554 $table->add (1, $row++, new CFPlus::UI::CheckBox 782 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
555 state => $CFG->{fast}, 783 state => $CFG->{fast},
556 tooltip => "Lower the visual quality considerably to speed up rendering.", 784 tooltip => "Lower the visual quality considerably to speed up rendering.",
557 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 785 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
558 ); 786 );
559 787
560 $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");
561 $table->add (1, $row++, new CFPlus::UI::Slider 789 $table->add_at (1, $row++, new CFPlus::UI::Slider
562 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 790 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.", 791 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 }, 792 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
565 ); 793 );
566 794
567 $table->add (1, $row++, new CFPlus::UI::Button 795 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 796 expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the video settings above.", 797 tooltip => "Apply the video settings above.",
570 on_activate => sub { 798 on_activate => sub {
571 video_shutdown (); 799 video_shutdown ();
572 video_init (); 800 video_init ();
573 0 801 0
574 } 802 }
575 ); 803 );
576 804
577 $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");
578 $table->add (1, $row++, new CFPlus::UI::Slider 806 $table->add_at (1, $row++, new CFPlus::UI::Slider
579 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 807 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
580 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 808 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
581 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 }
582 ); 810 );
583 811
584 $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");
585 $table->add (1, $row++, new CFPlus::UI::CheckBox 813 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
586 state => $CFG->{map_smoothing}, 814 state => $CFG->{map_smoothing},
587 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. "
588 . "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. "
589 . "Changes take effect at next connection only.", 817 . "Changes take effect at next connection only.",
590 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
591 ); 819 );
592 820
593 $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");
594 $table->add (1, $row++, new CFPlus::UI::CheckBox 822 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
595 state => $CFG->{fow_enable}, 823 state => $CFG->{fow_enable},
596 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.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
598 ); 826 );
599 827
600 $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");
601 $table->add (1, $row++, new CFPlus::UI::Slider 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
602 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 830 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.", 831 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 } 832 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
605 ); 833 );
606 834
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"); 835 $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 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
621 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 837 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.", 838 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
623 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 839 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
624 ); 840 );
625 841
626 $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");
627 $table->add (1, $row++, new CFPlus::UI::Slider 843 $table->add_at (1, $row++, new CFPlus::UI::Slider
628 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 844 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.", 845 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
630 on_changed => sub { 846 on_changed => sub {
631 $CFG->{gauge_fontsize} = $_[1]; 847 $CFG->{gauge_fontsize} = $_[1];
632 &set_gauge_window_fontsize; 848 &set_gauge_window_fontsize;
633 0 849 0
634 } 850 }
635 ); 851 );
636 852
637 $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");
638 $table->add (1, $row++, new CFPlus::UI::Slider 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
639 range => [$CFG->{gauge_size}, 0.2, 0.8], 855 range => [$CFG->{gauge_size}, 0.2, 0.8],
640 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.",
641 on_changed => sub { 857 on_changed => sub {
642 $CFG->{gauge_size} = $_[1]; 858 $CFG->{gauge_size} = $_[1];
643 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 859 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
649} 865}
650 866
651sub audio_setup { 867sub audio_setup {
652 my $vbox = new CFPlus::UI::VBox; 868 my $vbox = new CFPlus::UI::VBox;
653 869
654 $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]);
655 871
656 my $row = 0; 872 my $row = 0;
657 873
658 $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");
659 $table->add (1, $row++, new CFPlus::UI::CheckBox 875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
660 state => $CFG->{audio_enable}, 876 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.", 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.",
662 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 878 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
663 ); 879 );
664# $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");
665# $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 {
666# $CFG->{effects_volume} = $_[1]; 882# $CFG->{effects_volume} = $_[1];
667# }); 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
668 $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");
669 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
670 $hbox->add (new CFPlus::UI::CheckBox 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
671 expand => 1, state => $CFG->{bgm_enable}, 904 expand => 1, state => $CFG->{bgm_enable},
672 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.",
673 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 }
674 ); 911 );
675 $hbox->add (new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
676 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
677 tooltip => "The volume of the background music. Changes are instant.", 914 tooltip => "The volume of the background music. Changes are instant.",
678 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 }
679 ); 916 );
680 917
681 $table->add (1, $row++, new CFPlus::UI::Button 918 $table->add_at (1, $row++, new CFPlus::UI::Button
682 expand => 1, align => 0, text => "Apply", 919 c_colspan => 2, expand => 1, align => 0, text => "Apply",
683 tooltip => "Apply the audio settings", 920 tooltip => "Apply the audio settings",
684 on_activate => sub { 921 on_activate => sub {
685 audio_shutdown (); 922 audio_shutdown ();
686 audio_init (); 923 audio_init ();
687 0 924 0
… …
745} 982}
746 983
747sub debug_setup { 984sub debug_setup {
748 my $table = new CFPlus::UI::Table; 985 my $table = new CFPlus::UI::Table;
749 986
750 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 987 $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 }); 988 $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"); 989 $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 }); 990 $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"); 991 $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 }); 992 $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"); 993 $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 }); 994 $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() } ); 995 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
759 996
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# 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 });
773 1031
774 $table 1032 $table
775} 1033}
776 1034
777sub stats_window { 1035sub stats_window {
… …
825 [2, 4, st_spd => "Spd", 10.54], 1083 [2, 4, st_spd => "Spd", 10.54],
826 [2, 5, st_wspd => "WSp", 10.54], 1084 [2, 5, st_wspd => "WSp", 10.54],
827 ) { 1085 ) {
828 my ($col, $row, $id, $label, $template) = @$_; 1086 my ($col, $row, $id, $label, $template) = @$_;
829 1087
830 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1088 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
831 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1089 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
832 align => +1, template => $template, tooltip => "#stat_$label"); 1090 align => +1, template => $template, tooltip => "#stat_$label");
833 $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
834 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,
835 align => -1, text => $label, tooltip => "#stat_$label"); 1093 align => -1, text => $label, tooltip => "#stat_$label");
836 } 1094 }
837 1095
838 $vb->add (new CFPlus::UI::FancyFrame 1096 $vb->add (new CFPlus::UI::FancyFrame
… …
879 cold => ["Cold", 1137 cold => ["Cold",
880 "<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, ...)"],
881 ghit => ["Ghost hit", 1139 ghit => ["Ghost hit",
882 "<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)"],
883 ); 1141 );
1142
884 for (qw/slow holyw conf fire depl magic 1143 for (qw/slow holyw conf fire depl magic
885 drain acid pois para deat phys 1144 drain acid pois para deat phys
886 blind fear tund elec cold ghit/) 1145 blind fear tund elec cold ghit/)
887 { 1146 {
888 $tbl2->add ($col, $row, 1147 $tbl2->add_at ($col, $row,
889 $STATWIDS->{"res_$_"} = 1148 $STATWIDS->{"res_$_"} =
890 new CFPlus::UI::Label 1149 new CFPlus::UI::Label
891 font => $FONT_FIXED, 1150 font => $FONT_FIXED,
892 template => "-100%", 1151 template => "-100%",
893 align => +1, 1152 align => +1,
894 valign => 0, 1153 valign => 0,
895 can_events => 1, 1154 can_events => 1,
896 can_hover => 1, 1155 can_hover => 1,
897 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
898 ); 1157 );
899 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1158 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
900 font => $FONT_FIXED, 1159 font => $FONT_FIXED,
901 can_hover => 1, 1160 can_hover => 1,
902 can_events => 1, 1161 can_events => 1,
903 path => "ui/resist/resist_$_.png", 1162 path => "ui/resist/resist_$_.png",
904 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
905 ); 1164 );
906 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1165 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
907 text => $resist_names{$_}->[0], 1166 text => $resist_names{$_}->[0],
908 font => $FONT_FIXED, 1167 font => $FONT_FIXED,
909 can_hover => 1, 1168 can_hover => 1,
910 can_events => 1, 1169 can_events => 1,
911 tooltip => $resist_names{$_}->[1], 1170 tooltip => $resist_names{$_}->[1],
… …
944 return if $METASERVER_ATIME > time; 1203 return if $METASERVER_ATIME > time;
945 $METASERVER_ATIME = time + 60; 1204 $METASERVER_ATIME = time + 60;
946 1205
947 my $table = $METASERVER->{table}; 1206 my $table = $METASERVER->{table};
948 $table->clear; 1207 $table->clear;
949 $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...");
950 1209
951 my $ok = 0; 1210 my $ok = 0;
952 1211
953 CFPlus::background { 1212 CFPlus::background {
954 my $ua = CFPlus::lwp_useragent; 1213 my $ua = CFPlus::lwp_useragent;
… …
965 "The time this server has been running without being restarted.", 1224 "The time this server has been running without being restarted.",
966 "The server software version - a '+' indicates a Crossfire+ server.", 1225 "The server software version - a '+' indicates a Crossfire+ server.",
967 "Short information about this server provided by its admins.", 1226 "Short information about this server provided by its admins.",
968 ); 1227 );
969 my @col = qw(#Users Host Uptime Version Description); 1228 my @col = qw(#Users Host Uptime Version Description);
970 $table->add ($_, 0, new CFPlus::UI::Label 1229 $table->add_at ($_, 0, new CFPlus::UI::Label
971 can_hover => 1, can_events => 1, 1230 can_hover => 1, can_events => 1,
972 align => 0, fg => [1, 1, 0], 1231 align => 0, fg => [1, 1, 0],
973 text => $col[$_], tooltip => $tip[$_]) 1232 text => $col[$_], tooltip => $tip[$_])
974 for 0 .. $#col; 1233 for 0 .. $#col;
975 1234
… …
997 1256
998 $m = [$users, $host, $uptime, $version, $desc]; 1257 $m = [$users, $host, $uptime, $version, $desc];
999 1258
1000 $y++; 1259 $y++;
1001 1260
1002 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1261 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1003 (new CFPlus::UI::Button 1262 (new CFPlus::UI::Button
1004 text => "Use", 1263 text => "Use",
1005 tooltip => "Put this server into the <b>Host:Port</b> field", 1264 tooltip => "Put this server into the <b>Host:Port</b> field",
1006 on_activate => sub { 1265 on_activate => sub {
1007 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1266 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1010 }, 1269 },
1011 ), 1270 ),
1012 (new CFPlus::UI::Empty expand => 1), 1271 (new CFPlus::UI::Empty expand => 1),
1013 ]); 1272 ]);
1014 1273
1015 $table->add ($_, $y, new CFPlus::UI::Label 1274 $table->add_at ($_, $y, new CFPlus::UI::Label
1016 max_w => $::WIDTH * 0.4, 1275 max_w => $::WIDTH * 0.4,
1017 ellipsise => 0, 1276 ellipsise => 0,
1018 align => $align[$_], 1277 align => $align[$_],
1019 text => $m->[$_], 1278 text => $m->[$_],
1020 tooltip => $tip[$_], 1279 tooltip => $tip[$_],
… …
1061 1320
1062 $vbox->add (new CFPlus::UI::FancyFrame 1321 $vbox->add (new CFPlus::UI::FancyFrame
1063 label => "Connection Settings", 1322 label => "Connection Settings",
1064 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]),
1065 ); 1324 );
1066 $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");
1067 1326
1068 { 1327 {
1069 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1328 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1070 1329
1071 $vbox->add ( 1330 $vbox->add (
1072 $HOST_ENTRY = new CFPlus::UI::Entry 1331 $HOST_ENTRY = new CFPlus::UI::Entry
1073 expand => 1, 1332 expand => 1,
1074 text => $CFG->{profile}{default}{host}, 1333 text => $CFG->{profile}{default}{host},
1075 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",
1076 on_changed => sub { 1335 on_changed => sub {
1077 my ($self, $value) = @_; 1336 my ($self, $value) = @_;
1078 $CFG->{profile}{default}{host} = $value; 1337 $CFG->{profile}{default}{host} = $value;
1079 0 1338 1
1080 } 1339 }
1081 ); 1340 );
1082 1341
1083 $vbox->add (new CFPlus::UI::Button 1342 $vbox->add (new CFPlus::UI::Button
1084 expand => 1, 1343 expand => 1,
1085 text => "Server List", 1344 text => "Server List",
1086 other => $METASERVER, 1345 other => $METASERVER,
1087 tooltip => "Show a list of available crossfire servers", 1346 tooltip => "Show a list of available crossfire servers",
1088 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1347 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1089 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1348 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1090 ); 1349 );
1091 } 1350 }
1092 1351
1093 $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");
1094 $table->add (1, 4, new CFPlus::UI::Entry 1353 $table->add_at (1, 4, new CFPlus::UI::Entry
1095 text => $CFG->{profile}{default}{user}, 1354 text => $CFG->{profile}{default}{user},
1096 tooltip => "The name of your character on the server", 1355 tooltip => "The name of your character on the server",
1097 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1356 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1098 ); 1357 );
1099 1358
1100 $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");
1101 $table->add (1, 5, new CFPlus::UI::Entry 1360 $table->add_at (1, 5, new CFPlus::UI::Entry
1102 text => $CFG->{profile}{default}{password}, 1361 text => $CFG->{profile}{default}{password},
1103 hidden => 1, 1362 hidden => 1,
1104 tooltip => "The password for your character", 1363 tooltip => "The password for your character",
1105 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1106 ); 1365 );
1107 1366
1108 $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");
1109 $table->add (1, 7, new CFPlus::UI::Slider 1368 $table->add_at (1, 7, new CFPlus::UI::Slider
1110 force_w => 100, 1369 force_w => 100,
1111 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1370 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1112 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. "
1113 . "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, "
1114 . "but you also increase bandwidth requirements and latency. " 1373 . "but you also increase bandwidth requirements and latency. "
1115 . "This option is only used once at log-in.", 1374 . "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 }, 1375 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1117 ); 1376 );
1118 1377
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"); 1378 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1133 $table->add (1, 9, new CFPlus::UI::Entry 1379 $table->add_at (1, 8, new CFPlus::UI::Entry
1134 text => $CFG->{output_rate}, 1380 text => $CFG->{output_rate},
1135 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 "
1136 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1382 . "when sending data. When 0 or unset, the server "
1137 . "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.",
1138 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1139 ); 1386 );
1140 1387
1141 $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");
1142 $table->add (1, 10, new CFPlus::UI::Entry 1389 $table->add_at (1, 9, new CFPlus::UI::Entry
1143 text => $CFG->{output_count}, 1390 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.", 1391 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 }, 1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1146 ); 1393 );
1147 1394
1148 $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");
1149 $table->add (1, 11, new CFPlus::UI::Entry 1396 $table->add_at (1, 10, new CFPlus::UI::Entry
1150 text => $CFG->{output_sync}, 1397 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.", 1398 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 }, 1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1153 ); 1400 );
1154 1401
1155 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1156 expand => 1, 1403 expand => 1,
1157 align => 0, 1404 align => 0,
1158 text => "Login", 1405 text => "Login",
1159 on_activate => sub { 1406 on_activate => sub {
1160 $CONN ? stop_game 1407 $CONN ? stop_game
1161 : start_game; 1408 : start_game;
1162 0 1409 1
1163 }, 1410 },
1164 ); 1411 );
1165 1412
1166 $vbox->add (new CFPlus::UI::FancyFrame 1413 $vbox->add (new CFPlus::UI::FancyFrame
1167 label => "Server Info", 1414 label => "Server Info",
… …
1174sub client_setup { 1421sub client_setup {
1175 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];
1176 1423
1177 my $row = 0; 1424 my $row = 0;
1178 1425
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"); 1426 $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 1427 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1194 state => $CFG->{show_tips}, 1428 state => $CFG->{show_tips},
1195 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?",
1196 on_changed => sub { 1430 on_changed => sub {
1197 my ($self, $value) = @_; 1431 my ($self, $value) = @_;
1198 $CFG->{show_tips} = $value; 1432 $CFG->{show_tips} = $value;
1199 0 1433 0
1200 } 1434 }
1201 ); 1435 );
1202 1436
1203 $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");
1204 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1438 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1205 text => $CFG->{logview_max_par}, 1439 text => $CFG->{logview_max_par},
1206 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 "
1207 . "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 "
1208 . "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.",
1209 on_changed => sub { 1443 on_changed => sub {
1210 my ($self, $value) = @_; 1444 my ($self, $value) = @_;
1211 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1445 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1212 0 1446 0
1213 }, 1447 },
1214 ); 1448 );
1215 1449
1216 $table 1450 $table
1217} 1451}
1218 1452
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 { 1453sub autopickup_setup {
1454 my $r = new CFPlus::UI::ScrolledWindow (
1455 expand => 1,
1456 scroll_y => 1
1457 );
1283 my $table = new CFPlus::UI::Table; 1458 $r->add (my $table = new CFPlus::UI::Table
1459 row_expand => [0],
1460 col_expand => [0, 1, 0, 1],
1461 );
1284 1462
1285 for ( 1463 for (
1286 ["General", 0, 0, 1464 ["General", 0, 0,
1287 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1465 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1288 ["Inhibit autopickup" => PICKUP_INHIBIT], 1466 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1323 ], 1501 ],
1324 ["Weight/Value ratio", 2, 17] 1502 ["Weight/Value ratio", 2, 17]
1325 ) 1503 )
1326 { 1504 {
1327 my ($title, $x, $y, @bits) = @$_; 1505 my ($title, $x, $y, @bits) = @$_;
1328 $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]);
1329 1507
1330 for (@bits) { 1508 for (@bits) {
1331 ++$y; 1509 ++$y;
1332 1510
1333 my $mask = $_->[1]; 1511 my $mask = $_->[1];
1334 $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);
1335 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1513 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1336 state => $::CFG->{pickup} & $mask, 1514 state => $::CFG->{pickup} & $mask,
1337 on_changed => sub { 1515 on_changed => sub {
1338 my ($box, $value) = @_; 1516 my ($box, $value) = @_;
1339 1517
1340 if ($value) { 1518 if ($value) {
… …
1351 1529
1352 ${$_->[2]} = $checkbox if $_->[2]; 1530 ${$_->[2]} = $checkbox if $_->[2];
1353 } 1531 }
1354 } 1532 }
1355 1533
1356 $table->add (2, 18, new CFPlus::UI::ValSlider 1534 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1357 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1535 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1358 template => ">= 99", 1536 template => ">= 99",
1359 to_value => sub { ">= " . 5 * $_[0] }, 1537 to_value => sub { ">= " . 5 * $_[0] },
1360 on_changed => sub { 1538 on_changed => sub {
1361 my ($slider, $value) = @_; 1539 my ($slider, $value) = @_;
… …
1364 $::CFG->{pickup} |= int $value 1542 $::CFG->{pickup} |= int $value
1365 if $value; 1543 if $value;
1366 1; 1544 1;
1367 }); 1545 });
1368 1546
1369 $table->add (3, 18, new CFPlus::UI::Button 1547 $table->add_at (3, 18, new CFPlus::UI::Button
1370 text => "set", 1548 text => "set",
1371 on_activate => sub { 1549 on_activate => sub {
1372 $::CONN->send_command ("pickup $::CFG->{pickup}") 1550 $::CONN->send_command ("pickup $::CFG->{pickup}")
1373 if defined $::CONN; 1551 if defined $::CONN;
1374 0 1552 0
1375 }); 1553 });
1376 1554
1377 $table 1555 $r
1378} 1556}
1379 1557
1380my %SORT_ORDER = ( 1558my %SORT_ORDER = (
1381 type => undef, 1559 type => undef,
1382 mtime => sub { 1560 mtime => sub {
… …
1437 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1615 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1438 1616
1439 $hb 1617 $hb
1440} 1618}
1441 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
1442sub toggle_player_page { 1660sub toggle_player_page {
1443 my ($widget) = @_; 1661 my ($widget) = @_;
1444 1662
1445 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1663 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1446 $PL_WINDOW->hide; 1664 $PL_WINDOW->hide;
… …
1463 1681
1464 my $ntb = 1682 my $ntb =
1465 $PL_NOTEBOOK = 1683 $PL_NOTEBOOK =
1466 new CFPlus::UI::Notebook expand => 1; 1684 new CFPlus::UI::Notebook expand => 1;
1467 1685
1468 $ntb->add ( 1686 $ntb->add_tab (
1469 "Statistics (F2)" => $STATS_PAGE = stats_window, 1687 "Statistics (F2)" => $STATS_PAGE = stats_window,
1470 "Shows statistics, where all your Stats and Resistances are shown." 1688 "Shows statistics, where all your Stats and Resistances are shown."
1471 ); 1689 );
1472 $ntb->add ( 1690 $ntb->add_tab (
1473 "Skills (F3)" => $SKILL_PAGE = skill_window, 1691 "Skills (F3)" => $SKILL_PAGE = skill_window,
1474 "Shows all your Skills." 1692 "Shows all your Skills."
1475 ); 1693 );
1476 1694
1477 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);
1478 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1696 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1479 $ntb->add ( 1697 $ntb->add_tab (
1480 "Spellbook (F4)" => $spellsw, 1698 "Spellbook (F4)" => $spellsw,
1481 "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."
1482 ); 1700 );
1483 $ntb->add ( 1701 $ntb->add_tab (
1484 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1485 "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 :). "
1486 . "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."
1487 ); 1705 );
1488 $ntb->add (Pickup => autopickup_setup, 1706 $ntb->add_tab (Pickup => autopickup_setup,
1489 "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.");
1490 1711
1491 $ntb->set_current_page ($INVENTORY_PAGE); 1712 $ntb->set_current_page ($INVENTORY_PAGE);
1492 1713
1493 $plwin->add ($ntb); 1714 $plwin->add ($ntb);
1494 $plwin 1715 $plwin
… …
1691 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1912 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]); 1913 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1693 1914
1694 $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]);
1695 1916
1696 $table->add (0, 0, new CFPlus::UI::Button 1917 $table->add_at (0, 0, new CFPlus::UI::Button
1697 text => "Close", 1918 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>.", 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>.",
1699 on_activate => $close, 1920 on_activate => $close,
1700 ); 1921 );
1701 1922
1702 $table->add (2, 0, new CFPlus::UI::Button 1923 $table->add_at (2, 0, new CFPlus::UI::Button
1703 text => "Next", 1924 text => "Next",
1704 tooltip => "Show the next <b>Tip of the day</b>.", 1925 tooltip => "Show the next <b>Tip of the day</b>.",
1705 on_activate => sub { 1926 on_activate => sub {
1706 $close->(); 1927 $close->();
1707 &show_tip_of_the_day; 1928 &show_tip_of_the_day;
… …
1716 CFPlus::SDL_Init 1937 CFPlus::SDL_Init
1717 and die "SDL::Init failed!\n"; 1938 and die "SDL::Init failed!\n";
1718} 1939}
1719 1940
1720sub video_init { 1941sub video_init {
1721 sdl_init;
1722
1723 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1724 1943
1725 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1944 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1726 1945
1727 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1946 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1728 $FULLSCREEN = $CFG->{fullscreen}; 1947 $FULLSCREEN = $CFG->{fullscreen};
1729 $FAST = $CFG->{fast}; 1948 $FAST = $CFG->{fast};
1730 1949
1731 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1950 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1732 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1951 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1733 1952
1734 $SDL_ACTIVE = 1; 1953 $SDL_ACTIVE = 1;
1735 $LAST_REFRESH = time - 0.01; 1954 $LAST_REFRESH = time - 0.01;
1736 1955
… …
1778 1997
1779 $MAPWIDGET = new CFPlus::MapWidget; 1998 $MAPWIDGET = new CFPlus::MapWidget;
1780 $MAPWIDGET->connect (activate_console => sub { 1999 $MAPWIDGET->connect (activate_console => sub {
1781 my ($mapwidget, $preset) = @_; 2000 my ($mapwidget, $preset) = @_;
1782 2001
1783 if ($CONSOLE) { 2002 $MESSAGE_WINDOW->activate_console ($preset)
1784 $CONSOLE->{input}->{auto_activated} = 1; 2003 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 }); 2004 });
1792 $MAPWIDGET->show; 2005 $MAPWIDGET->show;
1793 $MAPWIDGET->grab_focus; 2006 $MAPWIDGET->grab_focus;
1794
1795 $LOGVIEW = new CFPlus::UI::TextScroller
1796 expand => 1,
1797 font => $FONT_FIXED,
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 ;
1805 2007
1806 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2008 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1807 title => "Setup", 2009 title => "Setup",
1808 name => "setup_dialog", 2010 name => "setup_dialog",
1809 x => 'center', 2011 x => 'center',
… …
1813 force_h => $::HEIGHT * 0.6, 2015 force_h => $::HEIGHT * 0.6,
1814 has_close_button => 1, 2016 has_close_button => 1,
1815 ; 2017 ;
1816 2018
1817 $METASERVER = metaserver_dialog; 2019 $METASERVER = metaserver_dialog;
2020 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1818 2021
1819 $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,
1820 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2023 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1821 2024
1822 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2025 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1823 "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.");
1824 $SETUP_NOTEBOOK->add (Client => client_setup, 2027 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1825 "Configure various client-specific settings."); 2028 "Configure various client-specific settings.");
1826 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2029 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1827 "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.");
1828 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2031 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1829 "Configure the use of audio, sound effects and background music."); 2032 "Configure the use of audio, sound effects and background music.");
1830 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2033 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1831 "Lets you define, edit and delete key bindings." 2034 "Lets you define, edit and delete key bindings."
1832 . "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 "
1833 . "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 "
1834 . "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. "
1835 . "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 "
1836 . "binding editor closes"); 2039 . "binding editor closes");
1837 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2040 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1838 "Some debuggin' options. Do not ask."); 2041 "Some debuggin' options. Do not ask.");
1839 2042
1840 $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
1841 2044
1842 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2045 $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."); 2046 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1844 2047
1845 $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,
1846 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.");
1847 2050
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 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
1849 2052
1850 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2053 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1883 } 2086 }
1884 2087
1885 $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]);
1886} 2089}
1887 2090
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}
2006
2007sub video_shutdown { 2091sub video_shutdown {
2008 CFPlus::OpenGL::shutdown; 2092 CFPlus::OpenGL::shutdown;
2009 2093
2010 undef $SDL_ACTIVE; 2094 undef $SDL_ACTIVE;
2011} 2095}
2012 2096
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; 2097my %animate_object;
2118my $animate_timer; 2098my $animate_timer;
2119 2099
2120my $fps = 9; 2100my $fps = 9;
2121
2122my %demo;#d#
2123 2101
2124sub force_refresh { 2102sub force_refresh {
2125 $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;
2126 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2127 2105
2128 $CFPlus::UI::ROOT->draw; 2106 $CFPlus::UI::ROOT->draw;
2129 2107
2130 $WANT_REFRESH = 0; 2108 $WANT_REFRESH = 0;
2131 $CAN_REFRESH = 0; 2109 $CAN_REFRESH = 0;
2132 $LAST_REFRESH = $NOW; 2110 $LAST_REFRESH = $NOW;
2133 2111
2134 CFPlus::SDL_GL_SwapBuffers; 2112 CFPlus::SDL_GL_SwapBuffers;
2135} 2113}
2136 2114
2137my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2115my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2138 $NOW = time; 2116 $NOW = time;
2139 2117
2140 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2118 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2141 for CFPlus::SDL_PollEvent; 2119 for CFPlus::poll_events;
2142 2120
2143 if (%animate_object) { 2121 if (%animate_object) {
2144 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2122 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2145 $WANT_REFRESH++; 2123 ++$WANT_REFRESH;
2146 } 2124 }
2147 2125
2148 if ($WANT_REFRESH) { 2126 if ($WANT_REFRESH) {
2149 force_refresh; 2127 force_refresh;
2150 } else { 2128 } else {
… …
2159 2137
2160sub animation_stop { 2138sub animation_stop {
2161 my ($widget) = @_; 2139 my ($widget) = @_;
2162 delete $animate_object{$widget}; 2140 delete $animate_object{$widget};
2163} 2141}
2164
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 2142
2174%SDL_CB = ( 2143%SDL_CB = (
2175 CFPlus::SDL_QUIT => sub { 2144 CFPlus::SDL_QUIT => sub {
2176 exit; 2145 exit;
2177 }, 2146 },
… …
2180 CFPlus::SDL_VIDEOEXPOSE => sub { 2149 CFPlus::SDL_VIDEOEXPOSE => sub {
2181 CFPlus::UI::full_refresh; 2150 CFPlus::UI::full_refresh;
2182 }, 2151 },
2183 CFPlus::SDL_ACTIVEEVENT => sub { 2152 CFPlus::SDL_ACTIVEEVENT => sub {
2184# not useful, as APPACTIVE include sonly iconified state, not unmapped 2153# not useful, as APPACTIVE include sonly iconified state, not unmapped
2185# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2154# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2155# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2186# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2156# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2187# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2157# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2188# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2158# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2189 }, 2159 },
2190 CFPlus::SDL_KEYDOWN => sub { 2160 CFPlus::SDL_KEYDOWN => sub {
… …
2220 2190
2221 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2222 2192
2223 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2224 sdl_mode => 0, 2194 sdl_mode => 0,
2225 width => 640,
2226 height => 480,
2227 fullscreen => 0, 2195 fullscreen => 0,
2228 fast => 0, 2196 fast => 0,
2229 map_scale => 1, 2197 map_scale => 1,
2230 fow_enable => 1, 2198 fow_enable => 1,
2231 fow_intensity => 0.45, 2199 fow_intensity => 0,
2232 fow_smooth => 0,
2233 map_smoothing => 1, 2200 map_smoothing => 1,
2234 gui_fontsize => 1, 2201 gui_fontsize => 1,
2235 log_fontsize => 0.7, 2202 log_fontsize => 0.7,
2236 gauge_fontsize => 1, 2203 gauge_fontsize => 1,
2237 gauge_size => 0.35, 2204 gauge_size => 0.35,
2238 stat_fontsize => 0.7, 2205 stat_fontsize => 0.7,
2239 mapsize => 100, 2206 mapsize => 100,
2240 say_command => 'chat',
2241 audio_enable => 1, 2207 audio_enable => 1,
2208 effects_enable => 1,
2209 effects_volume => 1,
2242 bgm_enable => 1, 2210 bgm_enable => 1,
2243 bgm_volume => 0.25, 2211 bgm_volume => 0.5,
2244 face_prefetch => 0,
2245 output_sync => 1, 2212 output_sync => 1,
2246 output_count => 1, 2213 output_count => 1,
2247 output_rate => "", 2214 output_rate => "",
2248 pickup => 0, 2215 pickup => 0,
2249 inv_sort => "mtime", 2216 inv_sort => "mtime",
… …
2271 } 2238 }
2272 } 2239 }
2273 2240
2274 sdl_init; 2241 sdl_init;
2275 2242
2276 @SDL_MODES = reverse 2243 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2277 grep $_->[0] >= 640 && $_->[1] >= 480, 2244 @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)"; 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;
2281 2248
2282 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2249 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2283 2250
2284 { 2251 {
2285 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2252 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2327Event::loop; 2294Event::loop;
2328#CFPlus::SDL_Quit; 2295#CFPlus::SDL_Quit;
2329#CFPlus::_exit 0; 2296#CFPlus::_exit 0;
2330 2297
2331END { 2298END {
2299 video_shutdown;
2300 audio_shutdown;
2332 CFPlus::SDL_Quit; 2301 CFPlus::SDL_Quit;
2333 CFPlus::DB::Server::stop; 2302 CFPlus::DB::Server::stop;
2334} 2303}
2335 2304
2336=head1 NAME 2305=head1 NAME
2337 2306
2338cfplus - A Crossfire+ and Crossfire game client 2307cfplus - A Crossfire TRT and Crossfire game client
2339 2308
2340=head1 SYNOPSIS 2309=head1 SYNOPSIS
2341 2310
2342Just run it - no commandline arguments are supported. 2311Just run it - no commandline arguments are supported.
2343 2312
2344=head1 USAGE 2313=head1 USAGE
2345 2314
2346cfplus 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
2347fullscreen and interactively. 2316be used in fullscreen mode and interactively.
2348 2317
2349=head1 DEBUGGING 2318=head1 DEBUGGING
2350 2319
2351 2320
2352CFPLUS_DEBUG - environment variable 2321CFPLUS_DEBUG - environment variable

Diff Legend

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