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

Diff Legend

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