ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

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