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.181 by root, Sat Jul 21 16:07:53 2007 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 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;
… …
85use CFPlus::DB; 86use CFPlus::DB;
86use CFPlus::UI; 87use CFPlus::UI;
87use CFPlus::UI::Canvas; 88use CFPlus::UI::Canvas;
88use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
89use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
90use CFPlus::Pod; 92use CFPlus::Pod;
91use CFPlus::MapWidget; 93use CFPlus::MapWidget;
92use CFPlus::Macro; 94use CFPlus::Macro;
93 95
94$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
126 128
127our $MAP; 129our $MAP;
128our $MAPMAP; 130our $MAPMAP;
129our $MAPWIDGET; 131our $MAPWIDGET;
130our $BUTTONBAR; 132our $BUTTONBAR;
131our $LOGVIEW;
132our $CONSOLE;
133our $METASERVER; 133our $METASERVER;
134our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
135our $QUIT_DIALOG; 135our $QUIT_DIALOG;
136our $HOST_ENTRY; 136our $HOST_ENTRY;
137our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
144our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
145 145
146our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
147our $PL_WINDOW; 147our $PL_WINDOW;
148 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
149our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
150our $STATS_PAGE; 153our $STATS_PAGE;
151our $SKILL_PAGE; 154our $SKILL_PAGE;
152our $SPELL_PAGE; 155our $SPELL_PAGE;
153our $SPELL_LIST; 156our $SPELL_LIST;
… …
159our $STATWIDS; 162our $STATWIDS;
160 163
161our $SDL_ACTIVE; 164our $SDL_ACTIVE;
162our %SDL_CB; 165our %SDL_CB;
163 166
164our $SDL_MIXER;
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT;
167our $MUSIC_START;
168our $MUSIC_PLAYING;
169our $MUSIC_PLAYER;
170our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
171our @SOUNDS; # event => file mapping
172our %AUDIO_CHUNKS; # audio files
173
174our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
175our $STATUSBOX; 168our $STATUSBOX;
176our $DEBUG_STATUS; 169our $DEBUG_STATUS;
177 170
178our $INV; 171our $INV;
179our $INVR; 172our $INVR;
180our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
181 174
182our $PICKUP_CFG; 175our $PICKUP_CFG;
183 176
184our $IN_BUILD_MODE; 177#############################################################################
185our $BUILD_BUTTON;
186 178
187sub status { 179sub status {
188 $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]);
189} 181}
190 182
… …
192 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
193} 185}
194 186
195sub message { 187sub message {
196 my ($para) = @_; 188 my ($para) = @_;
197 189 $MESSAGE_WINDOW->message ($para);
198 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
199
200 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
201
202 $LOGVIEW->add_paragraph ($para);
203 $LOGVIEW->scroll_to_bottom;
204} 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 audio_music_set_meta { };
426
427 $MUSIC_WANT = [];
428 @MUSIC_JINGLE = ();
429 %AUDIO_PLAY = ();
430 %AUDIO_CHUNK = ();
431
432 CFPlus::Mix_CloseAudio if $SDL_MIXER;
433 undef $SDL_MIXER;
434}
435
436#############################################################################
205 437
206sub destroy_query_dialog { 438sub destroy_query_dialog {
207 (delete $_[0]{query_dialog})->destroy 439 (delete $_[0]{query_dialog})->destroy
208 if $_[0]{query_dialog}; 440 if $_[0]{query_dialog};
209} 441}
… …
461 maph => $mapsize, 693 maph => $mapsize,
462 694
463 client => "cfplus $CFPlus::VERSION $] $^O", 695 client => "cfplus $CFPlus::VERSION $] $^O",
464 696
465 map_widget => $MAPWIDGET, 697 map_widget => $MAPWIDGET,
466 logview => $LOGVIEW,
467 statusbox => $STATUSBOX, 698 statusbox => $STATUSBOX,
468 map => $MAP, 699 map => $MAP,
469 mapmap => $MAPMAP, 700 mapmap => $MAPMAP,
470 query => \&server_query, 701 query => \&server_query,
471 702
472 setup_req => { 703 setup_req => {
473 smoothing => $CFG->{map_smoothing}*1, 704 smoothing => $CFG->{map_smoothing}*1,
474 },
475
476 sound_play => sub {
477 my ($x, $y, $soundnum, $type) = @_;
478
479 $SDL_MIXER
480 or return;
481
482 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
483 or return;
484
485 $chunk->play;
486 }, 705 },
487 }; 706 };
488 707
489 if ($CONN) { 708 if ($CONN) {
490 CFPlus::lowdelay fileno $CONN->{fh}; 709 CFPlus::lowdelay fileno $CONN->{fh};
… …
502 $SETUP_DIALOG->show; 721 $SETUP_DIALOG->show;
503 $PL_WINDOW->hide; 722 $PL_WINDOW->hide;
504 $SPELL_LIST->clear_spells; 723 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 724 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
506 725
507 &audio_music_set ([]); 726 &audio_music_set_ambient ([]);
508 727
509 return unless $CONN; 728 return unless $CONN;
510 729
511 status "connection closed"; 730 status "connection closed";
512 731
… …
614 833
615 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 834 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
616 $table->add_at (1, $row++, new CFPlus::UI::Slider 835 $table->add_at (1, $row++, new CFPlus::UI::Slider
617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 836 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
618 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 837 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 838 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
620 ); 839 );
621 840
622 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 841 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
623 $table->add_at (1, $row++, new CFPlus::UI::Slider 842 $table->add_at (1, $row++, new CFPlus::UI::Slider
624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 843 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
… …
645} 864}
646 865
647sub audio_setup { 866sub audio_setup {
648 my $vbox = new CFPlus::UI::VBox; 867 my $vbox = new CFPlus::UI::VBox;
649 868
650 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 869 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
651 870
652 my $row = 0; 871 my $row = 0;
653 872
654 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 873 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
655 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 874 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
659 ); 878 );
660# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 879# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
661# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 880# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
662# $CFG->{effects_volume} = $_[1]; 881# $CFG->{effects_volume} = $_[1];
663# }); 882# });
883
884 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
885 $table->add_at (1, $row, new CFPlus::UI::CheckBox
886 expand => 1, state => $CFG->{effects_enable},
887 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
888 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 }
889 );
890 $table->add_at (2, $row++, new CFPlus::UI::Slider
891 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
892 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
893 . "is set highest and you use your operating system volume setting. Changes are instant.",
894 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
895 );
896
664 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 897 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
665 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 898 $table->add_at (1, $row, new CFPlus::UI::CheckBox
666 $hbox->add (new CFPlus::UI::CheckBox
667 expand => 1, state => $CFG->{bgm_enable}, 899 expand => 1, state => $CFG->{bgm_enable},
668 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 900 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
669 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 901 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
670 ); 902 );
671 $hbox->add (new CFPlus::UI::Slider 903 $table->add_at (2, $row++, new CFPlus::UI::Slider
672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 904 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
673 tooltip => "The volume of the background music. Changes are instant.", 905 tooltip => "The volume of the background music. Changes are instant.",
674 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 906 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
675 ); 907 );
676 908
677 $table->add_at (1, $row++, new CFPlus::UI::Button 909 $table->add_at (1, $row++, new CFPlus::UI::Button
678 expand => 1, align => 0, text => "Apply", 910 c_colspan => 2, expand => 1, align => 0, text => "Apply",
679 tooltip => "Apply the audio settings", 911 tooltip => "Apply the audio settings",
680 on_activate => sub { 912 on_activate => sub {
681 audio_shutdown (); 913 audio_shutdown ();
682 audio_init (); 914 audio_init ();
683 0 915 0
… …
754 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 986 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
755 987
756 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 988 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
757 989
758 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 990 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
759 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 991 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
760 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 992 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
761 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 993 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
762 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 994 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
763 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 995 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
764 996
765 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 997 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
766 998
767 $c->add_items ({ 999 $c->add_items ({
… …
1092 text => $CFG->{profile}{default}{host}, 1324 text => $CFG->{profile}{default}{host},
1093 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1325 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1094 on_changed => sub { 1326 on_changed => sub {
1095 my ($self, $value) = @_; 1327 my ($self, $value) = @_;
1096 $CFG->{profile}{default}{host} = $value; 1328 $CFG->{profile}{default}{host} = $value;
1097 0 1329 1
1098 } 1330 }
1099 ); 1331 );
1100 1332
1101 $vbox->add (new CFPlus::UI::Button 1333 $vbox->add (new CFPlus::UI::Button
1102 expand => 1, 1334 expand => 1,
1103 text => "Server List", 1335 text => "Server List",
1104 other => $METASERVER, 1336 other => $METASERVER,
1105 tooltip => "Show a list of available crossfire servers", 1337 tooltip => "Show a list of available crossfire servers",
1106 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1338 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1107 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1339 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1108 ); 1340 );
1109 } 1341 }
1110 1342
1111 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1343 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1112 $table->add_at (1, 4, new CFPlus::UI::Entry 1344 $table->add_at (1, 4, new CFPlus::UI::Entry
1113 text => $CFG->{profile}{default}{user}, 1345 text => $CFG->{profile}{default}{user},
1114 tooltip => "The name of your character on the server", 1346 tooltip => "The name of your character on the server",
1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1347 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1116 ); 1348 );
1117 1349
1118 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1350 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1119 $table->add_at (1, 5, new CFPlus::UI::Entry 1351 $table->add_at (1, 5, new CFPlus::UI::Entry
1120 text => $CFG->{profile}{default}{password}, 1352 text => $CFG->{profile}{default}{password},
1121 hidden => 1, 1353 hidden => 1,
1122 tooltip => "The password for your character", 1354 tooltip => "The password for your character",
1123 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1355 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1124 ); 1356 );
1125 1357
1126 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1358 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1127 $table->add_at (1, 7, new CFPlus::UI::Slider 1359 $table->add_at (1, 7, new CFPlus::UI::Slider
1128 force_w => 100, 1360 force_w => 100,
1129 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1361 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1130 tooltip => "This is the size of the portion of the map update the server sends you. " 1362 tooltip => "This is the size of the portion of the map update the server sends you. "
1131 . "If you set this to a high value you will be able to see further, " 1363 . "If you set this to a high value you will be able to see further, "
1132 . "but you also increase bandwidth requirements and latency. " 1364 . "but you also increase bandwidth requirements and latency. "
1133 . "This option is only used once at log-in.", 1365 . "This option is only used once at log-in.",
1134 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1366 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1135 ); 1367 );
1136 1368
1137 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1138 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1139 state => $CFG->{face_prefetch},
1140 tooltip => "<b>Background Image Prefetch</b>\n\n"
1141 . "If enabled, the client automatically pre-fetches images from the server. "
1142 . "This might increase or create lag, but increases the chances "
1143 . "of faces being ready for display when you encounter them. "
1144 . "It also uses up server bandwidth on every connect, "
1145 . "so only set it if you really need to prefetch images. "
1146 . "This option can be set and unset any time.",
1147 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1148 );
1149
1150 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1369 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1370 $table->add_at (1, 8, new CFPlus::UI::Entry
1371 text => $CFG->{output_rate},
1372 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1373 . "when sending data. When 0 or unset, the server "
1374 . "default will be used, which is usually around 100kb/s. Most servers will "
1375 . "dynamically find an optimal rate, so adjust this only when necessary.",
1376 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1377 );
1378
1379 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1151 $table->add_at (1, 9, new CFPlus::UI::Entry 1380 $table->add_at (1, 9, new CFPlus::UI::Entry
1152 text => $CFG->{output_rate},
1153 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1154 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1155 . "default will be used, which is usually around 100kb/s.",
1156 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1157 );
1158
1159 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1160 $table->add_at (1, 10, new CFPlus::UI::Entry
1161 text => $CFG->{output_count}, 1381 text => $CFG->{output_count},
1162 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1382 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1163 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1383 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1164 ); 1384 );
1165 1385
1166 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1386 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1167 $table->add_at (1, 11, new CFPlus::UI::Entry 1387 $table->add_at (1, 10, new CFPlus::UI::Entry
1168 text => $CFG->{output_sync}, 1388 text => $CFG->{output_sync},
1169 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1389 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1170 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1390 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1171 ); 1391 );
1172 1392
1173 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1393 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1174 expand => 1, 1394 expand => 1,
1175 align => 0, 1395 align => 0,
1176 text => "Login", 1396 text => "Login",
1177 on_activate => sub { 1397 on_activate => sub {
1178 $CONN ? stop_game 1398 $CONN ? stop_game
1179 : start_game; 1399 : start_game;
1180 0 1400 1
1181 }, 1401 },
1182 ); 1402 );
1183 1403
1184 $vbox->add (new CFPlus::UI::FancyFrame 1404 $vbox->add (new CFPlus::UI::FancyFrame
1185 label => "Server Info", 1405 label => "Server Info",
… …
1191 1411
1192sub client_setup { 1412sub client_setup {
1193 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1413 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1194 1414
1195 my $row = 0; 1415 my $row = 0;
1196
1197 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199 text => $CFG->{say_command},
1200 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. "
1201 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1202 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1203 on_changed => sub {
1204 my ($self, $value) = @_;
1205 $CFG->{say_command} = $value;
1206 0
1207 }
1208 );
1209 1416
1210 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1417 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1211 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1418 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1212 state => $CFG->{show_tips}, 1419 state => $CFG->{show_tips},
1213 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1420 tooltip => "Show the <b>Tip of the day</b> window at startup?",
… …
1224 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1431 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1225 . "sends more messages than this number, older messages get removed to save memory and " 1432 . "sends more messages than this number, older messages get removed to save memory and "
1226 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1433 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1227 on_changed => sub { 1434 on_changed => sub {
1228 my ($self, $value) = @_; 1435 my ($self, $value) = @_;
1229 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1436 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1230 0 1437 0
1231 }, 1438 },
1232 ); 1439 );
1233 1440
1234 $table 1441 $table
1235}
1236
1237sub message_window {
1238 my $window = new CFPlus::UI::Toplevel
1239 name => "message_window",
1240 title => "Messages",
1241 border_bg => [1, 1, 1, 1],
1242 x => "max",
1243 y => 0,
1244 force_w => $::WIDTH * 0.4,
1245 force_h => $::HEIGHT * 0.5,
1246 child => (my $vbox = new CFPlus::UI::VBox),
1247 has_close_button => 1;
1248
1249 $vbox->add ($LOGVIEW);
1250
1251 $vbox->add (my $input = new CFPlus::UI::Entry
1252 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1253 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1254 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1255 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1256 on_focus_in => sub {
1257 my ($input, $prev_focus) = @_;
1258
1259 delete $input->{refocus_map};
1260
1261 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1262 $input->{refocus_map} = 1;
1263 }
1264 delete $input->{auto_activated};
1265
1266 0
1267 },
1268 on_activate => sub {
1269 my ($input, $text) = @_;
1270 $input->set_text ('');
1271
1272 if ($text =~ /^\/(.*)/) {
1273 $::CONN->user_send ($1);
1274 } else {
1275 my $say_cmd = $::CFG->{say_command} || 'say';
1276 $::CONN->user_send ("$say_cmd $text");
1277 }
1278 if ($input->{refocus_map}) {
1279 delete $input->{refocus_map};
1280 $MAPWIDGET->focus_in
1281 }
1282
1283 0
1284 },
1285 on_escape => sub {
1286 $MAPWIDGET->grab_focus;
1287
1288 0
1289 },
1290 );
1291
1292 $CONSOLE = {
1293 window => $window,
1294 input => $input,
1295 };
1296
1297 $window
1298} 1442}
1299 1443
1300sub autopickup_setup { 1444sub autopickup_setup {
1301 my $r = new CFPlus::UI::ScrolledWindow ( 1445 my $r = new CFPlus::UI::ScrolledWindow (
1302 expand => 1, 1446 expand => 1,
… …
1462 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1606 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1463 1607
1464 $hb 1608 $hb
1465} 1609}
1466 1610
1611sub media_window {
1612 my $vb = new CFPlus::UI::VBox;
1613
1614 $vb->add (new CFPlus::UI::FancyFrame
1615 label => "Currently playing music",
1616 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1617 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1618 );
1619
1620 $vb->add (new CFPlus::UI::FancyFrame
1621 label => "Other media used in this session",
1622 expand => 1,
1623 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1624 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1625 );
1626
1627 $vb
1628}
1629
1630sub add_license {
1631 my ($meta) = @_;
1632
1633 $meta = $meta->{meta}
1634 or return;
1635
1636 $meta->{license} || $meta->{author} || $meta->{source}
1637 or return;
1638
1639 $LICENSE_WIDGET->add_paragraph ({
1640 fg => [1, 1, 1, 1],
1641 markup => "<small>"
1642 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1643 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1644 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1645 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1646 . "</small>",
1647 });
1648 $LICENSE_WIDGET->scroll_to_bottom;
1649}
1650
1467sub toggle_player_page { 1651sub toggle_player_page {
1468 my ($widget) = @_; 1652 my ($widget) = @_;
1469 1653
1470 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1654 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1471 $PL_WINDOW->hide; 1655 $PL_WINDOW->hide;
… …
1488 1672
1489 my $ntb = 1673 my $ntb =
1490 $PL_NOTEBOOK = 1674 $PL_NOTEBOOK =
1491 new CFPlus::UI::Notebook expand => 1; 1675 new CFPlus::UI::Notebook expand => 1;
1492 1676
1493 $ntb->add ( 1677 $ntb->add_tab (
1494 "Statistics (F2)" => $STATS_PAGE = stats_window, 1678 "Statistics (F2)" => $STATS_PAGE = stats_window,
1495 "Shows statistics, where all your Stats and Resistances are shown." 1679 "Shows statistics, where all your Stats and Resistances are shown."
1496 ); 1680 );
1497 $ntb->add ( 1681 $ntb->add_tab (
1498 "Skills (F3)" => $SKILL_PAGE = skill_window, 1682 "Skills (F3)" => $SKILL_PAGE = skill_window,
1499 "Shows all your Skills." 1683 "Shows all your Skills."
1500 ); 1684 );
1501 1685
1502 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1686 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1503 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1687 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1504 $ntb->add ( 1688 $ntb->add_tab (
1505 "Spellbook (F4)" => $spellsw, 1689 "Spellbook (F4)" => $spellsw,
1506 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1690 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1507 ); 1691 );
1508 $ntb->add ( 1692 $ntb->add_tab (
1509 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1693 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1510 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1694 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1511 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1695 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1512 ); 1696 );
1513 $ntb->add (Pickup => autopickup_setup, 1697 $ntb->add_tab (Pickup => autopickup_setup,
1514 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1698 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1699
1700 $ntb->add_tab (Media => media_window,
1701 "License, Author and Source info for media sent by the server.");
1515 1702
1516 $ntb->set_current_page ($INVENTORY_PAGE); 1703 $ntb->set_current_page ($INVENTORY_PAGE);
1517 1704
1518 $plwin->add ($ntb); 1705 $plwin->add ($ntb);
1519 $plwin 1706 $plwin
… …
1801 1988
1802 $MAPWIDGET = new CFPlus::MapWidget; 1989 $MAPWIDGET = new CFPlus::MapWidget;
1803 $MAPWIDGET->connect (activate_console => sub { 1990 $MAPWIDGET->connect (activate_console => sub {
1804 my ($mapwidget, $preset) = @_; 1991 my ($mapwidget, $preset) = @_;
1805 1992
1806 if ($CONSOLE) { 1993 $MESSAGE_WINDOW->activate_console ($preset)
1807 $CONSOLE->{input}->{auto_activated} = 1; 1994 if $MESSAGE_WINDOW;
1808 $CONSOLE->{input}->grab_focus;
1809
1810 if ($preset && $CONSOLE->{input}->get_text eq '') {
1811 $CONSOLE->{input}->set_text ($preset);
1812 }
1813 }
1814 }); 1995 });
1815 $MAPWIDGET->show; 1996 $MAPWIDGET->show;
1816 $MAPWIDGET->grab_focus; 1997 $MAPWIDGET->grab_focus;
1817
1818 $LOGVIEW = new CFPlus::UI::TextScroller
1819 expand => 1,
1820 font => $FONT_FIXED,
1821 fontsize => $::CFG->{log_fontsize},
1822 indent => -4,
1823 can_hover => 1,
1824 can_events => 1,
1825 max_par => $CFG->{logview_max_par},
1826 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1827 ;
1828 1998
1829 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1999 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1830 title => "Setup", 2000 title => "Setup",
1831 name => "setup_dialog", 2001 name => "setup_dialog",
1832 x => 'center', 2002 x => 'center',
… …
1836 force_h => $::HEIGHT * 0.6, 2006 force_h => $::HEIGHT * 0.6,
1837 has_close_button => 1, 2007 has_close_button => 1,
1838 ; 2008 ;
1839 2009
1840 $METASERVER = metaserver_dialog; 2010 $METASERVER = metaserver_dialog;
2011 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1841 2012
1842 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2013 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1843 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2014 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1844 2015
1845 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2016 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1846 "Configure the server to play on, your username, password and other server-related options."); 2017 "Configure the server to play on, your username, password and other server-related options.");
1847 $SETUP_NOTEBOOK->add (Client => client_setup, 2018 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1848 "Configure various client-specific settings."); 2019 "Configure various client-specific settings.");
1849 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2020 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1850 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2021 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1851 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2022 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1852 "Configure the use of audio, sound effects and background music."); 2023 "Configure the use of audio, sound effects and background music.");
1853 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2024 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1854 "Lets you define, edit and delete key bindings." 2025 "Lets you define, edit and delete key bindings."
1855 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2026 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1856 . "with nothing set and the recording started. After doing the actions you " 2027 . "with nothing set and the recording started. After doing the actions you "
1857 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2028 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1858 . "After pressing the combo the binding will be saved automatically and the " 2029 . "After pressing the combo the binding will be saved automatically and the "
1859 . "binding editor closes"); 2030 . "binding editor closes");
1860 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2031 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1861 "Some debuggin' options. Do not ask."); 2032 "Some debuggin' options. Do not ask.");
1862 2033
1863 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2034 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1864 2035
1865 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2036 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1866 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2037 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1867 2038
1868 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2039 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1869 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2040 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1870 2041
1871 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 2042 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
1872 2043
1873 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2044 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1906 } 2077 }
1907 2078
1908 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2079 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1909} 2080}
1910 2081
1911sub setup_build_button {
1912 my ($enabled) = @_;
1913 if ($enabled) {
1914 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1915 $BUILD_BUTTON ||= new CFPlus::UI::Button
1916 text => "Build",
1917 tooltip => "Opens the ingame builder",
1918 on_activate => sub {
1919 if ($CONN) {
1920 $CONN->send_ext_req (builder_player_items => sub {
1921 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1922 });
1923 }
1924 0
1925 };
1926 $BUTTONBAR->add ($BUILD_BUTTON);
1927 } else {
1928 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1929 }
1930}
1931
1932sub open_ingame_editor {
1933 my ($msg) = @_;
1934
1935 my $win = new CFPlus::UI::Toplevel
1936 x => 0,
1937 y => 'center',
1938 z => 4,
1939 name => 'builder_window',
1940 force_w => int $WIDTH * 1/4,
1941 force_h => int $HEIGHT * 3/4,
1942 title => "In game builder",
1943 has_close_button => 1;
1944
1945 my $r = new CFPlus::UI::ScrolledWindow (
1946 expand => 1,
1947 scroll_y => 1
1948 );
1949 $r->add (my $vb = new CFPlus::UI::VBox);
1950 $win->add ($r);
1951
1952
1953 $vb->add (
1954 new CFPlus::UI::Button
1955 text => "Disable build mode",
1956 on_activate => sub { $::IN_BUILD_MODE = undef }
1957 );
1958 $vb->add (
1959 new CFPlus::UI::Button
1960 text => "ERASE",
1961 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1962 );
1963
1964 for my $itemarchname (
1965 sort {
1966 $msg->{items}->{$a}->{build_arch_name}
1967 cmp $msg->{items}->{$b}->{build_arch_name}
1968 } keys %{$msg->{items}}
1969 ) {
1970 my $info = $msg->{items}->{$itemarchname};
1971 $vb->add (
1972 new CFPlus::UI::Button text => $info->{build_arch_name},
1973 on_activate => sub {
1974 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1975
1976 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1977 build_mode_query_arch_info ();
1978 }
1979 }
1980 );
1981 }
1982
1983 $win->show;
1984}
1985
1986sub build_mode_query_arch_info {
1987 my ($iteminfo) = $::IN_BUILD_MODE;
1988 my $itemarchname = $iteminfo->{item};
1989 my $info = $iteminfo->{info};
1990
1991 my $dialog = new CFPlus::UI::Toplevel
1992 x => "center",
1993 y => "center",
1994 z => 50,
1995 force_w => int $WIDTH * 1/2,
1996 title => "Enter information for placement of '$itemarchname'",
1997 has_close_button => 1;
1998
1999 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
2000
2001 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
2002 my $row = 0;
2003 if ($info->{has_name}) {
2004 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
2005 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
2006 }
2007 if ($info->{has_text}) {
2008 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
2009 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
2010 }
2011 if ($info->{has_connection}) {
2012 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
2013 $table->add_at (1, $row++,
2014 new CFPlus::UI::Entry
2015 expand => 1,
2016 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
2017 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
2018 );
2019 }
2020
2021 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2022 $hb->add (new CFPlus::UI::Button
2023 text => "Close",
2024 expand => 1,
2025 on_activate => sub { $dialog->hide; 0 },
2026 );
2027 $dialog->show;
2028}
2029
2030sub video_shutdown { 2082sub video_shutdown {
2031 CFPlus::OpenGL::shutdown; 2083 CFPlus::OpenGL::shutdown;
2032 2084
2033 undef $SDL_ACTIVE; 2085 undef $SDL_ACTIVE;
2034} 2086}
2035 2087
2036sub audio_channel_finished {
2037 my ($channel) = @_;
2038
2039 #warn "channel $channel finished\n";#d#
2040}
2041
2042sub audio_music_set {
2043 my ($songs) = @_;
2044
2045 my @want =
2046 grep $_,
2047 map $CONN->{music_meta}{$_},
2048 @$songs;
2049
2050 if (@want) {
2051 @MUSIC_WANT = @want;
2052 &audio_music_changed ();
2053 }
2054}
2055
2056sub audio_music_start {
2057 my $path = $MUSIC_PLAYING->{path}
2058 or return;
2059
2060 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2061 # music might have changed...
2062 $path eq $MUSIC_PLAYING->{path}
2063 or return &audio_music_start ();
2064
2065 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2066
2067 my $NOW = time;
2068
2069 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2070 my $pos = $MUSIC_PLAYING->{stop_pos};
2071 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2072 $MUSIC_START = time - $pos;
2073 } else {
2074 $MUSIC_PLAYER->play (0);
2075 $MUSIC_START = time;
2076 }
2077
2078 delete $MUSIC_PLAYING->{stop_time};
2079 delete $MUSIC_PLAYING->{stop_pos};
2080 }
2081}
2082
2083sub audio_music_changed {
2084 return unless $CFG->{bgm_enable};
2085
2086 # default MUSIC_WANT == MUSIC_DEFAULT
2087 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2088
2089 # if the currently playing song is acceptable, let it continue
2090 return if $MUSIC_PLAYING
2091 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2092
2093 my $NOW = time;
2094
2095 if ($MUSIC_PLAYING) {
2096 $MUSIC_PLAYING->{stop_time} = $NOW;
2097 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2098 CFPlus::MixMusic::fade_out 1000;
2099 } else {
2100 # sort by stop time, oldest first
2101 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2102
2103 # if the most recently-played piece played very recently,
2104 # resume it, else choose the oldest piece for rotation.
2105 $MUSIC_PLAYING =
2106 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2107 ? $MUSIC_WANT[-1]
2108 : $MUSIC_WANT[0];
2109
2110 audio_music_start;
2111 }
2112}
2113
2114sub audio_music_finished {
2115 $MUSIC_PLAYING = undef;
2116 undef $MUSIC_PLAYER;
2117
2118 audio_music_changed;
2119}
2120
2121sub audio_init {
2122 if ($CFG->{audio_enable}) {
2123 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2124 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2125
2126 unless ($SDL_MIXER) {
2127 status "Unable to open sound device: there will be no sound";
2128 return;
2129 }
2130
2131 CFPlus::Mix_AllocateChannels 8;
2132 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2133
2134 audio_music_finished;
2135
2136 local $_;
2137 while (<$fh>) {
2138 next if /^\s*#/;
2139 next if /^\s*$/;
2140
2141 my ($file, $volume, $event) = split /\s+/, $_, 3;
2142
2143 push @SOUNDS, "$volume,$file";
2144
2145 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2146 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2147 $chunk->volume ($volume * 128 / 100);
2148 $chunk
2149 };
2150 }
2151 } else {
2152 status "unable to open sound config: $!";
2153 }
2154 }
2155}
2156
2157sub audio_shutdown {
2158 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2159 undef $SDL_MIXER;
2160 @SOUNDS = ();
2161 %AUDIO_CHUNKS = ();
2162}
2163
2164my %animate_object; 2088my %animate_object;
2165my $animate_timer; 2089my $animate_timer;
2166 2090
2167my $fps = 9; 2091my $fps = 9;
2168
2169my %demo;#d#
2170 2092
2171sub force_refresh { 2093sub force_refresh {
2172 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2094 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2173 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2095 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2174 2096
… …
2206 2128
2207sub animation_stop { 2129sub animation_stop {
2208 my ($widget) = @_; 2130 my ($widget) = @_;
2209 delete $animate_object{$widget}; 2131 delete $animate_object{$widget};
2210} 2132}
2211
2212# check once/second for faces that need to be prefetched
2213# this should, of course, only run on demand, but
2214# SDL forces worse things on us....
2215
2216Event->timer (after => 1, interval => 0.25, cb => sub {
2217 $CONN->face_prefetch
2218 if $CONN;
2219});
2220 2133
2221%SDL_CB = ( 2134%SDL_CB = (
2222 CFPlus::SDL_QUIT => sub { 2135 CFPlus::SDL_QUIT => sub {
2223 exit; 2136 exit;
2224 }, 2137 },
… …
2268 2181
2269 CFPlus::UI::set_layout ($::CFG->{layout}); 2182 CFPlus::UI::set_layout ($::CFG->{layout});
2270 2183
2271 my %DEF_CFG = ( 2184 my %DEF_CFG = (
2272 sdl_mode => 0, 2185 sdl_mode => 0,
2273 width => 640,
2274 height => 480,
2275 fullscreen => 0, 2186 fullscreen => 0,
2276 fast => 0, 2187 fast => 0,
2277 map_scale => 1, 2188 map_scale => 1,
2278 fow_enable => 1, 2189 fow_enable => 1,
2279 fow_intensity => 0, 2190 fow_intensity => 0,
… …
2282 log_fontsize => 0.7, 2193 log_fontsize => 0.7,
2283 gauge_fontsize => 1, 2194 gauge_fontsize => 1,
2284 gauge_size => 0.35, 2195 gauge_size => 0.35,
2285 stat_fontsize => 0.7, 2196 stat_fontsize => 0.7,
2286 mapsize => 100, 2197 mapsize => 100,
2287 say_command => 'chat',
2288 audio_enable => 1, 2198 audio_enable => 1,
2199 effects_enable => 1,
2200 effects_volume => 1,
2289 bgm_enable => 1, 2201 bgm_enable => 1,
2290 bgm_volume => 0.25, 2202 bgm_volume => 0.5,
2291 face_prefetch => 0,
2292 output_sync => 1, 2203 output_sync => 1,
2293 output_count => 1, 2204 output_count => 1,
2294 output_rate => "", 2205 output_rate => "",
2295 pickup => 0, 2206 pickup => 0,
2296 inv_sort => "mtime", 2207 inv_sort => "mtime",

Diff Legend

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