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.158 by root, Sun Jul 1 03:12:35 2007 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 2007 UTC

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

Diff Legend

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