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

Diff Legend

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