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.173 by root, Tue Jul 17 17:39:08 2007 UTC vs.
Revision 1.208 by root, Fri Aug 10 04:02:14 2007 UTC

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

Diff Legend

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