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.207 by root, Thu Aug 9 11:02:08 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 $AUDIO_PLAY{$face}
223 or return;
224
225 if (my $chunk = $AUDIO_CHUNK{$face}) {
226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_;
228
229 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $channel->set_position_r ($dx, $dy, 20);
232 $chunk->play ($channel);
233 }
234 } else {
235 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{jingle}) {
241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 }
245 } else {
246 # fetch from database
247 CFPlus::DB::get res_data => $meta->{name}, sub {
248 my $rwops = new CFPlus::RW $_[0];
249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
251 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
252 $AUDIO_CHUNK{$face} = $chunk;
253
254 audio_sound_push ($face);
255 };
256 }
257 }
258}
259
260sub audio_sound_play {
261 my ($face, $dx, $dy, $vol) = @_;
262
263 $SDL_MIXER
264 or return;
265 $CFG->{effects_enable}
266 or return;
267
268 my $queue = $AUDIO_PLAY{$face} ||= [];
269 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
270 audio_sound_push $face
271 unless @$queue > 1;
272}
273
274sub audio_music_set_meta {
275 my ($meta) = @_;
276
277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
290 CFPlus::MixMusic::volume $base * $volume * 128;
291}
292
293sub audio_music_start {
294 my $meta = $MUSIC_PLAYING_META;
295
296 CFPlus::DB::get res_data => $meta->{name}, sub {
297 return unless $SDL_MIXER;
298
299 # music might have changed...
300 $meta eq $MUSIC_PLAYING_META
301 or return &audio_music_start ();
302
303 audio_music_update_volume;
304
305 $MUSIC_PLAYING_DATA = \$_[0];
306
307 my $rwops = $meta->{path}
308 ? new_from_file CFPlus::RW $meta->{path}
309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
310
311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
313
314 my $NOW = time;
315
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
319 $MUSIC_START = time - $pos;
320 } else {
321 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time;
323 }
324
325 delete $meta->{stop_time};
326 delete $meta->{stop_pos};
327 }
328}
329
330sub audio_music_push {
331 return unless $SDL_MIXER;
332
333 my $fade_out;
334
335 if (@MUSIC_JINGLE) {
336 @MUSIC_HAVE = $MUSIC_JINGLE[0];
337 $fade_out = 333;
338 } else {
339 return unless $CFG->{bgm_enable};
340
341 my @have =
342 grep $_,
343 map $CONN->{music_meta}{$_},
344 @$MUSIC_WANT;
345
346 @MUSIC_HAVE = @have
347 if @have;
348
349 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
351 $fade_out = 1000;
352 }
353
354 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356
357 my $NOW = time;
358
359 if ($MUSIC_PLAYING_META) {
360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
361 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
362 CFPlus::MixMusic::fade_out $fade_out;
363 } else {
364 # sort by stop time, oldest first
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366
367 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0];
373
374 audio_music_start;
375 }
376}
377
378sub audio_music_set_ambient {
379 my ($songs) = @_;
380
381 $MUSIC_WANT = $songs;
382 audio_music_push;
383}
384
385sub audio_music_finished {
386 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
391
392 undef $MUSIC_PLAYER;
393 undef $MUSIC_PLAYING_META;
394 undef $MUSIC_PLAYING_DATA;
395
396 audio_music_push;
397}
398
399sub audio_init {
400 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
403
404 unless ($SDL_MIXER) {
405 status "Unable to open sound device: there will be no sound";
406 return;
407 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else {
413 undef $SDL_MIXER;
414 }
415}
416
417sub audio_shutdown {
418 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META;
420 undef $MUSIC_PLAYING_DATA;
421
422 $MUSIC_WANT = [];
423 @MUSIC_JINGLE = ();
424 %AUDIO_PLAY = ();
425 %AUDIO_CHUNK = ();
426
427 CFPlus::Mix_CloseAudio if $SDL_MIXER;
428 undef $SDL_MIXER;
429}
430
431#############################################################################
197 432
198sub destroy_query_dialog { 433sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
201} 436}
… …
265 ellipsise => 0, 500 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
267 502
268 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
269 504
270 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
271 text => "Next Race", 506 text => "Next Race",
272 on_activate => sub { 507 on_activate => sub {
273 $conn->send ("reply n"); 508 $conn->send ("reply n");
274 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
275 0 510 0
276 }, 511 },
277 ); 512 );
278 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
279 text => "Accept", 514 text => "Accept",
280 on_activate => sub { 515 on_activate => sub {
281 $conn->send ("reply d"); 516 $conn->send ("reply d");
282 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
283 0 518 0
… …
318 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
319 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
320 return; 555 return;
321 } 556 }
322 557
323 $STATS_PAGE->show;
324 $MESSAGE_WINDOW->hide;
325
326 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
327 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
328 ellipsise => 0, 560 ellipsise => 0,
329 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
330 562
331 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
332 564
333 # left: re-roll 565 # left: re-roll
334 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
335 text => "Roll Again", 567 text => "Roll Again",
336 on_activate => sub { 568 on_activate => sub {
337 $conn->send ("reply y"); 569 $conn->send ("reply y");
338 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
339 0 571 0
… …
353 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
354 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
355 ], 587 ],
356 ), 1 .. 2; 588 ), 1 .. 2;
357 589
358 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
359 text => "Swap Stats", 591 text => "Swap Stats",
360 on_activate => sub { 592 on_activate => sub {
361 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
362 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
363 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
364 0 596 0
365 }, 597 },
366 ); 598 );
367 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
368 600
369 # right: accept 601 # right: accept
370 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
371 text => "Accept", 603 text => "Accept",
372 on_activate => sub { 604 on_activate => sub {
373 $conn->send ("reply n"); 605 $conn->send ("reply n");
374 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
375 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
… …
456 maph => $mapsize, 688 maph => $mapsize,
457 689
458 client => "cfplus $CFPlus::VERSION $] $^O", 690 client => "cfplus $CFPlus::VERSION $] $^O",
459 691
460 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
461 logview => $LOGVIEW,
462 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
463 map => $MAP, 694 map => $MAP,
464 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
465 query => \&server_query, 696 query => \&server_query,
466 697
467 setup_req => { 698 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1, 699 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 }, 700 },
482 }; 701 };
483 702
484 if ($CONN) { 703 if ($CONN) {
485 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
… …
495 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
497 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
498 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
499 $SPELL_LIST->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
500 722
501 return unless $CONN; 723 return unless $CONN;
502 724
503 status "connection closed"; 725 status "connection closed";
504 726
… …
514 736
515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 737 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
516 738
517 my $row = 0; 739 my $row = 0;
518 740
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 741 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 742 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1, 743 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523 745
746 my $vidmode_tooltip =
747 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
748 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
749
524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 750 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
526 752
753 $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]); 754 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"); 755 tooltip => $vidmode_tooltip);
756 $hbox->add (my $mode_label = new CFPlus::UI::Label
757 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
758 can_events => 1, tooltip => $vidmode_tooltip);
529 759
530 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
531 my ($self, $value) = @_; 761 my ($self, $value) = @_;
532 762
533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
535 }); 765 });
536 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
537 767
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
540 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
541 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
542 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
543 ); 773 );
544 774
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 775 $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 776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
547 state => $CFG->{fast}, 777 state => $CFG->{fast},
548 tooltip => "Lower the visual quality considerably to speed up rendering.", 778 tooltip => "Lower the visual quality considerably to speed up rendering.",
549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 779 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
550 ); 780 );
551 781
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 782 $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 783 $table->add_at (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 784 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.", 785 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 }, 786 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 ); 787 );
558 788
559 $table->add (1, $row++, new CFPlus::UI::Button 789 $table->add_at (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply", 790 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.", 791 tooltip => "Apply the video settings above.",
562 on_activate => sub { 792 on_activate => sub {
563 video_shutdown (); 793 video_shutdown ();
564 video_init (); 794 video_init ();
565 0 795 0
566 } 796 }
567 ); 797 );
568 798
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 799 $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 800 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 801 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 802 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 803 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 ); 804 );
575 805
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 806 $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 807 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing}, 808 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 809 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. " 810 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.", 811 . "Changes take effect at next connection only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
583 ); 813 );
584 814
585 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 815 $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 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
587 state => $CFG->{fow_enable}, 817 state => $CFG->{fow_enable},
588 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 818 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 } 819 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
590 ); 820 );
591 821
592 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 822 $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 823 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 824 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.", 825 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 } 826 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
597 ); 827 );
598 828
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"); 829 $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 830 $table->add_at (1, $row++, new CFPlus::UI::Slider
613 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 831 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.", 832 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 }, 833 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
616 ); 834 );
617 835
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 836 $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 837 $table->add_at (1, $row++, new CFPlus::UI::Slider
620 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 838 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.", 839 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
622 on_changed => sub { 840 on_changed => sub {
623 $CFG->{gauge_fontsize} = $_[1]; 841 $CFG->{gauge_fontsize} = $_[1];
624 &set_gauge_window_fontsize; 842 &set_gauge_window_fontsize;
625 0 843 0
626 } 844 }
627 ); 845 );
628 846
629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 847 $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 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
631 range => [$CFG->{gauge_size}, 0.2, 0.8], 849 range => [$CFG->{gauge_size}, 0.2, 0.8],
632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 850 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
633 on_changed => sub { 851 on_changed => sub {
634 $CFG->{gauge_size} = $_[1]; 852 $CFG->{gauge_size} = $_[1];
635 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 853 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
641} 859}
642 860
643sub audio_setup { 861sub audio_setup {
644 my $vbox = new CFPlus::UI::VBox; 862 my $vbox = new CFPlus::UI::VBox;
645 863
646 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 864 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
647 865
648 my $row = 0; 866 my $row = 0;
649 867
650 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 868 $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 869 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
652 state => $CFG->{audio_enable}, 870 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.", 871 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 } 872 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
655 ); 873 );
656# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 874# $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 { 875# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
658# $CFG->{effects_volume} = $_[1]; 876# $CFG->{effects_volume} = $_[1];
659# }); 877# });
878
879 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
880 $table->add_at (1, $row, new CFPlus::UI::CheckBox
881 expand => 1, state => $CFG->{effects_enable},
882 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
883 on_changed => sub {
884 $CFG->{effects_enable} = $_[1];
885 $CONN->update_fx_want if $CONN;
886 0
887 }
888 );
889 $table->add_at (2, $row++, new CFPlus::UI::Slider
890 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
891 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
892 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
893 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
894 );
895
660 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 896 $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 897 $table->add_at (1, $row, new CFPlus::UI::CheckBox
663 expand => 1, state => $CFG->{bgm_enable}, 898 expand => 1, state => $CFG->{bgm_enable},
664 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 899 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 } 900 on_changed => sub {
901 $CFG->{bgm_enable} = $_[1];
902 $CONN->update_fx_want if $CONN;
903 0
904 }
666 ); 905 );
667 $hbox->add (new CFPlus::UI::Slider 906 $table->add_at (2, $row++, new CFPlus::UI::Slider
668 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 907 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
669 tooltip => "The volume of the background music. Changes are instant.", 908 tooltip => "The volume of the background music. Changes are instant.",
670 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 909 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
671 ); 910 );
672 911
673 $table->add (1, $row++, new CFPlus::UI::Button 912 $table->add_at (1, $row++, new CFPlus::UI::Button
674 expand => 1, align => 0, text => "Apply", 913 c_colspan => 2, expand => 1, align => 0, text => "Apply",
675 tooltip => "Apply the audio settings", 914 tooltip => "Apply the audio settings",
676 on_activate => sub { 915 on_activate => sub {
677 audio_shutdown (); 916 audio_shutdown ();
678 audio_init (); 917 audio_init ();
679 0 918 0
… …
737} 976}
738 977
739sub debug_setup { 978sub debug_setup {
740 my $table = new CFPlus::UI::Table; 979 my $table = new CFPlus::UI::Table;
741 980
742 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 981 $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 }); 982 $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"); 983 $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 }); 984 $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"); 985 $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 }); 986 $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"); 987 $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 }); 988 $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" } ); 989 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
751 990
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# 991 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
992
993 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
994 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
995 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
996 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
997 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
998 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
999
1000 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1001
1002 $c->add_items ({
1003 type => "line_loop",
1004 color => [0, 1, 0],
1005 width => 9,
1006 coord_mode => "abs",
1007 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1008 });
1009
1010 $c->add_items ({
1011 type => "lines",
1012 color => [1, 1, 0],
1013 width => 2,
1014 coord_mode => "rel",
1015 coord => [[0,0], [1,1], [1,0], [0,1]],
1016 });
1017
1018 $c->add_items ({
1019 type => "polygon",
1020 color => [0, 0.43, 0],
1021 width => 2,
1022 coord_mode => "rel",
1023 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1024 });
765 1025
766 $table 1026 $table
767} 1027}
768 1028
769sub stats_window { 1029sub stats_window {
… …
817 [2, 4, st_spd => "Spd", 10.54], 1077 [2, 4, st_spd => "Spd", 10.54],
818 [2, 5, st_wspd => "WSp", 10.54], 1078 [2, 5, st_wspd => "WSp", 10.54],
819 ) { 1079 ) {
820 my ($col, $row, $id, $label, $template) = @$_; 1080 my ($col, $row, $id, $label, $template) = @$_;
821 1081
822 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1082 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
823 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1083 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
824 align => +1, template => $template, tooltip => "#stat_$label"); 1084 align => +1, template => $template, tooltip => "#stat_$label");
825 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1085 $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, 1086 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
827 align => -1, text => $label, tooltip => "#stat_$label"); 1087 align => -1, text => $label, tooltip => "#stat_$label");
828 } 1088 }
829 1089
830 $vb->add (new CFPlus::UI::FancyFrame 1090 $vb->add (new CFPlus::UI::FancyFrame
… …
871 cold => ["Cold", 1131 cold => ["Cold",
872 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1132 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
873 ghit => ["Ghost hit", 1133 ghit => ["Ghost hit",
874 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1134 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
875 ); 1135 );
1136
876 for (qw/slow holyw conf fire depl magic 1137 for (qw/slow holyw conf fire depl magic
877 drain acid pois para deat phys 1138 drain acid pois para deat phys
878 blind fear tund elec cold ghit/) 1139 blind fear tund elec cold ghit/)
879 { 1140 {
880 $tbl2->add ($col, $row, 1141 $tbl2->add_at ($col, $row,
881 $STATWIDS->{"res_$_"} = 1142 $STATWIDS->{"res_$_"} =
882 new CFPlus::UI::Label 1143 new CFPlus::UI::Label
883 font => $FONT_FIXED, 1144 font => $FONT_FIXED,
884 template => "-100%", 1145 template => "-100%",
885 align => +1, 1146 align => +1,
886 valign => 0, 1147 valign => 0,
887 can_events => 1, 1148 can_events => 1,
888 can_hover => 1, 1149 can_hover => 1,
889 tooltip => $resist_names{$_}->[1], 1150 tooltip => $resist_names{$_}->[1],
890 ); 1151 );
891 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1152 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
892 font => $FONT_FIXED, 1153 font => $FONT_FIXED,
893 can_hover => 1, 1154 can_hover => 1,
894 can_events => 1, 1155 can_events => 1,
895 path => "ui/resist/resist_$_.png", 1156 path => "ui/resist/resist_$_.png",
896 tooltip => $resist_names{$_}->[1], 1157 tooltip => $resist_names{$_}->[1],
897 ); 1158 );
898 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1159 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
899 text => $resist_names{$_}->[0], 1160 text => $resist_names{$_}->[0],
900 font => $FONT_FIXED, 1161 font => $FONT_FIXED,
901 can_hover => 1, 1162 can_hover => 1,
902 can_events => 1, 1163 can_events => 1,
903 tooltip => $resist_names{$_}->[1], 1164 tooltip => $resist_names{$_}->[1],
… …
936 return if $METASERVER_ATIME > time; 1197 return if $METASERVER_ATIME > time;
937 $METASERVER_ATIME = time + 60; 1198 $METASERVER_ATIME = time + 60;
938 1199
939 my $table = $METASERVER->{table}; 1200 my $table = $METASERVER->{table};
940 $table->clear; 1201 $table->clear;
941 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1202 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
942 1203
943 my $ok = 0; 1204 my $ok = 0;
944 1205
945 CFPlus::background { 1206 CFPlus::background {
946 my $ua = CFPlus::lwp_useragent; 1207 my $ua = CFPlus::lwp_useragent;
… …
957 "The time this server has been running without being restarted.", 1218 "The time this server has been running without being restarted.",
958 "The server software version - a '+' indicates a Crossfire+ server.", 1219 "The server software version - a '+' indicates a Crossfire+ server.",
959 "Short information about this server provided by its admins.", 1220 "Short information about this server provided by its admins.",
960 ); 1221 );
961 my @col = qw(#Users Host Uptime Version Description); 1222 my @col = qw(#Users Host Uptime Version Description);
962 $table->add ($_, 0, new CFPlus::UI::Label 1223 $table->add_at ($_, 0, new CFPlus::UI::Label
963 can_hover => 1, can_events => 1, 1224 can_hover => 1, can_events => 1,
964 align => 0, fg => [1, 1, 0], 1225 align => 0, fg => [1, 1, 0],
965 text => $col[$_], tooltip => $tip[$_]) 1226 text => $col[$_], tooltip => $tip[$_])
966 for 0 .. $#col; 1227 for 0 .. $#col;
967 1228
… …
989 1250
990 $m = [$users, $host, $uptime, $version, $desc]; 1251 $m = [$users, $host, $uptime, $version, $desc];
991 1252
992 $y++; 1253 $y++;
993 1254
994 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1255 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
995 (new CFPlus::UI::Button 1256 (new CFPlus::UI::Button
996 text => "Use", 1257 text => "Use",
997 tooltip => "Put this server into the <b>Host:Port</b> field", 1258 tooltip => "Put this server into the <b>Host:Port</b> field",
998 on_activate => sub { 1259 on_activate => sub {
999 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1260 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1002 }, 1263 },
1003 ), 1264 ),
1004 (new CFPlus::UI::Empty expand => 1), 1265 (new CFPlus::UI::Empty expand => 1),
1005 ]); 1266 ]);
1006 1267
1007 $table->add ($_, $y, new CFPlus::UI::Label 1268 $table->add_at ($_, $y, new CFPlus::UI::Label
1008 max_w => $::WIDTH * 0.4, 1269 max_w => $::WIDTH * 0.4,
1009 ellipsise => 0, 1270 ellipsise => 0,
1010 align => $align[$_], 1271 align => $align[$_],
1011 text => $m->[$_], 1272 text => $m->[$_],
1012 tooltip => $tip[$_], 1273 tooltip => $tip[$_],
… …
1053 1314
1054 $vbox->add (new CFPlus::UI::FancyFrame 1315 $vbox->add (new CFPlus::UI::FancyFrame
1055 label => "Connection Settings", 1316 label => "Connection Settings",
1056 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1317 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1057 ); 1318 );
1058 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1319 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1059 1320
1060 { 1321 {
1061 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1322 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1062 1323
1063 $vbox->add ( 1324 $vbox->add (
1064 $HOST_ENTRY = new CFPlus::UI::Entry 1325 $HOST_ENTRY = new CFPlus::UI::Entry
1065 expand => 1, 1326 expand => 1,
1066 text => $CFG->{profile}{default}{host}, 1327 text => $CFG->{profile}{default}{host},
1067 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1328 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1068 on_changed => sub { 1329 on_changed => sub {
1069 my ($self, $value) = @_; 1330 my ($self, $value) = @_;
1070 $CFG->{profile}{default}{host} = $value; 1331 $CFG->{profile}{default}{host} = $value;
1071 0 1332 1
1072 } 1333 }
1073 ); 1334 );
1074 1335
1075 $vbox->add (new CFPlus::UI::Button 1336 $vbox->add (new CFPlus::UI::Button
1076 expand => 1, 1337 expand => 1,
1077 text => "Server List", 1338 text => "Server List",
1078 other => $METASERVER, 1339 other => $METASERVER,
1079 tooltip => "Show a list of available crossfire servers", 1340 tooltip => "Show a list of available crossfire servers",
1080 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1341 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1081 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1342 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1082 ); 1343 );
1083 } 1344 }
1084 1345
1085 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1346 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1086 $table->add (1, 4, new CFPlus::UI::Entry 1347 $table->add_at (1, 4, new CFPlus::UI::Entry
1087 text => $CFG->{profile}{default}{user}, 1348 text => $CFG->{profile}{default}{user},
1088 tooltip => "The name of your character on the server", 1349 tooltip => "The name of your character on the server",
1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1350 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1090 ); 1351 );
1091 1352
1092 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1353 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1093 $table->add (1, 5, new CFPlus::UI::Entry 1354 $table->add_at (1, 5, new CFPlus::UI::Entry
1094 text => $CFG->{profile}{default}{password}, 1355 text => $CFG->{profile}{default}{password},
1095 hidden => 1, 1356 hidden => 1,
1096 tooltip => "The password for your character", 1357 tooltip => "The password for your character",
1097 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1358 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1098 ); 1359 );
1099 1360
1100 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1361 $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 1362 $table->add_at (1, 7, new CFPlus::UI::Slider
1102 force_w => 100, 1363 force_w => 100,
1103 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1364 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1104 tooltip => "This is the size of the portion of the map update the server sends you. " 1365 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, " 1366 . "If you set this to a high value you will be able to see further, "
1106 . "but you also increase bandwidth requirements and latency. " 1367 . "but you also increase bandwidth requirements and latency. "
1107 . "This option is only used once at log-in.", 1368 . "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 }, 1369 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1109 ); 1370 );
1110 1371
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"); 1372 $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 1373 $table->add_at (1, 8, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate}, 1374 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1375 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 " 1376 . "when sending data. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.", 1377 . "default will be used, which is usually around 100kb/s. Most servers will "
1378 . "dynamically find an optimal rate, so adjust this only when necessary.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1379 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1131 ); 1380 );
1132 1381
1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1382 $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 1383 $table->add_at (1, 9, new CFPlus::UI::Entry
1135 text => $CFG->{output_count}, 1384 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.", 1385 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 }, 1386 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1138 ); 1387 );
1139 1388
1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1389 $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 1390 $table->add_at (1, 10, new CFPlus::UI::Entry
1142 text => $CFG->{output_sync}, 1391 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.", 1392 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 }, 1393 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1145 ); 1394 );
1146 1395
1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1396 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1148 expand => 1, 1397 expand => 1,
1149 align => 0, 1398 align => 0,
1150 text => "Login", 1399 text => "Login",
1151 on_activate => sub { 1400 on_activate => sub {
1152 $CONN ? stop_game 1401 $CONN ? stop_game
1153 : start_game; 1402 : start_game;
1154 0 1403 1
1155 }, 1404 },
1156 ); 1405 );
1157 1406
1158 $vbox->add (new CFPlus::UI::FancyFrame 1407 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info", 1408 label => "Server Info",
… …
1166sub client_setup { 1415sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1416 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168 1417
1169 my $row = 0; 1418 my $row = 0;
1170 1419
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"); 1420 $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 1421 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1186 state => $CFG->{show_tips}, 1422 state => $CFG->{show_tips},
1187 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1423 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1188 on_changed => sub { 1424 on_changed => sub {
1189 my ($self, $value) = @_; 1425 my ($self, $value) = @_;
1190 $CFG->{show_tips} = $value; 1426 $CFG->{show_tips} = $value;
1191 0 1427 0
1192 } 1428 }
1193 ); 1429 );
1194 1430
1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1431 $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 1432 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1197 text => $CFG->{logview_max_par}, 1433 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1434 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 " 1435 . "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.", 1436 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub { 1437 on_changed => sub {
1202 my ($self, $value) = @_; 1438 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1439 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1204 0 1440 0
1205 }, 1441 },
1206 ); 1442 );
1207 1443
1208 $table 1444 $table
1209} 1445}
1210 1446
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 { 1447sub autopickup_setup {
1448 my $r = new CFPlus::UI::ScrolledWindow (
1449 expand => 1,
1450 scroll_y => 1
1451 );
1275 my $table = new CFPlus::UI::Table; 1452 $r->add (my $table = new CFPlus::UI::Table
1453 row_expand => [0],
1454 col_expand => [0, 1, 0, 1],
1455 );
1276 1456
1277 for ( 1457 for (
1278 ["General", 0, 0, 1458 ["General", 0, 0,
1279 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1459 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1280 ["Inhibit autopickup" => PICKUP_INHIBIT], 1460 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1315 ], 1495 ],
1316 ["Weight/Value ratio", 2, 17] 1496 ["Weight/Value ratio", 2, 17]
1317 ) 1497 )
1318 { 1498 {
1319 my ($title, $x, $y, @bits) = @$_; 1499 my ($title, $x, $y, @bits) = @$_;
1320 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1500 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1321 1501
1322 for (@bits) { 1502 for (@bits) {
1323 ++$y; 1503 ++$y;
1324 1504
1325 my $mask = $_->[1]; 1505 my $mask = $_->[1];
1326 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1506 $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 1507 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1328 state => $::CFG->{pickup} & $mask, 1508 state => $::CFG->{pickup} & $mask,
1329 on_changed => sub { 1509 on_changed => sub {
1330 my ($box, $value) = @_; 1510 my ($box, $value) = @_;
1331 1511
1332 if ($value) { 1512 if ($value) {
… …
1343 1523
1344 ${$_->[2]} = $checkbox if $_->[2]; 1524 ${$_->[2]} = $checkbox if $_->[2];
1345 } 1525 }
1346 } 1526 }
1347 1527
1348 $table->add (2, 18, new CFPlus::UI::ValSlider 1528 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1349 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1529 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1350 template => ">= 99", 1530 template => ">= 99",
1351 to_value => sub { ">= " . 5 * $_[0] }, 1531 to_value => sub { ">= " . 5 * $_[0] },
1352 on_changed => sub { 1532 on_changed => sub {
1353 my ($slider, $value) = @_; 1533 my ($slider, $value) = @_;
… …
1356 $::CFG->{pickup} |= int $value 1536 $::CFG->{pickup} |= int $value
1357 if $value; 1537 if $value;
1358 1; 1538 1;
1359 }); 1539 });
1360 1540
1361 $table->add (3, 18, new CFPlus::UI::Button 1541 $table->add_at (3, 18, new CFPlus::UI::Button
1362 text => "set", 1542 text => "set",
1363 on_activate => sub { 1543 on_activate => sub {
1364 $::CONN->send_command ("pickup $::CFG->{pickup}") 1544 $::CONN->send_command ("pickup $::CFG->{pickup}")
1365 if defined $::CONN; 1545 if defined $::CONN;
1366 0 1546 0
1367 }); 1547 });
1368 1548
1369 $table 1549 $r
1370} 1550}
1371 1551
1372my %SORT_ORDER = ( 1552my %SORT_ORDER = (
1373 type => undef, 1553 type => undef,
1374 mtime => sub { 1554 mtime => sub {
… …
1429 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1609 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1430 1610
1431 $hb 1611 $hb
1432} 1612}
1433 1613
1614sub media_window {
1615 my $vb = new CFPlus::UI::VBox;
1616
1617 $vb->add (new CFPlus::UI::FancyFrame
1618 label => "Currently playing music",
1619 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1620 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1621 );
1622
1623 $vb->add (new CFPlus::UI::FancyFrame
1624 label => "Other media used in this session",
1625 expand => 1,
1626 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1627 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1628 );
1629
1630 $vb
1631}
1632
1633sub add_license {
1634 my ($meta) = @_;
1635
1636 $meta = $meta->{meta}
1637 or return;
1638
1639 $meta->{license} || $meta->{author} || $meta->{source}
1640 or return;
1641
1642 $LICENSE_WIDGET->add_paragraph ({
1643 fg => [1, 1, 1, 1],
1644 markup => "<small>"
1645 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1646 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1647 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1648 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1649 . "</small>",
1650 });
1651 $LICENSE_WIDGET->scroll_to_bottom;
1652}
1653
1434sub toggle_player_page { 1654sub toggle_player_page {
1435 my ($widget) = @_; 1655 my ($widget) = @_;
1436 1656
1437 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1657 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1438 $PL_WINDOW->hide; 1658 $PL_WINDOW->hide;
… …
1453 has_close_button => 1 1673 has_close_button => 1
1454 ; 1674 ;
1455 1675
1456 my $ntb = 1676 my $ntb =
1457 $PL_NOTEBOOK = 1677 $PL_NOTEBOOK =
1458 new CFPlus::UI::Notebook expand => 1, debug => 1; 1678 new CFPlus::UI::Notebook expand => 1;
1459 1679
1460 $ntb->add ( 1680 $ntb->add_tab (
1461 "Statistics (F2)" => $STATS_PAGE = stats_window, 1681 "Statistics (F2)" => $STATS_PAGE = stats_window,
1462 "Shows statistics, where all your Stats and Resistances are shown." 1682 "Shows statistics, where all your Stats and Resistances are shown."
1463 ); 1683 );
1464 $ntb->add ( 1684 $ntb->add_tab (
1465 "Skills (F3)" => $SKILL_PAGE = skill_window, 1685 "Skills (F3)" => $SKILL_PAGE = skill_window,
1466 "Shows all your Skills." 1686 "Shows all your Skills."
1467 ); 1687 );
1468 1688
1469 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1689 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1470 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1690 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1471 $ntb->add ( 1691 $ntb->add_tab (
1472 "Spellbook (F4)" => $spellsw, 1692 "Spellbook (F4)" => $spellsw,
1473 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1693 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1474 ); 1694 );
1475 $ntb->add ( 1695 $ntb->add_tab (
1476 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1696 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1477 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1697 "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." 1698 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1479 ); 1699 );
1700 $ntb->add_tab (Pickup => autopickup_setup,
1701 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1702
1703 $ntb->add_tab (Media => media_window,
1704 "License, Author and Source info for media sent by the server.");
1480 1705
1481 $ntb->set_current_page ($INVENTORY_PAGE); 1706 $ntb->set_current_page ($INVENTORY_PAGE);
1482 1707
1483 $plwin->add ($ntb); 1708 $plwin->add ($ntb);
1484 $plwin 1709 $plwin
… …
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1906 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]); 1907 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683 1908
1684 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1909 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685 1910
1686 $table->add (0, 0, new CFPlus::UI::Button 1911 $table->add_at (0, 0, new CFPlus::UI::Button
1687 text => "Close", 1912 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>.", 1913 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, 1914 on_activate => $close,
1690 ); 1915 );
1691 1916
1692 $table->add (2, 0, new CFPlus::UI::Button 1917 $table->add_at (2, 0, new CFPlus::UI::Button
1693 text => "Next", 1918 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.", 1919 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub { 1920 on_activate => sub {
1696 $close->(); 1921 $close->();
1697 &show_tip_of_the_day; 1922 &show_tip_of_the_day;
… …
1706 CFPlus::SDL_Init 1931 CFPlus::SDL_Init
1707 and die "SDL::Init failed!\n"; 1932 and die "SDL::Init failed!\n";
1708} 1933}
1709 1934
1710sub video_init { 1935sub video_init {
1711 sdl_init;
1712
1713 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1936 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1714 1937
1715 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1938 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1716 1939
1717 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1940 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1718 $FULLSCREEN = $CFG->{fullscreen}; 1941 $FULLSCREEN = $CFG->{fullscreen};
1719 $FAST = $CFG->{fast}; 1942 $FAST = $CFG->{fast};
1720 1943
1721 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1944 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1722 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1945 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1723 1946
1724 $SDL_ACTIVE = 1; 1947 $SDL_ACTIVE = 1;
1725 $LAST_REFRESH = time - 0.01; 1948 $LAST_REFRESH = time - 0.01;
1726 1949
… …
1768 1991
1769 $MAPWIDGET = new CFPlus::MapWidget; 1992 $MAPWIDGET = new CFPlus::MapWidget;
1770 $MAPWIDGET->connect (activate_console => sub { 1993 $MAPWIDGET->connect (activate_console => sub {
1771 my ($mapwidget, $preset) = @_; 1994 my ($mapwidget, $preset) = @_;
1772 1995
1773 if ($CONSOLE) { 1996 $MESSAGE_WINDOW->activate_console ($preset)
1774 $CONSOLE->{input}->{auto_activated} = 1; 1997 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 }); 1998 });
1782 $MAPWIDGET->show; 1999 $MAPWIDGET->show;
1783 $MAPWIDGET->grab_focus; 2000 $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 2001
1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2002 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1797 title => "Setup", 2003 title => "Setup",
1798 name => "setup_dialog", 2004 name => "setup_dialog",
1799 x => 'center', 2005 x => 'center',
… …
1803 force_h => $::HEIGHT * 0.6, 2009 force_h => $::HEIGHT * 0.6,
1804 has_close_button => 1, 2010 has_close_button => 1,
1805 ; 2011 ;
1806 2012
1807 $METASERVER = metaserver_dialog; 2013 $METASERVER = metaserver_dialog;
2014 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1808 2015
1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2016 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2017 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1811 2018
1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2019 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1813 "Configure the server to play on, your username, password and other server-related options."); 2020 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Client => client_setup, 2021 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1815 "Configure various client-specific settings."); 2022 "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, 2023 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1819 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2024 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1820 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2025 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1821 "Configure the use of audio, sound effects and background music."); 2026 "Configure the use of audio, sound effects and background music.");
1822 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2027 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1823 "Lets you define, edit and delete key bindings." 2028 "Lets you define, edit and delete key bindings."
1824 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2029 . "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 " 2030 . "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. " 2031 . "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 " 2032 . "After pressing the combo the binding will be saved automatically and the "
1828 . "binding editor closes"); 2033 . "binding editor closes");
1829 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2034 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1830 "Some debuggin' options. Do not ask."); 2035 "Some debuggin' options. Do not ask.");
1831 2036
1832 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2037 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1833 2038
1834 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2039 $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."); 2040 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1836 2041
1837 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2042 $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."); 2043 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1839 2044
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 2045 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 2046
1842 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2047 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1875 } 2080 }
1876 2081
1877 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1878} 2083}
1879 2084
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 { 2085sub video_shutdown {
2000 CFPlus::OpenGL::shutdown; 2086 CFPlus::OpenGL::shutdown;
2001 2087
2002 undef $SDL_ACTIVE; 2088 undef $SDL_ACTIVE;
2003} 2089}
2004 2090
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; 2091my %animate_object;
2068my $animate_timer; 2092my $animate_timer;
2069 2093
2070my $fps = 9; 2094my $fps = 9;
2071
2072my %demo;#d#
2073 2095
2074sub force_refresh { 2096sub force_refresh {
2075 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2076 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2077 2099
2078 $CFPlus::UI::ROOT->draw; 2100 $CFPlus::UI::ROOT->draw;
2079 2101
2080 $WANT_REFRESH = 0; 2102 $WANT_REFRESH = 0;
2081 $CAN_REFRESH = 0; 2103 $CAN_REFRESH = 0;
2082 $LAST_REFRESH = $NOW; 2104 $LAST_REFRESH = $NOW;
2083 2105
2084 CFPlus::SDL_GL_SwapBuffers; 2106 CFPlus::SDL_GL_SwapBuffers;
2085} 2107}
2086 2108
2087my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2088 $NOW = time; 2110 $NOW = time;
2089 2111
2090 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2091 for CFPlus::SDL_PollEvent; 2113 for CFPlus::poll_events;
2092 2114
2093 if (%animate_object) { 2115 if (%animate_object) {
2094 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2095 $WANT_REFRESH++; 2117 ++$WANT_REFRESH;
2096 } 2118 }
2097 2119
2098 if ($WANT_REFRESH) { 2120 if ($WANT_REFRESH) {
2099 force_refresh; 2121 force_refresh;
2100 } else { 2122 } else {
… …
2109 2131
2110sub animation_stop { 2132sub animation_stop {
2111 my ($widget) = @_; 2133 my ($widget) = @_;
2112 delete $animate_object{$widget}; 2134 delete $animate_object{$widget};
2113} 2135}
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 2136
2124%SDL_CB = ( 2137%SDL_CB = (
2125 CFPlus::SDL_QUIT => sub { 2138 CFPlus::SDL_QUIT => sub {
2126 exit; 2139 exit;
2127 }, 2140 },
… …
2130 CFPlus::SDL_VIDEOEXPOSE => sub { 2143 CFPlus::SDL_VIDEOEXPOSE => sub {
2131 CFPlus::UI::full_refresh; 2144 CFPlus::UI::full_refresh;
2132 }, 2145 },
2133 CFPlus::SDL_ACTIVEEVENT => sub { 2146 CFPlus::SDL_ACTIVEEVENT => sub {
2134# not useful, as APPACTIVE include sonly iconified state, not unmapped 2147# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2148# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2149# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2150# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2151# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2152# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2139 }, 2153 },
2140 CFPlus::SDL_KEYDOWN => sub { 2154 CFPlus::SDL_KEYDOWN => sub {
… …
2170 2184
2171 CFPlus::UI::set_layout ($::CFG->{layout}); 2185 CFPlus::UI::set_layout ($::CFG->{layout});
2172 2186
2173 my %DEF_CFG = ( 2187 my %DEF_CFG = (
2174 sdl_mode => 0, 2188 sdl_mode => 0,
2175 width => 640,
2176 height => 480,
2177 fullscreen => 0, 2189 fullscreen => 0,
2178 fast => 0, 2190 fast => 0,
2179 map_scale => 1, 2191 map_scale => 1,
2180 fow_enable => 1, 2192 fow_enable => 1,
2181 fow_intensity => 0.45, 2193 fow_intensity => 0,
2182 fow_smooth => 0,
2183 map_smoothing => 1, 2194 map_smoothing => 1,
2184 gui_fontsize => 1, 2195 gui_fontsize => 1,
2185 log_fontsize => 0.7, 2196 log_fontsize => 0.7,
2186 gauge_fontsize => 1, 2197 gauge_fontsize => 1,
2187 gauge_size => 0.35, 2198 gauge_size => 0.35,
2188 stat_fontsize => 0.7, 2199 stat_fontsize => 0.7,
2189 mapsize => 100, 2200 mapsize => 100,
2190 say_command => 'chat',
2191 audio_enable => 1, 2201 audio_enable => 1,
2202 effects_enable => 1,
2203 effects_volume => 1,
2192 bgm_enable => 1, 2204 bgm_enable => 1,
2193 bgm_volume => 0.25, 2205 bgm_volume => 0.5,
2194 face_prefetch => 0,
2195 output_sync => 1, 2206 output_sync => 1,
2196 output_count => 1, 2207 output_count => 1,
2197 output_rate => "", 2208 output_rate => "",
2198 pickup => 0, 2209 pickup => 0,
2199 inv_sort => "mtime", 2210 inv_sort => "mtime",
… …
2221 } 2232 }
2222 } 2233 }
2223 2234
2224 sdl_init; 2235 sdl_init;
2225 2236
2226 @SDL_MODES = reverse 2237 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2227 grep $_->[0] >= 640 && $_->[1] >= 480, 2238 @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)"; 2239 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2240
2241 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2231 2242
2232 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2243 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2233 2244
2234 { 2245 {
2235 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2246 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2277Event::loop; 2288Event::loop;
2278#CFPlus::SDL_Quit; 2289#CFPlus::SDL_Quit;
2279#CFPlus::_exit 0; 2290#CFPlus::_exit 0;
2280 2291
2281END { 2292END {
2293 video_shutdown;
2294 audio_shutdown;
2282 CFPlus::SDL_Quit; 2295 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop; 2296 CFPlus::DB::Server::stop;
2284} 2297}
2285 2298
2286=head1 NAME 2299=head1 NAME
2287 2300
2288cfplus - A Crossfire+ and Crossfire game client 2301cfplus - A Crossfire TRT and Crossfire game client
2289 2302
2290=head1 SYNOPSIS 2303=head1 SYNOPSIS
2291 2304
2292Just run it - no commandline arguments are supported. 2305Just run it - no commandline arguments are supported.
2293 2306
2294=head1 USAGE 2307=head1 USAGE
2295 2308
2296cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2309cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2297fullscreen and interactively. 2310be used in fullscreen mode and interactively.
2298 2311
2299=head1 DEBUGGING 2312=head1 DEBUGGING
2300 2313
2301 2314
2302CFPLUS_DEBUG - environment variable 2315CFPLUS_DEBUG - environment variable

Diff Legend

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