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.159 by root, Thu Jul 5 06:49:10 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 @SOUNDS; # event => file mapping
165our %AUDIO_CHUNKS; # audio files
166
167our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
168our $STATUSBOX; 167our $STATUSBOX;
169our $DEBUG_STATUS; 168our $DEBUG_STATUS;
170 169
171our $INV; 170our $INV;
172our $INVR; 171our $INVR;
173our $INV_RIGHT_HB; 172our $INVR_HB;
174 173
175our $PICKUP_CFG; 174#############################################################################
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
179 175
180sub status { 176sub status {
181 $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]);
182} 178}
183 179
… …
185 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
186} 182}
187 183
188sub message { 184sub message {
189 my ($para) = @_; 185 my ($para) = @_;
190 186 $MESSAGE_WINDOW->message ($para);
191 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
192
193 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
194
195 $LOGVIEW->add_paragraph ($para);
196 $LOGVIEW->scroll_to_bottom;
197} 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#############################################################################
198 429
199sub destroy_query_dialog { 430sub destroy_query_dialog {
200 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
201 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
202} 433}
… …
266 ellipsise => 0, 497 ellipsise => 0,
267 markup => "\nOr use your keyboard and the text entry below:\n"; 498 markup => "\nOr use your keyboard and the text entry below:\n";
268 499
269 unshift @dialog, my $table = new CFPlus::UI::Table; 500 unshift @dialog, my $table = new CFPlus::UI::Table;
270 501
271 $table->add (0, 0, new CFPlus::UI::Button 502 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Next Race", 503 text => "Next Race",
273 on_activate => sub { 504 on_activate => sub {
274 $conn->send ("reply n"); 505 $conn->send ("reply n");
275 destroy_query_dialog $conn; 506 destroy_query_dialog $conn;
276 0 507 0
277 }, 508 },
278 ); 509 );
279 $table->add (2, 0, new CFPlus::UI::Button 510 $table->add_at (2, 0, new CFPlus::UI::Button
280 text => "Accept", 511 text => "Accept",
281 on_activate => sub { 512 on_activate => sub {
282 $conn->send ("reply d"); 513 $conn->send ("reply d");
283 destroy_query_dialog $conn; 514 destroy_query_dialog $conn;
284 0 515 0
… …
319 $conn->send ("reply $stat"); 550 $conn->send ("reply $stat");
320 destroy_query_dialog $conn; 551 destroy_query_dialog $conn;
321 return; 552 return;
322 } 553 }
323 554
324 $STATS_PAGE->show;
325 $MESSAGE_WINDOW->hide;
326
327 unshift @dialog, new CFPlus::UI::Label 555 unshift @dialog, new CFPlus::UI::Label
328 max_w => $::WIDTH * 0.4, 556 max_w => $::WIDTH * 0.4,
329 ellipsise => 0, 557 ellipsise => 0,
330 markup => "\nOr use your keyboard and the text entry below:\n"; 558 markup => "\nOr use your keyboard and the text entry below:\n";
331 559
332 unshift @dialog, my $table = new CFPlus::UI::Table; 560 unshift @dialog, my $table = new CFPlus::UI::Table;
333 561
334 # left: re-roll 562 # left: re-roll
335 $table->add (0, 0, new CFPlus::UI::Button 563 $table->add_at (0, 0, new CFPlus::UI::Button
336 text => "Roll Again", 564 text => "Roll Again",
337 on_activate => sub { 565 on_activate => sub {
338 $conn->send ("reply y"); 566 $conn->send ("reply y");
339 destroy_query_dialog $conn; 567 destroy_query_dialog $conn;
340 0 568 0
… …
354 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 582 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
355 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 583 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
356 ], 584 ],
357 ), 1 .. 2; 585 ), 1 .. 2;
358 586
359 $table->add (2, 0, new CFPlus::UI::Button 587 $table->add_at (2, 0, new CFPlus::UI::Button
360 text => "Swap Stats", 588 text => "Swap Stats",
361 on_activate => sub { 589 on_activate => sub {
362 $conn->{stat_change_with} = $sw2->{value}; 590 $conn->{stat_change_with} = $sw2->{value};
363 $conn->send ("reply $sw1->{value}"); 591 $conn->send ("reply $sw1->{value}");
364 destroy_query_dialog $conn; 592 destroy_query_dialog $conn;
365 0 593 0
366 }, 594 },
367 ); 595 );
368 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 596 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
369 597
370 # right: accept 598 # right: accept
371 $table->add (4, 0, new CFPlus::UI::Button 599 $table->add_at (4, 0, new CFPlus::UI::Button
372 text => "Accept", 600 text => "Accept",
373 on_activate => sub { 601 on_activate => sub {
374 $conn->send ("reply n"); 602 $conn->send ("reply n");
375 $STATS_PAGE->hide; 603 $STATS_PAGE->hide;
376 destroy_query_dialog $conn; 604 destroy_query_dialog $conn;
… …
457 maph => $mapsize, 685 maph => $mapsize,
458 686
459 client => "cfplus $CFPlus::VERSION $] $^O", 687 client => "cfplus $CFPlus::VERSION $] $^O",
460 688
461 map_widget => $MAPWIDGET, 689 map_widget => $MAPWIDGET,
462 logview => $LOGVIEW,
463 statusbox => $STATUSBOX, 690 statusbox => $STATUSBOX,
464 map => $MAP, 691 map => $MAP,
465 mapmap => $MAPMAP, 692 mapmap => $MAPMAP,
466 query => \&server_query, 693 query => \&server_query,
467 694
468 setup_req => { 695 setup_req => {
469 smoothing => $CFG->{map_smoothing}*1, 696 smoothing => $CFG->{map_smoothing}*1,
470 },
471
472 sound_play => sub {
473 my ($x, $y, $soundnum, $type) = @_;
474
475 $SDL_MIXER
476 or return;
477
478 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
479 or return;
480
481 $chunk->play;
482 }, 697 },
483 }; 698 };
484 699
485 if ($CONN) { 700 if ($CONN) {
486 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
… …
498 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
499 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
500 $SPELL_LIST->clear_spells; 715 $SPELL_LIST->clear_spells;
501 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
502 717
718 &audio_music_set_ambient ([]);
719
503 return unless $CONN; 720 return unless $CONN;
504 721
505 status "connection closed"; 722 status "connection closed";
506 723
507 destroy_query_dialog $CONN; 724 destroy_query_dialog $CONN;
… …
516 733
517 $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]);
518 735
519 my $row = 0; 736 my $row = 0;
520 737
521 $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");
522 $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,
523 can_events => 1, 740 can_events => 1,
524 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 741 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
525 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
526 $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");
527 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 748 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
528 749
750 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
529 $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],
530 $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);
531 756
532 $mode_slider->connect (changed => sub { 757 $mode_slider->connect (changed => sub {
533 my ($self, $value) = @_; 758 my ($self, $value) = @_;
534 759
535 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 760 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
536 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 761 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
537 }); 762 });
538 $mode_slider->emit (changed => $mode_slider->{range}[0]); 763 $mode_slider->emit (changed => $mode_slider->{range}[0]);
539 764
540 $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");
541 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
542 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
543 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
544 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
545 ); 770 );
546 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
547 $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");
548 $table->add (1, $row++, new CFPlus::UI::CheckBox 794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
549 state => $CFG->{fast}, 795 state => $CFG->{fast},
550 tooltip => "Lower the visual quality considerably to speed up rendering.", 796 tooltip => "Lower the visual quality considerably to speed up rendering.",
551 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 797 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
552 ); 798 );
553 799
554 $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");
555 $table->add (1, $row++, new CFPlus::UI::Slider 801 $table->add_at (1, $row++, new CFPlus::UI::Slider
556 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 802 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
557 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.",
558 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 804 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
559 ); 805 );
560 806
561 $table->add (1, $row++, new CFPlus::UI::Button 807 $table->add_at (1, $row++, new CFPlus::UI::Button
562 expand => 1, align => 0, text => "Apply", 808 expand => 1, align => 0, text => "Apply",
563 tooltip => "Apply the video settings above.", 809 tooltip => "Apply the video settings above.",
564 on_activate => sub { 810 on_activate => sub {
565 video_shutdown (); 811 video_shutdown ();
566 video_init (); 812 video_init ();
567 0 813 0
568 } 814 }
569 ); 815 );
570 816
571 $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");
572 $table->add (1, $row++, new CFPlus::UI::Slider 818 $table->add_at (1, $row++, new CFPlus::UI::Slider
573 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 819 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
574 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 820 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
575 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 }
576 ); 822 );
577 823
578 $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");
579 $table->add (1, $row++, new CFPlus::UI::CheckBox 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{map_smoothing}, 826 state => $CFG->{map_smoothing},
581 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. "
582 . "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. "
583 . "Changes take effect at next connection only.", 829 . "Changes take effect at next login only.",
584 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 830 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
585 ); 831 );
586 832
587 $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");
588 $table->add (1, $row++, new CFPlus::UI::CheckBox 834 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
589 state => $CFG->{fow_enable}, 835 state => $CFG->{fow_enable},
590 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.",
591 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 837 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
592 ); 838 );
593 839
594 $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");
595 $table->add (1, $row++, new CFPlus::UI::Slider 841 $table->add_at (1, $row++, new CFPlus::UI::Slider
596 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 842 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
597 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.",
598 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 844 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
599 ); 845 );
600 846
601 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
602 $table->add (1, $row++, new CFPlus::UI::CheckBox
603 state => $CFG->{fow_smooth},
604 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
605 on_changed => sub {
606 my ($self, $value) = @_;
607 $CFG->{fow_smooth} = $value;
608 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
609 0
610 }
611 );
612
613 $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");
614 $table->add (1, $row++, new CFPlus::UI::Slider 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
615 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 849 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
616 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.",
617 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 852 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
618 ); 853 );
619 854
620 $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");
621 $table->add (1, $row++, new CFPlus::UI::Slider 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
622 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 857 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
623 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.",
624 on_changed => sub { 859 on_changed => sub {
625 $CFG->{gauge_fontsize} = $_[1]; 860 $CFG->{gauge_fontsize} = $_[1];
626 &set_gauge_window_fontsize; 861 &set_gauge_window_fontsize;
627 0 862 0
628 } 863 }
629 ); 864 );
630 865
631 $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");
632 $table->add (1, $row++, new CFPlus::UI::Slider 867 $table->add_at (1, $row++, new CFPlus::UI::Slider
633 range => [$CFG->{gauge_size}, 0.2, 0.8], 868 range => [$CFG->{gauge_size}, 0.2, 0.8],
634 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.",
635 on_changed => sub { 870 on_changed => sub {
636 $CFG->{gauge_size} = $_[1]; 871 $CFG->{gauge_size} = $_[1];
637 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 872 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
643} 878}
644 879
645sub audio_setup { 880sub audio_setup {
646 my $vbox = new CFPlus::UI::VBox; 881 my $vbox = new CFPlus::UI::VBox;
647 882
648 $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]);
649 884
650 my $row = 0; 885 my $row = 0;
651 886
652 $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");
653 $table->add (1, $row++, new CFPlus::UI::CheckBox 888 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
654 state => $CFG->{audio_enable}, 889 state => $CFG->{audio_enable},
655 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.",
656 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 891 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
657 ); 892 );
658# $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");
659# $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 {
660# $CFG->{effects_volume} = $_[1]; 895# $CFG->{effects_volume} = $_[1];
661# }); 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
662 $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");
663 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
664 $hbox->add (new CFPlus::UI::CheckBox 916 $table->add_at (1, $row, new CFPlus::UI::CheckBox
665 expand => 1, state => $CFG->{bgm_enable}, 917 expand => 1, state => $CFG->{bgm_enable},
666 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.",
667 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 }
668 ); 924 );
669 $hbox->add (new CFPlus::UI::Slider 925 $table->add_at (2, $row++, new CFPlus::UI::Slider
670 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 926 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
671 tooltip => "The volume of the background music. Changes are instant.", 927 tooltip => "The volume of the background music. Changes are instant.",
672 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 }
673 ); 929 );
674 930
675 $table->add (1, $row++, new CFPlus::UI::Button 931 $table->add_at (1, $row++, new CFPlus::UI::Button
676 expand => 1, align => 0, text => "Apply", 932 c_colspan => 2, expand => 1, align => 0, text => "Apply",
677 tooltip => "Apply the audio settings", 933 tooltip => "Apply the audio settings",
678 on_activate => sub { 934 on_activate => sub {
679 audio_shutdown (); 935 audio_shutdown ();
680 audio_init (); 936 audio_init ();
681 0 937 0
… …
739} 995}
740 996
741sub debug_setup { 997sub debug_setup {
742 my $table = new CFPlus::UI::Table; 998 my $table = new CFPlus::UI::Table;
743 999
744 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1000 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
745 $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 });
746 $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");
747 $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 });
748 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1004 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
749 $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 });
750 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1006 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
751 $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 });
752 $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() } );
753 1009
754 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
755
756 for my $x (0..2) {
757 for my $y (0 .. 2) {
758 $table->add ($x + 3, $y,
759 new CFPlus::UI::Entry
760 text => $default_smooth[$x * 3 + $y],
761 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
762 );
763 }
764 }
765
766 $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 });
767 1044
768 $table 1045 $table
769} 1046}
770 1047
771sub stats_window { 1048sub stats_window {
… …
819 [2, 4, st_spd => "Spd", 10.54], 1096 [2, 4, st_spd => "Spd", 10.54],
820 [2, 5, st_wspd => "WSp", 10.54], 1097 [2, 5, st_wspd => "WSp", 10.54],
821 ) { 1098 ) {
822 my ($col, $row, $id, $label, $template) = @$_; 1099 my ($col, $row, $id, $label, $template) = @$_;
823 1100
824 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1101 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
825 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1102 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
826 align => +1, template => $template, tooltip => "#stat_$label"); 1103 align => +1, template => $template, tooltip => "#stat_$label");
827 $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
828 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,
829 align => -1, text => $label, tooltip => "#stat_$label"); 1106 align => -1, text => $label, tooltip => "#stat_$label");
830 } 1107 }
831 1108
832 $vb->add (new CFPlus::UI::FancyFrame 1109 $vb->add (new CFPlus::UI::FancyFrame
… …
873 cold => ["Cold", 1150 cold => ["Cold",
874 "<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, ...)"],
875 ghit => ["Ghost hit", 1152 ghit => ["Ghost hit",
876 "<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)"],
877 ); 1154 );
1155
878 for (qw/slow holyw conf fire depl magic 1156 for (qw/slow holyw conf fire depl magic
879 drain acid pois para deat phys 1157 drain acid pois para deat phys
880 blind fear tund elec cold ghit/) 1158 blind fear tund elec cold ghit/)
881 { 1159 {
882 $tbl2->add ($col, $row, 1160 $tbl2->add_at ($col, $row,
883 $STATWIDS->{"res_$_"} = 1161 $STATWIDS->{"res_$_"} =
884 new CFPlus::UI::Label 1162 new CFPlus::UI::Label
885 font => $FONT_FIXED, 1163 font => $FONT_FIXED,
886 template => "-100%", 1164 template => "-100%",
887 align => +1, 1165 align => +1,
888 valign => 0, 1166 valign => 0,
889 can_events => 1, 1167 can_events => 1,
890 can_hover => 1, 1168 can_hover => 1,
891 tooltip => $resist_names{$_}->[1], 1169 tooltip => $resist_names{$_}->[1],
892 ); 1170 );
893 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1171 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
894 font => $FONT_FIXED, 1172 font => $FONT_FIXED,
895 can_hover => 1, 1173 can_hover => 1,
896 can_events => 1, 1174 can_events => 1,
897 path => "ui/resist/resist_$_.png", 1175 path => "ui/resist/resist_$_.png",
898 tooltip => $resist_names{$_}->[1], 1176 tooltip => $resist_names{$_}->[1],
899 ); 1177 );
900 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1178 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
901 text => $resist_names{$_}->[0], 1179 text => $resist_names{$_}->[0],
902 font => $FONT_FIXED, 1180 font => $FONT_FIXED,
903 can_hover => 1, 1181 can_hover => 1,
904 can_events => 1, 1182 can_events => 1,
905 tooltip => $resist_names{$_}->[1], 1183 tooltip => $resist_names{$_}->[1],
… …
938 return if $METASERVER_ATIME > time; 1216 return if $METASERVER_ATIME > time;
939 $METASERVER_ATIME = time + 60; 1217 $METASERVER_ATIME = time + 60;
940 1218
941 my $table = $METASERVER->{table}; 1219 my $table = $METASERVER->{table};
942 $table->clear; 1220 $table->clear;
943 $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...");
944 1222
945 my $ok = 0; 1223 my $ok = 0;
946 1224
947 CFPlus::background { 1225 CFPlus::background {
948 my $ua = CFPlus::lwp_useragent; 1226 my $ua = CFPlus::lwp_useragent;
… …
959 "The time this server has been running without being restarted.", 1237 "The time this server has been running without being restarted.",
960 "The server software version - a '+' indicates a Crossfire+ server.", 1238 "The server software version - a '+' indicates a Crossfire+ server.",
961 "Short information about this server provided by its admins.", 1239 "Short information about this server provided by its admins.",
962 ); 1240 );
963 my @col = qw(#Users Host Uptime Version Description); 1241 my @col = qw(#Users Host Uptime Version Description);
964 $table->add ($_, 0, new CFPlus::UI::Label 1242 $table->add_at ($_, 0, new CFPlus::UI::Label
965 can_hover => 1, can_events => 1, 1243 can_hover => 1, can_events => 1,
966 align => 0, fg => [1, 1, 0], 1244 align => 0, fg => [1, 1, 0],
967 text => $col[$_], tooltip => $tip[$_]) 1245 text => $col[$_], tooltip => $tip[$_])
968 for 0 .. $#col; 1246 for 0 .. $#col;
969 1247
… …
991 1269
992 $m = [$users, $host, $uptime, $version, $desc]; 1270 $m = [$users, $host, $uptime, $version, $desc];
993 1271
994 $y++; 1272 $y++;
995 1273
996 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1274 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
997 (new CFPlus::UI::Button 1275 (new CFPlus::UI::Button
998 text => "Use", 1276 text => "Use",
999 tooltip => "Put this server into the <b>Host:Port</b> field", 1277 tooltip => "Put this server into the <b>Host:Port</b> field",
1000 on_activate => sub { 1278 on_activate => sub {
1001 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1279 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1004 }, 1282 },
1005 ), 1283 ),
1006 (new CFPlus::UI::Empty expand => 1), 1284 (new CFPlus::UI::Empty expand => 1),
1007 ]); 1285 ]);
1008 1286
1009 $table->add ($_, $y, new CFPlus::UI::Label 1287 $table->add_at ($_, $y, new CFPlus::UI::Label
1010 max_w => $::WIDTH * 0.4, 1288 max_w => $::WIDTH * 0.4,
1011 ellipsise => 0, 1289 ellipsise => 0,
1012 align => $align[$_], 1290 align => $align[$_],
1013 text => $m->[$_], 1291 text => $m->[$_],
1014 tooltip => $tip[$_], 1292 tooltip => $tip[$_],
… …
1055 1333
1056 $vbox->add (new CFPlus::UI::FancyFrame 1334 $vbox->add (new CFPlus::UI::FancyFrame
1057 label => "Connection Settings", 1335 label => "Connection Settings",
1058 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]),
1059 ); 1337 );
1060 $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");
1061 1339
1062 { 1340 {
1063 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1341 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1064 1342
1065 $vbox->add ( 1343 $vbox->add (
1066 $HOST_ENTRY = new CFPlus::UI::Entry 1344 $HOST_ENTRY = new CFPlus::UI::Entry
1067 expand => 1, 1345 expand => 1,
1068 text => $CFG->{profile}{default}{host}, 1346 text => $CFG->{profile}{default}{host},
1069 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",
1070 on_changed => sub { 1348 on_changed => sub {
1071 my ($self, $value) = @_; 1349 my ($self, $value) = @_;
1072 $CFG->{profile}{default}{host} = $value; 1350 $CFG->{profile}{default}{host} = $value;
1073 0 1351 1
1074 } 1352 }
1075 ); 1353 );
1076 1354
1077 $vbox->add (new CFPlus::UI::Button 1355 $vbox->add (new CFPlus::UI::Button
1078 expand => 1, 1356 expand => 1,
1079 text => "Server List", 1357 text => "Server List",
1080 other => $METASERVER, 1358 other => $METASERVER,
1081 tooltip => "Show a list of available crossfire servers", 1359 tooltip => "Show a list of available crossfire servers",
1082 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1360 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1083 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1361 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1084 ); 1362 );
1085 } 1363 }
1086 1364
1087 $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");
1088 $table->add (1, 4, new CFPlus::UI::Entry 1366 $table->add_at (1, 4, new CFPlus::UI::Entry
1089 text => $CFG->{profile}{default}{user}, 1367 text => $CFG->{profile}{default}{user},
1090 tooltip => "The name of your character on the server", 1368 tooltip => "The name of your character on the server",
1091 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1369 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1092 ); 1370 );
1093 1371
1094 $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");
1095 $table->add (1, 5, new CFPlus::UI::Entry 1373 $table->add_at (1, 5, new CFPlus::UI::Entry
1096 text => $CFG->{profile}{default}{password}, 1374 text => $CFG->{profile}{default}{password},
1097 hidden => 1, 1375 hidden => 1,
1098 tooltip => "The password for your character", 1376 tooltip => "The password for your character",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1377 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1100 ); 1378 );
1101 1379
1102 $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");
1103 $table->add (1, 7, new CFPlus::UI::Slider 1381 $table->add_at (1, 7, new CFPlus::UI::Slider
1104 force_w => 100, 1382 force_w => 100,
1105 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1383 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1106 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. "
1107 . "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, "
1108 . "but you also increase bandwidth requirements and latency. " 1386 . "but you also increase bandwidth requirements and latency. "
1109 . "This option is only used once at log-in.", 1387 . "This option is only used once at log-in.",
1110 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 },
1111 ); 1389 );
1112 1390
1113 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1114 $table->add (1, 8, new CFPlus::UI::CheckBox
1115 state => $CFG->{face_prefetch},
1116 tooltip => "<b>Background Image Prefetch</b>\n\n"
1117 . "If enabled, the client automatically pre-fetches images from the server. "
1118 . "This might increase or create lag, but increases the chances "
1119 . "of faces being ready for display when you encounter them. "
1120 . "It also uses up server bandwidth on every connect, "
1121 . "so only set it if you really need to prefetch images. "
1122 . "This option can be set and unset any time.",
1123 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1124 );
1125
1126 $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");
1127 $table->add (1, 9, new CFPlus::UI::Entry 1392 $table->add_at (1, 8, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate}, 1393 text => $CFG->{output_rate},
1129 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 "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1395 . "when sending data. When 0 or unset, the server "
1131 . "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.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1398 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1133 ); 1399 );
1134 1400
1135 $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");
1136 $table->add (1, 10, new CFPlus::UI::Entry 1402 $table->add_at (1, 9, new CFPlus::UI::Entry
1137 text => $CFG->{output_count}, 1403 text => $CFG->{output_count},
1138 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.",
1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1405 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1140 ); 1406 );
1141 1407
1142 $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");
1143 $table->add (1, 11, new CFPlus::UI::Entry 1409 $table->add_at (1, 10, new CFPlus::UI::Entry
1144 text => $CFG->{output_sync}, 1410 text => $CFG->{output_sync},
1145 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.",
1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1412 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1147 ); 1413 );
1148 1414
1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1415 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1150 expand => 1, 1416 expand => 1,
1151 align => 0, 1417 align => 0,
1152 text => "Login", 1418 text => "Login",
1153 on_activate => sub { 1419 on_activate => sub {
1154 $CONN ? stop_game 1420 $CONN ? stop_game
1155 : start_game; 1421 : start_game;
1156 0 1422 1
1157 }, 1423 },
1158 ); 1424 );
1159 1425
1160 $vbox->add (new CFPlus::UI::FancyFrame 1426 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info", 1427 label => "Server Info",
… …
1168sub client_setup { 1434sub client_setup {
1169 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];
1170 1436
1171 my $row = 0; 1437 my $row = 0;
1172 1438
1173 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1175 text => $CFG->{say_command},
1176 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. "
1177 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1178 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1179 on_changed => sub {
1180 my ($self, $value) = @_;
1181 $CFG->{say_command} = $value;
1182 0
1183 }
1184 );
1185
1186 $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");
1187 $table->add (1, $row++, new CFPlus::UI::CheckBox 1440 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1188 state => $CFG->{show_tips}, 1441 state => $CFG->{show_tips},
1189 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?",
1190 on_changed => sub { 1443 on_changed => sub {
1191 my ($self, $value) = @_; 1444 my ($self, $value) = @_;
1192 $CFG->{show_tips} = $value; 1445 $CFG->{show_tips} = $value;
1193 0 1446 0
1194 } 1447 }
1195 ); 1448 );
1196 1449
1197 $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");
1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1451 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199 text => $CFG->{logview_max_par}, 1452 text => $CFG->{logview_max_par},
1200 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 "
1201 . "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 "
1202 . "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.",
1203 on_changed => sub { 1456 on_changed => sub {
1204 my ($self, $value) = @_; 1457 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1458 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1206 0 1459 0
1207 }, 1460 },
1208 ); 1461 );
1209 1462
1210 $table 1463 $table
1211} 1464}
1212 1465
1213sub message_window {
1214 my $window = new CFPlus::UI::Toplevel
1215 name => "message_window",
1216 title => "Messages",
1217 border_bg => [1, 1, 1, 1],
1218 x => "max",
1219 y => 0,
1220 force_w => $::WIDTH * 0.4,
1221 force_h => $::HEIGHT * 0.5,
1222 child => (my $vbox = new CFPlus::UI::VBox),
1223 has_close_button => 1;
1224
1225 $vbox->add ($LOGVIEW);
1226
1227 $vbox->add (my $input = new CFPlus::UI::Entry
1228 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1229 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1230 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1231 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1232 on_focus_in => sub {
1233 my ($input, $prev_focus) = @_;
1234
1235 delete $input->{refocus_map};
1236
1237 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1238 $input->{refocus_map} = 1;
1239 }
1240 delete $input->{auto_activated};
1241
1242 0
1243 },
1244 on_activate => sub {
1245 my ($input, $text) = @_;
1246 $input->set_text ('');
1247
1248 if ($text =~ /^\/(.*)/) {
1249 $::CONN->user_send ($1);
1250 } else {
1251 my $say_cmd = $::CFG->{say_command} || 'say';
1252 $::CONN->user_send ("$say_cmd $text");
1253 }
1254 if ($input->{refocus_map}) {
1255 delete $input->{refocus_map};
1256 $MAPWIDGET->focus_in
1257 }
1258
1259 0
1260 },
1261 on_escape => sub {
1262 $MAPWIDGET->grab_focus;
1263
1264 0
1265 },
1266 );
1267
1268 $CONSOLE = {
1269 window => $window,
1270 input => $input,
1271 };
1272
1273 $window
1274}
1275
1276sub autopickup_setup { 1466sub autopickup_setup {
1467 my $r = new CFPlus::UI::ScrolledWindow (
1468 expand => 1,
1469 scroll_y => 1
1470 );
1277 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 );
1278 1475
1279 for ( 1476 for (
1280 ["General", 0, 0, 1477 ["General", 0, 0,
1281 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1478 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1282 ["Inhibit autopickup" => PICKUP_INHIBIT], 1479 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1317 ], 1514 ],
1318 ["Weight/Value ratio", 2, 17] 1515 ["Weight/Value ratio", 2, 17]
1319 ) 1516 )
1320 { 1517 {
1321 my ($title, $x, $y, @bits) = @$_; 1518 my ($title, $x, $y, @bits) = @$_;
1322 $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]);
1323 1520
1324 for (@bits) { 1521 for (@bits) {
1325 ++$y; 1522 ++$y;
1326 1523
1327 my $mask = $_->[1]; 1524 my $mask = $_->[1];
1328 $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);
1329 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1526 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1330 state => $::CFG->{pickup} & $mask, 1527 state => $::CFG->{pickup} & $mask,
1331 on_changed => sub { 1528 on_changed => sub {
1332 my ($box, $value) = @_; 1529 my ($box, $value) = @_;
1333 1530
1334 if ($value) { 1531 if ($value) {
… …
1345 1542
1346 ${$_->[2]} = $checkbox if $_->[2]; 1543 ${$_->[2]} = $checkbox if $_->[2];
1347 } 1544 }
1348 } 1545 }
1349 1546
1350 $table->add (2, 18, new CFPlus::UI::ValSlider 1547 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1351 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1548 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1352 template => ">= 99", 1549 template => ">= 99",
1353 to_value => sub { ">= " . 5 * $_[0] }, 1550 to_value => sub { ">= " . 5 * $_[0] },
1354 on_changed => sub { 1551 on_changed => sub {
1355 my ($slider, $value) = @_; 1552 my ($slider, $value) = @_;
… …
1358 $::CFG->{pickup} |= int $value 1555 $::CFG->{pickup} |= int $value
1359 if $value; 1556 if $value;
1360 1; 1557 1;
1361 }); 1558 });
1362 1559
1363 $table->add (3, 18, new CFPlus::UI::Button 1560 $table->add_at (3, 18, new CFPlus::UI::Button
1364 text => "set", 1561 text => "set",
1365 on_activate => sub { 1562 on_activate => sub {
1366 $::CONN->send_command ("pickup $::CFG->{pickup}") 1563 $::CONN->send_command ("pickup $::CFG->{pickup}")
1367 if defined $::CONN; 1564 if defined $::CONN;
1368 0 1565 0
1369 }); 1566 });
1370 1567
1371 $table 1568 $r
1372} 1569}
1373 1570
1374my %SORT_ORDER = ( 1571my %SORT_ORDER = (
1375 type => undef, 1572 type => undef,
1376 mtime => sub { 1573 mtime => sub {
… …
1420 $sw1->add ($INV = new CFPlus::UI::Inventory); 1617 $sw1->add ($INV = new CFPlus::UI::Inventory);
1421 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1618 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1422 1619
1423 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1620 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1424 1621
1425 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1622 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1426 1623
1427 $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);
1428 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1625 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1429 1626
1430 # XXX: Call after $INVR = ... because set_opencont sets the items 1627 # XXX: Call after $INVR = ... because set_opencont sets the items
1431 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1628 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1432 1629
1433 $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;
1434} 1671}
1435 1672
1436sub toggle_player_page { 1673sub toggle_player_page {
1437 my ($widget) = @_; 1674 my ($widget) = @_;
1438 1675
… …
1457 1694
1458 my $ntb = 1695 my $ntb =
1459 $PL_NOTEBOOK = 1696 $PL_NOTEBOOK =
1460 new CFPlus::UI::Notebook expand => 1; 1697 new CFPlus::UI::Notebook expand => 1;
1461 1698
1462 $ntb->add ( 1699 $ntb->add_tab (
1463 "Statistics (F2)" => $STATS_PAGE = stats_window, 1700 "Statistics (F2)" => $STATS_PAGE = stats_window,
1464 "Shows statistics, where all your Stats and Resistances are shown." 1701 "Shows statistics, where all your Stats and Resistances are shown."
1465 ); 1702 );
1466 $ntb->add ( 1703 $ntb->add_tab (
1467 "Skills (F3)" => $SKILL_PAGE = skill_window, 1704 "Skills (F3)" => $SKILL_PAGE = skill_window,
1468 "Shows all your Skills." 1705 "Shows all your Skills."
1469 ); 1706 );
1470 1707
1471 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);
1472 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1709 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1473 $ntb->add ( 1710 $ntb->add_tab (
1474 "Spellbook (F4)" => $spellsw, 1711 "Spellbook (F4)" => $spellsw,
1475 "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."
1476 ); 1713 );
1477 $ntb->add ( 1714 $ntb->add_tab (
1478 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1715 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1479 "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 :). "
1480 . "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."
1481 ); 1718 );
1482 $ntb->add (Pickup => autopickup_setup, 1719 $ntb->add_tab (Pickup => autopickup_setup,
1483 "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.");
1484 1724
1485 $ntb->set_current_page ($INVENTORY_PAGE); 1725 $ntb->set_current_page ($INVENTORY_PAGE);
1486 1726
1487 $plwin->add ($ntb); 1727 $plwin->add ($ntb);
1488 $plwin 1728 $plwin
… …
1642 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1882 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1643 ); 1883 );
1644 $hb->add (new CFPlus::UI::Button 1884 $hb->add (new CFPlus::UI::Button
1645 text => "Quit anyway", 1885 text => "Quit anyway",
1646 expand => 1, 1886 expand => 1,
1647 on_activate => sub { exit }, 1887 on_activate => sub { Event::unloop_all },
1648 ); 1888 );
1649 } 1889 }
1650 1890
1651 $QUIT_DIALOG->show; 1891 $QUIT_DIALOG->show;
1652 $QUIT_DIALOG->grab_focus; 1892 $QUIT_DIALOG->grab_focus;
… …
1685 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1925 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1686 $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]);
1687 1927
1688 $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]);
1689 1929
1690 $table->add (0, 0, new CFPlus::UI::Button 1930 $table->add_at (0, 0, new CFPlus::UI::Button
1691 text => "Close", 1931 text => "Close",
1692 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>.",
1693 on_activate => $close, 1933 on_activate => $close,
1694 ); 1934 );
1695 1935
1696 $table->add (2, 0, new CFPlus::UI::Button 1936 $table->add_at (2, 0, new CFPlus::UI::Button
1697 text => "Next", 1937 text => "Next",
1698 tooltip => "Show the next <b>Tip of the day</b>.", 1938 tooltip => "Show the next <b>Tip of the day</b>.",
1699 on_activate => sub { 1939 on_activate => sub {
1700 $close->(); 1940 $close->();
1701 &show_tip_of_the_day; 1941 &show_tip_of_the_day;
… …
1710 CFPlus::SDL_Init 1950 CFPlus::SDL_Init
1711 and die "SDL::Init failed!\n"; 1951 and die "SDL::Init failed!\n";
1712} 1952}
1713 1953
1714sub video_init { 1954sub video_init {
1715 sdl_init;
1716
1717 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1955 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1718 1956
1719 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1957 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1720 1958
1721 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1959 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1722 $FULLSCREEN = $CFG->{fullscreen}; 1960 $FULLSCREEN = $CFG->{fullscreen};
1723 $FAST = $CFG->{fast}; 1961 $FAST = $CFG->{fast};
1724 1962
1725 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1963 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1726 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1964 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1727 1965
1728 $SDL_ACTIVE = 1; 1966 $SDL_ACTIVE = 1;
1729 $LAST_REFRESH = time - 0.01; 1967 $LAST_REFRESH = time - 0.01;
1730 1968
… …
1772 2010
1773 $MAPWIDGET = new CFPlus::MapWidget; 2011 $MAPWIDGET = new CFPlus::MapWidget;
1774 $MAPWIDGET->connect (activate_console => sub { 2012 $MAPWIDGET->connect (activate_console => sub {
1775 my ($mapwidget, $preset) = @_; 2013 my ($mapwidget, $preset) = @_;
1776 2014
1777 if ($CONSOLE) { 2015 $MESSAGE_WINDOW->activate_console ($preset)
1778 $CONSOLE->{input}->{auto_activated} = 1; 2016 if $MESSAGE_WINDOW;
1779 $CONSOLE->{input}->grab_focus;
1780
1781 if ($preset && $CONSOLE->{input}->get_text eq '') {
1782 $CONSOLE->{input}->set_text ($preset);
1783 }
1784 }
1785 }); 2017 });
1786 $MAPWIDGET->show; 2018 $MAPWIDGET->show;
1787 $MAPWIDGET->grab_focus; 2019 $MAPWIDGET->grab_focus;
1788
1789 $LOGVIEW = new CFPlus::UI::TextScroller
1790 expand => 1,
1791 font => $FONT_FIXED,
1792 fontsize => $::CFG->{log_fontsize},
1793 indent => -4,
1794 can_hover => 1,
1795 can_events => 1,
1796 max_par => $CFG->{logview_max_par},
1797 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1798 ;
1799 2020
1800 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2021 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1801 title => "Setup", 2022 title => "Setup",
1802 name => "setup_dialog", 2023 name => "setup_dialog",
1803 x => 'center', 2024 x => 'center',
… …
1807 force_h => $::HEIGHT * 0.6, 2028 force_h => $::HEIGHT * 0.6,
1808 has_close_button => 1, 2029 has_close_button => 1,
1809 ; 2030 ;
1810 2031
1811 $METASERVER = metaserver_dialog; 2032 $METASERVER = metaserver_dialog;
2033 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1812 2034
1813 $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,
1814 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2036 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1815 2037
1816 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2038 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1817 "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.");
1818 $SETUP_NOTEBOOK->add (Client => client_setup, 2040 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1819 "Configure various client-specific settings."); 2041 "Configure various client-specific settings.");
1820 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2042 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1821 "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.");
1822 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2044 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1823 "Configure the use of audio, sound effects and background music."); 2045 "Configure the use of audio, sound effects and background music.");
1824 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2046 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1825 "Lets you define, edit and delete key bindings." 2047 "Lets you define, edit and delete key bindings."
1826 . "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 "
1827 . "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 "
1828 . "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. "
1829 . "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 "
1830 . "binding editor closes"); 2052 . "binding editor closes");
1831 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2053 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1832 "Some debuggin' options. Do not ask."); 2054 "Some debuggin' options. Do not ask.");
1833 2055
1834 $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
1835 2057
1836 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2058 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1837 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.");
1838 2060
1839 $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,
1840 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.");
1841 2063
1842 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
1843 2065
1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2066 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1864 tooltip => "Terminates the program", 2086 tooltip => "Terminates the program",
1865 on_activate => sub { 2087 on_activate => sub {
1866 if ($CONN) { 2088 if ($CONN) {
1867 open_quit_dialog; 2089 open_quit_dialog;
1868 } else { 2090 } else {
1869 exit; 2091 Event::unloop_all;
1870 } 2092 }
1871 0 2093 0
1872 }, 2094 },
1873 ); 2095 );
1874 2096
1875 $BUTTONBAR->show; 2097 $BUTTONBAR->show;
1876 $SETUP_DIALOG->show; 2098 $SETUP_DIALOG->show;
2099 $MESSAGE_WINDOW->show;
1877 } 2100 }
1878 2101
1879 $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]);
1880}
1881
1882sub setup_build_button {
1883 my ($enabled) = @_;
1884 if ($enabled) {
1885 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1886 $BUILD_BUTTON ||= new CFPlus::UI::Button
1887 text => "Build",
1888 tooltip => "Opens the ingame builder",
1889 on_activate => sub {
1890 if ($CONN) {
1891 $CONN->send_ext_req (builder_player_items => sub {
1892 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1893 });
1894 }
1895 0
1896 };
1897 $BUTTONBAR->add ($BUILD_BUTTON);
1898 } else {
1899 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1900 }
1901}
1902
1903sub open_ingame_editor {
1904 my ($msg) = @_;
1905
1906 my $win = new CFPlus::UI::Toplevel
1907 x => 0,
1908 y => 'center',
1909 z => 4,
1910 name => 'builder_window',
1911 force_w => int $WIDTH * 1/4,
1912 force_h => int $HEIGHT * 3/4,
1913 title => "In game builder",
1914 has_close_button => 1;
1915
1916 my $r = new CFPlus::UI::ScrolledWindow (
1917 expand => 1,
1918 scroll_y => 1
1919 );
1920 $r->add (my $vb = new CFPlus::UI::VBox);
1921 $win->add ($r);
1922
1923
1924 $vb->add (
1925 new CFPlus::UI::Button
1926 text => "Disable build mode",
1927 on_activate => sub { $::IN_BUILD_MODE = undef }
1928 );
1929 $vb->add (
1930 new CFPlus::UI::Button
1931 text => "ERASE",
1932 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1933 );
1934
1935 for my $itemarchname (
1936 sort {
1937 $msg->{items}->{$a}->{build_arch_name}
1938 cmp $msg->{items}->{$b}->{build_arch_name}
1939 } keys %{$msg->{items}}
1940 ) {
1941 my $info = $msg->{items}->{$itemarchname};
1942 $vb->add (
1943 new CFPlus::UI::Button text => $info->{build_arch_name},
1944 on_activate => sub {
1945 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1946
1947 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1948 build_mode_query_arch_info ();
1949 }
1950 }
1951 );
1952 }
1953
1954 $win->show;
1955}
1956
1957sub build_mode_query_arch_info {
1958 my ($iteminfo) = $::IN_BUILD_MODE;
1959 my $itemarchname = $iteminfo->{item};
1960 my $info = $iteminfo->{info};
1961
1962 my $dialog = new CFPlus::UI::Toplevel
1963 x => "center",
1964 y => "center",
1965 z => 50,
1966 force_w => int $WIDTH * 1/2,
1967 title => "Enter information for placement of '$itemarchname'",
1968 has_close_button => 1;
1969
1970 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1971
1972 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1973 my $row = 0;
1974 if ($info->{has_name}) {
1975 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1976 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1977 }
1978 if ($info->{has_text}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1981 }
1982 if ($info->{has_connection}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1984 $table->add (1, $row++,
1985 new CFPlus::UI::Entry
1986 expand => 1,
1987 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1988 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1989 );
1990 }
1991
1992 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1993 $hb->add (new CFPlus::UI::Button
1994 text => "Close",
1995 expand => 1,
1996 on_activate => sub { $dialog->hide; 0 },
1997 );
1998 $dialog->show;
1999} 2103}
2000 2104
2001sub video_shutdown { 2105sub video_shutdown {
2002 CFPlus::OpenGL::shutdown; 2106 CFPlus::OpenGL::shutdown;
2003 2107
2004 undef $SDL_ACTIVE; 2108 undef $SDL_ACTIVE;
2005} 2109}
2006 2110
2007my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2008my $bgmusic;#TODO#hack#d#
2009
2010sub audio_channel_finished {
2011 my ($channel) = @_;
2012
2013 #warn "channel $channel finished\n";#d#
2014}
2015
2016sub audio_music_finished {
2017 return unless $CFG->{bgm_enable};
2018
2019 # TODO: hack, do play loop and mood music
2020 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2021 $bgmusic->play (0);
2022
2023 push @bgmusic, shift @bgmusic;
2024}
2025
2026sub audio_init {
2027 if ($CFG->{audio_enable}) {
2028 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2029 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2030
2031 unless ($SDL_MIXER) {
2032 status "Unable to open sound device: there will be no sound";
2033 return;
2034 }
2035
2036 CFPlus::Mix_AllocateChannels 8;
2037 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2038
2039 audio_music_finished;
2040
2041 local $_;
2042 while (<$fh>) {
2043 next if /^\s*#/;
2044 next if /^\s*$/;
2045
2046 my ($file, $volume, $event) = split /\s+/, $_, 3;
2047
2048 push @SOUNDS, "$volume,$file";
2049
2050 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2051 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2052 $chunk->volume ($volume * 128 / 100);
2053 $chunk
2054 };
2055 }
2056 } else {
2057 status "unable to open sound config: $!";
2058 }
2059 }
2060}
2061
2062sub audio_shutdown {
2063 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2064 undef $SDL_MIXER;
2065 @SOUNDS = ();
2066 %AUDIO_CHUNKS = ();
2067}
2068
2069my %animate_object; 2111my %animate_object;
2070my $animate_timer; 2112my $animate_timer;
2071 2113
2072my $fps = 9; 2114my $fps = 9;
2073 2115
2074my %demo;#d#
2075
2076sub force_refresh { 2116sub force_refresh {
2117 if ($ENV{CFPLUS_DEBUG} & 4) {
2077 $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;
2078 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2119 debug sprintf "%3.2f", $fps;
2120 }
2079 2121
2080 $CFPlus::UI::ROOT->draw; 2122 $CFPlus::UI::ROOT->draw;
2081 2123 CFPlus::SDL_GL_SwapBuffers;
2082 $WANT_REFRESH = 0;
2083 $CAN_REFRESH = 0;
2084 $LAST_REFRESH = $NOW; 2124 $LAST_REFRESH = $NOW;
2085 2125 $WANT_REFRESH->stop;
2086 CFPlus::SDL_GL_SwapBuffers;
2087} 2126}
2088 2127
2128$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2129
2089my $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 {
2090 $NOW = time; 2131 $NOW = time;
2091 2132
2092 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2133 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2093 for CFPlus::SDL_PollEvent; 2134 for CFPlus::poll_events;
2094 2135
2095 if (%animate_object) { 2136 if (%animate_object) {
2096 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2137 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2097 $WANT_REFRESH++; 2138 $WANT_REFRESH->start;
2098 }
2099
2100 if ($WANT_REFRESH) {
2101 force_refresh;
2102 } else {
2103 $CAN_REFRESH = 1;
2104 } 2139 }
2105}); 2140});
2106 2141
2107sub animation_start { 2142sub animation_start {
2108 my ($widget) = @_; 2143 my ($widget) = @_;
… …
2111 2146
2112sub animation_stop { 2147sub animation_stop {
2113 my ($widget) = @_; 2148 my ($widget) = @_;
2114 delete $animate_object{$widget}; 2149 delete $animate_object{$widget};
2115} 2150}
2116
2117# check once/second for faces that need to be prefetched
2118# this should, of course, only run on demand, but
2119# SDL forces worse things on us....
2120
2121Event->timer (after => 1, interval => 0.25, cb => sub {
2122 $CONN->face_prefetch
2123 if $CONN;
2124});
2125 2151
2126%SDL_CB = ( 2152%SDL_CB = (
2127 CFPlus::SDL_QUIT => sub { 2153 CFPlus::SDL_QUIT => sub {
2128 exit; 2154 exit;
2129 }, 2155 },
… …
2132 CFPlus::SDL_VIDEOEXPOSE => sub { 2158 CFPlus::SDL_VIDEOEXPOSE => sub {
2133 CFPlus::UI::full_refresh; 2159 CFPlus::UI::full_refresh;
2134 }, 2160 },
2135 CFPlus::SDL_ACTIVEEVENT => sub { 2161 CFPlus::SDL_ACTIVEEVENT => sub {
2136# not useful, as APPACTIVE include sonly iconified state, not unmapped 2162# not useful, as APPACTIVE include sonly iconified state, not unmapped
2137# 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#
2138# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2165# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2139# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2166# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2140# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2167# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2141 }, 2168 },
2142 CFPlus::SDL_KEYDOWN => sub { 2169 CFPlus::SDL_KEYDOWN => sub {
… …
2171 CFPlus::DB::Server::run; 2198 CFPlus::DB::Server::run;
2172 2199
2173 CFPlus::UI::set_layout ($::CFG->{layout}); 2200 CFPlus::UI::set_layout ($::CFG->{layout});
2174 2201
2175 my %DEF_CFG = ( 2202 my %DEF_CFG = (
2176 sdl_mode => 0, 2203 sdl_mode => 0,
2177 width => 640,
2178 height => 480,
2179 fullscreen => 0, 2204 fullscreen => 0,
2180 fast => 0, 2205 fast => 0,
2206 force_opengl11 => 0,
2207 texture_compression => 1,
2181 map_scale => 1, 2208 map_scale => 1,
2182 fow_enable => 1, 2209 fow_enable => 1,
2183 fow_intensity => 0.45, 2210 fow_intensity => 0,
2184 fow_smooth => 0,
2185 map_smoothing => 1, 2211 map_smoothing => 1,
2186 gui_fontsize => 1, 2212 gui_fontsize => 1,
2187 log_fontsize => 0.7, 2213 log_fontsize => 0.7,
2188 gauge_fontsize => 1, 2214 gauge_fontsize => 1,
2189 gauge_size => 0.35, 2215 gauge_size => 0.35,
2190 stat_fontsize => 0.7, 2216 stat_fontsize => 0.7,
2191 mapsize => 100, 2217 mapsize => 100,
2192 say_command => 'chat',
2193 audio_enable => 1, 2218 audio_enable => 1,
2219 effects_enable => 1,
2220 effects_volume => 1,
2194 bgm_enable => 1, 2221 bgm_enable => 1,
2195 bgm_volume => 0.25, 2222 bgm_volume => 0.5,
2196 face_prefetch => 0,
2197 output_sync => 1, 2223 output_sync => 1,
2198 output_count => 1, 2224 output_count => 1,
2199 output_rate => "", 2225 output_rate => "",
2200 pickup => 0, 2226 pickup => 0,
2201 inv_sort => "mtime", 2227 inv_sort => "mtime",
2202 default => "profile", # default profile 2228 default => "profile", # default profile
2203 show_tips => 1, 2229 show_tips => 1,
2204 logview_max_par => 1000, 2230 logview_max_par => 1000,
2205 ); 2231 );
2206 2232
2207 while (my ($k, $v) = each %DEF_CFG) { 2233 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2234 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2235 }
… …
2223 } 2249 }
2224 } 2250 }
2225 2251
2226 sdl_init; 2252 sdl_init;
2227 2253
2228 @SDL_MODES = reverse 2254 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2229 grep $_->[0] >= 640 && $_->[1] >= 480, 2255 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2230 CFPlus::SDL_ListModes;
2231
2232 @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;
2233 2259
2234 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2260 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2235 2261
2236 { 2262 {
2237 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2263 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2275} 2301}
2276 2302
2277show_tip_of_the_day if $CFG->{show_tips}; 2303show_tip_of_the_day if $CFG->{show_tips};
2278 2304
2279Event::loop; 2305Event::loop;
2306
2307#video_shutdown;
2308#audio_shutdown;
2280#CFPlus::SDL_Quit; 2309CFPlus::SDL_Quit;
2281#CFPlus::_exit 0;
2282
2283END {
2284 CFPlus::SDL_Quit;
2285 CFPlus::DB::Server::stop; 2310CFPlus::DB::Server::stop;
2286}
2287 2311
2288=head1 NAME 2312=head1 NAME
2289 2313
2290cfplus - A Crossfire+ and Crossfire game client 2314cfplus - A Crossfire TRT and Crossfire game client
2291 2315
2292=head1 SYNOPSIS 2316=head1 SYNOPSIS
2293 2317
2294Just run it - no commandline arguments are supported. 2318Just run it - no commandline arguments are supported.
2295 2319
2296=head1 USAGE 2320=head1 USAGE
2297 2321
2298cfplus 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
2299fullscreen and interactively. 2323be used in fullscreen mode and interactively.
2300 2324
2301=head1 DEBUGGING 2325=head1 DEBUGGING
2302 2326
2303 2327
2304CFPLUS_DEBUG - environment variable 2328CFPLUS_DEBUG - environment variable

Diff Legend

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