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.162 by root, Thu Jul 5 07:06:05 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 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->{face}[$face]
234 or return;
235
236 $meta->{data}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{data}{jingle}) {
241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 }
245 } else {
246 # fetch from database
247 CFPlus::DB::get res_data => $meta->{name}, sub {
248 my $rwops = new CFPlus::RW $_[0];
249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
252 $AUDIO_CHUNK{$face} = $chunk;
253
254 audio_sound_push ($face);
255 };
256 }
257 }
258}
259
260sub audio_sound_play {
261 my ($face, $dx, $dy, $vol) = @_;
262
263 $SDL_MIXER
264 or return;
265 $CFG->{effects_enable}
266 or return;
267
268 my $queue = $AUDIO_PLAY{$face} ||= [];
269 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
270 audio_sound_push $face
271 unless @$queue > 1;
272}
273
274sub audio_music_set_meta {
275 my ($meta) = @_;
276
277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
290 CFPlus::MixMusic::volume $base * $volume * 128;
291}
292
293sub audio_music_start {
294 my $meta = $MUSIC_PLAYING_META;
295
296 CFPlus::DB::get res_data => $meta->{name}, sub {
297 return unless $SDL_MIXER;
298
299 # music might have changed...
300 $meta eq $MUSIC_PLAYING_META
301 or return &audio_music_start ();
302
303 audio_music_update_volume;
304
305 $MUSIC_PLAYING_DATA = \$_[0];
306
307 my $rwops = $meta->{path}
308 ? new_from_file CFPlus::RW $meta->{path}
309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
310
311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
313
314 my $NOW = time;
315
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
319 $MUSIC_START = time - $pos;
320 } else {
321 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time;
323 }
324
325 delete $meta->{stop_time};
326 delete $meta->{stop_pos};
327 }
328}
329
330sub audio_music_push {
331 return unless $SDL_MIXER;
332
333 my $fade_out;
334
335 if (@MUSIC_JINGLE) {
336 @MUSIC_HAVE = $MUSIC_JINGLE[0];
337 $fade_out = 333;
338 } else {
339 return unless $CFG->{bgm_enable};
340
341 my @have =
342 grep $_ && $_->{data},
343 map $CONN->{face}[$_],
344 @$MUSIC_WANT;
345
346 @MUSIC_HAVE = @have
347 if @have;
348
349 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
351 $fade_out = 1000;
352 }
353
354 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356
357 my $NOW = time;
358
359 if ($MUSIC_PLAYING_META) {
360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
361 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
362 CFPlus::MixMusic::fade_out $fade_out;
363 } else {
364 # sort by stop time, oldest first
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366
367 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0];
373
374 audio_music_start;
375 }
376}
377
378sub audio_music_set_ambient {
379 my ($songs) = @_;
380
381 $MUSIC_WANT = $songs;
382 audio_music_push;
383}
384
385sub audio_music_finished {
386 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
391
392 undef $MUSIC_PLAYER;
393 undef $MUSIC_PLAYING_META;
394 undef $MUSIC_PLAYING_DATA;
395
396 audio_music_push;
397}
398
399sub audio_init {
400 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
403
404 unless ($SDL_MIXER) {
405 status "Unable to open sound device: there will be no sound";
406 return;
407 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else {
413 undef $SDL_MIXER;
414 }
415}
416
417sub audio_shutdown {
418 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META;
420 undef $MUSIC_PLAYING_DATA;
421
422 $MUSIC_WANT = [];
423 @MUSIC_JINGLE = ();
424 %AUDIO_PLAY = ();
425 %AUDIO_CHUNK = ();
426
427 CFPlus::Mix_CloseAudio if $SDL_MIXER;
428 undef $SDL_MIXER;
429}
430
431#############################################################################
198 432
199sub destroy_query_dialog { 433sub destroy_query_dialog {
200 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
201 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
202} 436}
… …
266 ellipsise => 0, 500 ellipsise => 0,
267 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
268 502
269 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
270 504
271 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Next Race", 506 text => "Next Race",
273 on_activate => sub { 507 on_activate => sub {
274 $conn->send ("reply n"); 508 $conn->send ("reply n");
275 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
276 0 510 0
277 }, 511 },
278 ); 512 );
279 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
280 text => "Accept", 514 text => "Accept",
281 on_activate => sub { 515 on_activate => sub {
282 $conn->send ("reply d"); 516 $conn->send ("reply d");
283 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
284 0 518 0
… …
319 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
320 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
321 return; 555 return;
322 } 556 }
323 557
324 $STATS_PAGE->show;
325 $MESSAGE_WINDOW->hide;
326
327 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
328 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
329 ellipsise => 0, 560 ellipsise => 0,
330 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
331 562
332 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
333 564
334 # left: re-roll 565 # left: re-roll
335 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
336 text => "Roll Again", 567 text => "Roll Again",
337 on_activate => sub { 568 on_activate => sub {
338 $conn->send ("reply y"); 569 $conn->send ("reply y");
339 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
340 0 571 0
… …
354 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
355 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
356 ], 587 ],
357 ), 1 .. 2; 588 ), 1 .. 2;
358 589
359 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
360 text => "Swap Stats", 591 text => "Swap Stats",
361 on_activate => sub { 592 on_activate => sub {
362 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
363 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
364 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
365 0 596 0
366 }, 597 },
367 ); 598 );
368 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
369 600
370 # right: accept 601 # right: accept
371 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
372 text => "Accept", 603 text => "Accept",
373 on_activate => sub { 604 on_activate => sub {
374 $conn->send ("reply n"); 605 $conn->send ("reply n");
375 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
376 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
… …
457 maph => $mapsize, 688 maph => $mapsize,
458 689
459 client => "cfplus $CFPlus::VERSION $] $^O", 690 client => "cfplus $CFPlus::VERSION $] $^O",
460 691
461 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
462 logview => $LOGVIEW,
463 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
464 map => $MAP, 694 map => $MAP,
465 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
466 query => \&server_query, 696 query => \&server_query,
467 697
468 setup_req => { 698 setup_req => {
469 smoothing => $CFG->{map_smoothing}*1, 699 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 }, 700 },
483 }; 701 };
484 702
485 if ($CONN) { 703 if ($CONN) {
486 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
… …
498 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
499 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
500 $SPELL_LIST->clear_spells; 718 $SPELL_LIST->clear_spells;
501 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
502 720
721 &audio_music_set_ambient ([]);
722
503 return unless $CONN; 723 return unless $CONN;
504 724
505 status "connection closed"; 725 status "connection closed";
506 726
507 destroy_query_dialog $CONN; 727 destroy_query_dialog $CONN;
… …
516 736
517 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 737 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
518 738
519 my $row = 0; 739 my $row = 0;
520 740
521 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 741 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
522 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 742 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
523 can_events => 1, 743 can_events => 1,
524 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
525 745
746 my $vidmode_tooltip =
747 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
748 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
749
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 750 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
527 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
528 752
753 $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]); 754 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"); 755 tooltip => $vidmode_tooltip);
756 $hbox->add (my $mode_label = new CFPlus::UI::Label
757 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
758 can_events => 1, tooltip => $vidmode_tooltip);
531 759
532 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
533 my ($self, $value) = @_; 761 my ($self, $value) = @_;
534 762
535 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
536 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
537 }); 765 });
538 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
539 767
540 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
541 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
542 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
543 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
544 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
545 ); 773 );
546 774
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
777 state => $CFG->{force_opengl11},
778 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
779 . "higher memory usage and slower performance. It will, however, help tremendously on "
780 . "cards that claim to support a feature but fall back to software rendering. "
781 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
782 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
783 . "experience extremely low framerates and your card should do better, try this option.</b>",
784 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
785 );
786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
788 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
789 state => $CFG->{texture_compression},
790 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
791 . "will save a lot of memory and increase performance. The compression algorithm "
792 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
793 . "forced OpenGL 1.1 mode.",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
795 );
796
547 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 797 $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 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
549 state => $CFG->{fast}, 799 state => $CFG->{fast},
550 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
551 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
552 ); 802 );
553 803
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 804 $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 805 $table->add_at (1, $row++, new CFPlus::UI::Slider
556 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 806 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.", 807 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 }, 808 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
559 ); 809 );
560 810
561 $table->add (1, $row++, new CFPlus::UI::Button 811 $table->add_at (1, $row++, new CFPlus::UI::Button
562 expand => 1, align => 0, text => "Apply", 812 expand => 1, align => 0, text => "Apply",
563 tooltip => "Apply the video settings above.", 813 tooltip => "Apply the video settings above.",
564 on_activate => sub { 814 on_activate => sub {
565 video_shutdown (); 815 video_shutdown ();
566 video_init (); 816 video_init ();
567 0 817 0
568 } 818 }
569 ); 819 );
570 820
571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 821 $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 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
573 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 823 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
574 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 824 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
575 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
576 ); 826 );
577 827
578 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 828 $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 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
581 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 831 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. " 832 . "This increases load on the graphics subsystem and works only with TRT servers. "
583 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
584 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
585 ); 835 );
586 836
587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 837 $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 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
589 state => $CFG->{fow_enable}, 839 state => $CFG->{fow_enable},
590 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 840 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 } 841 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
592 ); 842 );
593 843
594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 844 $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 845 $table->add_at (1, $row++, new CFPlus::UI::Slider
596 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 846 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.", 847 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 } 848 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
599 ); 849 );
600 850
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"); 851 $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 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
615 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 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.", 854 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
855 . "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 }, 856 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
618 ); 857 );
619 858
620 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 859 $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 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
622 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 861 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.", 862 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
624 on_changed => sub { 863 on_changed => sub {
625 $CFG->{gauge_fontsize} = $_[1]; 864 $CFG->{gauge_fontsize} = $_[1];
626 &set_gauge_window_fontsize; 865 &set_gauge_window_fontsize;
627 0 866 0
628 } 867 }
629 ); 868 );
630 869
631 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 870 $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 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
633 range => [$CFG->{gauge_size}, 0.2, 0.8], 872 range => [$CFG->{gauge_size}, 0.2, 0.8],
634 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 873 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
635 on_changed => sub { 874 on_changed => sub {
636 $CFG->{gauge_size} = $_[1]; 875 $CFG->{gauge_size} = $_[1];
637 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 876 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
643} 882}
644 883
645sub audio_setup { 884sub audio_setup {
646 my $vbox = new CFPlus::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
647 886
648 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 887 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
649 888
650 my $row = 0; 889 my $row = 0;
651 890
652 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 891 $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 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
654 state => $CFG->{audio_enable}, 893 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.", 894 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 } 895 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
657 ); 896 );
658# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 897# $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 { 898# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
660# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
661# }); 900# });
901
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{effects_enable},
905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub {
907 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
911 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
917 );
918
662 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 919 $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 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
665 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
666 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 922 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 } 923 on_changed => sub {
924 $CFG->{bgm_enable} = $_[1];
925 $CONN->update_fx_want if $CONN;
926 audio_music_push;
927 0
928 }
668 ); 929 );
669 $hbox->add (new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
670 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
671 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
672 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 933 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
673 ); 934 );
674 935
675 $table->add (1, $row++, new CFPlus::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
676 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
677 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
678 on_activate => sub { 939 on_activate => sub {
679 audio_shutdown (); 940 audio_shutdown ();
680 audio_init (); 941 audio_init ();
681 0 942 0
… …
739} 1000}
740 1001
741sub debug_setup { 1002sub debug_setup {
742 my $table = new CFPlus::UI::Table; 1003 my $table = new CFPlus::UI::Table;
743 1004
744 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1005 $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 }); 1006 $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"); 1007 $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 }); 1008 $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"); 1009 $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 }); 1010 $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"); 1011 $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 }); 1012 $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() } ); 1013 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
753 1014
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# 1015 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1016
1017 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1018 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1019 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1020 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1021 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1022 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1023
1024 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1025
1026 $c->add_items ({
1027 type => "line_loop",
1028 color => [0, 1, 0],
1029 width => 9,
1030 coord_mode => "abs",
1031 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1032 });
1033
1034 $c->add_items ({
1035 type => "lines",
1036 color => [1, 1, 0],
1037 width => 2,
1038 coord_mode => "rel",
1039 coord => [[0,0], [1,1], [1,0], [0,1]],
1040 });
1041
1042 $c->add_items ({
1043 type => "polygon",
1044 color => [0, 0.43, 0],
1045 width => 2,
1046 coord_mode => "rel",
1047 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1048 });
767 1049
768 $table 1050 $table
769} 1051}
770 1052
771sub stats_window { 1053sub stats_window {
… …
819 [2, 4, st_spd => "Spd", 10.54], 1101 [2, 4, st_spd => "Spd", 10.54],
820 [2, 5, st_wspd => "WSp", 10.54], 1102 [2, 5, st_wspd => "WSp", 10.54],
821 ) { 1103 ) {
822 my ($col, $row, $id, $label, $template) = @$_; 1104 my ($col, $row, $id, $label, $template) = @$_;
823 1105
824 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1106 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
825 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1107 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
826 align => +1, template => $template, tooltip => "#stat_$label"); 1108 align => +1, template => $template, tooltip => "#stat_$label");
827 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1109 $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, 1110 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
829 align => -1, text => $label, tooltip => "#stat_$label"); 1111 align => -1, text => $label, tooltip => "#stat_$label");
830 } 1112 }
831 1113
832 $vb->add (new CFPlus::UI::FancyFrame 1114 $vb->add (new CFPlus::UI::FancyFrame
… …
873 cold => ["Cold", 1155 cold => ["Cold",
874 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1156 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
875 ghit => ["Ghost hit", 1157 ghit => ["Ghost hit",
876 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1158 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
877 ); 1159 );
1160
878 for (qw/slow holyw conf fire depl magic 1161 for (qw/slow holyw conf fire depl magic
879 drain acid pois para deat phys 1162 drain acid pois para deat phys
880 blind fear tund elec cold ghit/) 1163 blind fear tund elec cold ghit/)
881 { 1164 {
882 $tbl2->add ($col, $row, 1165 $tbl2->add_at ($col, $row,
883 $STATWIDS->{"res_$_"} = 1166 $STATWIDS->{"res_$_"} =
884 new CFPlus::UI::Label 1167 new CFPlus::UI::Label
885 font => $FONT_FIXED, 1168 font => $FONT_FIXED,
886 template => "-100%", 1169 template => "-100%",
887 align => +1, 1170 align => +1,
888 valign => 0, 1171 valign => 0,
889 can_events => 1, 1172 can_events => 1,
890 can_hover => 1, 1173 can_hover => 1,
891 tooltip => $resist_names{$_}->[1], 1174 tooltip => $resist_names{$_}->[1],
892 ); 1175 );
893 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1176 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
894 font => $FONT_FIXED, 1177 font => $FONT_FIXED,
895 can_hover => 1, 1178 can_hover => 1,
896 can_events => 1, 1179 can_events => 1,
897 path => "ui/resist/resist_$_.png", 1180 path => "ui/resist/resist_$_.png",
898 tooltip => $resist_names{$_}->[1], 1181 tooltip => $resist_names{$_}->[1],
899 ); 1182 );
900 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1183 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
901 text => $resist_names{$_}->[0], 1184 text => $resist_names{$_}->[0],
902 font => $FONT_FIXED, 1185 font => $FONT_FIXED,
903 can_hover => 1, 1186 can_hover => 1,
904 can_events => 1, 1187 can_events => 1,
905 tooltip => $resist_names{$_}->[1], 1188 tooltip => $resist_names{$_}->[1],
… …
938 return if $METASERVER_ATIME > time; 1221 return if $METASERVER_ATIME > time;
939 $METASERVER_ATIME = time + 60; 1222 $METASERVER_ATIME = time + 60;
940 1223
941 my $table = $METASERVER->{table}; 1224 my $table = $METASERVER->{table};
942 $table->clear; 1225 $table->clear;
943 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1226 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
944 1227
945 my $ok = 0; 1228 my $ok = 0;
946 1229
947 CFPlus::background { 1230 CFPlus::background {
948 my $ua = CFPlus::lwp_useragent; 1231 my $ua = CFPlus::lwp_useragent;
… …
959 "The time this server has been running without being restarted.", 1242 "The time this server has been running without being restarted.",
960 "The server software version - a '+' indicates a Crossfire+ server.", 1243 "The server software version - a '+' indicates a Crossfire+ server.",
961 "Short information about this server provided by its admins.", 1244 "Short information about this server provided by its admins.",
962 ); 1245 );
963 my @col = qw(#Users Host Uptime Version Description); 1246 my @col = qw(#Users Host Uptime Version Description);
964 $table->add ($_, 0, new CFPlus::UI::Label 1247 $table->add_at ($_, 0, new CFPlus::UI::Label
965 can_hover => 1, can_events => 1, 1248 can_hover => 1, can_events => 1,
966 align => 0, fg => [1, 1, 0], 1249 align => 0, fg => [1, 1, 0],
967 text => $col[$_], tooltip => $tip[$_]) 1250 text => $col[$_], tooltip => $tip[$_])
968 for 0 .. $#col; 1251 for 0 .. $#col;
969 1252
… …
991 1274
992 $m = [$users, $host, $uptime, $version, $desc]; 1275 $m = [$users, $host, $uptime, $version, $desc];
993 1276
994 $y++; 1277 $y++;
995 1278
996 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1279 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
997 (new CFPlus::UI::Button 1280 (new CFPlus::UI::Button
998 text => "Use", 1281 text => "Use",
999 tooltip => "Put this server into the <b>Host:Port</b> field", 1282 tooltip => "Put this server into the <b>Host:Port</b> field",
1000 on_activate => sub { 1283 on_activate => sub {
1001 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1284 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1004 }, 1287 },
1005 ), 1288 ),
1006 (new CFPlus::UI::Empty expand => 1), 1289 (new CFPlus::UI::Empty expand => 1),
1007 ]); 1290 ]);
1008 1291
1009 $table->add ($_, $y, new CFPlus::UI::Label 1292 $table->add_at ($_, $y, new CFPlus::UI::Label
1010 max_w => $::WIDTH * 0.4, 1293 max_w => $::WIDTH * 0.4,
1011 ellipsise => 0, 1294 ellipsise => 0,
1012 align => $align[$_], 1295 align => $align[$_],
1013 text => $m->[$_], 1296 text => $m->[$_],
1014 tooltip => $tip[$_], 1297 tooltip => $tip[$_],
… …
1055 1338
1056 $vbox->add (new CFPlus::UI::FancyFrame 1339 $vbox->add (new CFPlus::UI::FancyFrame
1057 label => "Connection Settings", 1340 label => "Connection Settings",
1058 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1341 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1059 ); 1342 );
1060 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1343 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1061 1344
1062 { 1345 {
1063 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1346 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1064 1347
1065 $vbox->add ( 1348 $vbox->add (
1066 $HOST_ENTRY = new CFPlus::UI::Entry 1349 $HOST_ENTRY = new CFPlus::UI::Entry
1067 expand => 1, 1350 expand => 1,
1068 text => $CFG->{profile}{default}{host}, 1351 text => $CFG->{profile}{default}{host},
1069 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1352 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1070 on_changed => sub { 1353 on_changed => sub {
1071 my ($self, $value) = @_; 1354 my ($self, $value) = @_;
1072 $CFG->{profile}{default}{host} = $value; 1355 $CFG->{profile}{default}{host} = $value;
1073 0 1356 1
1074 } 1357 }
1075 ); 1358 );
1076 1359
1077 $vbox->add (new CFPlus::UI::Button 1360 $vbox->add (new CFPlus::UI::Button
1078 expand => 1, 1361 expand => 1,
1079 text => "Server List", 1362 text => "Server List",
1080 other => $METASERVER, 1363 other => $METASERVER,
1081 tooltip => "Show a list of available crossfire servers", 1364 tooltip => "Show a list of available crossfire servers",
1082 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1365 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1083 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1366 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1084 ); 1367 );
1085 } 1368 }
1086 1369
1087 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1370 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1088 $table->add (1, 4, new CFPlus::UI::Entry 1371 $table->add_at (1, 4, new CFPlus::UI::Entry
1089 text => $CFG->{profile}{default}{user}, 1372 text => $CFG->{profile}{default}{user},
1090 tooltip => "The name of your character on the server", 1373 tooltip => "The name of your character on the server",
1091 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1374 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1092 ); 1375 );
1093 1376
1094 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1377 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1095 $table->add (1, 5, new CFPlus::UI::Entry 1378 $table->add_at (1, 5, new CFPlus::UI::Entry
1096 text => $CFG->{profile}{default}{password}, 1379 text => $CFG->{profile}{default}{password},
1097 hidden => 1, 1380 hidden => 1,
1098 tooltip => "The password for your character", 1381 tooltip => "The password for your character",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1382 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1100 ); 1383 );
1101 1384
1102 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1385 $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 1386 $table->add_at (1, 7, new CFPlus::UI::Slider
1104 force_w => 100, 1387 force_w => 100,
1105 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1388 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1106 tooltip => "This is the size of the portion of the map update the server sends you. " 1389 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, " 1390 . "If you set this to a high value you will be able to see further, "
1108 . "but you also increase bandwidth requirements and latency. " 1391 . "but you also increase bandwidth requirements and latency. "
1109 . "This option is only used once at log-in.", 1392 . "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 }, 1393 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1111 ); 1394 );
1112 1395
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"); 1396 $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 1397 $table->add_at (1, 8, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate}, 1398 text => $CFG->{output_rate},
1129 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1399 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 " 1400 . "when sending data. When 0 or unset, the server "
1131 . "default will be used, which is usually around 100kb/s.", 1401 . "default will be used, which is usually around 100kb/s. Most servers will "
1402 . "dynamically find an optimal rate, so adjust this only when necessary.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1403 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1133 ); 1404 );
1134 1405
1135 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1406 $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 1407 $table->add_at (1, 9, new CFPlus::UI::Entry
1137 text => $CFG->{output_count}, 1408 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.", 1409 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 }, 1410 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1140 ); 1411 );
1141 1412
1142 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1413 $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 1414 $table->add_at (1, 10, new CFPlus::UI::Entry
1144 text => $CFG->{output_sync}, 1415 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.", 1416 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 }, 1417 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1147 ); 1418 );
1148 1419
1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1420 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1150 expand => 1, 1421 expand => 1,
1151 align => 0, 1422 align => 0,
1152 text => "Login", 1423 text => "Login",
1153 on_activate => sub { 1424 on_activate => sub {
1154 $CONN ? stop_game 1425 $CONN ? stop_game
1155 : start_game; 1426 : start_game;
1156 0 1427 1
1157 }, 1428 },
1158 ); 1429 );
1159 1430
1160 $vbox->add (new CFPlus::UI::FancyFrame 1431 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info", 1432 label => "Server Info",
… …
1168sub client_setup { 1439sub client_setup {
1169 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1440 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1170 1441
1171 my $row = 0; 1442 my $row = 0;
1172 1443
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"); 1444 $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 1445 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1188 state => $CFG->{show_tips}, 1446 state => $CFG->{show_tips},
1189 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1447 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1190 on_changed => sub { 1448 on_changed => sub {
1191 my ($self, $value) = @_; 1449 my ($self, $value) = @_;
1192 $CFG->{show_tips} = $value; 1450 $CFG->{show_tips} = $value;
1193 0 1451 0
1194 } 1452 }
1195 ); 1453 );
1196 1454
1197 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1455 $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 1456 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199 text => $CFG->{logview_max_par}, 1457 text => $CFG->{logview_max_par},
1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1458 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 " 1459 . "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.", 1460 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203 on_changed => sub { 1461 on_changed => sub {
1204 my ($self, $value) = @_; 1462 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1463 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1206 0 1464 0
1207 }, 1465 },
1208 ); 1466 );
1209 1467
1210 $table 1468 $table
1211} 1469}
1212 1470
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 { 1471sub autopickup_setup {
1472 my $r = new CFPlus::UI::ScrolledWindow (
1473 expand => 1,
1474 scroll_y => 1
1475 );
1277 my $table = new CFPlus::UI::Table; 1476 $r->add (my $table = new CFPlus::UI::Table
1477 row_expand => [0],
1478 col_expand => [0, 1, 0, 1],
1479 );
1278 1480
1279 for ( 1481 for (
1280 ["General", 0, 0, 1482 ["General", 0, 0,
1281 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1483 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1282 ["Inhibit autopickup" => PICKUP_INHIBIT], 1484 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1317 ], 1519 ],
1318 ["Weight/Value ratio", 2, 17] 1520 ["Weight/Value ratio", 2, 17]
1319 ) 1521 )
1320 { 1522 {
1321 my ($title, $x, $y, @bits) = @$_; 1523 my ($title, $x, $y, @bits) = @$_;
1322 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1524 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1323 1525
1324 for (@bits) { 1526 for (@bits) {
1325 ++$y; 1527 ++$y;
1326 1528
1327 my $mask = $_->[1]; 1529 my $mask = $_->[1];
1328 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1530 $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 1531 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1330 state => $::CFG->{pickup} & $mask, 1532 state => $::CFG->{pickup} & $mask,
1331 on_changed => sub { 1533 on_changed => sub {
1332 my ($box, $value) = @_; 1534 my ($box, $value) = @_;
1333 1535
1334 if ($value) { 1536 if ($value) {
… …
1345 1547
1346 ${$_->[2]} = $checkbox if $_->[2]; 1548 ${$_->[2]} = $checkbox if $_->[2];
1347 } 1549 }
1348 } 1550 }
1349 1551
1350 $table->add (2, 18, new CFPlus::UI::ValSlider 1552 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1351 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1553 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1352 template => ">= 99", 1554 template => ">= 99",
1353 to_value => sub { ">= " . 5 * $_[0] }, 1555 to_value => sub { ">= " . 5 * $_[0] },
1354 on_changed => sub { 1556 on_changed => sub {
1355 my ($slider, $value) = @_; 1557 my ($slider, $value) = @_;
… …
1358 $::CFG->{pickup} |= int $value 1560 $::CFG->{pickup} |= int $value
1359 if $value; 1561 if $value;
1360 1; 1562 1;
1361 }); 1563 });
1362 1564
1363 $table->add (3, 18, new CFPlus::UI::Button 1565 $table->add_at (3, 18, new CFPlus::UI::Button
1364 text => "set", 1566 text => "set",
1365 on_activate => sub { 1567 on_activate => sub {
1366 $::CONN->send_command ("pickup $::CFG->{pickup}") 1568 $::CONN->send_command ("pickup $::CFG->{pickup}")
1367 if defined $::CONN; 1569 if defined $::CONN;
1368 0 1570 0
1369 }); 1571 });
1370 1572
1371 $table 1573 $r
1372} 1574}
1373 1575
1374my %SORT_ORDER = ( 1576my %SORT_ORDER = (
1375 type => undef, 1577 type => undef,
1376 mtime => sub { 1578 mtime => sub {
… …
1420 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1421 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1422 1624
1423 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1424 1626
1425 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1426 1628
1427 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1629 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1428 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1429 1631
1430 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
1431 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1633 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1432 1634
1433 $hb 1635 $hb
1636}
1637
1638sub media_window {
1639 my $vb = new CFPlus::UI::VBox;
1640
1641 $vb->add (new CFPlus::UI::FancyFrame
1642 label => "Currently playing music",
1643 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1644 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1645 );
1646
1647 $vb->add (new CFPlus::UI::FancyFrame
1648 label => "Other media used in this session",
1649 expand => 1,
1650 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1651 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1652 );
1653
1654 $vb
1655}
1656
1657sub add_license {
1658 my ($meta) = @_;
1659
1660 $meta = $meta->{data}
1661 or return;
1662
1663 $meta->{license} || $meta->{author} || $meta->{source}
1664 or return;
1665
1666 $LICENSE_WIDGET->add_paragraph ({
1667 fg => [1, 1, 1, 1],
1668 markup => "<small>"
1669 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1670 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1671 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1672 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1673 . "</small>",
1674 });
1675 $LICENSE_WIDGET->scroll_to_bottom;
1434} 1676}
1435 1677
1436sub toggle_player_page { 1678sub toggle_player_page {
1437 my ($widget) = @_; 1679 my ($widget) = @_;
1438 1680
… …
1457 1699
1458 my $ntb = 1700 my $ntb =
1459 $PL_NOTEBOOK = 1701 $PL_NOTEBOOK =
1460 new CFPlus::UI::Notebook expand => 1; 1702 new CFPlus::UI::Notebook expand => 1;
1461 1703
1462 $ntb->add ( 1704 $ntb->add_tab (
1463 "Statistics (F2)" => $STATS_PAGE = stats_window, 1705 "Statistics (F2)" => $STATS_PAGE = stats_window,
1464 "Shows statistics, where all your Stats and Resistances are shown." 1706 "Shows statistics, where all your Stats and Resistances are shown."
1465 ); 1707 );
1466 $ntb->add ( 1708 $ntb->add_tab (
1467 "Skills (F3)" => $SKILL_PAGE = skill_window, 1709 "Skills (F3)" => $SKILL_PAGE = skill_window,
1468 "Shows all your Skills." 1710 "Shows all your Skills."
1469 ); 1711 );
1470 1712
1471 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1713 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1472 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1714 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1473 $ntb->add ( 1715 $ntb->add_tab (
1474 "Spellbook (F4)" => $spellsw, 1716 "Spellbook (F4)" => $spellsw,
1475 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1717 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1476 ); 1718 );
1477 $ntb->add ( 1719 $ntb->add_tab (
1478 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1479 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1721 "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." 1722 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1481 ); 1723 );
1482 $ntb->add (Pickup => autopickup_setup, 1724 $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."); 1725 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1726
1727 $ntb->add_tab (Media => media_window,
1728 "License, Author and Source info for media sent by the server.");
1484 1729
1485 $ntb->set_current_page ($INVENTORY_PAGE); 1730 $ntb->set_current_page ($INVENTORY_PAGE);
1486 1731
1487 $plwin->add ($ntb); 1732 $plwin->add ($ntb);
1488 $plwin 1733 $plwin
… …
1642 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1643 ); 1888 );
1644 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1645 text => "Quit anyway", 1890 text => "Quit anyway",
1646 expand => 1, 1891 expand => 1,
1647 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1648 ); 1893 );
1649 } 1894 }
1650 1895
1651 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1652 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
1685 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1930 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]); 1931 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1687 1932
1688 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1933 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1689 1934
1690 $table->add (0, 0, new CFPlus::UI::Button 1935 $table->add_at (0, 0, new CFPlus::UI::Button
1691 text => "Close", 1936 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>.", 1937 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, 1938 on_activate => $close,
1694 ); 1939 );
1695 1940
1696 $table->add (2, 0, new CFPlus::UI::Button 1941 $table->add_at (2, 0, new CFPlus::UI::Button
1697 text => "Next", 1942 text => "Next",
1698 tooltip => "Show the next <b>Tip of the day</b>.", 1943 tooltip => "Show the next <b>Tip of the day</b>.",
1699 on_activate => sub { 1944 on_activate => sub {
1700 $close->(); 1945 $close->();
1701 &show_tip_of_the_day; 1946 &show_tip_of_the_day;
… …
1710 CFPlus::SDL_Init 1955 CFPlus::SDL_Init
1711 and die "SDL::Init failed!\n"; 1956 and die "SDL::Init failed!\n";
1712} 1957}
1713 1958
1714sub video_init { 1959sub video_init {
1715 sdl_init;
1716
1717 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1960 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1718 1961
1719 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1962 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1720 1963
1721 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1964 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1722 $FULLSCREEN = $CFG->{fullscreen}; 1965 $FULLSCREEN = $CFG->{fullscreen};
1723 $FAST = $CFG->{fast}; 1966 $FAST = $CFG->{fast};
1724 1967
1725 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1968 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1726 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1969 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1727 1970
1728 $SDL_ACTIVE = 1; 1971 $SDL_ACTIVE = 1;
1729 $LAST_REFRESH = time - 0.01; 1972 $LAST_REFRESH = time - 0.01;
1730 1973
… …
1772 2015
1773 $MAPWIDGET = new CFPlus::MapWidget; 2016 $MAPWIDGET = new CFPlus::MapWidget;
1774 $MAPWIDGET->connect (activate_console => sub { 2017 $MAPWIDGET->connect (activate_console => sub {
1775 my ($mapwidget, $preset) = @_; 2018 my ($mapwidget, $preset) = @_;
1776 2019
1777 if ($CONSOLE) { 2020 $MESSAGE_WINDOW->activate_console ($preset)
1778 $CONSOLE->{input}->{auto_activated} = 1; 2021 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 }); 2022 });
1786 $MAPWIDGET->show; 2023 $MAPWIDGET->show;
1787 $MAPWIDGET->grab_focus; 2024 $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 2025
1800 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2026 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1801 title => "Setup", 2027 title => "Setup",
1802 name => "setup_dialog", 2028 name => "setup_dialog",
1803 x => 'center', 2029 x => 'center',
… …
1807 force_h => $::HEIGHT * 0.6, 2033 force_h => $::HEIGHT * 0.6,
1808 has_close_button => 1, 2034 has_close_button => 1,
1809 ; 2035 ;
1810 2036
1811 $METASERVER = metaserver_dialog; 2037 $METASERVER = metaserver_dialog;
2038 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1812 2039
1813 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2040 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1814 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2041 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1815 2042
1816 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2043 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1817 "Configure the server to play on, your username, password and other server-related options."); 2044 "Configure the server to play on, your username, password and other server-related options.");
1818 $SETUP_NOTEBOOK->add (Client => client_setup, 2045 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1819 "Configure various client-specific settings."); 2046 "Configure various client-specific settings.");
1820 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2047 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1821 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2048 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1822 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2049 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1823 "Configure the use of audio, sound effects and background music."); 2050 "Configure the use of audio, sound effects and background music.");
1824 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2051 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1825 "Lets you define, edit and delete key bindings." 2052 "Lets you define, edit and delete key bindings."
1826 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2053 . "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 " 2054 . "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. " 2055 . "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 " 2056 . "After pressing the combo the binding will be saved automatically and the "
1830 . "binding editor closes"); 2057 . "binding editor closes");
1831 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2058 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1832 "Some debuggin' options. Do not ask."); 2059 "Some debuggin' options. Do not ask.");
1833 2060
1834 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2061 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1835 2062
1836 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2063 $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."); 2064 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1838 2065
1839 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2066 $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."); 2067 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1841 2068
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 2069 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 2070
1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2071 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1864 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
1865 on_activate => sub { 2092 on_activate => sub {
1866 if ($CONN) { 2093 if ($CONN) {
1867 open_quit_dialog; 2094 open_quit_dialog;
1868 } else { 2095 } else {
1869 exit; 2096 Event::unloop_all;
1870 } 2097 }
1871 0 2098 0
1872 }, 2099 },
1873 ); 2100 );
1874 2101
1875 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
1876 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
1877 } 2105 }
1878 2106
1879 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2107 $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} 2108}
2000 2109
2001sub video_shutdown { 2110sub video_shutdown {
2002 CFPlus::OpenGL::shutdown; 2111 CFPlus::OpenGL::shutdown;
2003 2112
2004 undef $SDL_ACTIVE; 2113 undef $SDL_ACTIVE;
2005} 2114}
2006 2115
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; 2116my %animate_object;
2070my $animate_timer; 2117my $animate_timer;
2071 2118
2072my $fps = 9; 2119my $fps = 9;
2073 2120
2074my %demo;#d#
2075
2076sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
2077 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2123 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2078 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
2079 2126
2080 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
2081 2128 CFPlus::SDL_GL_SwapBuffers;
2082 $WANT_REFRESH = 0;
2083 $CAN_REFRESH = 0;
2084 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
2085 2130 $WANT_REFRESH->stop;
2086 CFPlus::SDL_GL_SwapBuffers;
2087} 2131}
2088 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
2089my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2135my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2090 $NOW = time; 2136 $NOW = time;
2091 2137
2092 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2093 for CFPlus::SDL_PollEvent; 2139 for CFPlus::poll_events;
2094 2140
2095 if (%animate_object) { 2141 if (%animate_object) {
2096 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2097 $WANT_REFRESH++; 2143 $WANT_REFRESH->start;
2098 }
2099
2100 if ($WANT_REFRESH) {
2101 force_refresh;
2102 } else {
2103 $CAN_REFRESH = 1;
2104 } 2144 }
2105}); 2145});
2106 2146
2107sub animation_start { 2147sub animation_start {
2108 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2111 2151
2112sub animation_stop { 2152sub animation_stop {
2113 my ($widget) = @_; 2153 my ($widget) = @_;
2114 delete $animate_object{$widget}; 2154 delete $animate_object{$widget};
2115} 2155}
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 2156
2126%SDL_CB = ( 2157%SDL_CB = (
2127 CFPlus::SDL_QUIT => sub { 2158 CFPlus::SDL_QUIT => sub {
2128 exit; 2159 exit;
2129 }, 2160 },
… …
2132 CFPlus::SDL_VIDEOEXPOSE => sub { 2163 CFPlus::SDL_VIDEOEXPOSE => sub {
2133 CFPlus::UI::full_refresh; 2164 CFPlus::UI::full_refresh;
2134 }, 2165 },
2135 CFPlus::SDL_ACTIVEEVENT => sub { 2166 CFPlus::SDL_ACTIVEEVENT => sub {
2136# not useful, as APPACTIVE include sonly iconified state, not unmapped 2167# not useful, as APPACTIVE include sonly iconified state, not unmapped
2137# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2168# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2169# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2138# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2170# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2139# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2171# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2140# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2172# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2141 }, 2173 },
2142 CFPlus::SDL_KEYDOWN => sub { 2174 CFPlus::SDL_KEYDOWN => sub {
… …
2171 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2172 2204
2173 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2174 2206
2175 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2176 sdl_mode => 0, 2208 sdl_mode => 0,
2177 width => 640,
2178 height => 480,
2179 fullscreen => 0, 2209 fullscreen => 0,
2180 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2181 map_scale => 1, 2213 map_scale => 1,
2182 fow_enable => 1, 2214 fow_enable => 1,
2183 fow_intensity => 0.45, 2215 fow_intensity => 0,
2184 fow_smooth => 0,
2185 map_smoothing => 1, 2216 map_smoothing => 1,
2186 gui_fontsize => 1, 2217 gui_fontsize => 1,
2187 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2188 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2189 gauge_size => 0.35, 2220 gauge_size => 0.35,
2190 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2191 mapsize => 100, 2222 mapsize => 100,
2192 say_command => 'chat',
2193 audio_enable => 1, 2223 audio_enable => 1,
2224 effects_enable => 1,
2225 effects_volume => 1,
2194 bgm_enable => 1, 2226 bgm_enable => 1,
2195 bgm_volume => 0.25, 2227 bgm_volume => 0.5,
2196 face_prefetch => 0,
2197 output_sync => 1, 2228 output_sync => 1,
2198 output_count => 1, 2229 output_count => 1,
2199 output_rate => "", 2230 output_rate => "",
2200 pickup => 0, 2231 pickup => 0,
2201 inv_sort => "mtime", 2232 inv_sort => "mtime",
2202 default => "profile", # default profile 2233 default => "profile", # default profile
2203 show_tips => 1, 2234 show_tips => 1,
2204 logview_max_par => 1000, 2235 logview_max_par => 1000,
2205 ); 2236 );
2206 2237
2207 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2240 }
… …
2223 } 2254 }
2224 } 2255 }
2225 2256
2226 sdl_init; 2257 sdl_init;
2227 2258
2228 @SDL_MODES = reverse 2259 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2229 grep $_->[0] >= 640 && $_->[1] >= 480, 2260 @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)"; 2261 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2262
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2233 2264
2234 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2265 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2235 2266
2236 { 2267 {
2237 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2268 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2275} 2306}
2276 2307
2277show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2278 2309
2279Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2280#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2281#CFPlus::_exit 0;
2282
2283END {
2284 CFPlus::SDL_Quit;
2285 CFPlus::DB::Server::stop; 2315CFPlus::DB::Server::stop;
2286}
2287 2316
2288=head1 NAME 2317=head1 NAME
2289 2318
2290cfplus - A Crossfire+ and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2291 2320
2292=head1 SYNOPSIS 2321=head1 SYNOPSIS
2293 2322
2294Just run it - no commandline arguments are supported. 2323Just run it - no commandline arguments are supported.
2295 2324
2296=head1 USAGE 2325=head1 USAGE
2297 2326
2298cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2327cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2299fullscreen and interactively. 2328be used in fullscreen mode and interactively.
2300 2329
2301=head1 DEBUGGING 2330=head1 DEBUGGING
2302 2331
2303 2332
2304CFPLUS_DEBUG - environment variable 2333CFPLUS_DEBUG - environment variable

Diff Legend

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