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.152 by root, Tue Apr 24 01:13:15 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) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 72 if %PAR::LibCache;
51 73
52use Time::HiRes 'time'; 74use Time::HiRes 'time';
53use Event; 75use Event;
76use List::Util qw(max min);
54 77
55use Crossfire; 78use Crossfire;
56use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
57 80
58use Compress::LZF; 81use Compress::LZF;
… …
60use CFPlus; 83use CFPlus;
61use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
62use CFPlus::Protocol; 85use CFPlus::Protocol;
63use CFPlus::DB; 86use CFPlus::DB;
64use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
67use CFPlus::Pod; 92use CFPlus::Pod;
68use CFPlus::MapWidget; 93use CFPlus::MapWidget;
69use CFPlus::Macro; 94use CFPlus::Macro;
70 95
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
103 128
104our $MAP; 129our $MAP;
105our $MAPMAP; 130our $MAPMAP;
106our $MAPWIDGET; 131our $MAPWIDGET;
107our $BUTTONBAR; 132our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 133our $METASERVER;
111our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 135our $QUIT_DIALOG;
113our $HOST_ENTRY; 136our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
122 145
123our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
124our $PL_WINDOW; 147our $PL_WINDOW;
125 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
126our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
127our $STATS_PAGE; 153our $STATS_PAGE;
128our $SKILL_PAGE; 154our $SKILL_PAGE;
129our $SPELL_PAGE; 155our $SPELL_PAGE;
130our $SPELL_LIST; 156our $SPELL_LIST;
… …
136our $STATWIDS; 162our $STATWIDS;
137 163
138our $SDL_ACTIVE; 164our $SDL_ACTIVE;
139our %SDL_CB; 165our %SDL_CB;
140 166
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 168our $STATUSBOX;
147our $DEBUG_STATUS; 169our $DEBUG_STATUS;
148 170
149our $INV; 171our $INV;
150our $INVR; 172our $INVR;
151our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
152 174
153our $PICKUP_CFG; 175our $PICKUP_CFG;
154 176
155our $IN_BUILD_MODE; 177#############################################################################
156our $BUILD_BUTTON;
157 178
158sub status { 179sub status {
159 $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]);
160} 181}
161 182
… …
163 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
164} 185}
165 186
166sub message { 187sub message {
167 my ($para) = @_; 188 my ($para) = @_;
168 189 $MESSAGE_WINDOW->message ($para);
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
175} 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#############################################################################
176 432
177sub destroy_query_dialog { 433sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
180} 436}
… …
244 ellipsise => 0, 500 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
246 502
247 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
248 504
249 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 506 text => "Next Race",
251 on_activate => sub { 507 on_activate => sub {
252 $conn->send ("reply n"); 508 $conn->send ("reply n");
253 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
254 0 510 0
255 }, 511 },
256 ); 512 );
257 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 514 text => "Accept",
259 on_activate => sub { 515 on_activate => sub {
260 $conn->send ("reply d"); 516 $conn->send ("reply d");
261 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
262 0 518 0
… …
269 ellipsise => 0, 525 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 526 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ; 527 ;
272 } 528 }
273 529
274 if ($conn->{chargen_race_title}) {
275 unshift @dialog, new CFPlus::UI::Face 530 unshift @dialog, new CFPlus::UI::Face
276 face => $conn->{player}{face}, 531 face => $conn->{player}{face},
277 bg => [.2, .2, .2, 1], 532 bg => [.2, .2, .2, 1],
278 min_w => 64, 533 min_w => 64,
279 min_h => 64, 534 min_h => 64,
280 ;
281 } 535 ;
282 536
283 if ($conn->{chargen_race_title}) { 537 if ($conn->{chargen_race_title}) {
284 unshift @dialog, new CFPlus::UI::Label 538 unshift @dialog, new CFPlus::UI::Label
285 allign => 1, 539 allign => 1,
286 ellipsise => 0, 540 ellipsise => 0,
… …
299 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
300 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
301 return; 555 return;
302 } 556 }
303 557
304 $STATS_PAGE->show;
305 $MESSAGE_WINDOW->hide;
306
307 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
308 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
309 ellipsise => 0, 560 ellipsise => 0,
310 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
311 562
312 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
313 564
314 # left: re-roll 565 # left: re-roll
315 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
316 text => "Roll Again", 567 text => "Roll Again",
317 on_activate => sub { 568 on_activate => sub {
318 $conn->send ("reply y"); 569 $conn->send ("reply y");
319 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
320 0 571 0
… …
334 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
335 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
336 ], 587 ],
337 ), 1 .. 2; 588 ), 1 .. 2;
338 589
339 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
340 text => "Swap Stats", 591 text => "Swap Stats",
341 on_activate => sub { 592 on_activate => sub {
342 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
343 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
344 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
345 0 596 0
346 }, 597 },
347 ); 598 );
348 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
349 600
350 # right: accept 601 # right: accept
351 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
352 text => "Accept", 603 text => "Accept",
353 on_activate => sub { 604 on_activate => sub {
354 $conn->send ("reply n"); 605 $conn->send ("reply n");
355 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
356 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
… …
437 maph => $mapsize, 688 maph => $mapsize,
438 689
439 client => "cfplus $CFPlus::VERSION $] $^O", 690 client => "cfplus $CFPlus::VERSION $] $^O",
440 691
441 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
442 logview => $LOGVIEW,
443 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
444 map => $MAP, 694 map => $MAP,
445 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
446 query => \&server_query, 696 query => \&server_query,
447 697
448 setup_req => { 698 setup_req => {
449 smoothing => $CFG->{map_smoothing}*1, 699 smoothing => $CFG->{map_smoothing}*1,
450 },
451
452 sound_play => sub {
453 my ($x, $y, $soundnum, $type) = @_;
454
455 $SDL_MIXER
456 or return;
457
458 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
459 or return;
460
461 $chunk->play;
462 }, 700 },
463 }; 701 };
464 702
465 if ($CONN) { 703 if ($CONN) {
466 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
… …
476 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
477 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
478 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
479 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
480 $SPELL_LIST->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
481 722
482 return unless $CONN; 723 return unless $CONN;
483 724
484 status "connection closed"; 725 status "connection closed";
485 726
… …
495 736
496 $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]);
497 738
498 my $row = 0; 739 my $row = 0;
499 740
500 $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");
501 $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,
502 can_events => 1, 743 can_events => 1,
503 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
504 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
505 $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");
506 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
507 752
753 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
508 $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],
509 $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);
510 759
511 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
512 my ($self, $value) = @_; 761 my ($self, $value) = @_;
513 762
514 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
515 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
516 }); 765 });
517 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
518 767
519 $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");
520 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
521 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
522 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
524 ); 773 );
525 774
526 $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");
527 $table->add (1, $row++, new CFPlus::UI::CheckBox 776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fast}, 777 state => $CFG->{fast},
529 tooltip => "Lower the visual quality considerably to speed up rendering.", 778 tooltip => "Lower the visual quality considerably to speed up rendering.",
530 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 779 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
531 ); 780 );
532 781
533 $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");
534 $table->add (1, $row++, new CFPlus::UI::Slider 783 $table->add_at (1, $row++, new CFPlus::UI::Slider
535 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 784 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
536 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.",
537 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 786 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538 ); 787 );
539 788
540 $table->add (1, $row++, new CFPlus::UI::Button 789 $table->add_at (1, $row++, new CFPlus::UI::Button
541 expand => 1, align => 0, text => "Apply", 790 expand => 1, align => 0, text => "Apply",
542 tooltip => "Apply the video settings above.", 791 tooltip => "Apply the video settings above.",
543 on_activate => sub { 792 on_activate => sub {
544 video_shutdown (); 793 video_shutdown ();
545 video_init (); 794 video_init ();
546 0 795 0
547 } 796 }
548 ); 797 );
549 798
550 $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");
551 $table->add (1, $row++, new CFPlus::UI::Slider 800 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 801 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
553 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 802 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
554 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 }
555 ); 804 );
556 805
557 $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");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox 807 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{map_smoothing}, 808 state => $CFG->{map_smoothing},
560 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. "
561 . "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. "
562 . "Changes take effect at next connection only.", 811 . "Changes take effect at next connection only.",
563 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
564 ); 813 );
565 814
566 $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");
567 $table->add (1, $row++, new CFPlus::UI::CheckBox 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
568 state => $CFG->{fow_enable}, 817 state => $CFG->{fow_enable},
569 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.",
570 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 819 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
571 ); 820 );
572 821
573 $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");
574 $table->add (1, $row++, new CFPlus::UI::Slider 823 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 824 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
576 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.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 826 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
578 ); 827 );
579 828
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{fow_smooth},
583 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
584 on_changed => sub {
585 my ($self, $value) = @_;
586 $CFG->{fow_smooth} = $value;
587 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
588 0
589 }
590 );
591
592 $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");
593 $table->add (1, $row++, new CFPlus::UI::Slider 830 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 831 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
595 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.",
596 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 833 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
597 ); 834 );
598 835
599 $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");
600 $table->add (1, $row++, new CFPlus::UI::Slider 837 $table->add_at (1, $row++, new CFPlus::UI::Slider
601 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 838 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
602 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.",
603 on_changed => sub { 840 on_changed => sub {
604 $CFG->{gauge_fontsize} = $_[1]; 841 $CFG->{gauge_fontsize} = $_[1];
605 &set_gauge_window_fontsize; 842 &set_gauge_window_fontsize;
606 0 843 0
607 } 844 }
608 ); 845 );
609 846
610 $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");
611 $table->add (1, $row++, new CFPlus::UI::Slider 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
612 range => [$CFG->{gauge_size}, 0.2, 0.8], 849 range => [$CFG->{gauge_size}, 0.2, 0.8],
613 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.",
614 on_changed => sub { 851 on_changed => sub {
615 $CFG->{gauge_size} = $_[1]; 852 $CFG->{gauge_size} = $_[1];
616 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 853 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
622} 859}
623 860
624sub audio_setup { 861sub audio_setup {
625 my $vbox = new CFPlus::UI::VBox; 862 my $vbox = new CFPlus::UI::VBox;
626 863
627 $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]);
628 865
629 my $row = 0; 866 my $row = 0;
630 867
631 $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");
632 $table->add (1, $row++, new CFPlus::UI::CheckBox 869 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
633 state => $CFG->{audio_enable}, 870 state => $CFG->{audio_enable},
634 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.",
635 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 872 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
636 ); 873 );
637# $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");
638# $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 {
639# $CFG->{effects_volume} = $_[1]; 876# $CFG->{effects_volume} = $_[1];
640# }); 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
641 $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");
642 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
643 $hbox->add (new CFPlus::UI::CheckBox 897 $table->add_at (1, $row, new CFPlus::UI::CheckBox
644 expand => 1, state => $CFG->{bgm_enable}, 898 expand => 1, state => $CFG->{bgm_enable},
645 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.",
646 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 }
647 ); 905 );
648 $hbox->add (new CFPlus::UI::Slider 906 $table->add_at (2, $row++, new CFPlus::UI::Slider
649 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 907 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
650 tooltip => "The volume of the background music. Changes are instant.", 908 tooltip => "The volume of the background music. Changes are instant.",
651 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 }
652 ); 910 );
653 911
654 $table->add (1, $row++, new CFPlus::UI::Button 912 $table->add_at (1, $row++, new CFPlus::UI::Button
655 expand => 1, align => 0, text => "Apply", 913 c_colspan => 2, expand => 1, align => 0, text => "Apply",
656 tooltip => "Apply the audio settings", 914 tooltip => "Apply the audio settings",
657 on_activate => sub { 915 on_activate => sub {
658 audio_shutdown (); 916 audio_shutdown ();
659 audio_init (); 917 audio_init ();
660 0 918 0
… …
718} 976}
719 977
720sub debug_setup { 978sub debug_setup {
721 my $table = new CFPlus::UI::Table; 979 my $table = new CFPlus::UI::Table;
722 980
723 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 981 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
724 $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 });
725 $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");
726 $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 });
727 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 985 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
728 $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 });
729 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 987 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
730 $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 });
731 $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() } );
732 990
733 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
734
735 for my $x (0..2) {
736 for my $y (0 .. 2) {
737 $table->add ($x + 3, $y,
738 new CFPlus::UI::Entry
739 text => $default_smooth[$x * 3 + $y],
740 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
741 );
742 }
743 }
744
745 $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 });
746 1025
747 $table 1026 $table
748} 1027}
749 1028
750sub stats_window { 1029sub stats_window {
… …
798 [2, 4, st_spd => "Spd", 10.54], 1077 [2, 4, st_spd => "Spd", 10.54],
799 [2, 5, st_wspd => "WSp", 10.54], 1078 [2, 5, st_wspd => "WSp", 10.54],
800 ) { 1079 ) {
801 my ($col, $row, $id, $label, $template) = @$_; 1080 my ($col, $row, $id, $label, $template) = @$_;
802 1081
803 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1082 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
804 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1083 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
805 align => +1, template => $template, tooltip => "#stat_$label"); 1084 align => +1, template => $template, tooltip => "#stat_$label");
806 $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
807 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,
808 align => -1, text => $label, tooltip => "#stat_$label"); 1087 align => -1, text => $label, tooltip => "#stat_$label");
809 } 1088 }
810 1089
811 $vb->add (new CFPlus::UI::FancyFrame 1090 $vb->add (new CFPlus::UI::FancyFrame
… …
852 cold => ["Cold", 1131 cold => ["Cold",
853 "<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, ...)"],
854 ghit => ["Ghost hit", 1133 ghit => ["Ghost hit",
855 "<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)"],
856 ); 1135 );
1136
857 for (qw/slow holyw conf fire depl magic 1137 for (qw/slow holyw conf fire depl magic
858 drain acid pois para deat phys 1138 drain acid pois para deat phys
859 blind fear tund elec cold ghit/) 1139 blind fear tund elec cold ghit/)
860 { 1140 {
861 $tbl2->add ($col, $row, 1141 $tbl2->add_at ($col, $row,
862 $STATWIDS->{"res_$_"} = 1142 $STATWIDS->{"res_$_"} =
863 new CFPlus::UI::Label 1143 new CFPlus::UI::Label
864 font => $FONT_FIXED, 1144 font => $FONT_FIXED,
865 template => "-100%", 1145 template => "-100%",
866 align => +1, 1146 align => +1,
867 valign => 0, 1147 valign => 0,
868 can_events => 1, 1148 can_events => 1,
869 can_hover => 1, 1149 can_hover => 1,
870 tooltip => $resist_names{$_}->[1], 1150 tooltip => $resist_names{$_}->[1],
871 ); 1151 );
872 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1152 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
873 font => $FONT_FIXED, 1153 font => $FONT_FIXED,
874 can_hover => 1, 1154 can_hover => 1,
875 can_events => 1, 1155 can_events => 1,
876 path => "ui/resist/resist_$_.png", 1156 path => "ui/resist/resist_$_.png",
877 tooltip => $resist_names{$_}->[1], 1157 tooltip => $resist_names{$_}->[1],
878 ); 1158 );
879 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1159 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
880 text => $resist_names{$_}->[0], 1160 text => $resist_names{$_}->[0],
881 font => $FONT_FIXED, 1161 font => $FONT_FIXED,
882 can_hover => 1, 1162 can_hover => 1,
883 can_events => 1, 1163 can_events => 1,
884 tooltip => $resist_names{$_}->[1], 1164 tooltip => $resist_names{$_}->[1],
… …
917 return if $METASERVER_ATIME > time; 1197 return if $METASERVER_ATIME > time;
918 $METASERVER_ATIME = time + 60; 1198 $METASERVER_ATIME = time + 60;
919 1199
920 my $table = $METASERVER->{table}; 1200 my $table = $METASERVER->{table};
921 $table->clear; 1201 $table->clear;
922 $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...");
923 1203
924 my $ok = 0; 1204 my $ok = 0;
925 1205
926 CFPlus::background { 1206 CFPlus::background {
927 my $ua = CFPlus::lwp_useragent; 1207 my $ua = CFPlus::lwp_useragent;
… …
938 "The time this server has been running without being restarted.", 1218 "The time this server has been running without being restarted.",
939 "The server software version - a '+' indicates a Crossfire+ server.", 1219 "The server software version - a '+' indicates a Crossfire+ server.",
940 "Short information about this server provided by its admins.", 1220 "Short information about this server provided by its admins.",
941 ); 1221 );
942 my @col = qw(#Users Host Uptime Version Description); 1222 my @col = qw(#Users Host Uptime Version Description);
943 $table->add ($_, 0, new CFPlus::UI::Label 1223 $table->add_at ($_, 0, new CFPlus::UI::Label
944 can_hover => 1, can_events => 1, 1224 can_hover => 1, can_events => 1,
945 align => 0, fg => [1, 1, 0], 1225 align => 0, fg => [1, 1, 0],
946 text => $col[$_], tooltip => $tip[$_]) 1226 text => $col[$_], tooltip => $tip[$_])
947 for 0 .. $#col; 1227 for 0 .. $#col;
948 1228
… …
970 1250
971 $m = [$users, $host, $uptime, $version, $desc]; 1251 $m = [$users, $host, $uptime, $version, $desc];
972 1252
973 $y++; 1253 $y++;
974 1254
975 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1255 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
976 (new CFPlus::UI::Button 1256 (new CFPlus::UI::Button
977 text => "Use", 1257 text => "Use",
978 tooltip => "Put this server into the <b>Host:Port</b> field", 1258 tooltip => "Put this server into the <b>Host:Port</b> field",
979 on_activate => sub { 1259 on_activate => sub {
980 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1260 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
983 }, 1263 },
984 ), 1264 ),
985 (new CFPlus::UI::Empty expand => 1), 1265 (new CFPlus::UI::Empty expand => 1),
986 ]); 1266 ]);
987 1267
988 $table->add ($_, $y, new CFPlus::UI::Label 1268 $table->add_at ($_, $y, new CFPlus::UI::Label
989 max_w => $::WIDTH * 0.4, 1269 max_w => $::WIDTH * 0.4,
990 ellipsise => 0, 1270 ellipsise => 0,
991 align => $align[$_], 1271 align => $align[$_],
992 text => $m->[$_], 1272 text => $m->[$_],
993 tooltip => $tip[$_], 1273 tooltip => $tip[$_],
… …
1034 1314
1035 $vbox->add (new CFPlus::UI::FancyFrame 1315 $vbox->add (new CFPlus::UI::FancyFrame
1036 label => "Connection Settings", 1316 label => "Connection Settings",
1037 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]),
1038 ); 1318 );
1039 $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");
1040 1320
1041 { 1321 {
1042 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1322 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1043 1323
1044 $vbox->add ( 1324 $vbox->add (
1045 $HOST_ENTRY = new CFPlus::UI::Entry 1325 $HOST_ENTRY = new CFPlus::UI::Entry
1046 expand => 1, 1326 expand => 1,
1047 text => $CFG->{profile}{default}{host}, 1327 text => $CFG->{profile}{default}{host},
1048 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",
1049 on_changed => sub { 1329 on_changed => sub {
1050 my ($self, $value) = @_; 1330 my ($self, $value) = @_;
1051 $CFG->{profile}{default}{host} = $value; 1331 $CFG->{profile}{default}{host} = $value;
1052 0 1332 1
1053 } 1333 }
1054 ); 1334 );
1055 1335
1056 $vbox->add (new CFPlus::UI::Button 1336 $vbox->add (new CFPlus::UI::Button
1057 expand => 1, 1337 expand => 1,
1058 text => "Server List", 1338 text => "Server List",
1059 other => $METASERVER, 1339 other => $METASERVER,
1060 tooltip => "Show a list of available crossfire servers", 1340 tooltip => "Show a list of available crossfire servers",
1061 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1341 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1062 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1342 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1063 ); 1343 );
1064 } 1344 }
1065 1345
1066 $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");
1067 $table->add (1, 4, new CFPlus::UI::Entry 1347 $table->add_at (1, 4, new CFPlus::UI::Entry
1068 text => $CFG->{profile}{default}{user}, 1348 text => $CFG->{profile}{default}{user},
1069 tooltip => "The name of your character on the server", 1349 tooltip => "The name of your character on the server",
1070 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1350 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1071 ); 1351 );
1072 1352
1073 $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");
1074 $table->add (1, 5, new CFPlus::UI::Entry 1354 $table->add_at (1, 5, new CFPlus::UI::Entry
1075 text => $CFG->{profile}{default}{password}, 1355 text => $CFG->{profile}{default}{password},
1076 hidden => 1, 1356 hidden => 1,
1077 tooltip => "The password for your character", 1357 tooltip => "The password for your character",
1078 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1358 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1079 ); 1359 );
1080 1360
1081 $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");
1082 $table->add (1, 7, new CFPlus::UI::Slider 1362 $table->add_at (1, 7, new CFPlus::UI::Slider
1083 force_w => 100, 1363 force_w => 100,
1084 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1364 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1085 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. "
1086 . "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, "
1087 . "but you also increase bandwidth requirements and latency. " 1367 . "but you also increase bandwidth requirements and latency. "
1088 . "This option is only used once at log-in.", 1368 . "This option is only used once at log-in.",
1089 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 },
1090 ); 1370 );
1091 1371
1092 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1093 $table->add (1, 8, new CFPlus::UI::CheckBox
1094 state => $CFG->{face_prefetch},
1095 tooltip => "<b>Background Image Prefetch</b>\n\n"
1096 . "If enabled, the client automatically pre-fetches images from the server. "
1097 . "This might increase or create lag, but increases the chances "
1098 . "of faces being ready for display when you encounter them. "
1099 . "It also uses up server bandwidth on every connect, "
1100 . "so only set it if you really need to prefetch images. "
1101 . "This option can be set and unset any time.",
1102 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1103 );
1104
1105 $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");
1106 $table->add (1, 9, new CFPlus::UI::Entry 1373 $table->add_at (1, 8, new CFPlus::UI::Entry
1107 text => $CFG->{output_rate}, 1374 text => $CFG->{output_rate},
1108 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 "
1109 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1376 . "when sending data. When 0 or unset, the server "
1110 . "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.",
1111 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1379 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1112 ); 1380 );
1113 1381
1114 $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");
1115 $table->add (1, 10, new CFPlus::UI::Entry 1383 $table->add_at (1, 9, new CFPlus::UI::Entry
1116 text => $CFG->{output_count}, 1384 text => $CFG->{output_count},
1117 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.",
1118 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1386 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1119 ); 1387 );
1120 1388
1121 $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");
1122 $table->add (1, 11, new CFPlus::UI::Entry 1390 $table->add_at (1, 10, new CFPlus::UI::Entry
1123 text => $CFG->{output_sync}, 1391 text => $CFG->{output_sync},
1124 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.",
1125 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1393 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1126 ); 1394 );
1127 1395
1128 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1396 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1129 expand => 1, 1397 expand => 1,
1130 align => 0, 1398 align => 0,
1131 text => "Login", 1399 text => "Login",
1132 on_activate => sub { 1400 on_activate => sub {
1133 $CONN ? stop_game 1401 $CONN ? stop_game
1134 : start_game; 1402 : start_game;
1135 0 1403 1
1136 }, 1404 },
1137 ); 1405 );
1138 1406
1139 $vbox->add (new CFPlus::UI::FancyFrame 1407 $vbox->add (new CFPlus::UI::FancyFrame
1140 label => "Server Info", 1408 label => "Server Info",
… …
1147sub client_setup { 1415sub client_setup {
1148 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];
1149 1417
1150 my $row = 0; 1418 my $row = 0;
1151 1419
1152 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1153 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1154 text => $CFG->{say_command},
1155 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. "
1156 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1157 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1158 on_changed => sub {
1159 my ($self, $value) = @_;
1160 $CFG->{say_command} = $value;
1161 0
1162 }
1163 );
1164
1165 $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");
1166 $table->add (1, $row++, new CFPlus::UI::CheckBox 1421 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1167 state => $CFG->{show_tips}, 1422 state => $CFG->{show_tips},
1168 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?",
1169 on_changed => sub { 1424 on_changed => sub {
1170 my ($self, $value) = @_; 1425 my ($self, $value) = @_;
1171 $CFG->{show_tips} = $value; 1426 $CFG->{show_tips} = $value;
1172 0 1427 0
1173 } 1428 }
1174 ); 1429 );
1175 1430
1176 $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");
1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1432 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1178 text => $CFG->{logview_max_par}, 1433 text => $CFG->{logview_max_par},
1179 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 "
1180 . "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 "
1181 . "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.",
1182 on_changed => sub { 1437 on_changed => sub {
1183 my ($self, $value) = @_; 1438 my ($self, $value) = @_;
1184 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1439 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1185 0 1440 0
1186 }, 1441 },
1187 ); 1442 );
1188 1443
1189 $table 1444 $table
1190} 1445}
1191 1446
1192sub message_window {
1193 my $window = new CFPlus::UI::Toplevel
1194 name => "message_window",
1195 title => "Messages",
1196 border_bg => [1, 1, 1, 1],
1197 x => "max",
1198 y => 0,
1199 force_w => $::WIDTH * 0.4,
1200 force_h => $::HEIGHT * 0.5,
1201 child => (my $vbox = new CFPlus::UI::VBox),
1202 has_close_button => 1;
1203
1204 $vbox->add ($LOGVIEW);
1205
1206 $vbox->add (my $input = new CFPlus::UI::Entry
1207 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1208 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1209 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1210 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1211 on_focus_in => sub {
1212 my ($input, $prev_focus) = @_;
1213
1214 delete $input->{refocus_map};
1215
1216 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1217 $input->{refocus_map} = 1;
1218 }
1219 delete $input->{auto_activated};
1220
1221 0
1222 },
1223 on_activate => sub {
1224 my ($input, $text) = @_;
1225 $input->set_text ('');
1226
1227 if ($text =~ /^\/(.*)/) {
1228 $::CONN->user_send ($1);
1229 } else {
1230 my $say_cmd = $::CFG->{say_command} || 'say';
1231 $::CONN->user_send ("$say_cmd $text");
1232 }
1233 if ($input->{refocus_map}) {
1234 delete $input->{refocus_map};
1235 $MAPWIDGET->focus_in
1236 }
1237
1238 0
1239 },
1240 on_escape => sub {
1241 $MAPWIDGET->grab_focus;
1242
1243 0
1244 },
1245 );
1246
1247 $CONSOLE = {
1248 window => $window,
1249 input => $input,
1250 };
1251
1252 $window
1253}
1254
1255sub autopickup_setup { 1447sub autopickup_setup {
1448 my $r = new CFPlus::UI::ScrolledWindow (
1449 expand => 1,
1450 scroll_y => 1
1451 );
1256 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 );
1257 1456
1258 for ( 1457 for (
1259 ["General", 0, 0, 1458 ["General", 0, 0,
1260 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1459 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1261 ["Inhibit autopickup" => PICKUP_INHIBIT], 1460 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1296 ], 1495 ],
1297 ["Weight/Value ratio", 2, 17] 1496 ["Weight/Value ratio", 2, 17]
1298 ) 1497 )
1299 { 1498 {
1300 my ($title, $x, $y, @bits) = @$_; 1499 my ($title, $x, $y, @bits) = @$_;
1301 $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]);
1302 1501
1303 for (@bits) { 1502 for (@bits) {
1304 ++$y; 1503 ++$y;
1305 1504
1306 my $mask = $_->[1]; 1505 my $mask = $_->[1];
1307 $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);
1308 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1507 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1309 state => $::CFG->{pickup} & $mask, 1508 state => $::CFG->{pickup} & $mask,
1310 on_changed => sub { 1509 on_changed => sub {
1311 my ($box, $value) = @_; 1510 my ($box, $value) = @_;
1312 1511
1313 if ($value) { 1512 if ($value) {
… …
1324 1523
1325 ${$_->[2]} = $checkbox if $_->[2]; 1524 ${$_->[2]} = $checkbox if $_->[2];
1326 } 1525 }
1327 } 1526 }
1328 1527
1329 $table->add (2, 18, new CFPlus::UI::ValSlider 1528 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1330 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1529 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1331 template => ">= 99", 1530 template => ">= 99",
1332 to_value => sub { ">= " . 5 * $_[0] }, 1531 to_value => sub { ">= " . 5 * $_[0] },
1333 on_changed => sub { 1532 on_changed => sub {
1334 my ($slider, $value) = @_; 1533 my ($slider, $value) = @_;
… …
1337 $::CFG->{pickup} |= int $value 1536 $::CFG->{pickup} |= int $value
1338 if $value; 1537 if $value;
1339 1; 1538 1;
1340 }); 1539 });
1341 1540
1342 $table->add (3, 18, new CFPlus::UI::Button 1541 $table->add_at (3, 18, new CFPlus::UI::Button
1343 text => "set", 1542 text => "set",
1344 on_activate => sub { 1543 on_activate => sub {
1345 $::CONN->send_command ("pickup $::CFG->{pickup}") 1544 $::CONN->send_command ("pickup $::CFG->{pickup}")
1346 if defined $::CONN; 1545 if defined $::CONN;
1347 0 1546 0
1348 }); 1547 });
1349 1548
1350 $table 1549 $r
1351} 1550}
1352 1551
1353my %SORT_ORDER = ( 1552my %SORT_ORDER = (
1354 type => undef, 1553 type => undef,
1355 mtime => sub { 1554 mtime => sub {
… …
1410 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1609 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1411 1610
1412 $hb 1611 $hb
1413} 1612}
1414 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
1415sub toggle_player_page { 1654sub toggle_player_page {
1416 my ($widget) = @_; 1655 my ($widget) = @_;
1417 1656
1418 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1657 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1419 $PL_WINDOW->hide; 1658 $PL_WINDOW->hide;
… …
1434 has_close_button => 1 1673 has_close_button => 1
1435 ; 1674 ;
1436 1675
1437 my $ntb = 1676 my $ntb =
1438 $PL_NOTEBOOK = 1677 $PL_NOTEBOOK =
1439 new CFPlus::UI::Notebook expand => 1, debug => 1; 1678 new CFPlus::UI::Notebook expand => 1;
1440 1679
1441 $ntb->add ( 1680 $ntb->add_tab (
1442 "Statistics (F2)" => $STATS_PAGE = stats_window, 1681 "Statistics (F2)" => $STATS_PAGE = stats_window,
1443 "Shows statistics, where all your Stats and Resistances are shown." 1682 "Shows statistics, where all your Stats and Resistances are shown."
1444 ); 1683 );
1445 $ntb->add ( 1684 $ntb->add_tab (
1446 "Skills (F3)" => $SKILL_PAGE = skill_window, 1685 "Skills (F3)" => $SKILL_PAGE = skill_window,
1447 "Shows all your Skills." 1686 "Shows all your Skills."
1448 ); 1687 );
1449 1688
1450 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);
1451 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1690 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1452 $ntb->add ( 1691 $ntb->add_tab (
1453 "Spellbook (F4)" => $spellsw, 1692 "Spellbook (F4)" => $spellsw,
1454 "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."
1455 ); 1694 );
1456 $ntb->add ( 1695 $ntb->add_tab (
1457 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1696 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1458 "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 :). "
1459 . "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."
1460 ); 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.");
1461 1705
1462 $ntb->set_current_page ($INVENTORY_PAGE); 1706 $ntb->set_current_page ($INVENTORY_PAGE);
1463 1707
1464 $plwin->add ($ntb); 1708 $plwin->add ($ntb);
1465 $plwin 1709 $plwin
… …
1662 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1906 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1663 $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]);
1664 1908
1665 $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]);
1666 1910
1667 $table->add (0, 0, new CFPlus::UI::Button 1911 $table->add_at (0, 0, new CFPlus::UI::Button
1668 text => "Close", 1912 text => "Close",
1669 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>.",
1670 on_activate => $close, 1914 on_activate => $close,
1671 ); 1915 );
1672 1916
1673 $table->add (2, 0, new CFPlus::UI::Button 1917 $table->add_at (2, 0, new CFPlus::UI::Button
1674 text => "Next", 1918 text => "Next",
1675 tooltip => "Show the next <b>Tip of the day</b>.", 1919 tooltip => "Show the next <b>Tip of the day</b>.",
1676 on_activate => sub { 1920 on_activate => sub {
1677 $close->(); 1921 $close->();
1678 &show_tip_of_the_day; 1922 &show_tip_of_the_day;
… …
1687 CFPlus::SDL_Init 1931 CFPlus::SDL_Init
1688 and die "SDL::Init failed!\n"; 1932 and die "SDL::Init failed!\n";
1689} 1933}
1690 1934
1691sub video_init { 1935sub video_init {
1692 sdl_init;
1693
1694 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1936 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1695 1937
1696 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1938 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1697 1939
1698 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1940 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1699 $FULLSCREEN = $CFG->{fullscreen}; 1941 $FULLSCREEN = $CFG->{fullscreen};
1700 $FAST = $CFG->{fast}; 1942 $FAST = $CFG->{fast};
1701 1943
1702 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1944 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1703 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1945 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1704 1946
1705 $SDL_ACTIVE = 1; 1947 $SDL_ACTIVE = 1;
1706 $LAST_REFRESH = time - 0.01; 1948 $LAST_REFRESH = time - 0.01;
1707 1949
… …
1749 1991
1750 $MAPWIDGET = new CFPlus::MapWidget; 1992 $MAPWIDGET = new CFPlus::MapWidget;
1751 $MAPWIDGET->connect (activate_console => sub { 1993 $MAPWIDGET->connect (activate_console => sub {
1752 my ($mapwidget, $preset) = @_; 1994 my ($mapwidget, $preset) = @_;
1753 1995
1754 if ($CONSOLE) { 1996 $MESSAGE_WINDOW->activate_console ($preset)
1755 $CONSOLE->{input}->{auto_activated} = 1; 1997 if $MESSAGE_WINDOW;
1756 $CONSOLE->{input}->grab_focus;
1757
1758 if ($preset && $CONSOLE->{input}->get_text eq '') {
1759 $CONSOLE->{input}->set_text ($preset);
1760 }
1761 }
1762 }); 1998 });
1763 $MAPWIDGET->show; 1999 $MAPWIDGET->show;
1764 $MAPWIDGET->grab_focus; 2000 $MAPWIDGET->grab_focus;
1765
1766 $LOGVIEW = new CFPlus::UI::TextScroller
1767 expand => 1,
1768 font => $FONT_FIXED,
1769 fontsize => $::CFG->{log_fontsize},
1770 indent => -4,
1771 can_hover => 1,
1772 can_events => 1,
1773 max_par => $CFG->{logview_max_par},
1774 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1775 ;
1776 2001
1777 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2002 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1778 title => "Setup", 2003 title => "Setup",
1779 name => "setup_dialog", 2004 name => "setup_dialog",
1780 x => 'center', 2005 x => 'center',
… …
1784 force_h => $::HEIGHT * 0.6, 2009 force_h => $::HEIGHT * 0.6,
1785 has_close_button => 1, 2010 has_close_button => 1,
1786 ; 2011 ;
1787 2012
1788 $METASERVER = metaserver_dialog; 2013 $METASERVER = metaserver_dialog;
2014 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1789 2015
1790 $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,
1791 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2017 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 2018
1793 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2019 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1794 "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.");
1795 $SETUP_NOTEBOOK->add (Client => client_setup, 2021 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1796 "Configure various client-specific settings."); 2022 "Configure various client-specific settings.");
1797 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1798 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1799 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2023 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1800 "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.");
1801 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2025 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1802 "Configure the use of audio, sound effects and background music."); 2026 "Configure the use of audio, sound effects and background music.");
1803 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2027 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1804 "Lets you define, edit and delete key bindings." 2028 "Lets you define, edit and delete key bindings."
1805 . "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 "
1806 . "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 "
1807 . "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. "
1808 . "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 "
1809 . "binding editor closes"); 2033 . "binding editor closes");
1810 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2034 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1811 "Some debuggin' options. Do not ask."); 2035 "Some debuggin' options. Do not ask.");
1812 2036
1813 $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
1814 2038
1815 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2039 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1816 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.");
1817 2041
1818 $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,
1819 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.");
1820 2044
1821 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
1822 2046
1823 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2047 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1856 } 2080 }
1857 2081
1858 $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]);
1859} 2083}
1860 2084
1861sub setup_build_button {
1862 my ($enabled) = @_;
1863 if ($enabled) {
1864 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1865 $BUILD_BUTTON ||= new CFPlus::UI::Button
1866 text => "Build",
1867 tooltip => "Opens the ingame builder",
1868 on_activate => sub {
1869 if ($CONN) {
1870 $CONN->send_ext_req (builder_player_items => sub {
1871 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1872 });
1873 }
1874 0
1875 };
1876 $BUTTONBAR->add ($BUILD_BUTTON);
1877 } else {
1878 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1879 }
1880}
1881
1882sub open_ingame_editor {
1883 my ($msg) = @_;
1884
1885 my $win = new CFPlus::UI::Toplevel
1886 x => 0,
1887 y => 'center',
1888 z => 4,
1889 name => 'builder_window',
1890 force_w => int $WIDTH * 1/4,
1891 force_h => int $HEIGHT * 3/4,
1892 title => "In game builder",
1893 has_close_button => 1;
1894
1895 my $r = new CFPlus::UI::ScrolledWindow (
1896 expand => 1,
1897 scroll_y => 1
1898 );
1899 $r->add (my $vb = new CFPlus::UI::VBox);
1900 $win->add ($r);
1901
1902
1903 $vb->add (
1904 new CFPlus::UI::Button
1905 text => "Disable build mode",
1906 on_activate => sub { $::IN_BUILD_MODE = undef }
1907 );
1908 $vb->add (
1909 new CFPlus::UI::Button
1910 text => "ERASE",
1911 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1912 );
1913
1914 for my $itemarchname (
1915 sort {
1916 $msg->{items}->{$a}->{build_arch_name}
1917 cmp $msg->{items}->{$b}->{build_arch_name}
1918 } keys %{$msg->{items}}
1919 ) {
1920 my $info = $msg->{items}->{$itemarchname};
1921 $vb->add (
1922 new CFPlus::UI::Button text => $info->{build_arch_name},
1923 on_activate => sub {
1924 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1925
1926 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1927 build_mode_query_arch_info ();
1928 }
1929 }
1930 );
1931 }
1932
1933 $win->show;
1934}
1935
1936sub build_mode_query_arch_info {
1937 my ($iteminfo) = $::IN_BUILD_MODE;
1938 my $itemarchname = $iteminfo->{item};
1939 my $info = $iteminfo->{info};
1940
1941 my $dialog = new CFPlus::UI::Toplevel
1942 x => "center",
1943 y => "center",
1944 z => 50,
1945 force_w => int $WIDTH * 1/2,
1946 title => "Enter information for placement of '$itemarchname'",
1947 has_close_button => 1;
1948
1949 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1950
1951 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1952 my $row = 0;
1953 if ($info->{has_name}) {
1954 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1955 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1956 }
1957 if ($info->{has_text}) {
1958 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1959 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1960 }
1961 if ($info->{has_connection}) {
1962 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1963 $table->add (1, $row++,
1964 new CFPlus::UI::Entry
1965 expand => 1,
1966 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1967 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1968 );
1969 }
1970
1971 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1972 $hb->add (new CFPlus::UI::Button
1973 text => "Close",
1974 expand => 1,
1975 on_activate => sub { $dialog->hide; 0 },
1976 );
1977 $dialog->show;
1978}
1979
1980sub video_shutdown { 2085sub video_shutdown {
1981 CFPlus::OpenGL::shutdown; 2086 CFPlus::OpenGL::shutdown;
1982 2087
1983 undef $SDL_ACTIVE; 2088 undef $SDL_ACTIVE;
1984} 2089}
1985 2090
1986my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1987my $bgmusic;#TODO#hack#d#
1988
1989sub audio_channel_finished {
1990 my ($channel) = @_;
1991
1992 #warn "channel $channel finished\n";#d#
1993}
1994
1995sub audio_music_finished {
1996 return unless $CFG->{bgm_enable};
1997
1998 # TODO: hack, do play loop and mood music
1999 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2000 $bgmusic->play (0);
2001
2002 push @bgmusic, shift @bgmusic;
2003}
2004
2005sub audio_init {
2006 if ($CFG->{audio_enable}) {
2007 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2008 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2009
2010 unless ($SDL_MIXER) {
2011 status "Unable to open sound device: there will be no sound";
2012 return;
2013 }
2014
2015 CFPlus::Mix_AllocateChannels 8;
2016 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2017
2018 audio_music_finished;
2019
2020 local $_;
2021 while (<$fh>) {
2022 next if /^\s*#/;
2023 next if /^\s*$/;
2024
2025 my ($file, $volume, $event) = split /\s+/, $_, 3;
2026
2027 push @SOUNDS, "$volume,$file";
2028
2029 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2030 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2031 $chunk->volume ($volume * 128 / 100);
2032 $chunk
2033 };
2034 }
2035 } else {
2036 status "unable to open sound config: $!";
2037 }
2038 }
2039}
2040
2041sub audio_shutdown {
2042 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2043 undef $SDL_MIXER;
2044 @SOUNDS = ();
2045 %AUDIO_CHUNKS = ();
2046}
2047
2048my %animate_object; 2091my %animate_object;
2049my $animate_timer; 2092my $animate_timer;
2050 2093
2051my $fps = 9; 2094my $fps = 9;
2052
2053my %demo;#d#
2054 2095
2055sub force_refresh { 2096sub force_refresh {
2056 $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;
2057 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2058 2099
2059 $CFPlus::UI::ROOT->draw; 2100 $CFPlus::UI::ROOT->draw;
2060 2101
2061 $WANT_REFRESH = 0; 2102 $WANT_REFRESH = 0;
2062 $CAN_REFRESH = 0; 2103 $CAN_REFRESH = 0;
2063 $LAST_REFRESH = $NOW; 2104 $LAST_REFRESH = $NOW;
2064 2105
2065 CFPlus::SDL_GL_SwapBuffers; 2106 CFPlus::SDL_GL_SwapBuffers;
2066} 2107}
2067 2108
2068my $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 {
2069 $NOW = time; 2110 $NOW = time;
2070 2111
2071 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2072 for CFPlus::SDL_PollEvent; 2113 for CFPlus::poll_events;
2073 2114
2074 if (%animate_object) { 2115 if (%animate_object) {
2075 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2076 $WANT_REFRESH++; 2117 ++$WANT_REFRESH;
2077 } 2118 }
2078 2119
2079 if ($WANT_REFRESH) { 2120 if ($WANT_REFRESH) {
2080 force_refresh; 2121 force_refresh;
2081 } else { 2122 } else {
… …
2090 2131
2091sub animation_stop { 2132sub animation_stop {
2092 my ($widget) = @_; 2133 my ($widget) = @_;
2093 delete $animate_object{$widget}; 2134 delete $animate_object{$widget};
2094} 2135}
2095
2096# check once/second for faces that need to be prefetched
2097# this should, of course, only run on demand, but
2098# SDL forces worse things on us....
2099
2100Event->timer (after => 1, interval => 0.25, cb => sub {
2101 $CONN->face_prefetch
2102 if $CONN;
2103});
2104 2136
2105%SDL_CB = ( 2137%SDL_CB = (
2106 CFPlus::SDL_QUIT => sub { 2138 CFPlus::SDL_QUIT => sub {
2107 exit; 2139 exit;
2108 }, 2140 },
… …
2111 CFPlus::SDL_VIDEOEXPOSE => sub { 2143 CFPlus::SDL_VIDEOEXPOSE => sub {
2112 CFPlus::UI::full_refresh; 2144 CFPlus::UI::full_refresh;
2113 }, 2145 },
2114 CFPlus::SDL_ACTIVEEVENT => sub { 2146 CFPlus::SDL_ACTIVEEVENT => sub {
2115# not useful, as APPACTIVE include sonly iconified state, not unmapped 2147# not useful, as APPACTIVE include sonly iconified state, not unmapped
2116# 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#
2117# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2150# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2118# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2151# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2119# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2152# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2120 }, 2153 },
2121 CFPlus::SDL_KEYDOWN => sub { 2154 CFPlus::SDL_KEYDOWN => sub {
… …
2151 2184
2152 CFPlus::UI::set_layout ($::CFG->{layout}); 2185 CFPlus::UI::set_layout ($::CFG->{layout});
2153 2186
2154 my %DEF_CFG = ( 2187 my %DEF_CFG = (
2155 sdl_mode => 0, 2188 sdl_mode => 0,
2156 width => 640,
2157 height => 480,
2158 fullscreen => 0, 2189 fullscreen => 0,
2159 fast => 0, 2190 fast => 0,
2160 map_scale => 1, 2191 map_scale => 1,
2161 fow_enable => 1, 2192 fow_enable => 1,
2162 fow_intensity => 0.45, 2193 fow_intensity => 0,
2163 fow_smooth => 0,
2164 map_smoothing => 1, 2194 map_smoothing => 1,
2165 gui_fontsize => 1, 2195 gui_fontsize => 1,
2166 log_fontsize => 0.7, 2196 log_fontsize => 0.7,
2167 gauge_fontsize => 1, 2197 gauge_fontsize => 1,
2168 gauge_size => 0.35, 2198 gauge_size => 0.35,
2169 stat_fontsize => 0.7, 2199 stat_fontsize => 0.7,
2170 mapsize => 100, 2200 mapsize => 100,
2171 say_command => 'chat',
2172 audio_enable => 1, 2201 audio_enable => 1,
2202 effects_enable => 1,
2203 effects_volume => 1,
2173 bgm_enable => 1, 2204 bgm_enable => 1,
2174 bgm_volume => 0.25, 2205 bgm_volume => 0.5,
2175 face_prefetch => 0,
2176 output_sync => 1, 2206 output_sync => 1,
2177 output_count => 1, 2207 output_count => 1,
2178 output_rate => "", 2208 output_rate => "",
2179 pickup => 0, 2209 pickup => 0,
2180 inv_sort => "mtime", 2210 inv_sort => "mtime",
… …
2202 } 2232 }
2203 } 2233 }
2204 2234
2205 sdl_init; 2235 sdl_init;
2206 2236
2207 @SDL_MODES = reverse 2237 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2208 grep $_->[0] >= 640 && $_->[1] >= 480, 2238 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2209 CFPlus::SDL_ListModes;
2210
2211 @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;
2212 2242
2213 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2243 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2214 2244
2215 { 2245 {
2216 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2246 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2258Event::loop; 2288Event::loop;
2259#CFPlus::SDL_Quit; 2289#CFPlus::SDL_Quit;
2260#CFPlus::_exit 0; 2290#CFPlus::_exit 0;
2261 2291
2262END { 2292END {
2293 video_shutdown;
2294 audio_shutdown;
2263 CFPlus::SDL_Quit; 2295 CFPlus::SDL_Quit;
2264 CFPlus::DB::Server::stop; 2296 CFPlus::DB::Server::stop;
2265} 2297}
2266 2298
2267=head1 NAME 2299=head1 NAME
2268 2300
2269cfplus - A Crossfire+ and Crossfire game client 2301cfplus - A Crossfire TRT and Crossfire game client
2270 2302
2271=head1 SYNOPSIS 2303=head1 SYNOPSIS
2272 2304
2273Just run it - no commandline arguments are supported. 2305Just run it - no commandline arguments are supported.
2274 2306
2275=head1 USAGE 2307=head1 USAGE
2276 2308
2277cfplus 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
2278fullscreen and interactively. 2310be used in fullscreen mode and interactively.
2279 2311
2280=head1 DEBUGGING 2312=head1 DEBUGGING
2281 2313
2282 2314
2283CFPLUS_DEBUG - environment variable 2315CFPLUS_DEBUG - environment variable

Diff Legend

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