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.208 by root, Fri Aug 10 04:02:14 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" };
… …
88our $CONN; 113our $CONN;
89our $PROFILE; # current profile 114our $PROFILE; # current profile
90our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
91 116
92our $WANT_REFRESH; 117our $WANT_REFRESH;
93our $CAN_REFRESH;
94 118
95our @SDL_MODES; 119our @SDL_MODES;
96our $WIDTH; 120our $WIDTH;
97our $HEIGHT; 121our $HEIGHT;
98our $FULLSCREEN; 122our $FULLSCREEN;
… …
103 127
104our $MAP; 128our $MAP;
105our $MAPMAP; 129our $MAPMAP;
106our $MAPWIDGET; 130our $MAPWIDGET;
107our $BUTTONBAR; 131our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 132our $METASERVER;
111our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 134our $QUIT_DIALOG;
113our $HOST_ENTRY; 135our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
122 144
123our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
124our $PL_WINDOW; 146our $PL_WINDOW;
125 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
126our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
127our $STATS_PAGE; 152our $STATS_PAGE;
128our $SKILL_PAGE; 153our $SKILL_PAGE;
129our $SPELL_PAGE; 154our $SPELL_PAGE;
130our $SPELL_LIST; 155our $SPELL_LIST;
… …
136our $STATWIDS; 161our $STATWIDS;
137 162
138our $SDL_ACTIVE; 163our $SDL_ACTIVE;
139our %SDL_CB; 164our %SDL_CB;
140 165
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 167our $STATUSBOX;
147our $DEBUG_STATUS; 168our $DEBUG_STATUS;
148 169
149our $INV; 170our $INV;
150our $INVR; 171our $INVR;
151our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
152 173
153our $PICKUP_CFG; 174our $PICKUP_CFG;
154 175
155our $IN_BUILD_MODE; 176#############################################################################
156our $BUILD_BUTTON;
157 177
158sub status { 178sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 180}
161 181
… …
163 $DEBUG_STATUS->set_text ($_[0]); 183 $DEBUG_STATUS->set_text ($_[0]);
164} 184}
165 185
166sub message { 186sub message {
167 my ($para) = @_; 187 my ($para) = @_;
168 188 $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} 189}
190
191#############################################################################
192#TODO: maybe move into own audio module...
193
194our $SDL_MIXER;
195
196our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
197our $MUSIC_WANT; # arryref of ambient music we want to play
198our @MUSIC_HAVE; # ambient music we have on disk
199our $MUSIC_START;
200our @MUSIC_JINGLE; # which jingles to play next
201our $MUSIC_PLAYING_DATA;
202our $MUSIC_PLAYING_META;
203our $MUSIC_PLAYER;
204our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
205
206our %AUDIO_CHUNK; # audio "files"
207our %AUDIO_PLAY; # which audio faces should be played
208
209sub audio_channel_finished {
210 my ($channel) = @_;
211
212# warn "channel $channel finished\n";#d#
213}
214
215sub audio_sound_push($) {
216 my ($face) = @_;
217
218 $CFG->{effects_enable}
219 or return;
220
221 $AUDIO_PLAY{$face}
222 or return;
223
224 if (my $chunk = $AUDIO_CHUNK{$face}) {
225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
226 my (undef, $dx, $dy, $vol) = @$_;
227
228 my $channel = CFPlus::Channel::find;
229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
230 $channel->set_position_r ($dx, $dy, 20);
231 $chunk->play ($channel);
232 }
233 } else {
234 # sound_meta not set means data is in flight either way
235 my $meta = $CONN->{sound_meta}{$face}
236 or return;
237
238 # if its a jingle, play it as ambient music
239 if ($meta->{meta}{jingle}) {
240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
242 &audio_music_push ($face);
243 }
244 } else {
245 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops
249 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
250 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
251 $AUDIO_CHUNK{$face} = $chunk;
252
253 audio_sound_push ($face);
254 };
255 }
256 }
257}
258
259sub audio_sound_play {
260 my ($face, $dx, $dy, $vol) = @_;
261
262 $SDL_MIXER
263 or return;
264 $CFG->{effects_enable}
265 or return;
266
267 my $queue = $AUDIO_PLAY{$face} ||= [];
268 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
269 audio_sound_push $face
270 unless @$queue > 1;
271}
272
273sub audio_music_set_meta {
274 my ($meta) = @_;
275
276 $MUSIC_PLAYING_META = $meta;
277 $MUSIC_PLAYING_WIDGET->set_markup (
278 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
279 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
280 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
281 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
282 );
283}
284
285sub audio_music_update_volume {
286 return unless $MUSIC_PLAYING_META;
287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
288 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
289 CFPlus::MixMusic::volume $base * $volume * 128;
290}
291
292sub audio_music_start {
293 my $meta = $MUSIC_PLAYING_META;
294
295 CFPlus::DB::get res_data => $meta->{name}, sub {
296 return unless $SDL_MIXER;
297
298 # music might have changed...
299 $meta eq $MUSIC_PLAYING_META
300 or return &audio_music_start ();
301
302 audio_music_update_volume;
303
304 $MUSIC_PLAYING_DATA = \$_[0];
305
306 my $rwops = $meta->{path}
307 ? new_from_file CFPlus::RW $meta->{path}
308 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
309
310 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
311 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
312
313 my $NOW = time;
314
315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
316 my $pos = $MUSIC_PLAYING_META->{stop_pos};
317 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
318 $MUSIC_START = time - $pos;
319 } else {
320 $MUSIC_PLAYER->play (0);
321 $MUSIC_START = time;
322 }
323
324 delete $meta->{stop_time};
325 delete $meta->{stop_pos};
326 }
327}
328
329sub audio_music_push {
330 return unless $SDL_MIXER;
331
332 my $fade_out;
333
334 if (@MUSIC_JINGLE) {
335 @MUSIC_HAVE = $MUSIC_JINGLE[0];
336 $fade_out = 333;
337 } else {
338 return unless $CFG->{bgm_enable};
339
340 my @have =
341 grep $_,
342 map $CONN->{music_meta}{$_},
343 @$MUSIC_WANT;
344
345 @MUSIC_HAVE = @have
346 if @have;
347
348 # default MUSIC_HAVE == MUSIC_DEFAULT
349 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
350 $fade_out = 1000;
351 }
352
353 # if the currently playing song is acceptable, let it continue
354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
355
356 my $NOW = time;
357
358 if ($MUSIC_PLAYING_META) {
359 $MUSIC_PLAYING_META->{stop_time} = $NOW;
360 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
361 CFPlus::MixMusic::fade_out $fade_out;
362 } else {
363 # sort by stop time, oldest first
364 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
365
366 # if the most recently-played piece played very recently,
367 # resume it, else choose the oldest piece for rotation.
368 audio_music_set_meta
369 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
370 ? $MUSIC_HAVE[-1]
371 : $MUSIC_HAVE[0];
372
373 audio_music_start;
374 }
375}
376
377sub audio_music_set_ambient {
378 my ($songs) = @_;
379
380 $MUSIC_WANT = $songs;
381 audio_music_push;
382}
383
384sub audio_music_finished {
385 # we compress multiple jingles of the same type
386 shift @MUSIC_JINGLE
387 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
388
389 $MUSIC_PLAYING_WIDGET->clear;
390
391 undef $MUSIC_PLAYER;
392 undef $MUSIC_PLAYING_META;
393 undef $MUSIC_PLAYING_DATA;
394
395 audio_music_push;
396}
397
398sub audio_init {
399 if ($CFG->{audio_enable}) {
400 $ENV{MIX_EFFECTSMAXSPEED} = 1;
401 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
402
403 unless ($SDL_MIXER) {
404 status "Unable to open sound device: there will be no sound";
405 return;
406 }
407
408 CFPlus::Mix_AllocateChannels 16;
409
410 audio_music_finished;
411 } else {
412 undef $SDL_MIXER;
413 }
414}
415
416sub audio_shutdown {
417 undef $MUSIC_PLAYER;
418 undef $MUSIC_PLAYING_META;
419 undef $MUSIC_PLAYING_DATA;
420
421 $MUSIC_WANT = [];
422 @MUSIC_JINGLE = ();
423 %AUDIO_PLAY = ();
424 %AUDIO_CHUNK = ();
425
426 CFPlus::Mix_CloseAudio if $SDL_MIXER;
427 undef $SDL_MIXER;
428}
429
430#############################################################################
176 431
177sub destroy_query_dialog { 432sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 433 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 434 if $_[0]{query_dialog};
180} 435}
… …
244 ellipsise => 0, 499 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 500 markup => "\nOr use your keyboard and the text entry below:\n";
246 501
247 unshift @dialog, my $table = new CFPlus::UI::Table; 502 unshift @dialog, my $table = new CFPlus::UI::Table;
248 503
249 $table->add (0, 0, new CFPlus::UI::Button 504 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 505 text => "Next Race",
251 on_activate => sub { 506 on_activate => sub {
252 $conn->send ("reply n"); 507 $conn->send ("reply n");
253 destroy_query_dialog $conn; 508 destroy_query_dialog $conn;
254 0 509 0
255 }, 510 },
256 ); 511 );
257 $table->add (2, 0, new CFPlus::UI::Button 512 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 513 text => "Accept",
259 on_activate => sub { 514 on_activate => sub {
260 $conn->send ("reply d"); 515 $conn->send ("reply d");
261 destroy_query_dialog $conn; 516 destroy_query_dialog $conn;
262 0 517 0
… …
269 ellipsise => 0, 524 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 525 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ; 526 ;
272 } 527 }
273 528
274 if ($conn->{chargen_race_title}) {
275 unshift @dialog, new CFPlus::UI::Face 529 unshift @dialog, new CFPlus::UI::Face
276 face => $conn->{player}{face}, 530 face => $conn->{player}{face},
277 bg => [.2, .2, .2, 1], 531 bg => [.2, .2, .2, 1],
278 min_w => 64, 532 min_w => 64,
279 min_h => 64, 533 min_h => 64,
280 ;
281 } 534 ;
282 535
283 if ($conn->{chargen_race_title}) { 536 if ($conn->{chargen_race_title}) {
284 unshift @dialog, new CFPlus::UI::Label 537 unshift @dialog, new CFPlus::UI::Label
285 allign => 1, 538 allign => 1,
286 ellipsise => 0, 539 ellipsise => 0,
… …
299 $conn->send ("reply $stat"); 552 $conn->send ("reply $stat");
300 destroy_query_dialog $conn; 553 destroy_query_dialog $conn;
301 return; 554 return;
302 } 555 }
303 556
304 $STATS_PAGE->show;
305 $MESSAGE_WINDOW->hide;
306
307 unshift @dialog, new CFPlus::UI::Label 557 unshift @dialog, new CFPlus::UI::Label
308 max_w => $::WIDTH * 0.4, 558 max_w => $::WIDTH * 0.4,
309 ellipsise => 0, 559 ellipsise => 0,
310 markup => "\nOr use your keyboard and the text entry below:\n"; 560 markup => "\nOr use your keyboard and the text entry below:\n";
311 561
312 unshift @dialog, my $table = new CFPlus::UI::Table; 562 unshift @dialog, my $table = new CFPlus::UI::Table;
313 563
314 # left: re-roll 564 # left: re-roll
315 $table->add (0, 0, new CFPlus::UI::Button 565 $table->add_at (0, 0, new CFPlus::UI::Button
316 text => "Roll Again", 566 text => "Roll Again",
317 on_activate => sub { 567 on_activate => sub {
318 $conn->send ("reply y"); 568 $conn->send ("reply y");
319 destroy_query_dialog $conn; 569 destroy_query_dialog $conn;
320 0 570 0
… …
334 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 584 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
335 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 585 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
336 ], 586 ],
337 ), 1 .. 2; 587 ), 1 .. 2;
338 588
339 $table->add (2, 0, new CFPlus::UI::Button 589 $table->add_at (2, 0, new CFPlus::UI::Button
340 text => "Swap Stats", 590 text => "Swap Stats",
341 on_activate => sub { 591 on_activate => sub {
342 $conn->{stat_change_with} = $sw2->{value}; 592 $conn->{stat_change_with} = $sw2->{value};
343 $conn->send ("reply $sw1->{value}"); 593 $conn->send ("reply $sw1->{value}");
344 destroy_query_dialog $conn; 594 destroy_query_dialog $conn;
345 0 595 0
346 }, 596 },
347 ); 597 );
348 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 598 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
349 599
350 # right: accept 600 # right: accept
351 $table->add (4, 0, new CFPlus::UI::Button 601 $table->add_at (4, 0, new CFPlus::UI::Button
352 text => "Accept", 602 text => "Accept",
353 on_activate => sub { 603 on_activate => sub {
354 $conn->send ("reply n"); 604 $conn->send ("reply n");
355 $STATS_PAGE->hide; 605 $STATS_PAGE->hide;
356 destroy_query_dialog $conn; 606 destroy_query_dialog $conn;
… …
437 maph => $mapsize, 687 maph => $mapsize,
438 688
439 client => "cfplus $CFPlus::VERSION $] $^O", 689 client => "cfplus $CFPlus::VERSION $] $^O",
440 690
441 map_widget => $MAPWIDGET, 691 map_widget => $MAPWIDGET,
442 logview => $LOGVIEW,
443 statusbox => $STATUSBOX, 692 statusbox => $STATUSBOX,
444 map => $MAP, 693 map => $MAP,
445 mapmap => $MAPMAP, 694 mapmap => $MAPMAP,
446 query => \&server_query, 695 query => \&server_query,
447 696
448 setup_req => { 697 setup_req => {
449 smoothing => $CFG->{map_smoothing}*1, 698 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 }, 699 },
463 }; 700 };
464 701
465 if ($CONN) { 702 if ($CONN) {
466 CFPlus::lowdelay fileno $CONN->{fh}; 703 CFPlus::lowdelay fileno $CONN->{fh};
… …
476 $LOGIN_BUTTON->set_text ("Login"); 713 $LOGIN_BUTTON->set_text ("Login");
477 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 714 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
478 $SETUP_DIALOG->show; 715 $SETUP_DIALOG->show;
479 $PL_WINDOW->hide; 716 $PL_WINDOW->hide;
480 $SPELL_LIST->clear_spells; 717 $SPELL_LIST->clear_spells;
718 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
719
720 &audio_music_set_ambient ([]);
481 721
482 return unless $CONN; 722 return unless $CONN;
483 723
484 status "connection closed"; 724 status "connection closed";
485 725
… …
495 735
496 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 736 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
497 737
498 my $row = 0; 738 my $row = 0;
499 739
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 740 $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, 741 $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, 742 can_events => 1,
503 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 743 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
504 744
745 my $vidmode_tooltip =
746 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
747 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
748
505 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 749 $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); 750 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
507 751
752 $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]); 753 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"); 754 tooltip => $vidmode_tooltip);
755 $hbox->add (my $mode_label = new CFPlus::UI::Label
756 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
757 can_events => 1, tooltip => $vidmode_tooltip);
510 758
511 $mode_slider->connect (changed => sub { 759 $mode_slider->connect (changed => sub {
512 my ($self, $value) = @_; 760 my ($self, $value) = @_;
513 761
514 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 762 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
515 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 763 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
516 }); 764 });
517 $mode_slider->emit (changed => $mode_slider->{range}[0]); 765 $mode_slider->emit (changed => $mode_slider->{range}[0]);
518 766
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 767 $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 768 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
521 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
522 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
524 ); 772 );
525 773
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 774 $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 775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fast}, 776 state => $CFG->{fast},
529 tooltip => "Lower the visual quality considerably to speed up rendering.", 777 tooltip => "Lower the visual quality considerably to speed up rendering.",
530 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
531 ); 779 );
532 780
533 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 781 $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 782 $table->add_at (1, $row++, new CFPlus::UI::Slider
535 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 783 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.", 784 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 }, 785 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538 ); 786 );
539 787
540 $table->add (1, $row++, new CFPlus::UI::Button 788 $table->add_at (1, $row++, new CFPlus::UI::Button
541 expand => 1, align => 0, text => "Apply", 789 expand => 1, align => 0, text => "Apply",
542 tooltip => "Apply the video settings above.", 790 tooltip => "Apply the video settings above.",
543 on_activate => sub { 791 on_activate => sub {
544 video_shutdown (); 792 video_shutdown ();
545 video_init (); 793 video_init ();
546 0 794 0
547 } 795 }
548 ); 796 );
549 797
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 798 $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 799 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 800 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
553 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 801 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 802 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
555 ); 803 );
556 804
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 805 $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 806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{map_smoothing}, 807 state => $CFG->{map_smoothing},
560 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 808 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. " 809 . "This increases load on the graphics subsystem and works only with 2.x servers. "
562 . "Changes take effect at next connection only.", 810 . "Changes take effect at next connection only.",
563 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 811 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
564 ); 812 );
565 813
566 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 814 $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 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
568 state => $CFG->{fow_enable}, 816 state => $CFG->{fow_enable},
569 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 817 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 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
571 ); 819 );
572 820
573 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 821 $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 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 823 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.", 824 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 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
578 ); 826 );
579 827
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"); 828 $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 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 830 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.", 831 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 }, 832 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
597 ); 833 );
598 834
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 835 $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 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
601 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 837 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.", 838 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
603 on_changed => sub { 839 on_changed => sub {
604 $CFG->{gauge_fontsize} = $_[1]; 840 $CFG->{gauge_fontsize} = $_[1];
605 &set_gauge_window_fontsize; 841 &set_gauge_window_fontsize;
606 0 842 0
607 } 843 }
608 ); 844 );
609 845
610 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 846 $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 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
612 range => [$CFG->{gauge_size}, 0.2, 0.8], 848 range => [$CFG->{gauge_size}, 0.2, 0.8],
613 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 849 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
614 on_changed => sub { 850 on_changed => sub {
615 $CFG->{gauge_size} = $_[1]; 851 $CFG->{gauge_size} = $_[1];
616 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 852 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
622} 858}
623 859
624sub audio_setup { 860sub audio_setup {
625 my $vbox = new CFPlus::UI::VBox; 861 my $vbox = new CFPlus::UI::VBox;
626 862
627 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 863 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
628 864
629 my $row = 0; 865 my $row = 0;
630 866
631 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 867 $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 868 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
633 state => $CFG->{audio_enable}, 869 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.", 870 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 } 871 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
636 ); 872 );
637# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 873# $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 { 874# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
639# $CFG->{effects_volume} = $_[1]; 875# $CFG->{effects_volume} = $_[1];
640# }); 876# });
877
878 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
879 $table->add_at (1, $row, new CFPlus::UI::CheckBox
880 expand => 1, state => $CFG->{effects_enable},
881 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
882 on_changed => sub {
883 $CFG->{effects_enable} = $_[1];
884 $CONN->update_fx_want if $CONN;
885 0
886 }
887 );
888 $table->add_at (2, $row++, new CFPlus::UI::Slider
889 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
890 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
891 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
892 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
893 );
894
641 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 895 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
642 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
643 $hbox->add (new CFPlus::UI::CheckBox 896 $table->add_at (1, $row, new CFPlus::UI::CheckBox
644 expand => 1, state => $CFG->{bgm_enable}, 897 expand => 1, state => $CFG->{bgm_enable},
645 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 898 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
646 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 899 on_changed => sub {
900 $CFG->{bgm_enable} = $_[1];
901 $CONN->update_fx_want if $CONN;
902 0
903 }
647 ); 904 );
648 $hbox->add (new CFPlus::UI::Slider 905 $table->add_at (2, $row++, new CFPlus::UI::Slider
649 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 906 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
650 tooltip => "The volume of the background music. Changes are instant.", 907 tooltip => "The volume of the background music. Changes are instant.",
651 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 908 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
652 ); 909 );
653 910
654 $table->add (1, $row++, new CFPlus::UI::Button 911 $table->add_at (1, $row++, new CFPlus::UI::Button
655 expand => 1, align => 0, text => "Apply", 912 c_colspan => 2, expand => 1, align => 0, text => "Apply",
656 tooltip => "Apply the audio settings", 913 tooltip => "Apply the audio settings",
657 on_activate => sub { 914 on_activate => sub {
658 audio_shutdown (); 915 audio_shutdown ();
659 audio_init (); 916 audio_init ();
660 0 917 0
… …
718} 975}
719 976
720sub debug_setup { 977sub debug_setup {
721 my $table = new CFPlus::UI::Table; 978 my $table = new CFPlus::UI::Table;
722 979
723 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 980 $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 }); 981 $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"); 982 $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 }); 983 $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"); 984 $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 }); 985 $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"); 986 $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 }); 987 $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" } ); 988 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
732 989
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# 990 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
991
992 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
993 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
994 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
995 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
996 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
997 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
998
999 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1000
1001 $c->add_items ({
1002 type => "line_loop",
1003 color => [0, 1, 0],
1004 width => 9,
1005 coord_mode => "abs",
1006 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1007 });
1008
1009 $c->add_items ({
1010 type => "lines",
1011 color => [1, 1, 0],
1012 width => 2,
1013 coord_mode => "rel",
1014 coord => [[0,0], [1,1], [1,0], [0,1]],
1015 });
1016
1017 $c->add_items ({
1018 type => "polygon",
1019 color => [0, 0.43, 0],
1020 width => 2,
1021 coord_mode => "rel",
1022 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1023 });
746 1024
747 $table 1025 $table
748} 1026}
749 1027
750sub stats_window { 1028sub stats_window {
… …
798 [2, 4, st_spd => "Spd", 10.54], 1076 [2, 4, st_spd => "Spd", 10.54],
799 [2, 5, st_wspd => "WSp", 10.54], 1077 [2, 5, st_wspd => "WSp", 10.54],
800 ) { 1078 ) {
801 my ($col, $row, $id, $label, $template) = @$_; 1079 my ($col, $row, $id, $label, $template) = @$_;
802 1080
803 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1081 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
804 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1082 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
805 align => +1, template => $template, tooltip => "#stat_$label"); 1083 align => +1, template => $template, tooltip => "#stat_$label");
806 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1084 $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, 1085 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
808 align => -1, text => $label, tooltip => "#stat_$label"); 1086 align => -1, text => $label, tooltip => "#stat_$label");
809 } 1087 }
810 1088
811 $vb->add (new CFPlus::UI::FancyFrame 1089 $vb->add (new CFPlus::UI::FancyFrame
… …
852 cold => ["Cold", 1130 cold => ["Cold",
853 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1131 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
854 ghit => ["Ghost hit", 1132 ghit => ["Ghost hit",
855 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1133 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
856 ); 1134 );
1135
857 for (qw/slow holyw conf fire depl magic 1136 for (qw/slow holyw conf fire depl magic
858 drain acid pois para deat phys 1137 drain acid pois para deat phys
859 blind fear tund elec cold ghit/) 1138 blind fear tund elec cold ghit/)
860 { 1139 {
861 $tbl2->add ($col, $row, 1140 $tbl2->add_at ($col, $row,
862 $STATWIDS->{"res_$_"} = 1141 $STATWIDS->{"res_$_"} =
863 new CFPlus::UI::Label 1142 new CFPlus::UI::Label
864 font => $FONT_FIXED, 1143 font => $FONT_FIXED,
865 template => "-100%", 1144 template => "-100%",
866 align => +1, 1145 align => +1,
867 valign => 0, 1146 valign => 0,
868 can_events => 1, 1147 can_events => 1,
869 can_hover => 1, 1148 can_hover => 1,
870 tooltip => $resist_names{$_}->[1], 1149 tooltip => $resist_names{$_}->[1],
871 ); 1150 );
872 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1151 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
873 font => $FONT_FIXED, 1152 font => $FONT_FIXED,
874 can_hover => 1, 1153 can_hover => 1,
875 can_events => 1, 1154 can_events => 1,
876 path => "ui/resist/resist_$_.png", 1155 path => "ui/resist/resist_$_.png",
877 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
878 ); 1157 );
879 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1158 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
880 text => $resist_names{$_}->[0], 1159 text => $resist_names{$_}->[0],
881 font => $FONT_FIXED, 1160 font => $FONT_FIXED,
882 can_hover => 1, 1161 can_hover => 1,
883 can_events => 1, 1162 can_events => 1,
884 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
… …
917 return if $METASERVER_ATIME > time; 1196 return if $METASERVER_ATIME > time;
918 $METASERVER_ATIME = time + 60; 1197 $METASERVER_ATIME = time + 60;
919 1198
920 my $table = $METASERVER->{table}; 1199 my $table = $METASERVER->{table};
921 $table->clear; 1200 $table->clear;
922 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1201 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
923 1202
924 my $ok = 0; 1203 my $ok = 0;
925 1204
926 CFPlus::background { 1205 CFPlus::background {
927 my $ua = CFPlus::lwp_useragent; 1206 my $ua = CFPlus::lwp_useragent;
… …
938 "The time this server has been running without being restarted.", 1217 "The time this server has been running without being restarted.",
939 "The server software version - a '+' indicates a Crossfire+ server.", 1218 "The server software version - a '+' indicates a Crossfire+ server.",
940 "Short information about this server provided by its admins.", 1219 "Short information about this server provided by its admins.",
941 ); 1220 );
942 my @col = qw(#Users Host Uptime Version Description); 1221 my @col = qw(#Users Host Uptime Version Description);
943 $table->add ($_, 0, new CFPlus::UI::Label 1222 $table->add_at ($_, 0, new CFPlus::UI::Label
944 can_hover => 1, can_events => 1, 1223 can_hover => 1, can_events => 1,
945 align => 0, fg => [1, 1, 0], 1224 align => 0, fg => [1, 1, 0],
946 text => $col[$_], tooltip => $tip[$_]) 1225 text => $col[$_], tooltip => $tip[$_])
947 for 0 .. $#col; 1226 for 0 .. $#col;
948 1227
… …
970 1249
971 $m = [$users, $host, $uptime, $version, $desc]; 1250 $m = [$users, $host, $uptime, $version, $desc];
972 1251
973 $y++; 1252 $y++;
974 1253
975 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1254 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
976 (new CFPlus::UI::Button 1255 (new CFPlus::UI::Button
977 text => "Use", 1256 text => "Use",
978 tooltip => "Put this server into the <b>Host:Port</b> field", 1257 tooltip => "Put this server into the <b>Host:Port</b> field",
979 on_activate => sub { 1258 on_activate => sub {
980 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1259 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
983 }, 1262 },
984 ), 1263 ),
985 (new CFPlus::UI::Empty expand => 1), 1264 (new CFPlus::UI::Empty expand => 1),
986 ]); 1265 ]);
987 1266
988 $table->add ($_, $y, new CFPlus::UI::Label 1267 $table->add_at ($_, $y, new CFPlus::UI::Label
989 max_w => $::WIDTH * 0.4, 1268 max_w => $::WIDTH * 0.4,
990 ellipsise => 0, 1269 ellipsise => 0,
991 align => $align[$_], 1270 align => $align[$_],
992 text => $m->[$_], 1271 text => $m->[$_],
993 tooltip => $tip[$_], 1272 tooltip => $tip[$_],
… …
1034 1313
1035 $vbox->add (new CFPlus::UI::FancyFrame 1314 $vbox->add (new CFPlus::UI::FancyFrame
1036 label => "Connection Settings", 1315 label => "Connection Settings",
1037 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1316 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1038 ); 1317 );
1039 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1318 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1040 1319
1041 { 1320 {
1042 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1321 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1043 1322
1044 $vbox->add ( 1323 $vbox->add (
1045 $HOST_ENTRY = new CFPlus::UI::Entry 1324 $HOST_ENTRY = new CFPlus::UI::Entry
1046 expand => 1, 1325 expand => 1,
1047 text => $CFG->{profile}{default}{host}, 1326 text => $CFG->{profile}{default}{host},
1048 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1327 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1049 on_changed => sub { 1328 on_changed => sub {
1050 my ($self, $value) = @_; 1329 my ($self, $value) = @_;
1051 $CFG->{profile}{default}{host} = $value; 1330 $CFG->{profile}{default}{host} = $value;
1052 0 1331 1
1053 } 1332 }
1054 ); 1333 );
1055 1334
1056 $vbox->add (new CFPlus::UI::Button 1335 $vbox->add (new CFPlus::UI::Button
1057 expand => 1, 1336 expand => 1,
1058 text => "Server List", 1337 text => "Server List",
1059 other => $METASERVER, 1338 other => $METASERVER,
1060 tooltip => "Show a list of available crossfire servers", 1339 tooltip => "Show a list of available crossfire servers",
1061 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1340 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1062 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1341 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1063 ); 1342 );
1064 } 1343 }
1065 1344
1066 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1345 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1067 $table->add (1, 4, new CFPlus::UI::Entry 1346 $table->add_at (1, 4, new CFPlus::UI::Entry
1068 text => $CFG->{profile}{default}{user}, 1347 text => $CFG->{profile}{default}{user},
1069 tooltip => "The name of your character on the server", 1348 tooltip => "The name of your character on the server",
1070 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1349 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1071 ); 1350 );
1072 1351
1073 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1352 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1074 $table->add (1, 5, new CFPlus::UI::Entry 1353 $table->add_at (1, 5, new CFPlus::UI::Entry
1075 text => $CFG->{profile}{default}{password}, 1354 text => $CFG->{profile}{default}{password},
1076 hidden => 1, 1355 hidden => 1,
1077 tooltip => "The password for your character", 1356 tooltip => "The password for your character",
1078 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1357 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1079 ); 1358 );
1080 1359
1081 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1360 $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 1361 $table->add_at (1, 7, new CFPlus::UI::Slider
1083 force_w => 100, 1362 force_w => 100,
1084 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1363 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1085 tooltip => "This is the size of the portion of the map update the server sends you. " 1364 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, " 1365 . "If you set this to a high value you will be able to see further, "
1087 . "but you also increase bandwidth requirements and latency. " 1366 . "but you also increase bandwidth requirements and latency. "
1088 . "This option is only used once at log-in.", 1367 . "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 }, 1368 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1090 ); 1369 );
1091 1370
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"); 1371 $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 1372 $table->add_at (1, 8, new CFPlus::UI::Entry
1107 text => $CFG->{output_rate}, 1373 text => $CFG->{output_rate},
1108 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1374 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 " 1375 . "when sending data. When 0 or unset, the server "
1110 . "default will be used, which is usually around 100kb/s.", 1376 . "default will be used, which is usually around 100kb/s. Most servers will "
1377 . "dynamically find an optimal rate, so adjust this only when necessary.",
1111 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1378 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1112 ); 1379 );
1113 1380
1114 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1381 $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 1382 $table->add_at (1, 9, new CFPlus::UI::Entry
1116 text => $CFG->{output_count}, 1383 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.", 1384 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 }, 1385 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1119 ); 1386 );
1120 1387
1121 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1388 $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 1389 $table->add_at (1, 10, new CFPlus::UI::Entry
1123 text => $CFG->{output_sync}, 1390 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.", 1391 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 }, 1392 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1126 ); 1393 );
1127 1394
1128 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1395 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1129 expand => 1, 1396 expand => 1,
1130 align => 0, 1397 align => 0,
1131 text => "Login", 1398 text => "Login",
1132 on_activate => sub { 1399 on_activate => sub {
1133 $CONN ? stop_game 1400 $CONN ? stop_game
1134 : start_game; 1401 : start_game;
1135 0 1402 1
1136 }, 1403 },
1137 ); 1404 );
1138 1405
1139 $vbox->add (new CFPlus::UI::FancyFrame 1406 $vbox->add (new CFPlus::UI::FancyFrame
1140 label => "Server Info", 1407 label => "Server Info",
… …
1147sub client_setup { 1414sub client_setup {
1148 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1415 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1149 1416
1150 my $row = 0; 1417 my $row = 0;
1151 1418
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"); 1419 $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 1420 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1167 state => $CFG->{show_tips}, 1421 state => $CFG->{show_tips},
1168 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1422 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1169 on_changed => sub { 1423 on_changed => sub {
1170 my ($self, $value) = @_; 1424 my ($self, $value) = @_;
1171 $CFG->{show_tips} = $value; 1425 $CFG->{show_tips} = $value;
1172 0 1426 0
1173 } 1427 }
1174 ); 1428 );
1175 1429
1176 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1430 $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 1431 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1178 text => $CFG->{logview_max_par}, 1432 text => $CFG->{logview_max_par},
1179 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1433 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 " 1434 . "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.", 1435 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1182 on_changed => sub { 1436 on_changed => sub {
1183 my ($self, $value) = @_; 1437 my ($self, $value) = @_;
1184 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1438 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1185 0 1439 0
1186 }, 1440 },
1187 ); 1441 );
1188 1442
1189 $table 1443 $table
1190} 1444}
1191 1445
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 { 1446sub autopickup_setup {
1447 my $r = new CFPlus::UI::ScrolledWindow (
1448 expand => 1,
1449 scroll_y => 1
1450 );
1256 my $table = new CFPlus::UI::Table; 1451 $r->add (my $table = new CFPlus::UI::Table
1452 row_expand => [0],
1453 col_expand => [0, 1, 0, 1],
1454 );
1257 1455
1258 for ( 1456 for (
1259 ["General", 0, 0, 1457 ["General", 0, 0,
1260 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1458 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1261 ["Inhibit autopickup" => PICKUP_INHIBIT], 1459 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1296 ], 1494 ],
1297 ["Weight/Value ratio", 2, 17] 1495 ["Weight/Value ratio", 2, 17]
1298 ) 1496 )
1299 { 1497 {
1300 my ($title, $x, $y, @bits) = @$_; 1498 my ($title, $x, $y, @bits) = @$_;
1301 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1499 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1302 1500
1303 for (@bits) { 1501 for (@bits) {
1304 ++$y; 1502 ++$y;
1305 1503
1306 my $mask = $_->[1]; 1504 my $mask = $_->[1];
1307 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1505 $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 1506 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1309 state => $::CFG->{pickup} & $mask, 1507 state => $::CFG->{pickup} & $mask,
1310 on_changed => sub { 1508 on_changed => sub {
1311 my ($box, $value) = @_; 1509 my ($box, $value) = @_;
1312 1510
1313 if ($value) { 1511 if ($value) {
… …
1324 1522
1325 ${$_->[2]} = $checkbox if $_->[2]; 1523 ${$_->[2]} = $checkbox if $_->[2];
1326 } 1524 }
1327 } 1525 }
1328 1526
1329 $table->add (2, 18, new CFPlus::UI::ValSlider 1527 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1330 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1528 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1331 template => ">= 99", 1529 template => ">= 99",
1332 to_value => sub { ">= " . 5 * $_[0] }, 1530 to_value => sub { ">= " . 5 * $_[0] },
1333 on_changed => sub { 1531 on_changed => sub {
1334 my ($slider, $value) = @_; 1532 my ($slider, $value) = @_;
… …
1337 $::CFG->{pickup} |= int $value 1535 $::CFG->{pickup} |= int $value
1338 if $value; 1536 if $value;
1339 1; 1537 1;
1340 }); 1538 });
1341 1539
1342 $table->add (3, 18, new CFPlus::UI::Button 1540 $table->add_at (3, 18, new CFPlus::UI::Button
1343 text => "set", 1541 text => "set",
1344 on_activate => sub { 1542 on_activate => sub {
1345 $::CONN->send_command ("pickup $::CFG->{pickup}") 1543 $::CONN->send_command ("pickup $::CFG->{pickup}")
1346 if defined $::CONN; 1544 if defined $::CONN;
1347 0 1545 0
1348 }); 1546 });
1349 1547
1350 $table 1548 $r
1351} 1549}
1352 1550
1353my %SORT_ORDER = ( 1551my %SORT_ORDER = (
1354 type => undef, 1552 type => undef,
1355 mtime => sub { 1553 mtime => sub {
… …
1410 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1608 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1411 1609
1412 $hb 1610 $hb
1413} 1611}
1414 1612
1613sub media_window {
1614 my $vb = new CFPlus::UI::VBox;
1615
1616 $vb->add (new CFPlus::UI::FancyFrame
1617 label => "Currently playing music",
1618 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1619 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1620 );
1621
1622 $vb->add (new CFPlus::UI::FancyFrame
1623 label => "Other media used in this session",
1624 expand => 1,
1625 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1626 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1627 );
1628
1629 $vb
1630}
1631
1632sub add_license {
1633 my ($meta) = @_;
1634
1635 $meta = $meta->{meta}
1636 or return;
1637
1638 $meta->{license} || $meta->{author} || $meta->{source}
1639 or return;
1640
1641 $LICENSE_WIDGET->add_paragraph ({
1642 fg => [1, 1, 1, 1],
1643 markup => "<small>"
1644 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1645 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1646 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1647 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1648 . "</small>",
1649 });
1650 $LICENSE_WIDGET->scroll_to_bottom;
1651}
1652
1415sub toggle_player_page { 1653sub toggle_player_page {
1416 my ($widget) = @_; 1654 my ($widget) = @_;
1417 1655
1418 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1656 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1419 $PL_WINDOW->hide; 1657 $PL_WINDOW->hide;
… …
1434 has_close_button => 1 1672 has_close_button => 1
1435 ; 1673 ;
1436 1674
1437 my $ntb = 1675 my $ntb =
1438 $PL_NOTEBOOK = 1676 $PL_NOTEBOOK =
1439 new CFPlus::UI::Notebook expand => 1, debug => 1; 1677 new CFPlus::UI::Notebook expand => 1;
1440 1678
1441 $ntb->add ( 1679 $ntb->add_tab (
1442 "Statistics (F2)" => $STATS_PAGE = stats_window, 1680 "Statistics (F2)" => $STATS_PAGE = stats_window,
1443 "Shows statistics, where all your Stats and Resistances are shown." 1681 "Shows statistics, where all your Stats and Resistances are shown."
1444 ); 1682 );
1445 $ntb->add ( 1683 $ntb->add_tab (
1446 "Skills (F3)" => $SKILL_PAGE = skill_window, 1684 "Skills (F3)" => $SKILL_PAGE = skill_window,
1447 "Shows all your Skills." 1685 "Shows all your Skills."
1448 ); 1686 );
1449 1687
1450 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1688 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1451 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1689 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1452 $ntb->add ( 1690 $ntb->add_tab (
1453 "Spellbook (F4)" => $spellsw, 1691 "Spellbook (F4)" => $spellsw,
1454 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1692 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1455 ); 1693 );
1456 $ntb->add ( 1694 $ntb->add_tab (
1457 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1695 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1458 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1696 "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." 1697 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1460 ); 1698 );
1699 $ntb->add_tab (Pickup => autopickup_setup,
1700 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1701
1702 $ntb->add_tab (Media => media_window,
1703 "License, Author and Source info for media sent by the server.");
1461 1704
1462 $ntb->set_current_page ($INVENTORY_PAGE); 1705 $ntb->set_current_page ($INVENTORY_PAGE);
1463 1706
1464 $plwin->add ($ntb); 1707 $plwin->add ($ntb);
1465 $plwin 1708 $plwin
… …
1662 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1905 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]); 1906 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1664 1907
1665 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1908 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1666 1909
1667 $table->add (0, 0, new CFPlus::UI::Button 1910 $table->add_at (0, 0, new CFPlus::UI::Button
1668 text => "Close", 1911 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>.", 1912 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, 1913 on_activate => $close,
1671 ); 1914 );
1672 1915
1673 $table->add (2, 0, new CFPlus::UI::Button 1916 $table->add_at (2, 0, new CFPlus::UI::Button
1674 text => "Next", 1917 text => "Next",
1675 tooltip => "Show the next <b>Tip of the day</b>.", 1918 tooltip => "Show the next <b>Tip of the day</b>.",
1676 on_activate => sub { 1919 on_activate => sub {
1677 $close->(); 1920 $close->();
1678 &show_tip_of_the_day; 1921 &show_tip_of_the_day;
… …
1687 CFPlus::SDL_Init 1930 CFPlus::SDL_Init
1688 and die "SDL::Init failed!\n"; 1931 and die "SDL::Init failed!\n";
1689} 1932}
1690 1933
1691sub video_init { 1934sub video_init {
1692 sdl_init;
1693
1694 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1935 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1695 1936
1696 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1937 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1697 1938
1698 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1939 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1699 $FULLSCREEN = $CFG->{fullscreen}; 1940 $FULLSCREEN = $CFG->{fullscreen};
1700 $FAST = $CFG->{fast}; 1941 $FAST = $CFG->{fast};
1701 1942
1702 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1943 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1703 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1944 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1704 1945
1705 $SDL_ACTIVE = 1; 1946 $SDL_ACTIVE = 1;
1706 $LAST_REFRESH = time - 0.01; 1947 $LAST_REFRESH = time - 0.01;
1707 1948
… …
1749 1990
1750 $MAPWIDGET = new CFPlus::MapWidget; 1991 $MAPWIDGET = new CFPlus::MapWidget;
1751 $MAPWIDGET->connect (activate_console => sub { 1992 $MAPWIDGET->connect (activate_console => sub {
1752 my ($mapwidget, $preset) = @_; 1993 my ($mapwidget, $preset) = @_;
1753 1994
1754 if ($CONSOLE) { 1995 $MESSAGE_WINDOW->activate_console ($preset)
1755 $CONSOLE->{input}->{auto_activated} = 1; 1996 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 }); 1997 });
1763 $MAPWIDGET->show; 1998 $MAPWIDGET->show;
1764 $MAPWIDGET->grab_focus; 1999 $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 2000
1777 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2001 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1778 title => "Setup", 2002 title => "Setup",
1779 name => "setup_dialog", 2003 name => "setup_dialog",
1780 x => 'center', 2004 x => 'center',
… …
1784 force_h => $::HEIGHT * 0.6, 2008 force_h => $::HEIGHT * 0.6,
1785 has_close_button => 1, 2009 has_close_button => 1,
1786 ; 2010 ;
1787 2011
1788 $METASERVER = metaserver_dialog; 2012 $METASERVER = metaserver_dialog;
2013 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1789 2014
1790 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2015 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1791 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2016 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 2017
1793 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2018 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1794 "Configure the server to play on, your username, password and other server-related options."); 2019 "Configure the server to play on, your username, password and other server-related options.");
1795 $SETUP_NOTEBOOK->add (Client => client_setup, 2020 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1796 "Configure various client-specific settings."); 2021 "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, 2022 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1800 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2023 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1801 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2024 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1802 "Configure the use of audio, sound effects and background music."); 2025 "Configure the use of audio, sound effects and background music.");
1803 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2026 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1804 "Lets you define, edit and delete key bindings." 2027 "Lets you define, edit and delete key bindings."
1805 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2028 . "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 " 2029 . "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. " 2030 . "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 " 2031 . "After pressing the combo the binding will be saved automatically and the "
1809 . "binding editor closes"); 2032 . "binding editor closes");
1810 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2033 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1811 "Some debuggin' options. Do not ask."); 2034 "Some debuggin' options. Do not ask.");
1812 2035
1813 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2036 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1814 2037
1815 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2038 $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."); 2039 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1817 2040
1818 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2041 $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."); 2042 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1820 2043
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 2044 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 2045
1823 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2046 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1856 } 2079 }
1857 2080
1858 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2081 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1859} 2082}
1860 2083
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 { 2084sub video_shutdown {
1981 CFPlus::OpenGL::shutdown; 2085 CFPlus::OpenGL::shutdown;
1982 2086
1983 undef $SDL_ACTIVE; 2087 undef $SDL_ACTIVE;
1984} 2088}
1985 2089
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; 2090my %animate_object;
2049my $animate_timer; 2091my $animate_timer;
2050 2092
2051my $fps = 9; 2093my $fps = 9;
2052 2094
2053my %demo;#d#
2054
2055sub force_refresh { 2095sub force_refresh {
2096 if ($ENV{CFPLUS_DEBUG} & 4) {
2056 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2057 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps;
2099 }
2058 2100
2059 $CFPlus::UI::ROOT->draw; 2101 $CFPlus::UI::ROOT->draw;
2060 2102 CFPlus::SDL_GL_SwapBuffers;
2061 $WANT_REFRESH = 0;
2062 $CAN_REFRESH = 0;
2063 $LAST_REFRESH = $NOW; 2103 $LAST_REFRESH = $NOW;
2064 2104 $WANT_REFRESH->stop;
2065 CFPlus::SDL_GL_SwapBuffers;
2066} 2105}
2067 2106
2107$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2108
2068my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, 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->start;
2077 }
2078
2079 if ($WANT_REFRESH) {
2080 force_refresh;
2081 } else {
2082 $CAN_REFRESH = 1;
2083 } 2118 }
2084}); 2119});
2085 2120
2086sub animation_start { 2121sub animation_start {
2087 my ($widget) = @_; 2122 my ($widget) = @_;
… …
2090 2125
2091sub animation_stop { 2126sub animation_stop {
2092 my ($widget) = @_; 2127 my ($widget) = @_;
2093 delete $animate_object{$widget}; 2128 delete $animate_object{$widget};
2094} 2129}
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 2130
2105%SDL_CB = ( 2131%SDL_CB = (
2106 CFPlus::SDL_QUIT => sub { 2132 CFPlus::SDL_QUIT => sub {
2107 exit; 2133 exit;
2108 }, 2134 },
… …
2111 CFPlus::SDL_VIDEOEXPOSE => sub { 2137 CFPlus::SDL_VIDEOEXPOSE => sub {
2112 CFPlus::UI::full_refresh; 2138 CFPlus::UI::full_refresh;
2113 }, 2139 },
2114 CFPlus::SDL_ACTIVEEVENT => sub { 2140 CFPlus::SDL_ACTIVEEVENT => sub {
2115# not useful, as APPACTIVE include sonly iconified state, not unmapped 2141# not useful, as APPACTIVE include sonly iconified state, not unmapped
2116# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2142# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2143# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2117# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2144# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2118# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2145# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2119# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2146# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2120 }, 2147 },
2121 CFPlus::SDL_KEYDOWN => sub { 2148 CFPlus::SDL_KEYDOWN => sub {
… …
2151 2178
2152 CFPlus::UI::set_layout ($::CFG->{layout}); 2179 CFPlus::UI::set_layout ($::CFG->{layout});
2153 2180
2154 my %DEF_CFG = ( 2181 my %DEF_CFG = (
2155 sdl_mode => 0, 2182 sdl_mode => 0,
2156 width => 640,
2157 height => 480,
2158 fullscreen => 0, 2183 fullscreen => 0,
2159 fast => 0, 2184 fast => 0,
2160 map_scale => 1, 2185 map_scale => 1,
2161 fow_enable => 1, 2186 fow_enable => 1,
2162 fow_intensity => 0.45, 2187 fow_intensity => 0,
2163 fow_smooth => 0,
2164 map_smoothing => 1, 2188 map_smoothing => 1,
2165 gui_fontsize => 1, 2189 gui_fontsize => 1,
2166 log_fontsize => 0.7, 2190 log_fontsize => 0.7,
2167 gauge_fontsize => 1, 2191 gauge_fontsize => 1,
2168 gauge_size => 0.35, 2192 gauge_size => 0.35,
2169 stat_fontsize => 0.7, 2193 stat_fontsize => 0.7,
2170 mapsize => 100, 2194 mapsize => 100,
2171 say_command => 'chat',
2172 audio_enable => 1, 2195 audio_enable => 1,
2196 effects_enable => 1,
2197 effects_volume => 1,
2173 bgm_enable => 1, 2198 bgm_enable => 1,
2174 bgm_volume => 0.25, 2199 bgm_volume => 0.5,
2175 face_prefetch => 0,
2176 output_sync => 1, 2200 output_sync => 1,
2177 output_count => 1, 2201 output_count => 1,
2178 output_rate => "", 2202 output_rate => "",
2179 pickup => 0, 2203 pickup => 0,
2180 inv_sort => "mtime", 2204 inv_sort => "mtime",
… …
2202 } 2226 }
2203 } 2227 }
2204 2228
2205 sdl_init; 2229 sdl_init;
2206 2230
2207 @SDL_MODES = reverse 2231 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2208 grep $_->[0] >= 640 && $_->[1] >= 480, 2232 @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)"; 2233 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2234
2235 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2212 2236
2213 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2237 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2214 2238
2215 { 2239 {
2216 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2240 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2258Event::loop; 2282Event::loop;
2259#CFPlus::SDL_Quit; 2283#CFPlus::SDL_Quit;
2260#CFPlus::_exit 0; 2284#CFPlus::_exit 0;
2261 2285
2262END { 2286END {
2287 video_shutdown;
2288 audio_shutdown;
2263 CFPlus::SDL_Quit; 2289 CFPlus::SDL_Quit;
2264 CFPlus::DB::Server::stop; 2290 CFPlus::DB::Server::stop;
2265} 2291}
2266 2292
2267=head1 NAME 2293=head1 NAME
2268 2294
2269cfplus - A Crossfire+ and Crossfire game client 2295cfplus - A Crossfire TRT and Crossfire game client
2270 2296
2271=head1 SYNOPSIS 2297=head1 SYNOPSIS
2272 2298
2273Just run it - no commandline arguments are supported. 2299Just run it - no commandline arguments are supported.
2274 2300
2275=head1 USAGE 2301=head1 USAGE
2276 2302
2277cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2303cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2278fullscreen and interactively. 2304be used in fullscreen mode and interactively.
2279 2305
2280=head1 DEBUGGING 2306=head1 DEBUGGING
2281 2307
2282 2308
2283CFPLUS_DEBUG - environment variable 2309CFPLUS_DEBUG - environment variable

Diff Legend

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