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.153 by root, Tue Apr 24 01:13:54 2007 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 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 $dx = $dx / 10 * 255;
232 $channel->set_panning (255 - $dx, 255 + $dx);
233
234# my $angle = $dx ? : $dx < 0 ?
235# my $distance = -$vol;
236# $channel->set_position ($angle, $distance);
237
238 $chunk->play ($channel);
239 }
240 } else {
241 # sound_meta not set means data is in flight either way
242 my $meta = $CONN->{sound_meta}{$face}
243 or return;
244
245 # if its a jingle, play it as ambient music
246 if ($meta->{meta}{jingle}) {
247 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
248 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
249 &audio_music_push ($face);
250 }
251 } else {
252 # fetch from database
253 CFPlus::DB::get res_data => $meta->{name}, sub {
254 my $rwops = new CFPlus::RW $_[0];
255 my $chunk = new CFPlus::MixChunk $rwops
256 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
257 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
258 $AUDIO_CHUNK{$face} = $chunk;
259
260 audio_sound_push ($face);
261 };
262 }
263 }
264}
265
266sub audio_sound_play {
267 my ($face, $dx, $dy, $vol) = @_;
268
269 $SDL_MIXER
270 or return;
271 $CFG->{effects_enable}
272 or return;
273
274 my $queue = $AUDIO_PLAY{$face} ||= [];
275 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
276 audio_sound_push $face
277 unless @$queue > 1;
278}
279
280sub audio_music_set_meta {
281 my ($meta) = @_;
282
283 $MUSIC_PLAYING_META = $meta;
284 $MUSIC_PLAYING_WIDGET->set_markup (
285 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
286 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
287 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
288 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
289 );
290}
291
292sub audio_music_update_volume {
293 return unless $MUSIC_PLAYING_META;
294 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
295 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
296 CFPlus::MixMusic::volume $base * $volume * 128;
297}
298
299sub audio_music_start {
300 my $meta = $MUSIC_PLAYING_META;
301
302 CFPlus::DB::get res_data => $meta->{name}, sub {
303 return unless $SDL_MIXER;
304
305 # music might have changed...
306 $meta eq $MUSIC_PLAYING_META
307 or return &audio_music_start ();
308
309 audio_music_update_volume;
310
311 $MUSIC_PLAYING_DATA = \$_[0];
312
313 my $rwops = $meta->{path}
314 ? new_from_file CFPlus::RW $meta->{path}
315 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
316
317 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
318 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
319
320 my $NOW = time;
321
322 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
323 my $pos = $MUSIC_PLAYING_META->{stop_pos};
324 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
325 $MUSIC_START = time - $pos;
326 } else {
327 $MUSIC_PLAYER->play (0);
328 $MUSIC_START = time;
329 }
330
331 delete $meta->{stop_time};
332 delete $meta->{stop_pos};
333 }
334}
335
336sub audio_music_push {
337 return unless $SDL_MIXER;
338
339 my $fade_out;
340
341 if (@MUSIC_JINGLE) {
342 @MUSIC_HAVE = $MUSIC_JINGLE[0];
343 $fade_out = 333;
344 } else {
345 return unless $CFG->{bgm_enable};
346
347 my @have =
348 grep $_,
349 map $CONN->{music_meta}{$_},
350 @$MUSIC_WANT;
351
352 @MUSIC_HAVE = @have
353 if @have;
354
355 # default MUSIC_HAVE == MUSIC_DEFAULT
356 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
357 $fade_out = 1000;
358 }
359
360 # if the currently playing song is acceptable, let it continue
361 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
362
363 my $NOW = time;
364
365 if ($MUSIC_PLAYING_META) {
366 $MUSIC_PLAYING_META->{stop_time} = $NOW;
367 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
368 CFPlus::MixMusic::fade_out $fade_out;
369 } else {
370 # sort by stop time, oldest first
371 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
372
373 # if the most recently-played piece played very recently,
374 # resume it, else choose the oldest piece for rotation.
375 audio_music_set_meta
376 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
377 ? $MUSIC_HAVE[-1]
378 : $MUSIC_HAVE[0];
379
380 audio_music_start;
381 }
382}
383
384sub audio_music_set_ambient {
385 my ($songs) = @_;
386
387 $MUSIC_WANT = $songs;
388 audio_music_push;
389}
390
391sub audio_music_finished {
392 # we compress multiple jingles of the same type
393 shift @MUSIC_JINGLE
394 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
395
396 $MUSIC_PLAYING_WIDGET->clear;
397
398 undef $MUSIC_PLAYER;
399 undef $MUSIC_PLAYING_META;
400 undef $MUSIC_PLAYING_DATA;
401
402 audio_music_push;
403}
404
405sub audio_init {
406 if ($CFG->{audio_enable}) {
407 $ENV{MIX_EFFECTSMAXSPEED} = 1;
408 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
409
410 unless ($SDL_MIXER) {
411 status "Unable to open sound device: there will be no sound";
412 return;
413 }
414
415 CFPlus::Mix_AllocateChannels 16;
416
417 audio_music_finished;
418 } else {
419 undef $SDL_MIXER;
420 }
421}
422
423sub audio_shutdown {
424 undef $MUSIC_PLAYER;
425 undef $MUSIC_PLAYING_META;
426 undef $MUSIC_PLAYING_DATA;
427
428 $MUSIC_WANT = [];
429 @MUSIC_JINGLE = ();
430 %AUDIO_PLAY = ();
431 %AUDIO_CHUNK = ();
432
433 CFPlus::Mix_CloseAudio if $SDL_MIXER;
434 undef $SDL_MIXER;
435}
436
437#############################################################################
176 438
177sub destroy_query_dialog { 439sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 440 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 441 if $_[0]{query_dialog};
180} 442}
… …
244 ellipsise => 0, 506 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 507 markup => "\nOr use your keyboard and the text entry below:\n";
246 508
247 unshift @dialog, my $table = new CFPlus::UI::Table; 509 unshift @dialog, my $table = new CFPlus::UI::Table;
248 510
249 $table->add (0, 0, new CFPlus::UI::Button 511 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 512 text => "Next Race",
251 on_activate => sub { 513 on_activate => sub {
252 $conn->send ("reply n"); 514 $conn->send ("reply n");
253 destroy_query_dialog $conn; 515 destroy_query_dialog $conn;
254 0 516 0
255 }, 517 },
256 ); 518 );
257 $table->add (2, 0, new CFPlus::UI::Button 519 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 520 text => "Accept",
259 on_activate => sub { 521 on_activate => sub {
260 $conn->send ("reply d"); 522 $conn->send ("reply d");
261 destroy_query_dialog $conn; 523 destroy_query_dialog $conn;
262 0 524 0
… …
297 $conn->send ("reply $stat"); 559 $conn->send ("reply $stat");
298 destroy_query_dialog $conn; 560 destroy_query_dialog $conn;
299 return; 561 return;
300 } 562 }
301 563
302 $STATS_PAGE->show;
303 $MESSAGE_WINDOW->hide;
304
305 unshift @dialog, new CFPlus::UI::Label 564 unshift @dialog, new CFPlus::UI::Label
306 max_w => $::WIDTH * 0.4, 565 max_w => $::WIDTH * 0.4,
307 ellipsise => 0, 566 ellipsise => 0,
308 markup => "\nOr use your keyboard and the text entry below:\n"; 567 markup => "\nOr use your keyboard and the text entry below:\n";
309 568
310 unshift @dialog, my $table = new CFPlus::UI::Table; 569 unshift @dialog, my $table = new CFPlus::UI::Table;
311 570
312 # left: re-roll 571 # left: re-roll
313 $table->add (0, 0, new CFPlus::UI::Button 572 $table->add_at (0, 0, new CFPlus::UI::Button
314 text => "Roll Again", 573 text => "Roll Again",
315 on_activate => sub { 574 on_activate => sub {
316 $conn->send ("reply y"); 575 $conn->send ("reply y");
317 destroy_query_dialog $conn; 576 destroy_query_dialog $conn;
318 0 577 0
… …
332 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 591 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
333 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 592 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
334 ], 593 ],
335 ), 1 .. 2; 594 ), 1 .. 2;
336 595
337 $table->add (2, 0, new CFPlus::UI::Button 596 $table->add_at (2, 0, new CFPlus::UI::Button
338 text => "Swap Stats", 597 text => "Swap Stats",
339 on_activate => sub { 598 on_activate => sub {
340 $conn->{stat_change_with} = $sw2->{value}; 599 $conn->{stat_change_with} = $sw2->{value};
341 $conn->send ("reply $sw1->{value}"); 600 $conn->send ("reply $sw1->{value}");
342 destroy_query_dialog $conn; 601 destroy_query_dialog $conn;
343 0 602 0
344 }, 603 },
345 ); 604 );
346 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 605 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
347 606
348 # right: accept 607 # right: accept
349 $table->add (4, 0, new CFPlus::UI::Button 608 $table->add_at (4, 0, new CFPlus::UI::Button
350 text => "Accept", 609 text => "Accept",
351 on_activate => sub { 610 on_activate => sub {
352 $conn->send ("reply n"); 611 $conn->send ("reply n");
353 $STATS_PAGE->hide; 612 $STATS_PAGE->hide;
354 destroy_query_dialog $conn; 613 destroy_query_dialog $conn;
… …
435 maph => $mapsize, 694 maph => $mapsize,
436 695
437 client => "cfplus $CFPlus::VERSION $] $^O", 696 client => "cfplus $CFPlus::VERSION $] $^O",
438 697
439 map_widget => $MAPWIDGET, 698 map_widget => $MAPWIDGET,
440 logview => $LOGVIEW,
441 statusbox => $STATUSBOX, 699 statusbox => $STATUSBOX,
442 map => $MAP, 700 map => $MAP,
443 mapmap => $MAPMAP, 701 mapmap => $MAPMAP,
444 query => \&server_query, 702 query => \&server_query,
445 703
446 setup_req => { 704 setup_req => {
447 smoothing => $CFG->{map_smoothing}*1, 705 smoothing => $CFG->{map_smoothing}*1,
448 },
449
450 sound_play => sub {
451 my ($x, $y, $soundnum, $type) = @_;
452
453 $SDL_MIXER
454 or return;
455
456 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
457 or return;
458
459 $chunk->play;
460 }, 706 },
461 }; 707 };
462 708
463 if ($CONN) { 709 if ($CONN) {
464 CFPlus::lowdelay fileno $CONN->{fh}; 710 CFPlus::lowdelay fileno $CONN->{fh};
… …
474 $LOGIN_BUTTON->set_text ("Login"); 720 $LOGIN_BUTTON->set_text ("Login");
475 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 721 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
476 $SETUP_DIALOG->show; 722 $SETUP_DIALOG->show;
477 $PL_WINDOW->hide; 723 $PL_WINDOW->hide;
478 $SPELL_LIST->clear_spells; 724 $SPELL_LIST->clear_spells;
725 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
726
727 &audio_music_set_ambient ([]);
479 728
480 return unless $CONN; 729 return unless $CONN;
481 730
482 status "connection closed"; 731 status "connection closed";
483 732
… …
493 742
494 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 743 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
495 744
496 my $row = 0; 745 my $row = 0;
497 746
498 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
499 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 748 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
500 can_events => 1, 749 can_events => 1,
501 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 750 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
502 751
752 my $vidmode_tooltip =
753 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
754 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
755
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 756 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
504 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 757 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
505 758
759 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
506 $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]); 760 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
507 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 761 tooltip => $vidmode_tooltip);
762 $hbox->add (my $mode_label = new CFPlus::UI::Label
763 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
764 can_events => 1, tooltip => $vidmode_tooltip);
508 765
509 $mode_slider->connect (changed => sub { 766 $mode_slider->connect (changed => sub {
510 my ($self, $value) = @_; 767 my ($self, $value) = @_;
511 768
512 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 769 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
513 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 770 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
514 }); 771 });
515 $mode_slider->emit (changed => $mode_slider->{range}[0]); 772 $mode_slider->emit (changed => $mode_slider->{range}[0]);
516 773
517 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
518 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 775 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
519 state => $CFG->{fullscreen}, 776 state => $CFG->{fullscreen},
520 tooltip => "Bring the client into fullscreen mode.", 777 tooltip => "Bring the client into fullscreen mode.",
521 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
522 ); 779 );
523 780
524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 781 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
525 $table->add (1, $row++, new CFPlus::UI::CheckBox 782 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
526 state => $CFG->{fast}, 783 state => $CFG->{fast},
527 tooltip => "Lower the visual quality considerably to speed up rendering.", 784 tooltip => "Lower the visual quality considerably to speed up rendering.",
528 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 785 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
529 ); 786 );
530 787
531 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 788 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
532 $table->add (1, $row++, new CFPlus::UI::Slider 789 $table->add_at (1, $row++, new CFPlus::UI::Slider
533 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 790 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
534 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 791 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
535 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 792 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
536 ); 793 );
537 794
538 $table->add (1, $row++, new CFPlus::UI::Button 795 $table->add_at (1, $row++, new CFPlus::UI::Button
539 expand => 1, align => 0, text => "Apply", 796 expand => 1, align => 0, text => "Apply",
540 tooltip => "Apply the video settings above.", 797 tooltip => "Apply the video settings above.",
541 on_activate => sub { 798 on_activate => sub {
542 video_shutdown (); 799 video_shutdown ();
543 video_init (); 800 video_init ();
544 0 801 0
545 } 802 }
546 ); 803 );
547 804
548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
549 $table->add (1, $row++, new CFPlus::UI::Slider 806 $table->add_at (1, $row++, new CFPlus::UI::Slider
550 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 807 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
551 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 808 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
552 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 809 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
553 ); 810 );
554 811
555 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 812 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox 813 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{map_smoothing}, 814 state => $CFG->{map_smoothing},
558 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 815 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
559 . "This increases load on the graphics subsystem and works only with 2.x servers. " 816 . "This increases load on the graphics subsystem and works only with 2.x servers. "
560 . "Changes take effect at next connection only.", 817 . "Changes take effect at next connection only.",
561 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
562 ); 819 );
563 820
564 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
565 $table->add (1, $row++, new CFPlus::UI::CheckBox 822 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
566 state => $CFG->{fow_enable}, 823 state => $CFG->{fow_enable},
567 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 824 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
568 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
569 ); 826 );
570 827
571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
572 $table->add (1, $row++, new CFPlus::UI::Slider 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
573 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 830 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
574 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 831 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
575 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 832 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
576 ); 833 );
577 834
578 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
579 $table->add (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{fow_smooth},
581 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
582 on_changed => sub {
583 my ($self, $value) = @_;
584 $CFG->{fow_smooth} = $value;
585 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
586 0
587 }
588 );
589
590 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 835 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
591 $table->add (1, $row++, new CFPlus::UI::Slider 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
592 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 837 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
593 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 838 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
594 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 839 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
595 ); 840 );
596 841
597 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 842 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
598 $table->add (1, $row++, new CFPlus::UI::Slider 843 $table->add_at (1, $row++, new CFPlus::UI::Slider
599 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 844 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
600 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 845 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
601 on_changed => sub { 846 on_changed => sub {
602 $CFG->{gauge_fontsize} = $_[1]; 847 $CFG->{gauge_fontsize} = $_[1];
603 &set_gauge_window_fontsize; 848 &set_gauge_window_fontsize;
604 0 849 0
605 } 850 }
606 ); 851 );
607 852
608 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 853 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
609 $table->add (1, $row++, new CFPlus::UI::Slider 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
610 range => [$CFG->{gauge_size}, 0.2, 0.8], 855 range => [$CFG->{gauge_size}, 0.2, 0.8],
611 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 856 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
612 on_changed => sub { 857 on_changed => sub {
613 $CFG->{gauge_size} = $_[1]; 858 $CFG->{gauge_size} = $_[1];
614 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 859 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
620} 865}
621 866
622sub audio_setup { 867sub audio_setup {
623 my $vbox = new CFPlus::UI::VBox; 868 my $vbox = new CFPlus::UI::VBox;
624 869
625 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 870 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
626 871
627 my $row = 0; 872 my $row = 0;
628 873
629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 874 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
630 $table->add (1, $row++, new CFPlus::UI::CheckBox 875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
631 state => $CFG->{audio_enable}, 876 state => $CFG->{audio_enable},
632 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.", 877 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.",
633 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 878 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
634 ); 879 );
635# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 880# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
636# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 881# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
637# $CFG->{effects_volume} = $_[1]; 882# $CFG->{effects_volume} = $_[1];
638# }); 883# });
884
885 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
886 $table->add_at (1, $row, new CFPlus::UI::CheckBox
887 expand => 1, state => $CFG->{effects_enable},
888 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
889 on_changed => sub {
890 $CFG->{effects_enable} = $_[1];
891 $CONN->update_fx_want if $CONN;
892 0
893 }
894 );
895 $table->add_at (2, $row++, new CFPlus::UI::Slider
896 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
897 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
898 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
899 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
900 );
901
639 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
640 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
641 $hbox->add (new CFPlus::UI::CheckBox 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
642 expand => 1, state => $CFG->{bgm_enable}, 904 expand => 1, state => $CFG->{bgm_enable},
643 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 905 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
644 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 906 on_changed => sub {
907 $CFG->{bgm_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
645 ); 911 );
646 $hbox->add (new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
647 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
648 tooltip => "The volume of the background music. Changes are instant.", 914 tooltip => "The volume of the background music. Changes are instant.",
649 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 915 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
650 ); 916 );
651 917
652 $table->add (1, $row++, new CFPlus::UI::Button 918 $table->add_at (1, $row++, new CFPlus::UI::Button
653 expand => 1, align => 0, text => "Apply", 919 c_colspan => 2, expand => 1, align => 0, text => "Apply",
654 tooltip => "Apply the audio settings", 920 tooltip => "Apply the audio settings",
655 on_activate => sub { 921 on_activate => sub {
656 audio_shutdown (); 922 audio_shutdown ();
657 audio_init (); 923 audio_init ();
658 0 924 0
… …
716} 982}
717 983
718sub debug_setup { 984sub debug_setup {
719 my $table = new CFPlus::UI::Table; 985 my $table = new CFPlus::UI::Table;
720 986
721 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 987 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
722 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 988 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
723 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 989 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
724 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 990 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
725 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 991 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
726 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 992 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
727 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 993 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
728 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 994 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
729 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 995 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
730 996
731 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
732
733 for my $x (0..2) {
734 for my $y (0 .. 2) {
735 $table->add ($x + 3, $y,
736 new CFPlus::UI::Entry
737 text => $default_smooth[$x * 3 + $y],
738 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
739 );
740 }
741 }
742
743 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 997 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
998
999 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1000 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1001 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1002 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1003 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1004 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1005
1006 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1007
1008 $c->add_items ({
1009 type => "line_loop",
1010 color => [0, 1, 0],
1011 width => 9,
1012 coord_mode => "abs",
1013 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1014 });
1015
1016 $c->add_items ({
1017 type => "lines",
1018 color => [1, 1, 0],
1019 width => 2,
1020 coord_mode => "rel",
1021 coord => [[0,0], [1,1], [1,0], [0,1]],
1022 });
1023
1024 $c->add_items ({
1025 type => "polygon",
1026 color => [0, 0.43, 0],
1027 width => 2,
1028 coord_mode => "rel",
1029 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1030 });
744 1031
745 $table 1032 $table
746} 1033}
747 1034
748sub stats_window { 1035sub stats_window {
… …
796 [2, 4, st_spd => "Spd", 10.54], 1083 [2, 4, st_spd => "Spd", 10.54],
797 [2, 5, st_wspd => "WSp", 10.54], 1084 [2, 5, st_wspd => "WSp", 10.54],
798 ) { 1085 ) {
799 my ($col, $row, $id, $label, $template) = @$_; 1086 my ($col, $row, $id, $label, $template) = @$_;
800 1087
801 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1088 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
802 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1089 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
803 align => +1, template => $template, tooltip => "#stat_$label"); 1090 align => +1, template => $template, tooltip => "#stat_$label");
804 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1091 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
805 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1092 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
806 align => -1, text => $label, tooltip => "#stat_$label"); 1093 align => -1, text => $label, tooltip => "#stat_$label");
807 } 1094 }
808 1095
809 $vb->add (new CFPlus::UI::FancyFrame 1096 $vb->add (new CFPlus::UI::FancyFrame
… …
850 cold => ["Cold", 1137 cold => ["Cold",
851 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1138 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
852 ghit => ["Ghost hit", 1139 ghit => ["Ghost hit",
853 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1140 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
854 ); 1141 );
1142
855 for (qw/slow holyw conf fire depl magic 1143 for (qw/slow holyw conf fire depl magic
856 drain acid pois para deat phys 1144 drain acid pois para deat phys
857 blind fear tund elec cold ghit/) 1145 blind fear tund elec cold ghit/)
858 { 1146 {
859 $tbl2->add ($col, $row, 1147 $tbl2->add_at ($col, $row,
860 $STATWIDS->{"res_$_"} = 1148 $STATWIDS->{"res_$_"} =
861 new CFPlus::UI::Label 1149 new CFPlus::UI::Label
862 font => $FONT_FIXED, 1150 font => $FONT_FIXED,
863 template => "-100%", 1151 template => "-100%",
864 align => +1, 1152 align => +1,
865 valign => 0, 1153 valign => 0,
866 can_events => 1, 1154 can_events => 1,
867 can_hover => 1, 1155 can_hover => 1,
868 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
869 ); 1157 );
870 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1158 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
871 font => $FONT_FIXED, 1159 font => $FONT_FIXED,
872 can_hover => 1, 1160 can_hover => 1,
873 can_events => 1, 1161 can_events => 1,
874 path => "ui/resist/resist_$_.png", 1162 path => "ui/resist/resist_$_.png",
875 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
876 ); 1164 );
877 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1165 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
878 text => $resist_names{$_}->[0], 1166 text => $resist_names{$_}->[0],
879 font => $FONT_FIXED, 1167 font => $FONT_FIXED,
880 can_hover => 1, 1168 can_hover => 1,
881 can_events => 1, 1169 can_events => 1,
882 tooltip => $resist_names{$_}->[1], 1170 tooltip => $resist_names{$_}->[1],
… …
915 return if $METASERVER_ATIME > time; 1203 return if $METASERVER_ATIME > time;
916 $METASERVER_ATIME = time + 60; 1204 $METASERVER_ATIME = time + 60;
917 1205
918 my $table = $METASERVER->{table}; 1206 my $table = $METASERVER->{table};
919 $table->clear; 1207 $table->clear;
920 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1208 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
921 1209
922 my $ok = 0; 1210 my $ok = 0;
923 1211
924 CFPlus::background { 1212 CFPlus::background {
925 my $ua = CFPlus::lwp_useragent; 1213 my $ua = CFPlus::lwp_useragent;
… …
936 "The time this server has been running without being restarted.", 1224 "The time this server has been running without being restarted.",
937 "The server software version - a '+' indicates a Crossfire+ server.", 1225 "The server software version - a '+' indicates a Crossfire+ server.",
938 "Short information about this server provided by its admins.", 1226 "Short information about this server provided by its admins.",
939 ); 1227 );
940 my @col = qw(#Users Host Uptime Version Description); 1228 my @col = qw(#Users Host Uptime Version Description);
941 $table->add ($_, 0, new CFPlus::UI::Label 1229 $table->add_at ($_, 0, new CFPlus::UI::Label
942 can_hover => 1, can_events => 1, 1230 can_hover => 1, can_events => 1,
943 align => 0, fg => [1, 1, 0], 1231 align => 0, fg => [1, 1, 0],
944 text => $col[$_], tooltip => $tip[$_]) 1232 text => $col[$_], tooltip => $tip[$_])
945 for 0 .. $#col; 1233 for 0 .. $#col;
946 1234
… …
968 1256
969 $m = [$users, $host, $uptime, $version, $desc]; 1257 $m = [$users, $host, $uptime, $version, $desc];
970 1258
971 $y++; 1259 $y++;
972 1260
973 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1261 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
974 (new CFPlus::UI::Button 1262 (new CFPlus::UI::Button
975 text => "Use", 1263 text => "Use",
976 tooltip => "Put this server into the <b>Host:Port</b> field", 1264 tooltip => "Put this server into the <b>Host:Port</b> field",
977 on_activate => sub { 1265 on_activate => sub {
978 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1266 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
981 }, 1269 },
982 ), 1270 ),
983 (new CFPlus::UI::Empty expand => 1), 1271 (new CFPlus::UI::Empty expand => 1),
984 ]); 1272 ]);
985 1273
986 $table->add ($_, $y, new CFPlus::UI::Label 1274 $table->add_at ($_, $y, new CFPlus::UI::Label
987 max_w => $::WIDTH * 0.4, 1275 max_w => $::WIDTH * 0.4,
988 ellipsise => 0, 1276 ellipsise => 0,
989 align => $align[$_], 1277 align => $align[$_],
990 text => $m->[$_], 1278 text => $m->[$_],
991 tooltip => $tip[$_], 1279 tooltip => $tip[$_],
… …
1032 1320
1033 $vbox->add (new CFPlus::UI::FancyFrame 1321 $vbox->add (new CFPlus::UI::FancyFrame
1034 label => "Connection Settings", 1322 label => "Connection Settings",
1035 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1323 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1036 ); 1324 );
1037 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1325 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1038 1326
1039 { 1327 {
1040 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1328 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1041 1329
1042 $vbox->add ( 1330 $vbox->add (
1043 $HOST_ENTRY = new CFPlus::UI::Entry 1331 $HOST_ENTRY = new CFPlus::UI::Entry
1044 expand => 1, 1332 expand => 1,
1045 text => $CFG->{profile}{default}{host}, 1333 text => $CFG->{profile}{default}{host},
1046 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1334 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1047 on_changed => sub { 1335 on_changed => sub {
1048 my ($self, $value) = @_; 1336 my ($self, $value) = @_;
1049 $CFG->{profile}{default}{host} = $value; 1337 $CFG->{profile}{default}{host} = $value;
1050 0 1338 1
1051 } 1339 }
1052 ); 1340 );
1053 1341
1054 $vbox->add (new CFPlus::UI::Button 1342 $vbox->add (new CFPlus::UI::Button
1055 expand => 1, 1343 expand => 1,
1056 text => "Server List", 1344 text => "Server List",
1057 other => $METASERVER, 1345 other => $METASERVER,
1058 tooltip => "Show a list of available crossfire servers", 1346 tooltip => "Show a list of available crossfire servers",
1059 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1347 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1060 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1348 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1061 ); 1349 );
1062 } 1350 }
1063 1351
1064 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1352 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1065 $table->add (1, 4, new CFPlus::UI::Entry 1353 $table->add_at (1, 4, new CFPlus::UI::Entry
1066 text => $CFG->{profile}{default}{user}, 1354 text => $CFG->{profile}{default}{user},
1067 tooltip => "The name of your character on the server", 1355 tooltip => "The name of your character on the server",
1068 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1356 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1069 ); 1357 );
1070 1358
1071 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1359 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1072 $table->add (1, 5, new CFPlus::UI::Entry 1360 $table->add_at (1, 5, new CFPlus::UI::Entry
1073 text => $CFG->{profile}{default}{password}, 1361 text => $CFG->{profile}{default}{password},
1074 hidden => 1, 1362 hidden => 1,
1075 tooltip => "The password for your character", 1363 tooltip => "The password for your character",
1076 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1077 ); 1365 );
1078 1366
1079 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1367 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1080 $table->add (1, 7, new CFPlus::UI::Slider 1368 $table->add_at (1, 7, new CFPlus::UI::Slider
1081 force_w => 100, 1369 force_w => 100,
1082 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1370 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1083 tooltip => "This is the size of the portion of the map update the server sends you. " 1371 tooltip => "This is the size of the portion of the map update the server sends you. "
1084 . "If you set this to a high value you will be able to see further, " 1372 . "If you set this to a high value you will be able to see further, "
1085 . "but you also increase bandwidth requirements and latency. " 1373 . "but you also increase bandwidth requirements and latency. "
1086 . "This option is only used once at log-in.", 1374 . "This option is only used once at log-in.",
1087 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1375 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1088 ); 1376 );
1089 1377
1090 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1091 $table->add (1, 8, new CFPlus::UI::CheckBox
1092 state => $CFG->{face_prefetch},
1093 tooltip => "<b>Background Image Prefetch</b>\n\n"
1094 . "If enabled, the client automatically pre-fetches images from the server. "
1095 . "This might increase or create lag, but increases the chances "
1096 . "of faces being ready for display when you encounter them. "
1097 . "It also uses up server bandwidth on every connect, "
1098 . "so only set it if you really need to prefetch images. "
1099 . "This option can be set and unset any time.",
1100 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1101 );
1102
1103 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1378 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1104 $table->add (1, 9, new CFPlus::UI::Entry 1379 $table->add_at (1, 8, new CFPlus::UI::Entry
1105 text => $CFG->{output_rate}, 1380 text => $CFG->{output_rate},
1106 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1381 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1107 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1382 . "when sending data. When 0 or unset, the server "
1108 . "default will be used, which is usually around 100kb/s.", 1383 . "default will be used, which is usually around 100kb/s. Most servers will "
1384 . "dynamically find an optimal rate, so adjust this only when necessary.",
1109 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1110 ); 1386 );
1111 1387
1112 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1388 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1113 $table->add (1, 10, new CFPlus::UI::Entry 1389 $table->add_at (1, 9, new CFPlus::UI::Entry
1114 text => $CFG->{output_count}, 1390 text => $CFG->{output_count},
1115 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.",
1116 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1117 ); 1393 );
1118 1394
1119 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1395 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1120 $table->add (1, 11, new CFPlus::UI::Entry 1396 $table->add_at (1, 10, new CFPlus::UI::Entry
1121 text => $CFG->{output_sync}, 1397 text => $CFG->{output_sync},
1122 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1398 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1123 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1124 ); 1400 );
1125 1401
1126 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1127 expand => 1, 1403 expand => 1,
1128 align => 0, 1404 align => 0,
1129 text => "Login", 1405 text => "Login",
1130 on_activate => sub { 1406 on_activate => sub {
1131 $CONN ? stop_game 1407 $CONN ? stop_game
1132 : start_game; 1408 : start_game;
1133 0 1409 1
1134 }, 1410 },
1135 ); 1411 );
1136 1412
1137 $vbox->add (new CFPlus::UI::FancyFrame 1413 $vbox->add (new CFPlus::UI::FancyFrame
1138 label => "Server Info", 1414 label => "Server Info",
… …
1145sub client_setup { 1421sub client_setup {
1146 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1422 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1147 1423
1148 my $row = 0; 1424 my $row = 0;
1149 1425
1150 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1151 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1152 text => $CFG->{say_command},
1153 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. "
1154 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1155 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1156 on_changed => sub {
1157 my ($self, $value) = @_;
1158 $CFG->{say_command} = $value;
1159 0
1160 }
1161 );
1162
1163 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1426 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1164 $table->add (1, $row++, new CFPlus::UI::CheckBox 1427 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1165 state => $CFG->{show_tips}, 1428 state => $CFG->{show_tips},
1166 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1429 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1167 on_changed => sub { 1430 on_changed => sub {
1168 my ($self, $value) = @_; 1431 my ($self, $value) = @_;
1169 $CFG->{show_tips} = $value; 1432 $CFG->{show_tips} = $value;
1170 0 1433 0
1171 } 1434 }
1172 ); 1435 );
1173 1436
1174 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1437 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1175 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1438 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1176 text => $CFG->{logview_max_par}, 1439 text => $CFG->{logview_max_par},
1177 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1440 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1178 . "sends more messages than this number, older messages get removed to save memory and " 1441 . "sends more messages than this number, older messages get removed to save memory and "
1179 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1442 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1180 on_changed => sub { 1443 on_changed => sub {
1181 my ($self, $value) = @_; 1444 my ($self, $value) = @_;
1182 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1445 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1183 0 1446 0
1184 }, 1447 },
1185 ); 1448 );
1186 1449
1187 $table 1450 $table
1188} 1451}
1189 1452
1190sub message_window {
1191 my $window = new CFPlus::UI::Toplevel
1192 name => "message_window",
1193 title => "Messages",
1194 border_bg => [1, 1, 1, 1],
1195 x => "max",
1196 y => 0,
1197 force_w => $::WIDTH * 0.4,
1198 force_h => $::HEIGHT * 0.5,
1199 child => (my $vbox = new CFPlus::UI::VBox),
1200 has_close_button => 1;
1201
1202 $vbox->add ($LOGVIEW);
1203
1204 $vbox->add (my $input = new CFPlus::UI::Entry
1205 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1206 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1207 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1208 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1209 on_focus_in => sub {
1210 my ($input, $prev_focus) = @_;
1211
1212 delete $input->{refocus_map};
1213
1214 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1215 $input->{refocus_map} = 1;
1216 }
1217 delete $input->{auto_activated};
1218
1219 0
1220 },
1221 on_activate => sub {
1222 my ($input, $text) = @_;
1223 $input->set_text ('');
1224
1225 if ($text =~ /^\/(.*)/) {
1226 $::CONN->user_send ($1);
1227 } else {
1228 my $say_cmd = $::CFG->{say_command} || 'say';
1229 $::CONN->user_send ("$say_cmd $text");
1230 }
1231 if ($input->{refocus_map}) {
1232 delete $input->{refocus_map};
1233 $MAPWIDGET->focus_in
1234 }
1235
1236 0
1237 },
1238 on_escape => sub {
1239 $MAPWIDGET->grab_focus;
1240
1241 0
1242 },
1243 );
1244
1245 $CONSOLE = {
1246 window => $window,
1247 input => $input,
1248 };
1249
1250 $window
1251}
1252
1253sub autopickup_setup { 1453sub autopickup_setup {
1454 my $r = new CFPlus::UI::ScrolledWindow (
1455 expand => 1,
1456 scroll_y => 1
1457 );
1254 my $table = new CFPlus::UI::Table; 1458 $r->add (my $table = new CFPlus::UI::Table
1459 row_expand => [0],
1460 col_expand => [0, 1, 0, 1],
1461 );
1255 1462
1256 for ( 1463 for (
1257 ["General", 0, 0, 1464 ["General", 0, 0,
1258 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1465 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1259 ["Inhibit autopickup" => PICKUP_INHIBIT], 1466 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1294 ], 1501 ],
1295 ["Weight/Value ratio", 2, 17] 1502 ["Weight/Value ratio", 2, 17]
1296 ) 1503 )
1297 { 1504 {
1298 my ($title, $x, $y, @bits) = @$_; 1505 my ($title, $x, $y, @bits) = @$_;
1299 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1506 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1300 1507
1301 for (@bits) { 1508 for (@bits) {
1302 ++$y; 1509 ++$y;
1303 1510
1304 my $mask = $_->[1]; 1511 my $mask = $_->[1];
1305 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1512 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1306 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1513 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1307 state => $::CFG->{pickup} & $mask, 1514 state => $::CFG->{pickup} & $mask,
1308 on_changed => sub { 1515 on_changed => sub {
1309 my ($box, $value) = @_; 1516 my ($box, $value) = @_;
1310 1517
1311 if ($value) { 1518 if ($value) {
… …
1322 1529
1323 ${$_->[2]} = $checkbox if $_->[2]; 1530 ${$_->[2]} = $checkbox if $_->[2];
1324 } 1531 }
1325 } 1532 }
1326 1533
1327 $table->add (2, 18, new CFPlus::UI::ValSlider 1534 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1328 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1535 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1329 template => ">= 99", 1536 template => ">= 99",
1330 to_value => sub { ">= " . 5 * $_[0] }, 1537 to_value => sub { ">= " . 5 * $_[0] },
1331 on_changed => sub { 1538 on_changed => sub {
1332 my ($slider, $value) = @_; 1539 my ($slider, $value) = @_;
… …
1335 $::CFG->{pickup} |= int $value 1542 $::CFG->{pickup} |= int $value
1336 if $value; 1543 if $value;
1337 1; 1544 1;
1338 }); 1545 });
1339 1546
1340 $table->add (3, 18, new CFPlus::UI::Button 1547 $table->add_at (3, 18, new CFPlus::UI::Button
1341 text => "set", 1548 text => "set",
1342 on_activate => sub { 1549 on_activate => sub {
1343 $::CONN->send_command ("pickup $::CFG->{pickup}") 1550 $::CONN->send_command ("pickup $::CFG->{pickup}")
1344 if defined $::CONN; 1551 if defined $::CONN;
1345 0 1552 0
1346 }); 1553 });
1347 1554
1348 $table 1555 $r
1349} 1556}
1350 1557
1351my %SORT_ORDER = ( 1558my %SORT_ORDER = (
1352 type => undef, 1559 type => undef,
1353 mtime => sub { 1560 mtime => sub {
… …
1408 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1615 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1409 1616
1410 $hb 1617 $hb
1411} 1618}
1412 1619
1620sub media_window {
1621 my $vb = new CFPlus::UI::VBox;
1622
1623 $vb->add (new CFPlus::UI::FancyFrame
1624 label => "Currently playing music",
1625 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1626 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1627 );
1628
1629 $vb->add (new CFPlus::UI::FancyFrame
1630 label => "Other media used in this session",
1631 expand => 1,
1632 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1633 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1634 );
1635
1636 $vb
1637}
1638
1639sub add_license {
1640 my ($meta) = @_;
1641
1642 $meta = $meta->{meta}
1643 or return;
1644
1645 $meta->{license} || $meta->{author} || $meta->{source}
1646 or return;
1647
1648 $LICENSE_WIDGET->add_paragraph ({
1649 fg => [1, 1, 1, 1],
1650 markup => "<small>"
1651 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1652 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1653 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1654 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1655 . "</small>",
1656 });
1657 $LICENSE_WIDGET->scroll_to_bottom;
1658}
1659
1413sub toggle_player_page { 1660sub toggle_player_page {
1414 my ($widget) = @_; 1661 my ($widget) = @_;
1415 1662
1416 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1663 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1417 $PL_WINDOW->hide; 1664 $PL_WINDOW->hide;
… …
1432 has_close_button => 1 1679 has_close_button => 1
1433 ; 1680 ;
1434 1681
1435 my $ntb = 1682 my $ntb =
1436 $PL_NOTEBOOK = 1683 $PL_NOTEBOOK =
1437 new CFPlus::UI::Notebook expand => 1, debug => 1; 1684 new CFPlus::UI::Notebook expand => 1;
1438 1685
1439 $ntb->add ( 1686 $ntb->add_tab (
1440 "Statistics (F2)" => $STATS_PAGE = stats_window, 1687 "Statistics (F2)" => $STATS_PAGE = stats_window,
1441 "Shows statistics, where all your Stats and Resistances are shown." 1688 "Shows statistics, where all your Stats and Resistances are shown."
1442 ); 1689 );
1443 $ntb->add ( 1690 $ntb->add_tab (
1444 "Skills (F3)" => $SKILL_PAGE = skill_window, 1691 "Skills (F3)" => $SKILL_PAGE = skill_window,
1445 "Shows all your Skills." 1692 "Shows all your Skills."
1446 ); 1693 );
1447 1694
1448 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1695 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1449 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1696 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1450 $ntb->add ( 1697 $ntb->add_tab (
1451 "Spellbook (F4)" => $spellsw, 1698 "Spellbook (F4)" => $spellsw,
1452 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1699 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1453 ); 1700 );
1454 $ntb->add ( 1701 $ntb->add_tab (
1455 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1456 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1703 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1457 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1704 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1458 ); 1705 );
1706 $ntb->add_tab (Pickup => autopickup_setup,
1707 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1708
1709 $ntb->add_tab (Media => media_window,
1710 "License, Author and Source info for media sent by the server.");
1459 1711
1460 $ntb->set_current_page ($INVENTORY_PAGE); 1712 $ntb->set_current_page ($INVENTORY_PAGE);
1461 1713
1462 $plwin->add ($ntb); 1714 $plwin->add ($ntb);
1463 $plwin 1715 $plwin
… …
1660 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1912 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1661 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1913 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1662 1914
1663 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1915 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1664 1916
1665 $table->add (0, 0, new CFPlus::UI::Button 1917 $table->add_at (0, 0, new CFPlus::UI::Button
1666 text => "Close", 1918 text => "Close",
1667 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>.", 1919 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>.",
1668 on_activate => $close, 1920 on_activate => $close,
1669 ); 1921 );
1670 1922
1671 $table->add (2, 0, new CFPlus::UI::Button 1923 $table->add_at (2, 0, new CFPlus::UI::Button
1672 text => "Next", 1924 text => "Next",
1673 tooltip => "Show the next <b>Tip of the day</b>.", 1925 tooltip => "Show the next <b>Tip of the day</b>.",
1674 on_activate => sub { 1926 on_activate => sub {
1675 $close->(); 1927 $close->();
1676 &show_tip_of_the_day; 1928 &show_tip_of_the_day;
… …
1685 CFPlus::SDL_Init 1937 CFPlus::SDL_Init
1686 and die "SDL::Init failed!\n"; 1938 and die "SDL::Init failed!\n";
1687} 1939}
1688 1940
1689sub video_init { 1941sub video_init {
1690 sdl_init;
1691
1692 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1693 1943
1694 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1944 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1695 1945
1696 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1946 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1697 $FULLSCREEN = $CFG->{fullscreen}; 1947 $FULLSCREEN = $CFG->{fullscreen};
1698 $FAST = $CFG->{fast}; 1948 $FAST = $CFG->{fast};
1699 1949
1700 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1950 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1701 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1951 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1702 1952
1703 $SDL_ACTIVE = 1; 1953 $SDL_ACTIVE = 1;
1704 $LAST_REFRESH = time - 0.01; 1954 $LAST_REFRESH = time - 0.01;
1705 1955
… …
1747 1997
1748 $MAPWIDGET = new CFPlus::MapWidget; 1998 $MAPWIDGET = new CFPlus::MapWidget;
1749 $MAPWIDGET->connect (activate_console => sub { 1999 $MAPWIDGET->connect (activate_console => sub {
1750 my ($mapwidget, $preset) = @_; 2000 my ($mapwidget, $preset) = @_;
1751 2001
1752 if ($CONSOLE) { 2002 $MESSAGE_WINDOW->activate_console ($preset)
1753 $CONSOLE->{input}->{auto_activated} = 1; 2003 if $MESSAGE_WINDOW;
1754 $CONSOLE->{input}->grab_focus;
1755
1756 if ($preset && $CONSOLE->{input}->get_text eq '') {
1757 $CONSOLE->{input}->set_text ($preset);
1758 }
1759 }
1760 }); 2004 });
1761 $MAPWIDGET->show; 2005 $MAPWIDGET->show;
1762 $MAPWIDGET->grab_focus; 2006 $MAPWIDGET->grab_focus;
1763
1764 $LOGVIEW = new CFPlus::UI::TextScroller
1765 expand => 1,
1766 font => $FONT_FIXED,
1767 fontsize => $::CFG->{log_fontsize},
1768 indent => -4,
1769 can_hover => 1,
1770 can_events => 1,
1771 max_par => $CFG->{logview_max_par},
1772 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1773 ;
1774 2007
1775 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2008 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1776 title => "Setup", 2009 title => "Setup",
1777 name => "setup_dialog", 2010 name => "setup_dialog",
1778 x => 'center', 2011 x => 'center',
… …
1782 force_h => $::HEIGHT * 0.6, 2015 force_h => $::HEIGHT * 0.6,
1783 has_close_button => 1, 2016 has_close_button => 1,
1784 ; 2017 ;
1785 2018
1786 $METASERVER = metaserver_dialog; 2019 $METASERVER = metaserver_dialog;
2020 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1787 2021
1788 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2022 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1789 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2023 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1790 2024
1791 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2025 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1792 "Configure the server to play on, your username, password and other server-related options."); 2026 "Configure the server to play on, your username, password and other server-related options.");
1793 $SETUP_NOTEBOOK->add (Client => client_setup, 2027 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1794 "Configure various client-specific settings."); 2028 "Configure various client-specific settings.");
1795 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1796 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1797 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2029 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1798 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2030 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1799 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2031 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1800 "Configure the use of audio, sound effects and background music."); 2032 "Configure the use of audio, sound effects and background music.");
1801 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2033 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1802 "Lets you define, edit and delete key bindings." 2034 "Lets you define, edit and delete key bindings."
1803 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2035 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1804 . "with nothing set and the recording started. After doing the actions you " 2036 . "with nothing set and the recording started. After doing the actions you "
1805 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2037 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1806 . "After pressing the combo the binding will be saved automatically and the " 2038 . "After pressing the combo the binding will be saved automatically and the "
1807 . "binding editor closes"); 2039 . "binding editor closes");
1808 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2040 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1809 "Some debuggin' options. Do not ask."); 2041 "Some debuggin' options. Do not ask.");
1810 2042
1811 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2043 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1812 2044
1813 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2045 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1814 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2046 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1815 2047
1816 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2048 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1817 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2049 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1818 2050
1819 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 2051 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
1820 2052
1821 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2053 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1854 } 2086 }
1855 2087
1856 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2088 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1857} 2089}
1858 2090
1859sub setup_build_button {
1860 my ($enabled) = @_;
1861 if ($enabled) {
1862 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1863 $BUILD_BUTTON ||= new CFPlus::UI::Button
1864 text => "Build",
1865 tooltip => "Opens the ingame builder",
1866 on_activate => sub {
1867 if ($CONN) {
1868 $CONN->send_ext_req (builder_player_items => sub {
1869 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1870 });
1871 }
1872 0
1873 };
1874 $BUTTONBAR->add ($BUILD_BUTTON);
1875 } else {
1876 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1877 }
1878}
1879
1880sub open_ingame_editor {
1881 my ($msg) = @_;
1882
1883 my $win = new CFPlus::UI::Toplevel
1884 x => 0,
1885 y => 'center',
1886 z => 4,
1887 name => 'builder_window',
1888 force_w => int $WIDTH * 1/4,
1889 force_h => int $HEIGHT * 3/4,
1890 title => "In game builder",
1891 has_close_button => 1;
1892
1893 my $r = new CFPlus::UI::ScrolledWindow (
1894 expand => 1,
1895 scroll_y => 1
1896 );
1897 $r->add (my $vb = new CFPlus::UI::VBox);
1898 $win->add ($r);
1899
1900
1901 $vb->add (
1902 new CFPlus::UI::Button
1903 text => "Disable build mode",
1904 on_activate => sub { $::IN_BUILD_MODE = undef }
1905 );
1906 $vb->add (
1907 new CFPlus::UI::Button
1908 text => "ERASE",
1909 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1910 );
1911
1912 for my $itemarchname (
1913 sort {
1914 $msg->{items}->{$a}->{build_arch_name}
1915 cmp $msg->{items}->{$b}->{build_arch_name}
1916 } keys %{$msg->{items}}
1917 ) {
1918 my $info = $msg->{items}->{$itemarchname};
1919 $vb->add (
1920 new CFPlus::UI::Button text => $info->{build_arch_name},
1921 on_activate => sub {
1922 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1923
1924 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1925 build_mode_query_arch_info ();
1926 }
1927 }
1928 );
1929 }
1930
1931 $win->show;
1932}
1933
1934sub build_mode_query_arch_info {
1935 my ($iteminfo) = $::IN_BUILD_MODE;
1936 my $itemarchname = $iteminfo->{item};
1937 my $info = $iteminfo->{info};
1938
1939 my $dialog = new CFPlus::UI::Toplevel
1940 x => "center",
1941 y => "center",
1942 z => 50,
1943 force_w => int $WIDTH * 1/2,
1944 title => "Enter information for placement of '$itemarchname'",
1945 has_close_button => 1;
1946
1947 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1948
1949 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1950 my $row = 0;
1951 if ($info->{has_name}) {
1952 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1953 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1954 }
1955 if ($info->{has_text}) {
1956 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1957 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1958 }
1959 if ($info->{has_connection}) {
1960 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1961 $table->add (1, $row++,
1962 new CFPlus::UI::Entry
1963 expand => 1,
1964 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1965 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1966 );
1967 }
1968
1969 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1970 $hb->add (new CFPlus::UI::Button
1971 text => "Close",
1972 expand => 1,
1973 on_activate => sub { $dialog->hide; 0 },
1974 );
1975 $dialog->show;
1976}
1977
1978sub video_shutdown { 2091sub video_shutdown {
1979 CFPlus::OpenGL::shutdown; 2092 CFPlus::OpenGL::shutdown;
1980 2093
1981 undef $SDL_ACTIVE; 2094 undef $SDL_ACTIVE;
1982} 2095}
1983 2096
1984my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1985my $bgmusic;#TODO#hack#d#
1986
1987sub audio_channel_finished {
1988 my ($channel) = @_;
1989
1990 #warn "channel $channel finished\n";#d#
1991}
1992
1993sub audio_music_finished {
1994 return unless $CFG->{bgm_enable};
1995
1996 # TODO: hack, do play loop and mood music
1997 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1998 $bgmusic->play (0);
1999
2000 push @bgmusic, shift @bgmusic;
2001}
2002
2003sub audio_init {
2004 if ($CFG->{audio_enable}) {
2005 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2006 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2007
2008 unless ($SDL_MIXER) {
2009 status "Unable to open sound device: there will be no sound";
2010 return;
2011 }
2012
2013 CFPlus::Mix_AllocateChannels 8;
2014 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2015
2016 audio_music_finished;
2017
2018 local $_;
2019 while (<$fh>) {
2020 next if /^\s*#/;
2021 next if /^\s*$/;
2022
2023 my ($file, $volume, $event) = split /\s+/, $_, 3;
2024
2025 push @SOUNDS, "$volume,$file";
2026
2027 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2028 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2029 $chunk->volume ($volume * 128 / 100);
2030 $chunk
2031 };
2032 }
2033 } else {
2034 status "unable to open sound config: $!";
2035 }
2036 }
2037}
2038
2039sub audio_shutdown {
2040 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2041 undef $SDL_MIXER;
2042 @SOUNDS = ();
2043 %AUDIO_CHUNKS = ();
2044}
2045
2046my %animate_object; 2097my %animate_object;
2047my $animate_timer; 2098my $animate_timer;
2048 2099
2049my $fps = 9; 2100my $fps = 9;
2050
2051my %demo;#d#
2052 2101
2053sub force_refresh { 2102sub force_refresh {
2054 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2103 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2055 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2056 2105
2057 $CFPlus::UI::ROOT->draw; 2106 $CFPlus::UI::ROOT->draw;
2058 2107
2059 $WANT_REFRESH = 0; 2108 $WANT_REFRESH = 0;
2060 $CAN_REFRESH = 0; 2109 $CAN_REFRESH = 0;
2061 $LAST_REFRESH = $NOW; 2110 $LAST_REFRESH = $NOW;
2062 2111
2063 CFPlus::SDL_GL_SwapBuffers; 2112 CFPlus::SDL_GL_SwapBuffers;
2064} 2113}
2065 2114
2066my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2115my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2067 $NOW = time; 2116 $NOW = time;
2068 2117
2069 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2118 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2070 for CFPlus::SDL_PollEvent; 2119 for CFPlus::poll_events;
2071 2120
2072 if (%animate_object) { 2121 if (%animate_object) {
2073 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2122 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2074 $WANT_REFRESH++; 2123 ++$WANT_REFRESH;
2075 } 2124 }
2076 2125
2077 if ($WANT_REFRESH) { 2126 if ($WANT_REFRESH) {
2078 force_refresh; 2127 force_refresh;
2079 } else { 2128 } else {
… …
2088 2137
2089sub animation_stop { 2138sub animation_stop {
2090 my ($widget) = @_; 2139 my ($widget) = @_;
2091 delete $animate_object{$widget}; 2140 delete $animate_object{$widget};
2092} 2141}
2093
2094# check once/second for faces that need to be prefetched
2095# this should, of course, only run on demand, but
2096# SDL forces worse things on us....
2097
2098Event->timer (after => 1, interval => 0.25, cb => sub {
2099 $CONN->face_prefetch
2100 if $CONN;
2101});
2102 2142
2103%SDL_CB = ( 2143%SDL_CB = (
2104 CFPlus::SDL_QUIT => sub { 2144 CFPlus::SDL_QUIT => sub {
2105 exit; 2145 exit;
2106 }, 2146 },
… …
2109 CFPlus::SDL_VIDEOEXPOSE => sub { 2149 CFPlus::SDL_VIDEOEXPOSE => sub {
2110 CFPlus::UI::full_refresh; 2150 CFPlus::UI::full_refresh;
2111 }, 2151 },
2112 CFPlus::SDL_ACTIVEEVENT => sub { 2152 CFPlus::SDL_ACTIVEEVENT => sub {
2113# not useful, as APPACTIVE include sonly iconified state, not unmapped 2153# not useful, as APPACTIVE include sonly iconified state, not unmapped
2114# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2154# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2155# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2115# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2156# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2116# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2157# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2117# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2158# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2118 }, 2159 },
2119 CFPlus::SDL_KEYDOWN => sub { 2160 CFPlus::SDL_KEYDOWN => sub {
… …
2149 2190
2150 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2151 2192
2152 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2153 sdl_mode => 0, 2194 sdl_mode => 0,
2154 width => 640,
2155 height => 480,
2156 fullscreen => 0, 2195 fullscreen => 0,
2157 fast => 0, 2196 fast => 0,
2158 map_scale => 1, 2197 map_scale => 1,
2159 fow_enable => 1, 2198 fow_enable => 1,
2160 fow_intensity => 0.45, 2199 fow_intensity => 0,
2161 fow_smooth => 0,
2162 map_smoothing => 1, 2200 map_smoothing => 1,
2163 gui_fontsize => 1, 2201 gui_fontsize => 1,
2164 log_fontsize => 0.7, 2202 log_fontsize => 0.7,
2165 gauge_fontsize => 1, 2203 gauge_fontsize => 1,
2166 gauge_size => 0.35, 2204 gauge_size => 0.35,
2167 stat_fontsize => 0.7, 2205 stat_fontsize => 0.7,
2168 mapsize => 100, 2206 mapsize => 100,
2169 say_command => 'chat',
2170 audio_enable => 1, 2207 audio_enable => 1,
2208 effects_enable => 1,
2209 effects_volume => 1,
2171 bgm_enable => 1, 2210 bgm_enable => 1,
2172 bgm_volume => 0.25, 2211 bgm_volume => 0.5,
2173 face_prefetch => 0,
2174 output_sync => 1, 2212 output_sync => 1,
2175 output_count => 1, 2213 output_count => 1,
2176 output_rate => "", 2214 output_rate => "",
2177 pickup => 0, 2215 pickup => 0,
2178 inv_sort => "mtime", 2216 inv_sort => "mtime",
… …
2200 } 2238 }
2201 } 2239 }
2202 2240
2203 sdl_init; 2241 sdl_init;
2204 2242
2205 @SDL_MODES = reverse 2243 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2206 grep $_->[0] >= 640 && $_->[1] >= 480, 2244 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2207 CFPlus::SDL_ListModes;
2208
2209 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2245 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2246
2247 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2210 2248
2211 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2249 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2212 2250
2213 { 2251 {
2214 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2252 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2256Event::loop; 2294Event::loop;
2257#CFPlus::SDL_Quit; 2295#CFPlus::SDL_Quit;
2258#CFPlus::_exit 0; 2296#CFPlus::_exit 0;
2259 2297
2260END { 2298END {
2299 video_shutdown;
2300 audio_shutdown;
2261 CFPlus::SDL_Quit; 2301 CFPlus::SDL_Quit;
2262 CFPlus::DB::Server::stop; 2302 CFPlus::DB::Server::stop;
2263} 2303}
2264 2304
2265=head1 NAME 2305=head1 NAME
2266 2306
2267cfplus - A Crossfire+ and Crossfire game client 2307cfplus - A Crossfire TRT and Crossfire game client
2268 2308
2269=head1 SYNOPSIS 2309=head1 SYNOPSIS
2270 2310
2271Just run it - no commandline arguments are supported. 2311Just run it - no commandline arguments are supported.
2272 2312
2273=head1 USAGE 2313=head1 USAGE
2274 2314
2275cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2315cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2276fullscreen and interactively. 2316be used in fullscreen mode and interactively.
2277 2317
2278=head1 DEBUGGING 2318=head1 DEBUGGING
2279 2319
2280 2320
2281CFPLUS_DEBUG - environment variable 2321CFPLUS_DEBUG - environment variable

Diff Legend

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