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.169 by root, Sun Jul 15 21:08:40 2007 UTC vs.
Revision 1.204 by root, Mon Aug 6 05:06:33 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 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $dx = $dx / 10 * 255;
229 $channel->set_panning (255 - $dx, 255 + $dx);
230
231# my $angle = $dx ? : $dx < 0 ?
232# my $distance = -$vol;
233# $channel->set_position ($angle, $distance);
234
235 $chunk->play ($channel);
236 }
237 } else {
238 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face}
240 or return;
241
242 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) {
244 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face);
247 }
248 } else {
249 # fetch from database
250 CFPlus::DB::get res_data => $meta->{name}, sub {
251 my $rwops = new CFPlus::RW $_[0];
252 my $chunk = new CFPlus::MixChunk $rwops
253 or Carp::confess "sound face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
254 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
255 $AUDIO_CHUNK{$face} = $chunk;
256
257 audio_sound_push ($face);
258 };
259 }
260 }
261}
262
263sub audio_sound_play {
264 my ($face, $dx, $dy, $vol) = @_;
265
266 $SDL_MIXER
267 or return;
268 $CFG->{effects_enable}
269 or return;
270
271 my $queue = $AUDIO_PLAY{$face} ||= [];
272 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
273 audio_sound_push $face
274 unless @$queue > 1;
275}
276
277sub audio_music_set_meta {
278 my ($meta) = @_;
279
280 $MUSIC_PLAYING_META = $meta;
281 $MUSIC_PLAYING_WIDGET->set_markup (
282 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
283 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
284 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
285 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
286 );
287}
288
289sub audio_music_update_volume {
290 return unless $MUSIC_PLAYING_META;
291 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
292 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
293 CFPlus::MixMusic::volume $base * $volume * 128;
294}
295
296sub audio_music_start {
297 my $meta = $MUSIC_PLAYING_META;
298
299 CFPlus::DB::get res_data => $meta->{name}, sub {
300 return unless $SDL_MIXER;
301
302 # music might have changed...
303 $meta eq $MUSIC_PLAYING_META
304 or return &audio_music_start ();
305
306 audio_music_update_volume;
307
308 $MUSIC_PLAYING_DATA = \$_[0];
309
310 my $rwops = $meta->{path}
311 ? new_from_file CFPlus::RW $meta->{path}
312 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
313
314 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
315 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
316
317 my $NOW = time;
318
319 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
320 my $pos = $MUSIC_PLAYING_META->{stop_pos};
321 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
322 $MUSIC_START = time - $pos;
323 } else {
324 $MUSIC_PLAYER->play (0);
325 $MUSIC_START = time;
326 }
327
328 delete $meta->{stop_time};
329 delete $meta->{stop_pos};
330 }
331}
332
333sub audio_music_push {
334 return unless $SDL_MIXER;
335
336 my $fade_out;
337
338 if (@MUSIC_JINGLE) {
339 @MUSIC_HAVE = $MUSIC_JINGLE[0];
340 $fade_out = 333;
341 } else {
342 return unless $CFG->{bgm_enable};
343
344 my @have =
345 grep $_,
346 map $CONN->{music_meta}{$_},
347 @$MUSIC_WANT;
348
349 @MUSIC_HAVE = @have
350 if @have;
351
352 # default MUSIC_HAVE == MUSIC_DEFAULT
353 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
354 $fade_out = 1000;
355 }
356
357 # if the currently playing song is acceptable, let it continue
358 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
359
360 my $NOW = time;
361
362 if ($MUSIC_PLAYING_META) {
363 $MUSIC_PLAYING_META->{stop_time} = $NOW;
364 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
365 CFPlus::MixMusic::fade_out $fade_out;
366 } else {
367 # sort by stop time, oldest first
368 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
369
370 # if the most recently-played piece played very recently,
371 # resume it, else choose the oldest piece for rotation.
372 audio_music_set_meta
373 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
374 ? $MUSIC_HAVE[-1]
375 : $MUSIC_HAVE[0];
376
377 audio_music_start;
378 }
379}
380
381sub audio_music_set_ambient {
382 my ($songs) = @_;
383
384 $MUSIC_WANT = $songs;
385 audio_music_push;
386}
387
388sub audio_music_finished {
389 # we compress multiple jingles of the same type
390 shift @MUSIC_JINGLE
391 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
392
393 $MUSIC_PLAYING_WIDGET->clear;
394
395 undef $MUSIC_PLAYER;
396 undef $MUSIC_PLAYING_META;
397 undef $MUSIC_PLAYING_DATA;
398
399 audio_music_push;
400}
401
402sub audio_init {
403 if ($CFG->{audio_enable}) {
404 $ENV{MIX_EFFECTSMAXSPEED} = 1;
405 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
406
407 unless ($SDL_MIXER) {
408 status "Unable to open sound device: there will be no sound";
409 return;
410 }
411
412 CFPlus::Mix_AllocateChannels 16;
413
414 audio_music_finished;
415 } else {
416 undef $SDL_MIXER;
417 }
418}
419
420sub audio_shutdown {
421 undef $MUSIC_PLAYER;
422 undef $MUSIC_PLAYING_META;
423 undef $MUSIC_PLAYING_DATA;
424
425 $MUSIC_WANT = [];
426 @MUSIC_JINGLE = ();
427 %AUDIO_PLAY = ();
428 %AUDIO_CHUNK = ();
429
430 CFPlus::Mix_CloseAudio if $SDL_MIXER;
431 undef $SDL_MIXER;
432}
433
434#############################################################################
204 435
205sub destroy_query_dialog { 436sub destroy_query_dialog {
206 (delete $_[0]{query_dialog})->destroy 437 (delete $_[0]{query_dialog})->destroy
207 if $_[0]{query_dialog}; 438 if $_[0]{query_dialog};
208} 439}
… …
272 ellipsise => 0, 503 ellipsise => 0,
273 markup => "\nOr use your keyboard and the text entry below:\n"; 504 markup => "\nOr use your keyboard and the text entry below:\n";
274 505
275 unshift @dialog, my $table = new CFPlus::UI::Table; 506 unshift @dialog, my $table = new CFPlus::UI::Table;
276 507
277 $table->add (0, 0, new CFPlus::UI::Button 508 $table->add_at (0, 0, new CFPlus::UI::Button
278 text => "Next Race", 509 text => "Next Race",
279 on_activate => sub { 510 on_activate => sub {
280 $conn->send ("reply n"); 511 $conn->send ("reply n");
281 destroy_query_dialog $conn; 512 destroy_query_dialog $conn;
282 0 513 0
283 }, 514 },
284 ); 515 );
285 $table->add (2, 0, new CFPlus::UI::Button 516 $table->add_at (2, 0, new CFPlus::UI::Button
286 text => "Accept", 517 text => "Accept",
287 on_activate => sub { 518 on_activate => sub {
288 $conn->send ("reply d"); 519 $conn->send ("reply d");
289 destroy_query_dialog $conn; 520 destroy_query_dialog $conn;
290 0 521 0
… …
325 $conn->send ("reply $stat"); 556 $conn->send ("reply $stat");
326 destroy_query_dialog $conn; 557 destroy_query_dialog $conn;
327 return; 558 return;
328 } 559 }
329 560
330 $STATS_PAGE->show;
331 $MESSAGE_WINDOW->hide;
332
333 unshift @dialog, new CFPlus::UI::Label 561 unshift @dialog, new CFPlus::UI::Label
334 max_w => $::WIDTH * 0.4, 562 max_w => $::WIDTH * 0.4,
335 ellipsise => 0, 563 ellipsise => 0,
336 markup => "\nOr use your keyboard and the text entry below:\n"; 564 markup => "\nOr use your keyboard and the text entry below:\n";
337 565
338 unshift @dialog, my $table = new CFPlus::UI::Table; 566 unshift @dialog, my $table = new CFPlus::UI::Table;
339 567
340 # left: re-roll 568 # left: re-roll
341 $table->add (0, 0, new CFPlus::UI::Button 569 $table->add_at (0, 0, new CFPlus::UI::Button
342 text => "Roll Again", 570 text => "Roll Again",
343 on_activate => sub { 571 on_activate => sub {
344 $conn->send ("reply y"); 572 $conn->send ("reply y");
345 destroy_query_dialog $conn; 573 destroy_query_dialog $conn;
346 0 574 0
… …
360 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 588 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
361 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 589 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
362 ], 590 ],
363 ), 1 .. 2; 591 ), 1 .. 2;
364 592
365 $table->add (2, 0, new CFPlus::UI::Button 593 $table->add_at (2, 0, new CFPlus::UI::Button
366 text => "Swap Stats", 594 text => "Swap Stats",
367 on_activate => sub { 595 on_activate => sub {
368 $conn->{stat_change_with} = $sw2->{value}; 596 $conn->{stat_change_with} = $sw2->{value};
369 $conn->send ("reply $sw1->{value}"); 597 $conn->send ("reply $sw1->{value}");
370 destroy_query_dialog $conn; 598 destroy_query_dialog $conn;
371 0 599 0
372 }, 600 },
373 ); 601 );
374 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 602 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
375 603
376 # right: accept 604 # right: accept
377 $table->add (4, 0, new CFPlus::UI::Button 605 $table->add_at (4, 0, new CFPlus::UI::Button
378 text => "Accept", 606 text => "Accept",
379 on_activate => sub { 607 on_activate => sub {
380 $conn->send ("reply n"); 608 $conn->send ("reply n");
381 $STATS_PAGE->hide; 609 $STATS_PAGE->hide;
382 destroy_query_dialog $conn; 610 destroy_query_dialog $conn;
… …
463 maph => $mapsize, 691 maph => $mapsize,
464 692
465 client => "cfplus $CFPlus::VERSION $] $^O", 693 client => "cfplus $CFPlus::VERSION $] $^O",
466 694
467 map_widget => $MAPWIDGET, 695 map_widget => $MAPWIDGET,
468 logview => $LOGVIEW,
469 statusbox => $STATUSBOX, 696 statusbox => $STATUSBOX,
470 map => $MAP, 697 map => $MAP,
471 mapmap => $MAPMAP, 698 mapmap => $MAPMAP,
472 query => \&server_query, 699 query => \&server_query,
473 700
474 setup_req => { 701 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1, 702 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 }, 703 },
489 }; 704 };
490 705
491 if ($CONN) { 706 if ($CONN) {
492 CFPlus::lowdelay fileno $CONN->{fh}; 707 CFPlus::lowdelay fileno $CONN->{fh};
… …
504 $SETUP_DIALOG->show; 719 $SETUP_DIALOG->show;
505 $PL_WINDOW->hide; 720 $PL_WINDOW->hide;
506 $SPELL_LIST->clear_spells; 721 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 722 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508 723
509 &audio_music_set ([]); 724 &audio_music_set_ambient ([]);
510 725
511 return unless $CONN; 726 return unless $CONN;
512 727
513 status "connection closed"; 728 status "connection closed";
514 729
… …
524 739
525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 740 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
526 741
527 my $row = 0; 742 my $row = 0;
528 743
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 744 $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, 745 $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, 746 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 747 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533 748
749 my $vidmode_tooltip =
750 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
751 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
752
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 753 $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); 754 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
536 755
756 $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]); 757 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"); 758 tooltip => $vidmode_tooltip);
759 $hbox->add (my $mode_label = new CFPlus::UI::Label
760 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
761 can_events => 1, tooltip => $vidmode_tooltip);
539 762
540 $mode_slider->connect (changed => sub { 763 $mode_slider->connect (changed => sub {
541 my ($self, $value) = @_; 764 my ($self, $value) = @_;
542 765
543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 766 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 767 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
545 }); 768 });
546 $mode_slider->emit (changed => $mode_slider->{range}[0]); 769 $mode_slider->emit (changed => $mode_slider->{range}[0]);
547 770
548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 771 $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 772 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
550 state => $CFG->{fullscreen}, 773 state => $CFG->{fullscreen},
551 tooltip => "Bring the client into fullscreen mode.", 774 tooltip => "Bring the client into fullscreen mode.",
552 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 775 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
553 ); 776 );
554 777
555 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 778 $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 779 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{fast}, 780 state => $CFG->{fast},
558 tooltip => "Lower the visual quality considerably to speed up rendering.", 781 tooltip => "Lower the visual quality considerably to speed up rendering.",
559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 782 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
560 ); 783 );
561 784
562 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 785 $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 786 $table->add_at (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 787 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.", 788 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 }, 789 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 ); 790 );
568 791
569 $table->add (1, $row++, new CFPlus::UI::Button 792 $table->add_at (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply", 793 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.", 794 tooltip => "Apply the video settings above.",
572 on_activate => sub { 795 on_activate => sub {
573 video_shutdown (); 796 video_shutdown ();
574 video_init (); 797 video_init ();
575 0 798 0
576 } 799 }
577 ); 800 );
578 801
579 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 802 $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 803 $table->add_at (1, $row++, new CFPlus::UI::Slider
581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 804 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 805 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 806 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
584 ); 807 );
585 808
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 809 $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 810 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing}, 811 state => $CFG->{map_smoothing},
589 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 812 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. " 813 . "This increases load on the graphics subsystem and works only with 2.x servers. "
591 . "Changes take effect at next connection only.", 814 . "Changes take effect at next connection only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 815 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
593 ); 816 );
594 817
595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 818 $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 819 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
597 state => $CFG->{fow_enable}, 820 state => $CFG->{fow_enable},
598 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 821 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 } 822 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
600 ); 823 );
601 824
602 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 825 $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 826 $table->add_at (1, $row++, new CFPlus::UI::Slider
604 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 827 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.", 828 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 } 829 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
607 ); 830 );
608 831
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"); 832 $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 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 834 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.", 835 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 }, 836 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
626 ); 837 );
627 838
628 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 839 $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 840 $table->add_at (1, $row++, new CFPlus::UI::Slider
630 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 841 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.", 842 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
632 on_changed => sub { 843 on_changed => sub {
633 $CFG->{gauge_fontsize} = $_[1]; 844 $CFG->{gauge_fontsize} = $_[1];
634 &set_gauge_window_fontsize; 845 &set_gauge_window_fontsize;
635 0 846 0
636 } 847 }
637 ); 848 );
638 849
639 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 850 $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 851 $table->add_at (1, $row++, new CFPlus::UI::Slider
641 range => [$CFG->{gauge_size}, 0.2, 0.8], 852 range => [$CFG->{gauge_size}, 0.2, 0.8],
642 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 853 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
643 on_changed => sub { 854 on_changed => sub {
644 $CFG->{gauge_size} = $_[1]; 855 $CFG->{gauge_size} = $_[1];
645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 856 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
651} 862}
652 863
653sub audio_setup { 864sub audio_setup {
654 my $vbox = new CFPlus::UI::VBox; 865 my $vbox = new CFPlus::UI::VBox;
655 866
656 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 867 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
657 868
658 my $row = 0; 869 my $row = 0;
659 870
660 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 871 $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 872 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
662 state => $CFG->{audio_enable}, 873 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.", 874 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 } 875 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
665 ); 876 );
666# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 877# $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 { 878# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
668# $CFG->{effects_volume} = $_[1]; 879# $CFG->{effects_volume} = $_[1];
669# }); 880# });
881
882 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
883 $table->add_at (1, $row, new CFPlus::UI::CheckBox
884 expand => 1, state => $CFG->{effects_enable},
885 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
886 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 }
887 );
888 $table->add_at (2, $row++, new CFPlus::UI::Slider
889 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
890 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
891 . "is set highest and you use your operating system volume setting. Changes are instant.",
892 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
893 );
894
670 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 895 $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 896 $table->add_at (1, $row, new CFPlus::UI::CheckBox
673 expand => 1, state => $CFG->{bgm_enable}, 897 expand => 1, state => $CFG->{bgm_enable},
674 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 898 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 } 899 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
676 ); 900 );
677 $hbox->add (new CFPlus::UI::Slider 901 $table->add_at (2, $row++, new CFPlus::UI::Slider
678 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 902 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
679 tooltip => "The volume of the background music. Changes are instant.", 903 tooltip => "The volume of the background music. Changes are instant.",
680 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 904 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
681 ); 905 );
682 906
683 $table->add (1, $row++, new CFPlus::UI::Button 907 $table->add_at (1, $row++, new CFPlus::UI::Button
684 expand => 1, align => 0, text => "Apply", 908 c_colspan => 2, expand => 1, align => 0, text => "Apply",
685 tooltip => "Apply the audio settings", 909 tooltip => "Apply the audio settings",
686 on_activate => sub { 910 on_activate => sub {
687 audio_shutdown (); 911 audio_shutdown ();
688 audio_init (); 912 audio_init ();
689 0 913 0
… …
747} 971}
748 972
749sub debug_setup { 973sub debug_setup {
750 my $table = new CFPlus::UI::Table; 974 my $table = new CFPlus::UI::Table;
751 975
752 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 976 $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 }); 977 $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"); 978 $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 }); 979 $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"); 980 $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 }); 981 $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"); 982 $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 }); 983 $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() } ); 984 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
761 985
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# 986 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
987
988 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
989 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
990 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
991 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
992 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
993 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
994
995 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
996
997 $c->add_items ({
998 type => "line_loop",
999 color => [0, 1, 0],
1000 width => 9,
1001 coord_mode => "abs",
1002 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1003 });
1004
1005 $c->add_items ({
1006 type => "lines",
1007 color => [1, 1, 0],
1008 width => 2,
1009 coord_mode => "rel",
1010 coord => [[0,0], [1,1], [1,0], [0,1]],
1011 });
1012
1013 $c->add_items ({
1014 type => "polygon",
1015 color => [0, 0.43, 0],
1016 width => 2,
1017 coord_mode => "rel",
1018 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1019 });
775 1020
776 $table 1021 $table
777} 1022}
778 1023
779sub stats_window { 1024sub stats_window {
… …
827 [2, 4, st_spd => "Spd", 10.54], 1072 [2, 4, st_spd => "Spd", 10.54],
828 [2, 5, st_wspd => "WSp", 10.54], 1073 [2, 5, st_wspd => "WSp", 10.54],
829 ) { 1074 ) {
830 my ($col, $row, $id, $label, $template) = @$_; 1075 my ($col, $row, $id, $label, $template) = @$_;
831 1076
832 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1077 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
833 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1078 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
834 align => +1, template => $template, tooltip => "#stat_$label"); 1079 align => +1, template => $template, tooltip => "#stat_$label");
835 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1080 $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, 1081 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
837 align => -1, text => $label, tooltip => "#stat_$label"); 1082 align => -1, text => $label, tooltip => "#stat_$label");
838 } 1083 }
839 1084
840 $vb->add (new CFPlus::UI::FancyFrame 1085 $vb->add (new CFPlus::UI::FancyFrame
… …
881 cold => ["Cold", 1126 cold => ["Cold",
882 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1127 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
883 ghit => ["Ghost hit", 1128 ghit => ["Ghost hit",
884 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1129 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
885 ); 1130 );
1131
886 for (qw/slow holyw conf fire depl magic 1132 for (qw/slow holyw conf fire depl magic
887 drain acid pois para deat phys 1133 drain acid pois para deat phys
888 blind fear tund elec cold ghit/) 1134 blind fear tund elec cold ghit/)
889 { 1135 {
890 $tbl2->add ($col, $row, 1136 $tbl2->add_at ($col, $row,
891 $STATWIDS->{"res_$_"} = 1137 $STATWIDS->{"res_$_"} =
892 new CFPlus::UI::Label 1138 new CFPlus::UI::Label
893 font => $FONT_FIXED, 1139 font => $FONT_FIXED,
894 template => "-100%", 1140 template => "-100%",
895 align => +1, 1141 align => +1,
896 valign => 0, 1142 valign => 0,
897 can_events => 1, 1143 can_events => 1,
898 can_hover => 1, 1144 can_hover => 1,
899 tooltip => $resist_names{$_}->[1], 1145 tooltip => $resist_names{$_}->[1],
900 ); 1146 );
901 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1147 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
902 font => $FONT_FIXED, 1148 font => $FONT_FIXED,
903 can_hover => 1, 1149 can_hover => 1,
904 can_events => 1, 1150 can_events => 1,
905 path => "ui/resist/resist_$_.png", 1151 path => "ui/resist/resist_$_.png",
906 tooltip => $resist_names{$_}->[1], 1152 tooltip => $resist_names{$_}->[1],
907 ); 1153 );
908 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1154 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
909 text => $resist_names{$_}->[0], 1155 text => $resist_names{$_}->[0],
910 font => $FONT_FIXED, 1156 font => $FONT_FIXED,
911 can_hover => 1, 1157 can_hover => 1,
912 can_events => 1, 1158 can_events => 1,
913 tooltip => $resist_names{$_}->[1], 1159 tooltip => $resist_names{$_}->[1],
… …
946 return if $METASERVER_ATIME > time; 1192 return if $METASERVER_ATIME > time;
947 $METASERVER_ATIME = time + 60; 1193 $METASERVER_ATIME = time + 60;
948 1194
949 my $table = $METASERVER->{table}; 1195 my $table = $METASERVER->{table};
950 $table->clear; 1196 $table->clear;
951 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1197 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
952 1198
953 my $ok = 0; 1199 my $ok = 0;
954 1200
955 CFPlus::background { 1201 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent; 1202 my $ua = CFPlus::lwp_useragent;
… …
967 "The time this server has been running without being restarted.", 1213 "The time this server has been running without being restarted.",
968 "The server software version - a '+' indicates a Crossfire+ server.", 1214 "The server software version - a '+' indicates a Crossfire+ server.",
969 "Short information about this server provided by its admins.", 1215 "Short information about this server provided by its admins.",
970 ); 1216 );
971 my @col = qw(#Users Host Uptime Version Description); 1217 my @col = qw(#Users Host Uptime Version Description);
972 $table->add ($_, 0, new CFPlus::UI::Label 1218 $table->add_at ($_, 0, new CFPlus::UI::Label
973 can_hover => 1, can_events => 1, 1219 can_hover => 1, can_events => 1,
974 align => 0, fg => [1, 1, 0], 1220 align => 0, fg => [1, 1, 0],
975 text => $col[$_], tooltip => $tip[$_]) 1221 text => $col[$_], tooltip => $tip[$_])
976 for 0 .. $#col; 1222 for 0 .. $#col;
977 1223
… …
999 1245
1000 $m = [$users, $host, $uptime, $version, $desc]; 1246 $m = [$users, $host, $uptime, $version, $desc];
1001 1247
1002 $y++; 1248 $y++;
1003 1249
1004 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1250 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1005 (new CFPlus::UI::Button 1251 (new CFPlus::UI::Button
1006 text => "Use", 1252 text => "Use",
1007 tooltip => "Put this server into the <b>Host:Port</b> field", 1253 tooltip => "Put this server into the <b>Host:Port</b> field",
1008 on_activate => sub { 1254 on_activate => sub {
1009 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1255 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1012 }, 1258 },
1013 ), 1259 ),
1014 (new CFPlus::UI::Empty expand => 1), 1260 (new CFPlus::UI::Empty expand => 1),
1015 ]); 1261 ]);
1016 1262
1017 $table->add ($_, $y, new CFPlus::UI::Label 1263 $table->add_at ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4, 1264 max_w => $::WIDTH * 0.4,
1019 ellipsise => 0, 1265 ellipsise => 0,
1020 align => $align[$_], 1266 align => $align[$_],
1021 text => $m->[$_], 1267 text => $m->[$_],
1022 tooltip => $tip[$_], 1268 tooltip => $tip[$_],
… …
1063 1309
1064 $vbox->add (new CFPlus::UI::FancyFrame 1310 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings", 1311 label => "Connection Settings",
1066 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1312 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1067 ); 1313 );
1068 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1314 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1069 1315
1070 { 1316 {
1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1317 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1072 1318
1073 $vbox->add ( 1319 $vbox->add (
1074 $HOST_ENTRY = new CFPlus::UI::Entry 1320 $HOST_ENTRY = new CFPlus::UI::Entry
1075 expand => 1, 1321 expand => 1,
1076 text => $CFG->{profile}{default}{host}, 1322 text => $CFG->{profile}{default}{host},
1077 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1323 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1078 on_changed => sub { 1324 on_changed => sub {
1079 my ($self, $value) = @_; 1325 my ($self, $value) = @_;
1080 $CFG->{profile}{default}{host} = $value; 1326 $CFG->{profile}{default}{host} = $value;
1081 0 1327 1
1082 } 1328 }
1083 ); 1329 );
1084 1330
1085 $vbox->add (new CFPlus::UI::Button 1331 $vbox->add (new CFPlus::UI::Button
1086 expand => 1, 1332 expand => 1,
1087 text => "Server List", 1333 text => "Server List",
1088 other => $METASERVER, 1334 other => $METASERVER,
1089 tooltip => "Show a list of available crossfire servers", 1335 tooltip => "Show a list of available crossfire servers",
1090 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1336 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1091 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1337 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1092 ); 1338 );
1093 } 1339 }
1094 1340
1095 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1341 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1096 $table->add (1, 4, new CFPlus::UI::Entry 1342 $table->add_at (1, 4, new CFPlus::UI::Entry
1097 text => $CFG->{profile}{default}{user}, 1343 text => $CFG->{profile}{default}{user},
1098 tooltip => "The name of your character on the server", 1344 tooltip => "The name of your character on the server",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1345 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1100 ); 1346 );
1101 1347
1102 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1348 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1103 $table->add (1, 5, new CFPlus::UI::Entry 1349 $table->add_at (1, 5, new CFPlus::UI::Entry
1104 text => $CFG->{profile}{default}{password}, 1350 text => $CFG->{profile}{default}{password},
1105 hidden => 1, 1351 hidden => 1,
1106 tooltip => "The password for your character", 1352 tooltip => "The password for your character",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1353 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1108 ); 1354 );
1109 1355
1110 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1356 $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 1357 $table->add_at (1, 7, new CFPlus::UI::Slider
1112 force_w => 100, 1358 force_w => 100,
1113 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1359 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1114 tooltip => "This is the size of the portion of the map update the server sends you. " 1360 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, " 1361 . "If you set this to a high value you will be able to see further, "
1116 . "but you also increase bandwidth requirements and latency. " 1362 . "but you also increase bandwidth requirements and latency. "
1117 . "This option is only used once at log-in.", 1363 . "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 }, 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1119 ); 1365 );
1120 1366
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"); 1367 $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 1368 $table->add_at (1, 8, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate}, 1369 text => $CFG->{output_rate},
1137 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1370 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 " 1371 . "when sending data. When 0 or unset, the server "
1139 . "default will be used, which is usually around 100kb/s.", 1372 . "default will be used, which is usually around 100kb/s. Most servers will "
1373 . "dynamically find an optimal rate, so adjust this only when necessary.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1374 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1141 ); 1375 );
1142 1376
1143 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1377 $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 1378 $table->add_at (1, 9, new CFPlus::UI::Entry
1145 text => $CFG->{output_count}, 1379 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.", 1380 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 }, 1381 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1148 ); 1382 );
1149 1383
1150 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1384 $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 1385 $table->add_at (1, 10, new CFPlus::UI::Entry
1152 text => $CFG->{output_sync}, 1386 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.", 1387 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 }, 1388 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1155 ); 1389 );
1156 1390
1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1391 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1158 expand => 1, 1392 expand => 1,
1159 align => 0, 1393 align => 0,
1160 text => "Login", 1394 text => "Login",
1161 on_activate => sub { 1395 on_activate => sub {
1162 $CONN ? stop_game 1396 $CONN ? stop_game
1163 : start_game; 1397 : start_game;
1164 0 1398 1
1165 }, 1399 },
1166 ); 1400 );
1167 1401
1168 $vbox->add (new CFPlus::UI::FancyFrame 1402 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info", 1403 label => "Server Info",
… …
1176sub client_setup { 1410sub client_setup {
1177 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1411 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1178 1412
1179 my $row = 0; 1413 my $row = 0;
1180 1414
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"); 1415 $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 1416 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1196 state => $CFG->{show_tips}, 1417 state => $CFG->{show_tips},
1197 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1418 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1198 on_changed => sub { 1419 on_changed => sub {
1199 my ($self, $value) = @_; 1420 my ($self, $value) = @_;
1200 $CFG->{show_tips} = $value; 1421 $CFG->{show_tips} = $value;
1201 0 1422 0
1202 } 1423 }
1203 ); 1424 );
1204 1425
1205 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1426 $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 1427 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1207 text => $CFG->{logview_max_par}, 1428 text => $CFG->{logview_max_par},
1208 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1429 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 " 1430 . "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.", 1431 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1211 on_changed => sub { 1432 on_changed => sub {
1212 my ($self, $value) = @_; 1433 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1434 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1214 0 1435 0
1215 }, 1436 },
1216 ); 1437 );
1217 1438
1218 $table 1439 $table
1219} 1440}
1220 1441
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}
1283
1284sub autopickup_setup { 1442sub autopickup_setup {
1443 my $r = new CFPlus::UI::ScrolledWindow (
1444 expand => 1,
1445 scroll_y => 1
1446 );
1285 my $table = new CFPlus::UI::Table; 1447 $r->add (my $table = new CFPlus::UI::Table
1448 row_expand => [0],
1449 col_expand => [0, 1, 0, 1],
1450 );
1286 1451
1287 for ( 1452 for (
1288 ["General", 0, 0, 1453 ["General", 0, 0,
1289 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1454 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1290 ["Inhibit autopickup" => PICKUP_INHIBIT], 1455 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1325 ], 1490 ],
1326 ["Weight/Value ratio", 2, 17] 1491 ["Weight/Value ratio", 2, 17]
1327 ) 1492 )
1328 { 1493 {
1329 my ($title, $x, $y, @bits) = @$_; 1494 my ($title, $x, $y, @bits) = @$_;
1330 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1495 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1331 1496
1332 for (@bits) { 1497 for (@bits) {
1333 ++$y; 1498 ++$y;
1334 1499
1335 my $mask = $_->[1]; 1500 my $mask = $_->[1];
1336 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1501 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1337 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1502 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1338 state => $::CFG->{pickup} & $mask, 1503 state => $::CFG->{pickup} & $mask,
1339 on_changed => sub { 1504 on_changed => sub {
1340 my ($box, $value) = @_; 1505 my ($box, $value) = @_;
1341 1506
1342 if ($value) { 1507 if ($value) {
… …
1353 1518
1354 ${$_->[2]} = $checkbox if $_->[2]; 1519 ${$_->[2]} = $checkbox if $_->[2];
1355 } 1520 }
1356 } 1521 }
1357 1522
1358 $table->add (2, 18, new CFPlus::UI::ValSlider 1523 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1359 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1524 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1360 template => ">= 99", 1525 template => ">= 99",
1361 to_value => sub { ">= " . 5 * $_[0] }, 1526 to_value => sub { ">= " . 5 * $_[0] },
1362 on_changed => sub { 1527 on_changed => sub {
1363 my ($slider, $value) = @_; 1528 my ($slider, $value) = @_;
… …
1366 $::CFG->{pickup} |= int $value 1531 $::CFG->{pickup} |= int $value
1367 if $value; 1532 if $value;
1368 1; 1533 1;
1369 }); 1534 });
1370 1535
1371 $table->add (3, 18, new CFPlus::UI::Button 1536 $table->add_at (3, 18, new CFPlus::UI::Button
1372 text => "set", 1537 text => "set",
1373 on_activate => sub { 1538 on_activate => sub {
1374 $::CONN->send_command ("pickup $::CFG->{pickup}") 1539 $::CONN->send_command ("pickup $::CFG->{pickup}")
1375 if defined $::CONN; 1540 if defined $::CONN;
1376 0 1541 0
1377 }); 1542 });
1378 1543
1379 $table 1544 $r
1380} 1545}
1381 1546
1382my %SORT_ORDER = ( 1547my %SORT_ORDER = (
1383 type => undef, 1548 type => undef,
1384 mtime => sub { 1549 mtime => sub {
… …
1439 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1604 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1440 1605
1441 $hb 1606 $hb
1442} 1607}
1443 1608
1609sub media_window {
1610 my $vb = new CFPlus::UI::VBox;
1611
1612 $vb->add (new CFPlus::UI::FancyFrame
1613 label => "Currently playing music",
1614 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1615 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1616 );
1617
1618 $vb->add (new CFPlus::UI::FancyFrame
1619 label => "Other media used in this session",
1620 expand => 1,
1621 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1622 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1623 );
1624
1625 $vb
1626}
1627
1628sub add_license {
1629 my ($meta) = @_;
1630
1631 $meta = $meta->{meta}
1632 or return;
1633
1634 $meta->{license} || $meta->{author} || $meta->{source}
1635 or return;
1636
1637 $LICENSE_WIDGET->add_paragraph ({
1638 fg => [1, 1, 1, 1],
1639 markup => "<small>"
1640 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1641 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1642 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1643 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1644 . "</small>",
1645 });
1646 $LICENSE_WIDGET->scroll_to_bottom;
1647}
1648
1444sub toggle_player_page { 1649sub toggle_player_page {
1445 my ($widget) = @_; 1650 my ($widget) = @_;
1446 1651
1447 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1652 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1448 $PL_WINDOW->hide; 1653 $PL_WINDOW->hide;
… …
1465 1670
1466 my $ntb = 1671 my $ntb =
1467 $PL_NOTEBOOK = 1672 $PL_NOTEBOOK =
1468 new CFPlus::UI::Notebook expand => 1; 1673 new CFPlus::UI::Notebook expand => 1;
1469 1674
1470 $ntb->add ( 1675 $ntb->add_tab (
1471 "Statistics (F2)" => $STATS_PAGE = stats_window, 1676 "Statistics (F2)" => $STATS_PAGE = stats_window,
1472 "Shows statistics, where all your Stats and Resistances are shown." 1677 "Shows statistics, where all your Stats and Resistances are shown."
1473 ); 1678 );
1474 $ntb->add ( 1679 $ntb->add_tab (
1475 "Skills (F3)" => $SKILL_PAGE = skill_window, 1680 "Skills (F3)" => $SKILL_PAGE = skill_window,
1476 "Shows all your Skills." 1681 "Shows all your Skills."
1477 ); 1682 );
1478 1683
1479 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1684 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1480 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1685 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1481 $ntb->add ( 1686 $ntb->add_tab (
1482 "Spellbook (F4)" => $spellsw, 1687 "Spellbook (F4)" => $spellsw,
1483 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1688 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1484 ); 1689 );
1485 $ntb->add ( 1690 $ntb->add_tab (
1486 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1691 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1487 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1692 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1488 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1693 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1489 ); 1694 );
1490 $ntb->add (Pickup => autopickup_setup, 1695 $ntb->add_tab (Pickup => autopickup_setup,
1491 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1696 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1697
1698 $ntb->add_tab (Media => media_window,
1699 "License, Author and Source info for media sent by the server.");
1492 1700
1493 $ntb->set_current_page ($INVENTORY_PAGE); 1701 $ntb->set_current_page ($INVENTORY_PAGE);
1494 1702
1495 $plwin->add ($ntb); 1703 $plwin->add ($ntb);
1496 $plwin 1704 $plwin
… …
1693 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1901 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1694 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1902 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1695 1903
1696 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1904 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1697 1905
1698 $table->add (0, 0, new CFPlus::UI::Button 1906 $table->add_at (0, 0, new CFPlus::UI::Button
1699 text => "Close", 1907 text => "Close",
1700 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>.", 1908 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>.",
1701 on_activate => $close, 1909 on_activate => $close,
1702 ); 1910 );
1703 1911
1704 $table->add (2, 0, new CFPlus::UI::Button 1912 $table->add_at (2, 0, new CFPlus::UI::Button
1705 text => "Next", 1913 text => "Next",
1706 tooltip => "Show the next <b>Tip of the day</b>.", 1914 tooltip => "Show the next <b>Tip of the day</b>.",
1707 on_activate => sub { 1915 on_activate => sub {
1708 $close->(); 1916 $close->();
1709 &show_tip_of_the_day; 1917 &show_tip_of_the_day;
… …
1718 CFPlus::SDL_Init 1926 CFPlus::SDL_Init
1719 and die "SDL::Init failed!\n"; 1927 and die "SDL::Init failed!\n";
1720} 1928}
1721 1929
1722sub video_init { 1930sub video_init {
1723 sdl_init;
1724
1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1931 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1726 1932
1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1933 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1728 1934
1729 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1935 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1730 $FULLSCREEN = $CFG->{fullscreen}; 1936 $FULLSCREEN = $CFG->{fullscreen};
1731 $FAST = $CFG->{fast}; 1937 $FAST = $CFG->{fast};
1732 1938
1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1939 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1940 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1735 1941
1736 $SDL_ACTIVE = 1; 1942 $SDL_ACTIVE = 1;
1737 $LAST_REFRESH = time - 0.01; 1943 $LAST_REFRESH = time - 0.01;
1738 1944
… …
1780 1986
1781 $MAPWIDGET = new CFPlus::MapWidget; 1987 $MAPWIDGET = new CFPlus::MapWidget;
1782 $MAPWIDGET->connect (activate_console => sub { 1988 $MAPWIDGET->connect (activate_console => sub {
1783 my ($mapwidget, $preset) = @_; 1989 my ($mapwidget, $preset) = @_;
1784 1990
1785 if ($CONSOLE) { 1991 $MESSAGE_WINDOW->activate_console ($preset)
1786 $CONSOLE->{input}->{auto_activated} = 1; 1992 if $MESSAGE_WINDOW;
1787 $CONSOLE->{input}->grab_focus;
1788
1789 if ($preset && $CONSOLE->{input}->get_text eq '') {
1790 $CONSOLE->{input}->set_text ($preset);
1791 }
1792 }
1793 }); 1993 });
1794 $MAPWIDGET->show; 1994 $MAPWIDGET->show;
1795 $MAPWIDGET->grab_focus; 1995 $MAPWIDGET->grab_focus;
1796
1797 $LOGVIEW = new CFPlus::UI::TextScroller
1798 expand => 1,
1799 font => $FONT_FIXED,
1800 fontsize => $::CFG->{log_fontsize},
1801 indent => -4,
1802 can_hover => 1,
1803 can_events => 1,
1804 max_par => $CFG->{logview_max_par},
1805 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1806 ;
1807 1996
1808 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1997 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1809 title => "Setup", 1998 title => "Setup",
1810 name => "setup_dialog", 1999 name => "setup_dialog",
1811 x => 'center', 2000 x => 'center',
… …
1815 force_h => $::HEIGHT * 0.6, 2004 force_h => $::HEIGHT * 0.6,
1816 has_close_button => 1, 2005 has_close_button => 1,
1817 ; 2006 ;
1818 2007
1819 $METASERVER = metaserver_dialog; 2008 $METASERVER = metaserver_dialog;
2009 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1820 2010
1821 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2011 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1822 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2012 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1823 2013
1824 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2014 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1825 "Configure the server to play on, your username, password and other server-related options."); 2015 "Configure the server to play on, your username, password and other server-related options.");
1826 $SETUP_NOTEBOOK->add (Client => client_setup, 2016 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1827 "Configure various client-specific settings."); 2017 "Configure various client-specific settings.");
1828 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2018 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1829 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2019 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1830 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2020 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1831 "Configure the use of audio, sound effects and background music."); 2021 "Configure the use of audio, sound effects and background music.");
1832 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2022 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1833 "Lets you define, edit and delete key bindings." 2023 "Lets you define, edit and delete key bindings."
1834 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2024 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1835 . "with nothing set and the recording started. After doing the actions you " 2025 . "with nothing set and the recording started. After doing the actions you "
1836 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2026 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1837 . "After pressing the combo the binding will be saved automatically and the " 2027 . "After pressing the combo the binding will be saved automatically and the "
1838 . "binding editor closes"); 2028 . "binding editor closes");
1839 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2029 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1840 "Some debuggin' options. Do not ask."); 2030 "Some debuggin' options. Do not ask.");
1841 2031
1842 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2032 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1843 2033
1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2034 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1845 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2035 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1846 2036
1847 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2037 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1848 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2038 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1849 2039
1850 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 2040 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
1851 2041
1852 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2042 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1885 } 2075 }
1886 2076
1887 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2077 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1888} 2078}
1889 2079
1890sub setup_build_button {
1891 my ($enabled) = @_;
1892 if ($enabled) {
1893 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build",
1896 tooltip => "Opens the ingame builder",
1897 on_activate => sub {
1898 if ($CONN) {
1899 $CONN->send_ext_req (builder_player_items => sub {
1900 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1901 });
1902 }
1903 0
1904 };
1905 $BUTTONBAR->add ($BUILD_BUTTON);
1906 } else {
1907 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1908 }
1909}
1910
1911sub open_ingame_editor {
1912 my ($msg) = @_;
1913
1914 my $win = new CFPlus::UI::Toplevel
1915 x => 0,
1916 y => 'center',
1917 z => 4,
1918 name => 'builder_window',
1919 force_w => int $WIDTH * 1/4,
1920 force_h => int $HEIGHT * 3/4,
1921 title => "In game builder",
1922 has_close_button => 1;
1923
1924 my $r = new CFPlus::UI::ScrolledWindow (
1925 expand => 1,
1926 scroll_y => 1
1927 );
1928 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r);
1930
1931
1932 $vb->add (
1933 new CFPlus::UI::Button
1934 text => "Disable build mode",
1935 on_activate => sub { $::IN_BUILD_MODE = undef }
1936 );
1937 $vb->add (
1938 new CFPlus::UI::Button
1939 text => "ERASE",
1940 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1941 );
1942
1943 for my $itemarchname (
1944 sort {
1945 $msg->{items}->{$a}->{build_arch_name}
1946 cmp $msg->{items}->{$b}->{build_arch_name}
1947 } keys %{$msg->{items}}
1948 ) {
1949 my $info = $msg->{items}->{$itemarchname};
1950 $vb->add (
1951 new CFPlus::UI::Button text => $info->{build_arch_name},
1952 on_activate => sub {
1953 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1954
1955 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1956 build_mode_query_arch_info ();
1957 }
1958 }
1959 );
1960 }
1961
1962 $win->show;
1963}
1964
1965sub build_mode_query_arch_info {
1966 my ($iteminfo) = $::IN_BUILD_MODE;
1967 my $itemarchname = $iteminfo->{item};
1968 my $info = $iteminfo->{info};
1969
1970 my $dialog = new CFPlus::UI::Toplevel
1971 x => "center",
1972 y => "center",
1973 z => 50,
1974 force_w => int $WIDTH * 1/2,
1975 title => "Enter information for placement of '$itemarchname'",
1976 has_close_button => 1;
1977
1978 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1979
1980 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1981 my $row = 0;
1982 if ($info->{has_name}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1985 }
1986 if ($info->{has_text}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1988 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1989 }
1990 if ($info->{has_connection}) {
1991 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1992 $table->add (1, $row++,
1993 new CFPlus::UI::Entry
1994 expand => 1,
1995 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1996 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1997 );
1998 }
1999
2000 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2001 $hb->add (new CFPlus::UI::Button
2002 text => "Close",
2003 expand => 1,
2004 on_activate => sub { $dialog->hide; 0 },
2005 );
2006 $dialog->show;
2007}
2008
2009sub video_shutdown { 2080sub video_shutdown {
2010 CFPlus::OpenGL::shutdown; 2081 CFPlus::OpenGL::shutdown;
2011 2082
2012 undef $SDL_ACTIVE; 2083 undef $SDL_ACTIVE;
2013} 2084}
2014 2085
2015sub audio_channel_finished {
2016 my ($channel) = @_;
2017
2018 #warn "channel $channel finished\n";#d#
2019}
2020
2021sub audio_music_set {
2022 my ($songs) = @_;
2023
2024 my @want =
2025 grep $_,
2026 map $CONN->{music_meta}{$_},
2027 @$songs;
2028
2029 if (@want) {
2030 @MUSIC_WANT = @want;
2031 &audio_music_changed ();
2032 }
2033}
2034
2035sub audio_music_start {
2036 my $path = $MUSIC_PLAYING->{path}
2037 or return;
2038
2039 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2040 # music might have changed...
2041 $path eq $MUSIC_PLAYING->{path}
2042 or return &audio_music_start ();
2043
2044 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2045
2046 my $NOW = time;
2047
2048 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2049 my $pos = $MUSIC_PLAYING->{stop_pos};
2050 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2051 $MUSIC_START = time - $pos;
2052 } else {
2053 $MUSIC_PLAYER->play (0);
2054 $MUSIC_START = time;
2055 }
2056
2057 delete $MUSIC_PLAYING->{stop_time};
2058 delete $MUSIC_PLAYING->{stop_pos};
2059 }
2060}
2061
2062sub audio_music_changed {
2063 return unless $CFG->{bgm_enable};
2064
2065 # default MUSIC_WANT == MUSIC_DEFAULT
2066 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2067
2068 # if the currently playing song is acceptable, let it continue
2069 return if $MUSIC_PLAYING
2070 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2071
2072 my $NOW = time;
2073
2074 if ($MUSIC_PLAYING) {
2075 $MUSIC_PLAYING->{stop_time} = $NOW;
2076 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2077 CFPlus::MixMusic::fade_out 1000;
2078 } else {
2079 # sort by stop time, oldest first
2080 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2081
2082 # if the most recently-played piece played very recently,
2083 # resume it, else choose the oldest piece for rotation.
2084 $MUSIC_PLAYING =
2085 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2086 ? $MUSIC_WANT[-1]
2087 : $MUSIC_WANT[0];
2088
2089 audio_music_start;
2090 }
2091}
2092
2093sub audio_music_finished {
2094 $MUSIC_PLAYING = undef;
2095 undef $MUSIC_PLAYER;
2096
2097 audio_music_changed;
2098}
2099
2100sub audio_init {
2101 if ($CFG->{audio_enable}) {
2102 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2103 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2104
2105 unless ($SDL_MIXER) {
2106 status "Unable to open sound device: there will be no sound";
2107 return;
2108 }
2109
2110 CFPlus::Mix_AllocateChannels 8;
2111 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2112
2113 audio_music_finished;
2114
2115 local $_;
2116 while (<$fh>) {
2117 next if /^\s*#/;
2118 next if /^\s*$/;
2119
2120 my ($file, $volume, $event) = split /\s+/, $_, 3;
2121
2122 push @SOUNDS, "$volume,$file";
2123
2124 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2125 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2126 $chunk->volume ($volume * 128 / 100);
2127 $chunk
2128 };
2129 }
2130 } else {
2131 status "unable to open sound config: $!";
2132 }
2133 }
2134}
2135
2136sub audio_shutdown {
2137 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2138 undef $SDL_MIXER;
2139 @SOUNDS = ();
2140 %AUDIO_CHUNKS = ();
2141}
2142
2143my %animate_object; 2086my %animate_object;
2144my $animate_timer; 2087my $animate_timer;
2145 2088
2146my $fps = 9; 2089my $fps = 9;
2147
2148my %demo;#d#
2149 2090
2150sub force_refresh { 2091sub force_refresh {
2151 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2092 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2152 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2093 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2153 2094
2154 $CFPlus::UI::ROOT->draw; 2095 $CFPlus::UI::ROOT->draw;
2155 2096
2156 $WANT_REFRESH = 0; 2097 $WANT_REFRESH = 0;
2157 $CAN_REFRESH = 0; 2098 $CAN_REFRESH = 0;
2158 $LAST_REFRESH = $NOW; 2099 $LAST_REFRESH = $NOW;
2159 2100
2160 CFPlus::SDL_GL_SwapBuffers; 2101 CFPlus::SDL_GL_SwapBuffers;
2161} 2102}
2162 2103
… …
2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2107 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2167 for CFPlus::poll_events; 2108 for CFPlus::poll_events;
2168 2109
2169 if (%animate_object) { 2110 if (%animate_object) {
2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2111 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2171 $WANT_REFRESH++; 2112 ++$WANT_REFRESH;
2172 } 2113 }
2173 2114
2174 if ($WANT_REFRESH) { 2115 if ($WANT_REFRESH) {
2175 force_refresh; 2116 force_refresh;
2176 } else { 2117 } else {
… …
2185 2126
2186sub animation_stop { 2127sub animation_stop {
2187 my ($widget) = @_; 2128 my ($widget) = @_;
2188 delete $animate_object{$widget}; 2129 delete $animate_object{$widget};
2189} 2130}
2190
2191# check once/second for faces that need to be prefetched
2192# this should, of course, only run on demand, but
2193# SDL forces worse things on us....
2194
2195Event->timer (after => 1, interval => 0.25, cb => sub {
2196 $CONN->face_prefetch
2197 if $CONN;
2198});
2199 2131
2200%SDL_CB = ( 2132%SDL_CB = (
2201 CFPlus::SDL_QUIT => sub { 2133 CFPlus::SDL_QUIT => sub {
2202 exit; 2134 exit;
2203 }, 2135 },
… …
2206 CFPlus::SDL_VIDEOEXPOSE => sub { 2138 CFPlus::SDL_VIDEOEXPOSE => sub {
2207 CFPlus::UI::full_refresh; 2139 CFPlus::UI::full_refresh;
2208 }, 2140 },
2209 CFPlus::SDL_ACTIVEEVENT => sub { 2141 CFPlus::SDL_ACTIVEEVENT => sub {
2210# not useful, as APPACTIVE include sonly iconified state, not unmapped 2142# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2143# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2144# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2212# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2145# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2213# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2146# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2214# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2147# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2215 }, 2148 },
2216 CFPlus::SDL_KEYDOWN => sub { 2149 CFPlus::SDL_KEYDOWN => sub {
… …
2246 2179
2247 CFPlus::UI::set_layout ($::CFG->{layout}); 2180 CFPlus::UI::set_layout ($::CFG->{layout});
2248 2181
2249 my %DEF_CFG = ( 2182 my %DEF_CFG = (
2250 sdl_mode => 0, 2183 sdl_mode => 0,
2251 width => 640,
2252 height => 480,
2253 fullscreen => 0, 2184 fullscreen => 0,
2254 fast => 0, 2185 fast => 0,
2255 map_scale => 1, 2186 map_scale => 1,
2256 fow_enable => 1, 2187 fow_enable => 1,
2257 fow_intensity => 0.45, 2188 fow_intensity => 0,
2258 fow_smooth => 0,
2259 map_smoothing => 1, 2189 map_smoothing => 1,
2260 gui_fontsize => 1, 2190 gui_fontsize => 1,
2261 log_fontsize => 0.7, 2191 log_fontsize => 0.7,
2262 gauge_fontsize => 1, 2192 gauge_fontsize => 1,
2263 gauge_size => 0.35, 2193 gauge_size => 0.35,
2264 stat_fontsize => 0.7, 2194 stat_fontsize => 0.7,
2265 mapsize => 100, 2195 mapsize => 100,
2266 say_command => 'chat',
2267 audio_enable => 1, 2196 audio_enable => 1,
2197 effects_enable => 1,
2198 effects_volume => 1,
2268 bgm_enable => 1, 2199 bgm_enable => 1,
2269 bgm_volume => 0.25, 2200 bgm_volume => 0.5,
2270 face_prefetch => 0,
2271 output_sync => 1, 2201 output_sync => 1,
2272 output_count => 1, 2202 output_count => 1,
2273 output_rate => "", 2203 output_rate => "",
2274 pickup => 0, 2204 pickup => 0,
2275 inv_sort => "mtime", 2205 inv_sort => "mtime",
… …
2297 } 2227 }
2298 } 2228 }
2299 2229
2300 sdl_init; 2230 sdl_init;
2301 2231
2302 @SDL_MODES = reverse 2232 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2303 grep $_->[0] >= 640 && $_->[1] >= 480, 2233 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2304 CFPlus::SDL_ListModes;
2305
2306 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2234 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2235
2236 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2307 2237
2308 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2238 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2309 2239
2310 { 2240 {
2311 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2241 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2353Event::loop; 2283Event::loop;
2354#CFPlus::SDL_Quit; 2284#CFPlus::SDL_Quit;
2355#CFPlus::_exit 0; 2285#CFPlus::_exit 0;
2356 2286
2357END { 2287END {
2288 video_shutdown;
2289 audio_shutdown;
2358 CFPlus::SDL_Quit; 2290 CFPlus::SDL_Quit;
2359 CFPlus::DB::Server::stop; 2291 CFPlus::DB::Server::stop;
2360} 2292}
2361 2293
2362=head1 NAME 2294=head1 NAME
2363 2295
2364cfplus - A Crossfire+ and Crossfire game client 2296cfplus - A Crossfire TRT and Crossfire game client
2365 2297
2366=head1 SYNOPSIS 2298=head1 SYNOPSIS
2367 2299
2368Just run it - no commandline arguments are supported. 2300Just run it - no commandline arguments are supported.
2369 2301
2370=head1 USAGE 2302=head1 USAGE
2371 2303
2372cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2304cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2373fullscreen and interactively. 2305be used in fullscreen mode and interactively.
2374 2306
2375=head1 DEBUGGING 2307=head1 DEBUGGING
2376 2308
2377 2309
2378CFPLUS_DEBUG - environment variable 2310CFPLUS_DEBUG - environment variable

Diff Legend

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