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

Diff Legend

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