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.176 by root, Thu Jul 19 14:54:51 2007 UTC vs.
Revision 1.207 by root, Thu Aug 9 11:02:08 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines