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.147 by root, Fri Apr 6 07:45:35 2007 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 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;
… …
136our $STATWIDS; 159our $STATWIDS;
137 160
138our $SDL_ACTIVE; 161our $SDL_ACTIVE;
139our %SDL_CB; 162our %SDL_CB;
140 163
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 164our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 165our $STATUSBOX;
147our $DEBUG_STATUS; 166our $DEBUG_STATUS;
148 167
149our $INV; 168our $INV;
150our $INVR; 169our $INVR;
151our $INV_RIGHT_HB; 170our $INV_RIGHT_HB;
152 171
153our $PICKUP_CFG; 172our $PICKUP_CFG;
154 173
155our $IN_BUILD_MODE; 174#############################################################################
156our $BUILD_BUTTON;
157 175
158sub status { 176sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 178}
161 179
… …
163 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
164} 182}
165 183
166sub message { 184sub message {
167 my ($para) = @_; 185 my ($para) = @_;
168 186 $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} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 if (my $chunk = $AUDIO_CHUNK{$face}) {
220 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
221 my (undef, $dx, $dy, $vol) = @$_;
222
223 my $channel = CFPlus::Channel::find;
224 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
225 $dx = $dx / 10 * 255;
226 $channel->set_panning (255 - $dx, 255 + $dx);
227
228# my $angle = $dx ? : $dx < 0 ?
229# my $distance = -$vol;
230# $channel->set_position ($angle, $distance);
231
232 $chunk->play ($channel);
233 }
234 } else {
235 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{jingle}) {
241 delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 } 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 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
250 $AUDIO_CHUNK{$face} = $chunk;
251
252 audio_sound_push ($face);
253 };
254 }
255 }
256}
257
258sub audio_sound_play {
259 my ($face, $dx, $dy, $vol) = @_;
260
261 $SDL_MIXER
262 or return;
263 $CFG->{effects_enable}
264 or return;
265
266 my $queue = $AUDIO_PLAY{$face} ||= [];
267 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
268 audio_sound_push $face
269 unless @$queue > 1;
270}
271
272sub audio_music_update_volume {
273 return unless $MUSIC_PLAYING_META;
274 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
275 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
276 CFPlus::MixMusic::volume $base * $volume * 128;
277}
278
279sub audio_music_start {
280 my $meta = $MUSIC_PLAYING_META;
281
282 CFPlus::DB::get res_data => $meta->{name}, sub {
283 return unless $SDL_MIXER;
284
285 # music might have changed...
286 $meta eq $MUSIC_PLAYING_META
287 or return &audio_music_start ();
288
289 audio_music_update_volume;
290
291 $MUSIC_PLAYING_DATA = \$_[0];
292
293 my $rwops = $meta->{path}
294 ? new_from_file CFPlus::RW $meta->{path}
295 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
296
297 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
298 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
299
300 my $NOW = time;
301
302 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
303 my $pos = $MUSIC_PLAYING_META->{stop_pos};
304 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
305 $MUSIC_START = time - $pos;
306 } else {
307 $MUSIC_PLAYER->play (0);
308 $MUSIC_START = time;
309 }
310
311 delete $MUSIC_PLAYING_META->{stop_time};
312 delete $MUSIC_PLAYING_META->{stop_pos};
313 }
314}
315
316sub audio_music_push {
317 return unless $SDL_MIXER;
318
319 my $fade_out;
320
321 if (@MUSIC_JINGLE) {
322 @MUSIC_HAVE = $MUSIC_JINGLE[0];
323 $fade_out = 333;
324 } else {
325 return unless $CFG->{bgm_enable};
326
327 my @have =
328 grep $_,
329 map $CONN->{music_meta}{$_},
330 @$MUSIC_WANT;
331
332 @MUSIC_HAVE = @have
333 if @have;
334
335 # default MUSIC_HAVE == MUSIC_DEFAULT
336 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
337 $fade_out = 1000;
338 }
339
340 # if the currently playing song is acceptable, let it continue
341 return if $MUSIC_PLAYING_META
342 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
343
344 my $NOW = time;
345
346 if ($MUSIC_PLAYING_META) {
347 $MUSIC_PLAYING_META->{stop_time} = $NOW;
348 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
349 CFPlus::MixMusic::fade_out $fade_out;
350 } else {
351 # sort by stop time, oldest first
352 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
353
354 # if the most recently-played piece played very recently,
355 # resume it, else choose the oldest piece for rotation.
356 $MUSIC_PLAYING_META =
357 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
358 ? $MUSIC_HAVE[-1]
359 : $MUSIC_HAVE[0];
360
361 audio_music_start;
362 }
363}
364
365sub audio_music_set_ambient {
366 my ($songs) = @_;
367
368 $MUSIC_WANT = $songs;
369 audio_music_push;
370}
371
372sub audio_music_finished {
373 # we compress multiple jingles of the same type
374 shift @MUSIC_JINGLE
375 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
376
377 undef $MUSIC_PLAYER;
378 undef $MUSIC_PLAYING_META;
379 undef $MUSIC_PLAYING_DATA;
380
381 audio_music_push;
382}
383
384sub audio_init {
385 if ($CFG->{audio_enable}) {
386 $ENV{MIX_EFFECTSMAXSPEED} = 1;
387 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
388
389 unless ($SDL_MIXER) {
390 status "Unable to open sound device: there will be no sound";
391 return;
392 }
393
394 CFPlus::Mix_AllocateChannels 16;
395
396 audio_music_finished;
397 } else {
398 undef $SDL_MIXER;
399 }
400}
401
402sub audio_shutdown {
403 undef $MUSIC_PLAYER;
404 undef $MUSIC_PLAYING_META;
405 undef $MUSIC_PLAYING_DATA;
406
407 $MUSIC_WANT = [];
408 @MUSIC_JINGLE = ();
409 %AUDIO_PLAY = ();
410 %AUDIO_CHUNK = ();
411
412 CFPlus::Mix_CloseAudio if $SDL_MIXER;
413 undef $SDL_MIXER;
414}
415
416#############################################################################
176 417
177sub destroy_query_dialog { 418sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 419 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 420 if $_[0]{query_dialog};
180} 421}
… …
207 title => "Server Query", 448 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 449 child => my $vbox = new CFPlus::UI::VBox,
209 ; 450 ;
210 451
211 my @dialog = my $label = new CFPlus::UI::Label 452 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 453 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 454 ellipsise => 0,
214 text => $prompt; 455 text => $prompt;
215 456
216 if ($flags & CS_QUERY_YESNO) { 457 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 458 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 475 );
235 476
236 $dialog->grab_focus; 477 $dialog->grab_focus;
237 478
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 479 } elsif ($flags & CS_QUERY_SINGLECHAR) {
239 $dialog->{tooltip} = "#charcreation_focus";
240
241 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 480 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
242 $MESSAGE_WINDOW->show; 481 $dialog->{tooltip} = "#charcreation_focus";
243 482
244 unshift @dialog, new CFPlus::UI::Label 483 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 484 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 485 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 486 markup => "\nOr use your keyboard and the text entry below:\n";
248 487
249 unshift @dialog, my $table = new CFPlus::UI::Table; 488 unshift @dialog, my $table = new CFPlus::UI::Table;
250 489
251 $table->add (0, 0, new CFPlus::UI::Button 490 $table->add_at (0, 0, new CFPlus::UI::Button
252 text => "Next Race", 491 text => "Next Race",
253 on_activate => sub { 492 on_activate => sub {
254 $conn->send ("reply n"); 493 $conn->send ("reply n");
255 destroy_query_dialog $conn; 494 destroy_query_dialog $conn;
256 0 495 0
257 }, 496 },
258 ); 497 );
259 $table->add (2, 0, new CFPlus::UI::Button 498 $table->add_at (2, 0, new CFPlus::UI::Button
260 text => "Accept", 499 text => "Accept",
261 on_activate => sub { 500 on_activate => sub {
262 $conn->send ("reply d"); 501 $conn->send ("reply d");
263 destroy_query_dialog $conn; 502 destroy_query_dialog $conn;
264 0 503 0
265 }, 504 },
266 ); 505 );
267 506
507 if ($conn->{chargen_race_description}) {
508 unshift @dialog, new CFPlus::UI::Label
509 max_w => $::WIDTH * 0.8,
510 ellipsise => 0,
511 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
512 ;
513 }
514
515 unshift @dialog, new CFPlus::UI::Face
516 face => $conn->{player}{face},
517 bg => [.2, .2, .2, 1],
518 min_w => 64,
519 min_h => 64,
520 ;
521
522 if ($conn->{chargen_race_title}) {
523 unshift @dialog, new CFPlus::UI::Label
524 allign => 1,
525 ellipsise => 0,
526 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
527 ;
528 }
529
268 unshift @dialog, new CFPlus::UI::Label 530 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 531 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 532 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 533 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 534 ;
… …
276 $conn->send ("reply $stat"); 538 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 539 destroy_query_dialog $conn;
278 return; 540 return;
279 } 541 }
280 542
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283
284 unshift @dialog, new CFPlus::UI::Label 543 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 544 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 545 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 546 markup => "\nOr use your keyboard and the text entry below:\n";
288 547
289 unshift @dialog, my $table = new CFPlus::UI::Table; 548 unshift @dialog, my $table = new CFPlus::UI::Table;
290 549
291 # left: re-roll 550 # left: re-roll
292 $table->add (0, 0, new CFPlus::UI::Button 551 $table->add_at (0, 0, new CFPlus::UI::Button
293 text => "Roll Again", 552 text => "Roll Again",
294 on_activate => sub { 553 on_activate => sub {
295 $conn->send ("reply y"); 554 $conn->send ("reply y");
296 destroy_query_dialog $conn; 555 destroy_query_dialog $conn;
297 0 556 0
… …
311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 570 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 571 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313 ], 572 ],
314 ), 1 .. 2; 573 ), 1 .. 2;
315 574
316 $table->add (2, 0, new CFPlus::UI::Button 575 $table->add_at (2, 0, new CFPlus::UI::Button
317 text => "Swap Stats", 576 text => "Swap Stats",
318 on_activate => sub { 577 on_activate => sub {
319 $conn->{stat_change_with} = $sw2->{value}; 578 $conn->{stat_change_with} = $sw2->{value};
320 $conn->send ("reply $sw1->{value}"); 579 $conn->send ("reply $sw1->{value}");
321 destroy_query_dialog $conn; 580 destroy_query_dialog $conn;
322 0 581 0
323 }, 582 },
324 ); 583 );
325 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 584 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326 585
327 # right: accept 586 # right: accept
328 $table->add (4, 0, new CFPlus::UI::Button 587 $table->add_at (4, 0, new CFPlus::UI::Button
329 text => "Accept", 588 text => "Accept",
330 on_activate => sub { 589 on_activate => sub {
331 $conn->send ("reply n"); 590 $conn->send ("reply n");
332 $STATS_PAGE->hide; 591 $STATS_PAGE->hide;
333 destroy_query_dialog $conn; 592 destroy_query_dialog $conn;
… …
414 maph => $mapsize, 673 maph => $mapsize,
415 674
416 client => "cfplus $CFPlus::VERSION $] $^O", 675 client => "cfplus $CFPlus::VERSION $] $^O",
417 676
418 map_widget => $MAPWIDGET, 677 map_widget => $MAPWIDGET,
419 logview => $LOGVIEW,
420 statusbox => $STATUSBOX, 678 statusbox => $STATUSBOX,
421 map => $MAP, 679 map => $MAP,
422 mapmap => $MAPMAP, 680 mapmap => $MAPMAP,
423 query => \&server_query, 681 query => \&server_query,
424 682
425 sound_play => sub { 683 setup_req => {
426 my ($x, $y, $soundnum, $type) = @_; 684 smoothing => $CFG->{map_smoothing}*1,
427
428 $SDL_MIXER
429 or return;
430
431 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
432 or return;
433
434 $chunk->play;
435 }, 685 },
436 }; 686 };
437 687
438 if ($CONN) { 688 if ($CONN) {
439 CFPlus::lowdelay fileno $CONN->{fh}; 689 CFPlus::lowdelay fileno $CONN->{fh};
… …
449 $LOGIN_BUTTON->set_text ("Login"); 699 $LOGIN_BUTTON->set_text ("Login");
450 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 700 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
451 $SETUP_DIALOG->show; 701 $SETUP_DIALOG->show;
452 $PL_WINDOW->hide; 702 $PL_WINDOW->hide;
453 $SPELL_LIST->clear_spells; 703 $SPELL_LIST->clear_spells;
704 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
705
706 &audio_music_set_ambient ([]);
454 707
455 return unless $CONN; 708 return unless $CONN;
456 709
457 status "connection closed"; 710 status "connection closed";
458 711
… …
468 721
469 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 722 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
470 723
471 my $row = 0; 724 my $row = 0;
472 725
473 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 726 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
474 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 727 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
475 can_events => 1, 728 can_events => 1,
476 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 729 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
477 730
731 my $vidmode_tooltip =
732 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
733 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
734
478 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 735 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
479 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 736 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
480 737
738 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
481 $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]); 739 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
482 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 740 tooltip => $vidmode_tooltip);
741 $hbox->add (my $mode_label = new CFPlus::UI::Label
742 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
743 can_events => 1, tooltip => $vidmode_tooltip);
483 744
484 $mode_slider->connect (changed => sub { 745 $mode_slider->connect (changed => sub {
485 my ($self, $value) = @_; 746 my ($self, $value) = @_;
486 747
487 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 748 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
488 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 749 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
489 }); 750 });
490 $mode_slider->emit (changed => $mode_slider->{range}[0]); 751 $mode_slider->emit (changed => $mode_slider->{range}[0]);
491 752
492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 753 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
493 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 754 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
494 state => $CFG->{fullscreen}, 755 state => $CFG->{fullscreen},
495 tooltip => "Bring the client into fullscreen mode.", 756 tooltip => "Bring the client into fullscreen mode.",
496 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 757 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
497 ); 758 );
498 759
499 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 760 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
500 $table->add (1, $row++, new CFPlus::UI::CheckBox 761 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
501 state => $CFG->{fast}, 762 state => $CFG->{fast},
502 tooltip => "Lower the visual quality considerably to speed up rendering.", 763 tooltip => "Lower the visual quality considerably to speed up rendering.",
503 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 764 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
504 ); 765 );
505 766
767 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
768 $table->add_at (1, $row++, new CFPlus::UI::Slider
769 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
770 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
771 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
772 );
773
774 $table->add_at (1, $row++, new CFPlus::UI::Button
775 expand => 1, align => 0, text => "Apply",
776 tooltip => "Apply the video settings above.",
777 on_activate => sub {
778 video_shutdown ();
779 video_init ();
780 0
781 }
782 );
783
506 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
507 $table->add (1, $row++, new CFPlus::UI::Slider 785 $table->add_at (1, $row++, new CFPlus::UI::Slider
508 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 786 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
509 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 787 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
510 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 788 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
511 ); 789 );
512 790
791 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
792 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
793 state => $CFG->{map_smoothing},
794 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
795 . "This increases load on the graphics subsystem and works only with 2.x servers. "
796 . "Changes take effect at next connection only.",
797 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
798 );
799
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 800 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
514 $table->add (1, $row++, new CFPlus::UI::CheckBox 801 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
515 state => $CFG->{fow_enable}, 802 state => $CFG->{fow_enable},
516 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 803 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
517 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 804 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
518 ); 805 );
519 806
520 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 807 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
521 $table->add (1, $row++, new CFPlus::UI::Slider 808 $table->add_at (1, $row++, new CFPlus::UI::Slider
522 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 809 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
523 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 810 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
524 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 811 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
525 ); 812 );
526 813
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
528 $table->add (1, $row++, new CFPlus::UI::CheckBox
529 state => $CFG->{fow_smooth},
530 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
531 on_changed => sub {
532 my ($self, $value) = @_;
533 $CFG->{fow_smooth} = $value;
534 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
535 0
536 }
537 );
538
539 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
540 $table->add (1, $row++, new CFPlus::UI::Slider
541 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
542 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
543 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
544 );
545
546 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
547 $table->add (1, $row++, new CFPlus::UI::Slider 815 $table->add_at (1, $row++, new CFPlus::UI::Slider
548 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 816 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
549 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 817 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
550 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 818 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
551 ); 819 );
552 820
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
554 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
555 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 823 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
556 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 824 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
557 on_changed => sub { 825 on_changed => sub {
558 $CFG->{gauge_fontsize} = $_[1]; 826 $CFG->{gauge_fontsize} = $_[1];
559 &set_gauge_window_fontsize; 827 &set_gauge_window_fontsize;
560 0 828 0
561 } 829 }
562 ); 830 );
563 831
564 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 832 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
565 $table->add (1, $row++, new CFPlus::UI::Slider 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
566 range => [$CFG->{gauge_size}, 0.2, 0.8], 834 range => [$CFG->{gauge_size}, 0.2, 0.8],
567 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 835 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
568 on_changed => sub { 836 on_changed => sub {
569 $CFG->{gauge_size} = $_[1]; 837 $CFG->{gauge_size} = $_[1];
570 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 838 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
571 0 839 0
572 } 840 }
573 ); 841 );
574 842
575 $table->add (1, $row++, new CFPlus::UI::Button
576 expand => 1, align => 0, text => "Apply",
577 tooltip => "Apply the video settings",
578 on_activate => sub {
579 video_shutdown ();
580 video_init ();
581 0
582 }
583 );
584
585 $vbox 843 $vbox
586} 844}
587 845
588sub audio_setup { 846sub audio_setup {
589 my $vbox = new CFPlus::UI::VBox; 847 my $vbox = new CFPlus::UI::VBox;
590 848
591 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 849 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
592 850
593 my $row = 0; 851 my $row = 0;
594 852
595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 853 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
596 $table->add (1, $row++, new CFPlus::UI::CheckBox 854 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
597 state => $CFG->{audio_enable}, 855 state => $CFG->{audio_enable},
598 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.", 856 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.",
599 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 857 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
600 ); 858 );
601# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 859# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
602# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 860# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
603# $CFG->{effects_volume} = $_[1]; 861# $CFG->{effects_volume} = $_[1];
604# }); 862# });
863
864 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
865 $table->add_at (1, $row, new CFPlus::UI::CheckBox
866 expand => 1, state => $CFG->{effects_enable},
867 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
868 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 }
869 );
870 $table->add_at (2, $row++, new CFPlus::UI::Slider
871 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
872 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
873 . "is set highest and you use your operating system volume setting. Changes are instant.",
874 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
875 );
876
605 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
606 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
607 $hbox->add (new CFPlus::UI::CheckBox 878 $table->add_at (1, $row, new CFPlus::UI::CheckBox
608 expand => 1, state => $CFG->{bgm_enable}, 879 expand => 1, state => $CFG->{bgm_enable},
609 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 880 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
610 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 881 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
611 ); 882 );
612 $hbox->add (new CFPlus::UI::Slider 883 $table->add_at (2, $row++, new CFPlus::UI::Slider
613 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 884 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
614 tooltip => "The volume of the background music. Changes are instant.", 885 tooltip => "The volume of the background music. Changes are instant.",
615 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 886 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
616 ); 887 );
617 888
618 $table->add (1, $row++, new CFPlus::UI::Button 889 $table->add_at (1, $row++, new CFPlus::UI::Button
619 expand => 1, align => 0, text => "Apply", 890 c_colspan => 2, expand => 1, align => 0, text => "Apply",
620 tooltip => "Apply the audio settings", 891 tooltip => "Apply the audio settings",
621 on_activate => sub { 892 on_activate => sub {
622 audio_shutdown (); 893 audio_shutdown ();
623 audio_init (); 894 audio_init ();
624 0 895 0
… …
682} 953}
683 954
684sub debug_setup { 955sub debug_setup {
685 my $table = new CFPlus::UI::Table; 956 my $table = new CFPlus::UI::Table;
686 957
687 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 958 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
688 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 959 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
689 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 960 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
690 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 961 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
691 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 962 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
692 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 963 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
693 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 964 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
694 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 965 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
695 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 966 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
696 967
697 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
698
699 for my $x (0..2) {
700 for my $y (0 .. 2) {
701 $table->add ($x + 3, $y,
702 new CFPlus::UI::Entry
703 text => $default_smooth[$x * 3 + $y],
704 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
705 );
706 }
707 }
708
709 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 968 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
969
970 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
971 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
972 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
973 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
974 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
975 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
976
977 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
978
979 $c->add_items ({
980 type => "line_loop",
981 color => [0, 1, 0],
982 width => 9,
983 coord_mode => "abs",
984 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
985 });
986
987 $c->add_items ({
988 type => "lines",
989 color => [1, 1, 0],
990 width => 2,
991 coord_mode => "rel",
992 coord => [[0,0], [1,1], [1,0], [0,1]],
993 });
994
995 $c->add_items ({
996 type => "polygon",
997 color => [0, 0.43, 0],
998 width => 2,
999 coord_mode => "rel",
1000 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1001 });
710 1002
711 $table 1003 $table
712} 1004}
713 1005
714sub stats_window { 1006sub stats_window {
… …
762 [2, 4, st_spd => "Spd", 10.54], 1054 [2, 4, st_spd => "Spd", 10.54],
763 [2, 5, st_wspd => "WSp", 10.54], 1055 [2, 5, st_wspd => "WSp", 10.54],
764 ) { 1056 ) {
765 my ($col, $row, $id, $label, $template) = @$_; 1057 my ($col, $row, $id, $label, $template) = @$_;
766 1058
767 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1059 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
768 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1060 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
769 align => +1, template => $template, tooltip => "#stat_$label"); 1061 align => +1, template => $template, tooltip => "#stat_$label");
770 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1062 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
771 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1063 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
772 align => -1, text => $label, tooltip => "#stat_$label"); 1064 align => -1, text => $label, tooltip => "#stat_$label");
773 } 1065 }
774 1066
775 $vb->add (new CFPlus::UI::FancyFrame 1067 $vb->add (new CFPlus::UI::FancyFrame
… …
816 cold => ["Cold", 1108 cold => ["Cold",
817 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1109 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
818 ghit => ["Ghost hit", 1110 ghit => ["Ghost hit",
819 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1111 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
820 ); 1112 );
1113
821 for (qw/slow holyw conf fire depl magic 1114 for (qw/slow holyw conf fire depl magic
822 drain acid pois para deat phys 1115 drain acid pois para deat phys
823 blind fear tund elec cold ghit/) 1116 blind fear tund elec cold ghit/)
824 { 1117 {
825 $tbl2->add ($col, $row, 1118 $tbl2->add_at ($col, $row,
826 $STATWIDS->{"res_$_"} = 1119 $STATWIDS->{"res_$_"} =
827 new CFPlus::UI::Label 1120 new CFPlus::UI::Label
828 font => $FONT_FIXED, 1121 font => $FONT_FIXED,
829 template => "-100%", 1122 template => "-100%",
830 align => +1, 1123 align => +1,
831 valign => 0, 1124 valign => 0,
832 can_events => 1, 1125 can_events => 1,
833 can_hover => 1, 1126 can_hover => 1,
834 tooltip => $resist_names{$_}->[1], 1127 tooltip => $resist_names{$_}->[1],
835 ); 1128 );
836 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1129 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
837 font => $FONT_FIXED, 1130 font => $FONT_FIXED,
838 can_hover => 1, 1131 can_hover => 1,
839 can_events => 1, 1132 can_events => 1,
840 path => "ui/resist/resist_$_.png", 1133 path => "ui/resist/resist_$_.png",
841 tooltip => $resist_names{$_}->[1], 1134 tooltip => $resist_names{$_}->[1],
842 ); 1135 );
843 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1136 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
844 text => $resist_names{$_}->[0], 1137 text => $resist_names{$_}->[0],
845 font => $FONT_FIXED, 1138 font => $FONT_FIXED,
846 can_hover => 1, 1139 can_hover => 1,
847 can_events => 1, 1140 can_events => 1,
848 tooltip => $resist_names{$_}->[1], 1141 tooltip => $resist_names{$_}->[1],
… …
881 return if $METASERVER_ATIME > time; 1174 return if $METASERVER_ATIME > time;
882 $METASERVER_ATIME = time + 60; 1175 $METASERVER_ATIME = time + 60;
883 1176
884 my $table = $METASERVER->{table}; 1177 my $table = $METASERVER->{table};
885 $table->clear; 1178 $table->clear;
886 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1179 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
887 1180
888 my $ok = 0; 1181 my $ok = 0;
889 1182
890 CFPlus::background { 1183 CFPlus::background {
891 my $ua = CFPlus::lwp_useragent; 1184 my $ua = CFPlus::lwp_useragent;
… …
902 "The time this server has been running without being restarted.", 1195 "The time this server has been running without being restarted.",
903 "The server software version - a '+' indicates a Crossfire+ server.", 1196 "The server software version - a '+' indicates a Crossfire+ server.",
904 "Short information about this server provided by its admins.", 1197 "Short information about this server provided by its admins.",
905 ); 1198 );
906 my @col = qw(#Users Host Uptime Version Description); 1199 my @col = qw(#Users Host Uptime Version Description);
907 $table->add ($_, 0, new CFPlus::UI::Label 1200 $table->add_at ($_, 0, new CFPlus::UI::Label
908 can_hover => 1, can_events => 1, 1201 can_hover => 1, can_events => 1,
909 align => 0, fg => [1, 1, 0], 1202 align => 0, fg => [1, 1, 0],
910 text => $col[$_], tooltip => $tip[$_]) 1203 text => $col[$_], tooltip => $tip[$_])
911 for 0 .. $#col; 1204 for 0 .. $#col;
912 1205
… …
934 1227
935 $m = [$users, $host, $uptime, $version, $desc]; 1228 $m = [$users, $host, $uptime, $version, $desc];
936 1229
937 $y++; 1230 $y++;
938 1231
939 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1232 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
940 (new CFPlus::UI::Button 1233 (new CFPlus::UI::Button
941 text => "Use", 1234 text => "Use",
942 tooltip => "Put this server into the <b>Host:Port</b> field", 1235 tooltip => "Put this server into the <b>Host:Port</b> field",
943 on_activate => sub { 1236 on_activate => sub {
944 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1237 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
947 }, 1240 },
948 ), 1241 ),
949 (new CFPlus::UI::Empty expand => 1), 1242 (new CFPlus::UI::Empty expand => 1),
950 ]); 1243 ]);
951 1244
952 $table->add ($_, $y, new CFPlus::UI::Label 1245 $table->add_at ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4, 1246 max_w => $::WIDTH * 0.4,
954 ellipsise => 0, 1247 ellipsise => 0,
955 align => $align[$_], 1248 align => $align[$_],
956 text => $m->[$_], 1249 text => $m->[$_],
957 tooltip => $tip[$_], 1250 tooltip => $tip[$_],
… …
998 1291
999 $vbox->add (new CFPlus::UI::FancyFrame 1292 $vbox->add (new CFPlus::UI::FancyFrame
1000 label => "Connection Settings", 1293 label => "Connection Settings",
1001 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1294 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1002 ); 1295 );
1003 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1296 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1004 1297
1005 { 1298 {
1006 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1299 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1007 1300
1008 $vbox->add ( 1301 $vbox->add (
1009 $HOST_ENTRY = new CFPlus::UI::Entry 1302 $HOST_ENTRY = new CFPlus::UI::Entry
1010 expand => 1, 1303 expand => 1,
1011 text => $CFG->{profile}{default}{host}, 1304 text => $CFG->{profile}{default}{host},
1012 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1305 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1013 on_changed => sub { 1306 on_changed => sub {
1014 my ($self, $value) = @_; 1307 my ($self, $value) = @_;
1015 $CFG->{profile}{default}{host} = $value; 1308 $CFG->{profile}{default}{host} = $value;
1016 0 1309 1
1017 } 1310 }
1018 ); 1311 );
1019 1312
1020 $vbox->add (new CFPlus::UI::Button 1313 $vbox->add (new CFPlus::UI::Button
1021 expand => 1, 1314 expand => 1,
1022 text => "Server List", 1315 text => "Server List",
1023 other => $METASERVER, 1316 other => $METASERVER,
1024 tooltip => "Show a list of available crossfire servers", 1317 tooltip => "Show a list of available crossfire servers",
1025 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1318 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1026 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1319 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1027 ); 1320 );
1028 } 1321 }
1029 1322
1030 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1323 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1031 $table->add (1, 4, new CFPlus::UI::Entry 1324 $table->add_at (1, 4, new CFPlus::UI::Entry
1032 text => $CFG->{profile}{default}{user}, 1325 text => $CFG->{profile}{default}{user},
1033 tooltip => "The name of your character on the server", 1326 tooltip => "The name of your character on the server",
1034 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1327 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1035 ); 1328 );
1036 1329
1037 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1330 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1038 $table->add (1, 5, new CFPlus::UI::Entry 1331 $table->add_at (1, 5, new CFPlus::UI::Entry
1039 text => $CFG->{profile}{default}{password}, 1332 text => $CFG->{profile}{default}{password},
1040 hidden => 1, 1333 hidden => 1,
1041 tooltip => "The password for your character", 1334 tooltip => "The password for your character",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1335 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1043 ); 1336 );
1044 1337
1045 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1338 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1046 $table->add (1, 7, new CFPlus::UI::Slider 1339 $table->add_at (1, 7, new CFPlus::UI::Slider
1047 force_w => 100, 1340 force_w => 100,
1048 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1341 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1049 tooltip => "This is the size of the portion of the map update the server sends you. " 1342 tooltip => "This is the size of the portion of the map update the server sends you. "
1050 . "If you set this to a high value you will be able to see further, " 1343 . "If you set this to a high value you will be able to see further, "
1051 . "but you also increase bandwidth requirements and latency. " 1344 . "but you also increase bandwidth requirements and latency. "
1052 . "This option is only used once at log-in.", 1345 . "This option is only used once at log-in.",
1053 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1346 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1054 ); 1347 );
1055 1348
1056 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1057 $table->add (1, 8, new CFPlus::UI::CheckBox
1058 state => $CFG->{face_prefetch},
1059 tooltip => "<b>Background Image Prefetch</b>\n\n"
1060 . "If enabled, the client automatically pre-fetches images from the server. "
1061 . "This might increase or create lag, but increases the chances "
1062 . "of faces being ready for display when you encounter them. "
1063 . "It also uses up server bandwidth on every connect, "
1064 . "so only set it if you really need to prefetch images. "
1065 . "This option can be set and unset any time.",
1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1067 );
1068
1069 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1349 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1070 $table->add (1, 9, new CFPlus::UI::Entry 1350 $table->add_at (1, 8, new CFPlus::UI::Entry
1071 text => $CFG->{output_rate}, 1351 text => $CFG->{output_rate},
1072 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1352 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1073 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1353 . "when sending data. When 0 or unset, the server "
1074 . "default will be used, which is usually around 100kb/s.", 1354 . "default will be used, which is usually around 100kb/s. Most servers will "
1355 . "dynamically find an optimal rate, so adjust this only when necessary.",
1075 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1356 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1076 ); 1357 );
1077 1358
1078 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1359 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1079 $table->add (1, 10, new CFPlus::UI::Entry 1360 $table->add_at (1, 9, new CFPlus::UI::Entry
1080 text => $CFG->{output_count}, 1361 text => $CFG->{output_count},
1081 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1362 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1082 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1363 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1083 ); 1364 );
1084 1365
1085 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1366 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1086 $table->add (1, 11, new CFPlus::UI::Entry 1367 $table->add_at (1, 10, new CFPlus::UI::Entry
1087 text => $CFG->{output_sync}, 1368 text => $CFG->{output_sync},
1088 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1369 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1089 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1370 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1090 ); 1371 );
1091 1372
1092 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1373 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1093 expand => 1, 1374 expand => 1,
1094 align => 0, 1375 align => 0,
1095 text => "Login", 1376 text => "Login",
1096 on_activate => sub { 1377 on_activate => sub {
1097 $CONN ? stop_game 1378 $CONN ? stop_game
1098 : start_game; 1379 : start_game;
1099 0 1380 1
1100 }, 1381 },
1101 ); 1382 );
1102 1383
1103 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1384 $vbox->add (new CFPlus::UI::FancyFrame
1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry 1385 label => "Server Info",
1105 text => $CFG->{say_command}, 1386 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1106 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. "
1107 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1108 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1109 on_changed => sub {
1110 my ($self, $value) = @_;
1111 $CFG->{say_command} = $value;
1112 0
1113 }
1114 ); 1387 );
1115 1388
1389 $vbox
1390}
1391
1392sub client_setup {
1393 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1394
1395 my $row = 0;
1396
1116 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1397 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1117 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox 1398 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1118 state => $CFG->{show_tips}, 1399 state => $CFG->{show_tips},
1119 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1400 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1120 on_changed => sub { 1401 on_changed => sub {
1121 my ($self, $value) = @_; 1402 my ($self, $value) = @_;
1122 $CFG->{show_tips} = $value; 1403 $CFG->{show_tips} = $value;
1123 0 1404 0
1124 } 1405 }
1125 ); 1406 );
1126 1407
1127 $vbox->add (new CFPlus::UI::FancyFrame 1408 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1128 label => "Server Info", 1409 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1129 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1410 text => $CFG->{logview_max_par},
1130 ); 1411 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1131 1412 . "sends more messages than this number, older messages get removed to save memory and "
1132 $vbox 1413 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1133}
1134
1135sub message_window {
1136 my $window = new CFPlus::UI::Toplevel
1137 name => "message_window",
1138 title => "Messages",
1139 border_bg => [1, 1, 1, 1],
1140 x => "max",
1141 y => 0,
1142 force_w => $::WIDTH * 0.4,
1143 force_h => $::HEIGHT * 0.5,
1144 child => (my $vbox = new CFPlus::UI::VBox),
1145 has_close_button => 1;
1146
1147 $vbox->add ($LOGVIEW);
1148
1149 $vbox->add (my $input = new CFPlus::UI::Entry
1150 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1151 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1152 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1153 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1154 on_focus_in => sub { 1414 on_changed => sub {
1155 my ($input, $prev_focus) = @_; 1415 my ($self, $value) = @_;
1156 1416 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1157 delete $input->{refocus_map};
1158
1159 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1160 $input->{refocus_map} = 1;
1161 }
1162 delete $input->{auto_activated};
1163
1164 0 1417 0
1165 }, 1418 },
1166 on_activate => sub {
1167 my ($input, $text) = @_;
1168 $input->set_text ('');
1169
1170 if ($text =~ /^\/(.*)/) {
1171 $::CONN->user_send ($1);
1172 } else {
1173 my $say_cmd = $::CFG->{say_command} || 'say';
1174 $::CONN->user_send ("$say_cmd $text");
1175 }
1176 if ($input->{refocus_map}) {
1177 delete $input->{refocus_map};
1178 $MAPWIDGET->focus_in
1179 }
1180
1181 0
1182 },
1183 on_escape => sub {
1184 $MAPWIDGET->grab_focus;
1185
1186 0
1187 },
1188 );
1189
1190 $CONSOLE = {
1191 window => $window,
1192 input => $input,
1193 }; 1419 );
1194 1420
1195 $window 1421 $table
1196} 1422}
1197 1423
1198sub autopickup_setup { 1424sub autopickup_setup {
1425 my $r = new CFPlus::UI::ScrolledWindow (
1426 expand => 1,
1427 scroll_y => 1
1428 );
1199 my $table = new CFPlus::UI::Table; 1429 $r->add (my $table = new CFPlus::UI::Table
1430 row_expand => [0],
1431 col_expand => [0, 1, 0, 1],
1432 );
1200 1433
1201 for ( 1434 for (
1202 ["General", 0, 0, 1435 ["General", 0, 0,
1203 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1436 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1204 ["Inhibit autopickup" => PICKUP_INHIBIT], 1437 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1239 ], 1472 ],
1240 ["Weight/Value ratio", 2, 17] 1473 ["Weight/Value ratio", 2, 17]
1241 ) 1474 )
1242 { 1475 {
1243 my ($title, $x, $y, @bits) = @$_; 1476 my ($title, $x, $y, @bits) = @$_;
1244 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1477 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1245 1478
1246 for (@bits) { 1479 for (@bits) {
1247 ++$y; 1480 ++$y;
1248 1481
1249 my $mask = $_->[1]; 1482 my $mask = $_->[1];
1250 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1483 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1251 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1484 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1252 state => $::CFG->{pickup} & $mask, 1485 state => $::CFG->{pickup} & $mask,
1253 on_changed => sub { 1486 on_changed => sub {
1254 my ($box, $value) = @_; 1487 my ($box, $value) = @_;
1255 1488
1256 if ($value) { 1489 if ($value) {
… …
1267 1500
1268 ${$_->[2]} = $checkbox if $_->[2]; 1501 ${$_->[2]} = $checkbox if $_->[2];
1269 } 1502 }
1270 } 1503 }
1271 1504
1272 $table->add (2, 18, new CFPlus::UI::ValSlider 1505 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1273 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1506 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1274 template => ">= 99", 1507 template => ">= 99",
1275 to_value => sub { ">= " . 5 * $_[0] }, 1508 to_value => sub { ">= " . 5 * $_[0] },
1276 on_changed => sub { 1509 on_changed => sub {
1277 my ($slider, $value) = @_; 1510 my ($slider, $value) = @_;
… …
1280 $::CFG->{pickup} |= int $value 1513 $::CFG->{pickup} |= int $value
1281 if $value; 1514 if $value;
1282 1; 1515 1;
1283 }); 1516 });
1284 1517
1285 $table->add (3, 18, new CFPlus::UI::Button 1518 $table->add_at (3, 18, new CFPlus::UI::Button
1286 text => "set", 1519 text => "set",
1287 on_activate => sub { 1520 on_activate => sub {
1288 $::CONN->send_command ("pickup $::CFG->{pickup}") 1521 $::CONN->send_command ("pickup $::CFG->{pickup}")
1289 if defined $::CONN; 1522 if defined $::CONN;
1290 0 1523 0
1291 }); 1524 });
1292 1525
1293 $table 1526 $r
1294} 1527}
1295 1528
1296my %SORT_ORDER = ( 1529my %SORT_ORDER = (
1297 type => undef, 1530 type => undef,
1298 mtime => sub { 1531 mtime => sub {
… …
1377 has_close_button => 1 1610 has_close_button => 1
1378 ; 1611 ;
1379 1612
1380 my $ntb = 1613 my $ntb =
1381 $PL_NOTEBOOK = 1614 $PL_NOTEBOOK =
1382 new CFPlus::UI::Notebook expand => 1, debug => 1; 1615 new CFPlus::UI::Notebook expand => 1;
1383 1616
1384 $ntb->add ( 1617 $ntb->add_tab (
1385 "Statistics (F2)" => $STATS_PAGE = stats_window, 1618 "Statistics (F2)" => $STATS_PAGE = stats_window,
1386 "Shows statistics, where all your Stats and Resistances are shown." 1619 "Shows statistics, where all your Stats and Resistances are shown."
1387 ); 1620 );
1388 $ntb->add ( 1621 $ntb->add_tab (
1389 "Skills (F3)" => $SKILL_PAGE = skill_window, 1622 "Skills (F3)" => $SKILL_PAGE = skill_window,
1390 "Shows all your Skills." 1623 "Shows all your Skills."
1391 ); 1624 );
1392 1625
1393 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1626 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1394 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1627 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1395 $ntb->add ( 1628 $ntb->add_tab (
1396 "Spellbook (F4)" => $spellsw, 1629 "Spellbook (F4)" => $spellsw,
1397 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1630 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1398 ); 1631 );
1399 $ntb->add ( 1632 $ntb->add_tab (
1400 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1633 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1401 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1634 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1402 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1635 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1403 ); 1636 );
1637 $ntb->add_tab (Pickup => autopickup_setup,
1638 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1404 1639
1405 $ntb->set_current_page ($INVENTORY_PAGE); 1640 $ntb->set_current_page ($INVENTORY_PAGE);
1406 1641
1407 $plwin->add ($ntb); 1642 $plwin->add ($ntb);
1408 $plwin 1643 $plwin
… …
1574 1809
1575sub show_tip_of_the_day { 1810sub show_tip_of_the_day {
1576 # find all tips 1811 # find all tips
1577 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1812 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1578 1813
1579 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1814 CFPlus::DB::get state => "tip_of_the_day", sub {
1815 my ($todindex) = @_;
1580 $todindex = 0 if $todindex >= @tod; 1816 $todindex = 0 if $todindex >= @tod;
1581 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1817 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1582 1818
1583 # create dialog 1819 # create dialog
1584 my $dialog; 1820 my $dialog;
1585 1821
1586 my $close = sub { 1822 my $close = sub {
1587 $dialog->destroy; 1823 $dialog->destroy;
1824 };
1825
1826 $dialog = new CFPlus::UI::Toplevel
1827 x => "center",
1828 y => "center",
1829 z => 3,
1830 name => 'tip_of_the_day',
1831 force_w => int $WIDTH * 4/9,
1832 force_h => int $WIDTH * 2/9,
1833 title => "Tip of the day #" . (1 + $todindex),
1834 child => my $vbox = new CFPlus::UI::VBox,
1835 has_close_button => 1,
1836 on_delete => $close,
1837 ;
1838
1839 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1840 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1841 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1842
1843 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1844
1845 $table->add_at (0, 0, new CFPlus::UI::Button
1846 text => "Close",
1847 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>.",
1848 on_activate => $close,
1849 );
1850
1851 $table->add_at (2, 0, new CFPlus::UI::Button
1852 text => "Next",
1853 tooltip => "Show the next <b>Tip of the day</b>.",
1854 on_activate => sub {
1855 $close->();
1856 &show_tip_of_the_day;
1857 },
1858 );
1859
1860 $dialog->show;
1588 }; 1861 };
1589
1590 $dialog = new CFPlus::UI::Toplevel
1591 x => "center",
1592 y => "center",
1593 z => 3,
1594 name => 'tip_of_the_day',
1595 force_w => int $WIDTH * 4/9,
1596 force_h => int $WIDTH * 2/9,
1597 title => "Tip of the day #" . (1 + $todindex),
1598 child => my $vbox = new CFPlus::UI::VBox,
1599 has_close_button => 1,
1600 on_delete => $close,
1601 ;
1602
1603 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1604 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1605 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1606
1607 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1608
1609 $table->add (0, 0, new CFPlus::UI::Button
1610 text => "Close",
1611 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>.",
1612 on_activate => $close,
1613 );
1614
1615 $table->add (2, 0, new CFPlus::UI::Button
1616 text => "Next",
1617 tooltip => "Show the next <b>Tip of the day</b>.",
1618 on_activate => sub {
1619 $close->();
1620 &show_tip_of_the_day;
1621 },
1622 );
1623
1624 $dialog->show;
1625} 1862}
1626 1863
1627sub sdl_init { 1864sub sdl_init {
1628 CFPlus::SDL_Init 1865 CFPlus::SDL_Init
1629 and die "SDL::Init failed!\n"; 1866 and die "SDL::Init failed!\n";
1630} 1867}
1631 1868
1632sub video_init { 1869sub video_init {
1633 sdl_init;
1634
1635 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1870 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1636 1871
1637 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1872 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1638 1873
1639 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1874 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1640 $FULLSCREEN = $CFG->{fullscreen}; 1875 $FULLSCREEN = $CFG->{fullscreen};
1641 $FAST = $CFG->{fast}; 1876 $FAST = $CFG->{fast};
1642 1877
1643 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1878 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1644 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1879 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1645 1880
1646 $SDL_ACTIVE = 1; 1881 $SDL_ACTIVE = 1;
1647 $LAST_REFRESH = time - 0.01; 1882 $LAST_REFRESH = time - 0.01;
1648 1883
… …
1690 1925
1691 $MAPWIDGET = new CFPlus::MapWidget; 1926 $MAPWIDGET = new CFPlus::MapWidget;
1692 $MAPWIDGET->connect (activate_console => sub { 1927 $MAPWIDGET->connect (activate_console => sub {
1693 my ($mapwidget, $preset) = @_; 1928 my ($mapwidget, $preset) = @_;
1694 1929
1695 if ($CONSOLE) { 1930 $MESSAGE_WINDOW->activate_console ($preset)
1696 $CONSOLE->{input}->{auto_activated} = 1; 1931 if $MESSAGE_WINDOW;
1697 $CONSOLE->{input}->grab_focus;
1698
1699 if ($preset && $CONSOLE->{input}->get_text eq '') {
1700 $CONSOLE->{input}->set_text ($preset);
1701 }
1702 }
1703 }); 1932 });
1704 $MAPWIDGET->show; 1933 $MAPWIDGET->show;
1705 $MAPWIDGET->grab_focus; 1934 $MAPWIDGET->grab_focus;
1706
1707 $LOGVIEW = new CFPlus::UI::TextScroller
1708 expand => 1,
1709 font => $FONT_FIXED,
1710 fontsize => $::CFG->{log_fontsize},
1711 indent => -4,
1712 can_hover => 1,
1713 can_events => 1,
1714 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1715 ;
1716 1935
1717 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1936 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1718 title => "Setup", 1937 title => "Setup",
1719 name => "setup_dialog", 1938 name => "setup_dialog",
1720 x => 'center', 1939 x => 'center',
… …
1724 force_h => $::HEIGHT * 0.6, 1943 force_h => $::HEIGHT * 0.6,
1725 has_close_button => 1, 1944 has_close_button => 1,
1726 ; 1945 ;
1727 1946
1728 $METASERVER = metaserver_dialog; 1947 $METASERVER = metaserver_dialog;
1948 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1729 1949
1730 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1950 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1731 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1951 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1732 1952
1733 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1953 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1734 "Configure the server to play on, your username, password and other server-related options."); 1954 "Configure the server to play on, your username, password and other server-related options.");
1735 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1955 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1736 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1956 "Configure various client-specific settings.");
1737 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1957 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1738 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1958 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1739 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1959 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1740 "Configure the use of audio, sound effects and background music."); 1960 "Configure the use of audio, sound effects and background music.");
1741 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1961 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1742 "Lets you define, edit and delete key bindings." 1962 "Lets you define, edit and delete key bindings."
1743 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1963 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1744 . "with nothing set and the recording started. After doing the actions you " 1964 . "with nothing set and the recording started. After doing the actions you "
1745 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1965 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1746 . "After pressing the combo the binding will be saved automatically and the " 1966 . "After pressing the combo the binding will be saved automatically and the "
1747 . "binding editor closes"); 1967 . "binding editor closes");
1748 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1968 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1749 "Some debuggin' options. Do not ask."); 1969 "Some debuggin' options. Do not ask.");
1750 1970
1751 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1971 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1752 1972
1753 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1973 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1754 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1974 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1755 1975
1756 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1976 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1757 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1977 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1758 1978
1759 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 1979 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
1760 1980
1761 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1981 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1794 } 2014 }
1795 2015
1796 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2016 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1797} 2017}
1798 2018
1799sub setup_build_button {
1800 my ($enabled) = @_;
1801 if ($enabled) {
1802 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1803 $BUILD_BUTTON ||= new CFPlus::UI::Button
1804 text => "Build",
1805 tooltip => "Opens the ingame builder",
1806 on_activate => sub {
1807 if ($CONN) {
1808 $CONN->send_ext_req (builder_player_items => sub {
1809 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1810 });
1811 }
1812 0
1813 };
1814 $BUTTONBAR->add ($BUILD_BUTTON);
1815 } else {
1816 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1817 }
1818}
1819
1820sub open_ingame_editor {
1821 my ($msg) = @_;
1822
1823 my $win = new CFPlus::UI::Toplevel
1824 x => 0,
1825 y => 'center',
1826 z => 4,
1827 name => 'builder_window',
1828 force_w => int $WIDTH * 1/4,
1829 force_h => int $HEIGHT * 3/4,
1830 title => "In game builder",
1831 has_close_button => 1;
1832
1833 my $r = new CFPlus::UI::ScrolledWindow (
1834 expand => 1,
1835 scroll_y => 1
1836 );
1837 $r->add (my $vb = new CFPlus::UI::VBox);
1838 $win->add ($r);
1839
1840
1841 $vb->add (
1842 new CFPlus::UI::Button
1843 text => "Disable build mode",
1844 on_activate => sub { $::IN_BUILD_MODE = undef }
1845 );
1846 $vb->add (
1847 new CFPlus::UI::Button
1848 text => "ERASE",
1849 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1850 );
1851
1852 for my $itemarchname (
1853 sort {
1854 $msg->{items}->{$a}->{build_arch_name}
1855 cmp $msg->{items}->{$b}->{build_arch_name}
1856 } keys %{$msg->{items}}
1857 ) {
1858 my $info = $msg->{items}->{$itemarchname};
1859 $vb->add (
1860 new CFPlus::UI::Button text => $info->{build_arch_name},
1861 on_activate => sub {
1862 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1863
1864 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1865 build_mode_query_arch_info ();
1866 }
1867 }
1868 );
1869 }
1870
1871 $win->show;
1872}
1873
1874sub build_mode_query_arch_info {
1875 my ($iteminfo) = $::IN_BUILD_MODE;
1876 my $itemarchname = $iteminfo->{item};
1877 my $info = $iteminfo->{info};
1878
1879 my $dialog = new CFPlus::UI::Toplevel
1880 x => "center",
1881 y => "center",
1882 z => 50,
1883 force_w => int $WIDTH * 1/2,
1884 title => "Enter information for placement of '$itemarchname'",
1885 has_close_button => 1;
1886
1887 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1888
1889 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1890 my $row = 0;
1891 if ($info->{has_name}) {
1892 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1893 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1894 }
1895 if ($info->{has_text}) {
1896 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1897 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1898 }
1899 if ($info->{has_connection}) {
1900 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1901 $table->add (1, $row++,
1902 new CFPlus::UI::Entry
1903 expand => 1,
1904 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1905 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1906 );
1907 }
1908
1909 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1910 $hb->add (new CFPlus::UI::Button
1911 text => "Close",
1912 expand => 1,
1913 on_activate => sub { $dialog->hide; 0 },
1914 );
1915 $dialog->show;
1916}
1917
1918sub video_shutdown { 2019sub video_shutdown {
1919 CFPlus::OpenGL::shutdown; 2020 CFPlus::OpenGL::shutdown;
1920 2021
1921 undef $SDL_ACTIVE; 2022 undef $SDL_ACTIVE;
1922} 2023}
1923 2024
1924my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1925my $bgmusic;#TODO#hack#d#
1926
1927sub audio_channel_finished {
1928 my ($channel) = @_;
1929
1930 #warn "channel $channel finished\n";#d#
1931}
1932
1933sub audio_music_finished {
1934 return unless $CFG->{bgm_enable};
1935
1936 # TODO: hack, do play loop and mood music
1937 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1938 $bgmusic->play (0);
1939
1940 push @bgmusic, shift @bgmusic;
1941}
1942
1943sub audio_init {
1944 if ($CFG->{audio_enable}) {
1945 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1946 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1947
1948 unless ($SDL_MIXER) {
1949 status "Unable to open sound device: there will be no sound";
1950 return;
1951 }
1952
1953 CFPlus::Mix_AllocateChannels 8;
1954 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1955
1956 audio_music_finished;
1957
1958 local $_;
1959 while (<$fh>) {
1960 next if /^\s*#/;
1961 next if /^\s*$/;
1962
1963 my ($file, $volume, $event) = split /\s+/, $_, 3;
1964
1965 push @SOUNDS, "$volume,$file";
1966
1967 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1968 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1969 $chunk->volume ($volume * 128 / 100);
1970 $chunk
1971 };
1972 }
1973 } else {
1974 status "unable to open sound config: $!";
1975 }
1976 }
1977}
1978
1979sub audio_shutdown {
1980 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1981 undef $SDL_MIXER;
1982 @SOUNDS = ();
1983 %AUDIO_CHUNKS = ();
1984}
1985
1986my %animate_object; 2025my %animate_object;
1987my $animate_timer; 2026my $animate_timer;
1988 2027
1989my $fps = 9; 2028my $fps = 9;
1990
1991my %demo;#d#
1992 2029
1993sub force_refresh { 2030sub force_refresh {
1994 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2031 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1995 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2032 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1996 2033
1997 $CFPlus::UI::ROOT->draw; 2034 $CFPlus::UI::ROOT->draw;
1998 2035
1999 $WANT_REFRESH = 0; 2036 $WANT_REFRESH = 0;
2000 $CAN_REFRESH = 0; 2037 $CAN_REFRESH = 0;
2001 $LAST_REFRESH = $NOW; 2038 $LAST_REFRESH = $NOW;
2002 2039
2003 CFPlus::SDL_GL_SwapBuffers; 2040 CFPlus::SDL_GL_SwapBuffers;
2004} 2041}
2005 2042
2006my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2043my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2007 $NOW = time; 2044 $NOW = time;
2008 2045
2009 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2046 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2010 for CFPlus::SDL_PollEvent; 2047 for CFPlus::poll_events;
2011 2048
2012 if (%animate_object) { 2049 if (%animate_object) {
2013 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2050 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2014 $WANT_REFRESH++; 2051 ++$WANT_REFRESH;
2015 } 2052 }
2016 2053
2017 if ($WANT_REFRESH) { 2054 if ($WANT_REFRESH) {
2018 force_refresh; 2055 force_refresh;
2019 } else { 2056 } else {
… …
2029sub animation_stop { 2066sub animation_stop {
2030 my ($widget) = @_; 2067 my ($widget) = @_;
2031 delete $animate_object{$widget}; 2068 delete $animate_object{$widget};
2032} 2069}
2033 2070
2034# check once/second for faces that need to be prefetched
2035# this should, of course, only run on demand, but
2036# SDL forces worse things on us....
2037
2038Event->timer (after => 1, interval => 0.25, cb => sub {
2039 $CONN->face_prefetch
2040 if $CONN;
2041});
2042
2043%SDL_CB = ( 2071%SDL_CB = (
2044 CFPlus::SDL_QUIT => sub { 2072 CFPlus::SDL_QUIT => sub {
2045 Event::unloop -1; 2073 exit;
2046 }, 2074 },
2047 CFPlus::SDL_VIDEORESIZE => sub { 2075 CFPlus::SDL_VIDEORESIZE => sub {
2048 }, 2076 },
2049 CFPlus::SDL_VIDEOEXPOSE => sub { 2077 CFPlus::SDL_VIDEOEXPOSE => sub {
2050 CFPlus::UI::full_refresh; 2078 CFPlus::UI::full_refresh;
2051 }, 2079 },
2052 CFPlus::SDL_ACTIVEEVENT => sub { 2080 CFPlus::SDL_ACTIVEEVENT => sub {
2053# not useful, as APPACTIVE include sonly iconified state, not unmapped 2081# not useful, as APPACTIVE include sonly iconified state, not unmapped
2054# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2082# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2083# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2055# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2084# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2056# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2085# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2057# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2086# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2058 }, 2087 },
2059 CFPlus::SDL_KEYDOWN => sub { 2088 CFPlus::SDL_KEYDOWN => sub {
… …
2088 CFPlus::DB::Server::run; 2117 CFPlus::DB::Server::run;
2089 2118
2090 CFPlus::UI::set_layout ($::CFG->{layout}); 2119 CFPlus::UI::set_layout ($::CFG->{layout});
2091 2120
2092 my %DEF_CFG = ( 2121 my %DEF_CFG = (
2093 sdl_mode => 0, 2122 sdl_mode => 0,
2094 width => 640,
2095 height => 480,
2096 fullscreen => 0, 2123 fullscreen => 0,
2097 fast => 0, 2124 fast => 0,
2098 map_scale => 1, 2125 map_scale => 1,
2099 fow_enable => 1, 2126 fow_enable => 1,
2100 fow_intensity => 0.45, 2127 fow_intensity => 0,
2101 fow_smooth => 0, 2128 map_smoothing => 1,
2102 gui_fontsize => 1, 2129 gui_fontsize => 1,
2103 log_fontsize => 0.7, 2130 log_fontsize => 0.7,
2104 gauge_fontsize => 1, 2131 gauge_fontsize => 1,
2105 gauge_size => 0.35, 2132 gauge_size => 0.35,
2106 stat_fontsize => 0.7, 2133 stat_fontsize => 0.7,
2107 mapsize => 100, 2134 mapsize => 100,
2108 say_command => 'chat',
2109 audio_enable => 1, 2135 audio_enable => 1,
2136 effects_enable => 1,
2137 effects_volume => 1,
2110 bgm_enable => 1, 2138 bgm_enable => 1,
2111 bgm_volume => 0.25, 2139 bgm_volume => 0.5,
2112 face_prefetch => 0,
2113 output_sync => 1, 2140 output_sync => 1,
2114 output_count => 1, 2141 output_count => 1,
2115 output_rate => "", 2142 output_rate => "",
2116 pickup => 0, 2143 pickup => 0,
2117 inv_sort => "mtime", 2144 inv_sort => "mtime",
2118 default => "profile", # default profile 2145 default => "profile", # default profile
2119 show_tips => 1, 2146 show_tips => 1,
2147 logview_max_par => 1000,
2120 ); 2148 );
2121 2149
2122 while (my ($k, $v) = each %DEF_CFG) { 2150 while (my ($k, $v) = each %DEF_CFG) {
2123 $CFG->{$k} = $v unless exists $CFG->{$k}; 2151 $CFG->{$k} = $v unless exists $CFG->{$k};
2124 } 2152 }
… …
2138 } 2166 }
2139 } 2167 }
2140 2168
2141 sdl_init; 2169 sdl_init;
2142 2170
2143 @SDL_MODES = reverse 2171 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2144 grep $_->[0] >= 640 && $_->[1] >= 480, 2172 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2145 CFPlus::SDL_ListModes;
2146
2147 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2173 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2174
2175 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2148 2176
2149 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2177 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2150 2178
2151 { 2179 {
2152 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2180 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2193 2221
2194Event::loop; 2222Event::loop;
2195#CFPlus::SDL_Quit; 2223#CFPlus::SDL_Quit;
2196#CFPlus::_exit 0; 2224#CFPlus::_exit 0;
2197 2225
2226END {
2198END { CFPlus::SDL_Quit } 2227 CFPlus::SDL_Quit;
2228 CFPlus::DB::Server::stop;
2229}
2199 2230
2200=head1 NAME 2231=head1 NAME
2201 2232
2202cfplus - A Crossfire+ and Crossfire game client 2233cfplus - A Crossfire+ and Crossfire game client
2203 2234

Diff Legend

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