ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.152 by root, Tue Apr 24 01:13:15 2007 UTC vs.
Revision 1.197 by root, Tue Jul 31 02:25:52 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;
… …
137 160
138our $SDL_ACTIVE; 161our $SDL_ACTIVE;
139our %SDL_CB; 162our %SDL_CB;
140 163
141our $SDL_MIXER; 164our $SDL_MIXER;
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our $MUSIC_WANT; # arryref of ambient music
167our @MUSIC_HAVE; # ambient music we want now
168our $MUSIC_START;
169our @MUSIC_JINGLE; # which jingles to play
170our $MUSIC_PLAYING_DATA;
171our $MUSIC_PLAYING_META;
172our $MUSIC_PLAYER;
173our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
142our @SOUNDS; # event => file mapping 174our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files 175our %AUDIO_CHUNK; # audio files
144 176
145our $ALT_ENTER_MESSAGE; 177our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 178our $STATUSBOX;
147our $DEBUG_STATUS; 179our $DEBUG_STATUS;
148 180
… …
150our $INVR; 182our $INVR;
151our $INV_RIGHT_HB; 183our $INV_RIGHT_HB;
152 184
153our $PICKUP_CFG; 185our $PICKUP_CFG;
154 186
155our $IN_BUILD_MODE; 187#############################################################################
156our $BUILD_BUTTON; 188#TODO: maybe move into own audio module...
189
190sub audio_channel_finished {
191 my ($channel) = @_;
192
193# warn "channel $channel finished\n";#d#
194}
195
196our %AUDIO_PLAY;
197our %AUDIO_CHUNK;
198
199sub audio_sound_push($) {
200 my ($face) = @_;
201
202 if (my $chunk = $AUDIO_CHUNK{$face}) {
203 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
204 my (undef, $dx, $dy, $vol) = @$_;
205
206 my $channel = CFPlus::Channel::find;
207 $channel->volume ($vol * 128 / 255);
208 $dx = $dx / 10 * 255;
209 $channel->set_panning (255 - $dx, 255 + $dx);
210
211# my $angle = $dx ? : $dx < 0 ?
212# my $distance = -$vol;
213# $channel->set_position ($angle, $distance);
214
215 $chunk->play ($channel);
216 }
217 } else {
218 # sound_meta not set means data is in flight either way
219 my $meta = $CONN->{sound_meta}{$face}
220 or return;
221
222 # if its a jingle, play it as ambient music
223 if ($meta->{meta}{jingle}) {
224 push @MUSIC_JINGLE, $meta;
225 delete $AUDIO_PLAY{$face};
226 &audio_music_push ($face);
227 } else {
228 # fetch from database
229 CFPlus::DB::get res_data => $meta->{name}, sub {
230 my $rwops = new CFPlus::RW $_[0];
231 my $chunk = new CFPlus::MixChunk $rwops;
232 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
233 $AUDIO_CHUNK{$face} = $chunk;
234
235 audio_sound_push ($face);
236 };
237 }
238 }
239}
240
241sub audio_sound_play {
242 my ($face, $dx, $dy, $vol) = @_;
243
244 $SDL_MIXER
245 or return;
246
247 my $queue = $AUDIO_PLAY{$face} ||= [];
248 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
249 audio_sound_push $face
250 unless @$queue > 1;
251}
252
253sub audio_music_update_volume {
254 return unless $MUSIC_PLAYING_META;
255 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
256 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
257 CFPlus::MixMusic::volume $base * $volume * 128;
258}
259
260sub audio_music_start {
261 my $meta = $MUSIC_PLAYING_META;
262
263 CFPlus::DB::get res_data => $meta->{name}, sub {
264 return unless $SDL_MIXER;
265
266 # music might have changed...
267 $meta eq $MUSIC_PLAYING_META
268 or return &audio_music_start ();
269
270 audio_music_update_volume;
271
272 $MUSIC_PLAYING_DATA = \$_[0];
273
274 my $rwops = $meta->{path}
275 ? new_from_file CFPlus::RW $meta->{path}
276 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
277
278 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
279 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
280
281 my $NOW = time;
282
283 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
284 my $pos = $MUSIC_PLAYING_META->{stop_pos};
285 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
286 $MUSIC_START = time - $pos;
287 } else {
288 $MUSIC_PLAYER->play (0);
289 $MUSIC_START = time;
290 }
291
292 delete $MUSIC_PLAYING_META->{stop_time};
293 delete $MUSIC_PLAYING_META->{stop_pos};
294 }
295}
296
297sub audio_music_push {
298 return unless $SDL_MIXER;
299
300 my $fade_out;
301
302 if (@MUSIC_JINGLE) {
303 @MUSIC_HAVE = $MUSIC_JINGLE[0];
304 $fade_out = 333;
305 } else {
306 return unless $CFG->{bgm_enable};
307
308 my @have =
309 grep $_,
310 map $CONN->{music_meta}{$_},
311 @$MUSIC_WANT;
312
313 @MUSIC_HAVE = @have
314 if @have;
315
316 # default MUSIC_HAVE == MUSIC_DEFAULT
317 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
318 $fade_out = 1000;
319 }
320
321 # if the currently playing song is acceptable, let it continue
322 return if $MUSIC_PLAYING_META
323 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
324
325 my $NOW = time;
326
327 if ($MUSIC_PLAYING_META) {
328 $MUSIC_PLAYING_META->{stop_time} = $NOW;
329 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
330 CFPlus::MixMusic::fade_out $fade_out;
331 } else {
332 # sort by stop time, oldest first
333 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
334
335 # if the most recently-played piece played very recently,
336 # resume it, else choose the oldest piece for rotation.
337 $MUSIC_PLAYING_META =
338 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
339 ? $MUSIC_HAVE[-1]
340 : $MUSIC_HAVE[0];
341
342 audio_music_start;
343 }
344}
345
346sub audio_music_set_ambient {
347 my ($songs) = @_;
348
349 $MUSIC_WANT = $songs;
350 audio_music_push;
351}
352
353sub audio_music_finished {
354 shift @MUSIC_JINGLE
355 if $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
356
357 undef $MUSIC_PLAYER;
358 undef $MUSIC_PLAYING_META;
359 undef $MUSIC_PLAYING_DATA;
360
361 audio_music_push;
362}
363
364#############################################################################
157 365
158sub status { 366sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 367 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 368}
161 369
… …
163 $DEBUG_STATUS->set_text ($_[0]); 371 $DEBUG_STATUS->set_text ($_[0]);
164} 372}
165 373
166sub message { 374sub message {
167 my ($para) = @_; 375 my ($para) = @_;
168 376 $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} 377}
176 378
177sub destroy_query_dialog { 379sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 380 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 381 if $_[0]{query_dialog};
… …
244 ellipsise => 0, 446 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 447 markup => "\nOr use your keyboard and the text entry below:\n";
246 448
247 unshift @dialog, my $table = new CFPlus::UI::Table; 449 unshift @dialog, my $table = new CFPlus::UI::Table;
248 450
249 $table->add (0, 0, new CFPlus::UI::Button 451 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 452 text => "Next Race",
251 on_activate => sub { 453 on_activate => sub {
252 $conn->send ("reply n"); 454 $conn->send ("reply n");
253 destroy_query_dialog $conn; 455 destroy_query_dialog $conn;
254 0 456 0
255 }, 457 },
256 ); 458 );
257 $table->add (2, 0, new CFPlus::UI::Button 459 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 460 text => "Accept",
259 on_activate => sub { 461 on_activate => sub {
260 $conn->send ("reply d"); 462 $conn->send ("reply d");
261 destroy_query_dialog $conn; 463 destroy_query_dialog $conn;
262 0 464 0
… …
269 ellipsise => 0, 471 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 472 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ; 473 ;
272 } 474 }
273 475
274 if ($conn->{chargen_race_title}) {
275 unshift @dialog, new CFPlus::UI::Face 476 unshift @dialog, new CFPlus::UI::Face
276 face => $conn->{player}{face}, 477 face => $conn->{player}{face},
277 bg => [.2, .2, .2, 1], 478 bg => [.2, .2, .2, 1],
278 min_w => 64, 479 min_w => 64,
279 min_h => 64, 480 min_h => 64,
280 ;
281 } 481 ;
282 482
283 if ($conn->{chargen_race_title}) { 483 if ($conn->{chargen_race_title}) {
284 unshift @dialog, new CFPlus::UI::Label 484 unshift @dialog, new CFPlus::UI::Label
285 allign => 1, 485 allign => 1,
286 ellipsise => 0, 486 ellipsise => 0,
… …
299 $conn->send ("reply $stat"); 499 $conn->send ("reply $stat");
300 destroy_query_dialog $conn; 500 destroy_query_dialog $conn;
301 return; 501 return;
302 } 502 }
303 503
304 $STATS_PAGE->show;
305 $MESSAGE_WINDOW->hide;
306
307 unshift @dialog, new CFPlus::UI::Label 504 unshift @dialog, new CFPlus::UI::Label
308 max_w => $::WIDTH * 0.4, 505 max_w => $::WIDTH * 0.4,
309 ellipsise => 0, 506 ellipsise => 0,
310 markup => "\nOr use your keyboard and the text entry below:\n"; 507 markup => "\nOr use your keyboard and the text entry below:\n";
311 508
312 unshift @dialog, my $table = new CFPlus::UI::Table; 509 unshift @dialog, my $table = new CFPlus::UI::Table;
313 510
314 # left: re-roll 511 # left: re-roll
315 $table->add (0, 0, new CFPlus::UI::Button 512 $table->add_at (0, 0, new CFPlus::UI::Button
316 text => "Roll Again", 513 text => "Roll Again",
317 on_activate => sub { 514 on_activate => sub {
318 $conn->send ("reply y"); 515 $conn->send ("reply y");
319 destroy_query_dialog $conn; 516 destroy_query_dialog $conn;
320 0 517 0
… …
334 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 531 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
335 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 532 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
336 ], 533 ],
337 ), 1 .. 2; 534 ), 1 .. 2;
338 535
339 $table->add (2, 0, new CFPlus::UI::Button 536 $table->add_at (2, 0, new CFPlus::UI::Button
340 text => "Swap Stats", 537 text => "Swap Stats",
341 on_activate => sub { 538 on_activate => sub {
342 $conn->{stat_change_with} = $sw2->{value}; 539 $conn->{stat_change_with} = $sw2->{value};
343 $conn->send ("reply $sw1->{value}"); 540 $conn->send ("reply $sw1->{value}");
344 destroy_query_dialog $conn; 541 destroy_query_dialog $conn;
345 0 542 0
346 }, 543 },
347 ); 544 );
348 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 545 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
349 546
350 # right: accept 547 # right: accept
351 $table->add (4, 0, new CFPlus::UI::Button 548 $table->add_at (4, 0, new CFPlus::UI::Button
352 text => "Accept", 549 text => "Accept",
353 on_activate => sub { 550 on_activate => sub {
354 $conn->send ("reply n"); 551 $conn->send ("reply n");
355 $STATS_PAGE->hide; 552 $STATS_PAGE->hide;
356 destroy_query_dialog $conn; 553 destroy_query_dialog $conn;
… …
437 maph => $mapsize, 634 maph => $mapsize,
438 635
439 client => "cfplus $CFPlus::VERSION $] $^O", 636 client => "cfplus $CFPlus::VERSION $] $^O",
440 637
441 map_widget => $MAPWIDGET, 638 map_widget => $MAPWIDGET,
442 logview => $LOGVIEW,
443 statusbox => $STATUSBOX, 639 statusbox => $STATUSBOX,
444 map => $MAP, 640 map => $MAP,
445 mapmap => $MAPMAP, 641 mapmap => $MAPMAP,
446 query => \&server_query, 642 query => \&server_query,
447 643
448 setup_req => { 644 setup_req => {
449 smoothing => $CFG->{map_smoothing}*1, 645 smoothing => $CFG->{map_smoothing}*1,
450 },
451
452 sound_play => sub {
453 my ($x, $y, $soundnum, $type) = @_;
454
455 $SDL_MIXER
456 or return;
457
458 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
459 or return;
460
461 $chunk->play;
462 }, 646 },
463 }; 647 };
464 648
465 if ($CONN) { 649 if ($CONN) {
466 CFPlus::lowdelay fileno $CONN->{fh}; 650 CFPlus::lowdelay fileno $CONN->{fh};
… …
476 $LOGIN_BUTTON->set_text ("Login"); 660 $LOGIN_BUTTON->set_text ("Login");
477 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 661 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
478 $SETUP_DIALOG->show; 662 $SETUP_DIALOG->show;
479 $PL_WINDOW->hide; 663 $PL_WINDOW->hide;
480 $SPELL_LIST->clear_spells; 664 $SPELL_LIST->clear_spells;
665 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
666
667 &audio_music_set_ambient ([]);
481 668
482 return unless $CONN; 669 return unless $CONN;
483 670
484 status "connection closed"; 671 status "connection closed";
485 672
… …
495 682
496 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 683 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
497 684
498 my $row = 0; 685 my $row = 0;
499 686
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 687 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
501 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 688 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
502 can_events => 1, 689 can_events => 1,
503 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 690 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
504 691
692 my $vidmode_tooltip =
693 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
694 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
695
505 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 696 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
506 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 697 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
507 698
699 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
508 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 700 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
509 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 701 tooltip => $vidmode_tooltip);
702 $hbox->add (my $mode_label = new CFPlus::UI::Label
703 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
704 can_events => 1, tooltip => $vidmode_tooltip);
510 705
511 $mode_slider->connect (changed => sub { 706 $mode_slider->connect (changed => sub {
512 my ($self, $value) = @_; 707 my ($self, $value) = @_;
513 708
514 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 709 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
515 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 710 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
516 }); 711 });
517 $mode_slider->emit (changed => $mode_slider->{range}[0]); 712 $mode_slider->emit (changed => $mode_slider->{range}[0]);
518 713
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 714 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
520 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 715 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
521 state => $CFG->{fullscreen}, 716 state => $CFG->{fullscreen},
522 tooltip => "Bring the client into fullscreen mode.", 717 tooltip => "Bring the client into fullscreen mode.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 718 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
524 ); 719 );
525 720
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 721 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
527 $table->add (1, $row++, new CFPlus::UI::CheckBox 722 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fast}, 723 state => $CFG->{fast},
529 tooltip => "Lower the visual quality considerably to speed up rendering.", 724 tooltip => "Lower the visual quality considerably to speed up rendering.",
530 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 725 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
531 ); 726 );
532 727
533 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 728 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
534 $table->add (1, $row++, new CFPlus::UI::Slider 729 $table->add_at (1, $row++, new CFPlus::UI::Slider
535 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 730 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
536 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 731 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
537 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 732 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538 ); 733 );
539 734
540 $table->add (1, $row++, new CFPlus::UI::Button 735 $table->add_at (1, $row++, new CFPlus::UI::Button
541 expand => 1, align => 0, text => "Apply", 736 expand => 1, align => 0, text => "Apply",
542 tooltip => "Apply the video settings above.", 737 tooltip => "Apply the video settings above.",
543 on_activate => sub { 738 on_activate => sub {
544 video_shutdown (); 739 video_shutdown ();
545 video_init (); 740 video_init ();
546 0 741 0
547 } 742 }
548 ); 743 );
549 744
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 745 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
551 $table->add (1, $row++, new CFPlus::UI::Slider 746 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 747 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
553 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 748 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 749 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
555 ); 750 );
556 751
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 752 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox 753 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{map_smoothing}, 754 state => $CFG->{map_smoothing},
560 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 755 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
561 . "This increases load on the graphics subsystem and works only with 2.x servers. " 756 . "This increases load on the graphics subsystem and works only with 2.x servers. "
562 . "Changes take effect at next connection only.", 757 . "Changes take effect at next connection only.",
563 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 758 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
564 ); 759 );
565 760
566 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 761 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
567 $table->add (1, $row++, new CFPlus::UI::CheckBox 762 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
568 state => $CFG->{fow_enable}, 763 state => $CFG->{fow_enable},
569 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 764 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
570 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 765 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
571 ); 766 );
572 767
573 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
574 $table->add (1, $row++, new CFPlus::UI::Slider 769 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 770 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
576 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 771 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
578 ); 773 );
579 774
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{fow_smooth},
583 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
584 on_changed => sub {
585 my ($self, $value) = @_;
586 $CFG->{fow_smooth} = $value;
587 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
588 0
589 }
590 );
591
592 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
593 $table->add (1, $row++, new CFPlus::UI::Slider 776 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 777 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
595 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 778 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
596 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 779 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
597 ); 780 );
598 781
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 782 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
600 $table->add (1, $row++, new CFPlus::UI::Slider 783 $table->add_at (1, $row++, new CFPlus::UI::Slider
601 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 784 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
602 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 785 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
603 on_changed => sub { 786 on_changed => sub {
604 $CFG->{gauge_fontsize} = $_[1]; 787 $CFG->{gauge_fontsize} = $_[1];
605 &set_gauge_window_fontsize; 788 &set_gauge_window_fontsize;
606 0 789 0
607 } 790 }
608 ); 791 );
609 792
610 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
611 $table->add (1, $row++, new CFPlus::UI::Slider 794 $table->add_at (1, $row++, new CFPlus::UI::Slider
612 range => [$CFG->{gauge_size}, 0.2, 0.8], 795 range => [$CFG->{gauge_size}, 0.2, 0.8],
613 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 796 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
614 on_changed => sub { 797 on_changed => sub {
615 $CFG->{gauge_size} = $_[1]; 798 $CFG->{gauge_size} = $_[1];
616 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 799 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
626 809
627 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 810 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
628 811
629 my $row = 0; 812 my $row = 0;
630 813
631 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
632 $table->add (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
633 state => $CFG->{audio_enable}, 816 state => $CFG->{audio_enable},
634 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 817 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
635 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 818 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
636 ); 819 );
637# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 820# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
638# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 821# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
639# $CFG->{effects_volume} = $_[1]; 822# $CFG->{effects_volume} = $_[1];
640# }); 823# });
641 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
642 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 825 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
643 $hbox->add (new CFPlus::UI::CheckBox 826 $hbox->add (new CFPlus::UI::CheckBox
644 expand => 1, state => $CFG->{bgm_enable}, 827 expand => 1, state => $CFG->{bgm_enable},
645 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 828 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
646 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 829 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
647 ); 830 );
648 $hbox->add (new CFPlus::UI::Slider 831 $hbox->add (new CFPlus::UI::Slider
649 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 832 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
650 tooltip => "The volume of the background music. Changes are instant.", 833 tooltip => "The volume of the background music. Changes are instant.",
651 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 834 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
652 ); 835 );
653 836
654 $table->add (1, $row++, new CFPlus::UI::Button 837 $table->add_at (1, $row++, new CFPlus::UI::Button
655 expand => 1, align => 0, text => "Apply", 838 expand => 1, align => 0, text => "Apply",
656 tooltip => "Apply the audio settings", 839 tooltip => "Apply the audio settings",
657 on_activate => sub { 840 on_activate => sub {
658 audio_shutdown (); 841 audio_shutdown ();
659 audio_init (); 842 audio_init ();
… …
718} 901}
719 902
720sub debug_setup { 903sub debug_setup {
721 my $table = new CFPlus::UI::Table; 904 my $table = new CFPlus::UI::Table;
722 905
723 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 906 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
724 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 907 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
725 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 908 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
726 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 909 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
727 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 910 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
728 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 911 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
729 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 912 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
730 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 913 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
731 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 914 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
732 915
733 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
734
735 for my $x (0..2) {
736 for my $y (0 .. 2) {
737 $table->add ($x + 3, $y,
738 new CFPlus::UI::Entry
739 text => $default_smooth[$x * 3 + $y],
740 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
741 );
742 }
743 }
744
745 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 916 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
917
918 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
919 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
920 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
921 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
922 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
923 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
924
925 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
926
927 $c->add_items ({
928 type => "line_loop",
929 color => [0, 1, 0],
930 width => 9,
931 coord_mode => "abs",
932 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
933 });
934
935 $c->add_items ({
936 type => "lines",
937 color => [1, 1, 0],
938 width => 2,
939 coord_mode => "rel",
940 coord => [[0,0], [1,1], [1,0], [0,1]],
941 });
942
943 $c->add_items ({
944 type => "polygon",
945 color => [0, 0.43, 0],
946 width => 2,
947 coord_mode => "rel",
948 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
949 });
746 950
747 $table 951 $table
748} 952}
749 953
750sub stats_window { 954sub stats_window {
… …
798 [2, 4, st_spd => "Spd", 10.54], 1002 [2, 4, st_spd => "Spd", 10.54],
799 [2, 5, st_wspd => "WSp", 10.54], 1003 [2, 5, st_wspd => "WSp", 10.54],
800 ) { 1004 ) {
801 my ($col, $row, $id, $label, $template) = @$_; 1005 my ($col, $row, $id, $label, $template) = @$_;
802 1006
803 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1007 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
804 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1008 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
805 align => +1, template => $template, tooltip => "#stat_$label"); 1009 align => +1, template => $template, tooltip => "#stat_$label");
806 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1010 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
807 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1011 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
808 align => -1, text => $label, tooltip => "#stat_$label"); 1012 align => -1, text => $label, tooltip => "#stat_$label");
809 } 1013 }
810 1014
811 $vb->add (new CFPlus::UI::FancyFrame 1015 $vb->add (new CFPlus::UI::FancyFrame
… …
852 cold => ["Cold", 1056 cold => ["Cold",
853 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1057 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
854 ghit => ["Ghost hit", 1058 ghit => ["Ghost hit",
855 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1059 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
856 ); 1060 );
1061
857 for (qw/slow holyw conf fire depl magic 1062 for (qw/slow holyw conf fire depl magic
858 drain acid pois para deat phys 1063 drain acid pois para deat phys
859 blind fear tund elec cold ghit/) 1064 blind fear tund elec cold ghit/)
860 { 1065 {
861 $tbl2->add ($col, $row, 1066 $tbl2->add_at ($col, $row,
862 $STATWIDS->{"res_$_"} = 1067 $STATWIDS->{"res_$_"} =
863 new CFPlus::UI::Label 1068 new CFPlus::UI::Label
864 font => $FONT_FIXED, 1069 font => $FONT_FIXED,
865 template => "-100%", 1070 template => "-100%",
866 align => +1, 1071 align => +1,
867 valign => 0, 1072 valign => 0,
868 can_events => 1, 1073 can_events => 1,
869 can_hover => 1, 1074 can_hover => 1,
870 tooltip => $resist_names{$_}->[1], 1075 tooltip => $resist_names{$_}->[1],
871 ); 1076 );
872 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1077 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
873 font => $FONT_FIXED, 1078 font => $FONT_FIXED,
874 can_hover => 1, 1079 can_hover => 1,
875 can_events => 1, 1080 can_events => 1,
876 path => "ui/resist/resist_$_.png", 1081 path => "ui/resist/resist_$_.png",
877 tooltip => $resist_names{$_}->[1], 1082 tooltip => $resist_names{$_}->[1],
878 ); 1083 );
879 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1084 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
880 text => $resist_names{$_}->[0], 1085 text => $resist_names{$_}->[0],
881 font => $FONT_FIXED, 1086 font => $FONT_FIXED,
882 can_hover => 1, 1087 can_hover => 1,
883 can_events => 1, 1088 can_events => 1,
884 tooltip => $resist_names{$_}->[1], 1089 tooltip => $resist_names{$_}->[1],
… …
917 return if $METASERVER_ATIME > time; 1122 return if $METASERVER_ATIME > time;
918 $METASERVER_ATIME = time + 60; 1123 $METASERVER_ATIME = time + 60;
919 1124
920 my $table = $METASERVER->{table}; 1125 my $table = $METASERVER->{table};
921 $table->clear; 1126 $table->clear;
922 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1127 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
923 1128
924 my $ok = 0; 1129 my $ok = 0;
925 1130
926 CFPlus::background { 1131 CFPlus::background {
927 my $ua = CFPlus::lwp_useragent; 1132 my $ua = CFPlus::lwp_useragent;
… …
938 "The time this server has been running without being restarted.", 1143 "The time this server has been running without being restarted.",
939 "The server software version - a '+' indicates a Crossfire+ server.", 1144 "The server software version - a '+' indicates a Crossfire+ server.",
940 "Short information about this server provided by its admins.", 1145 "Short information about this server provided by its admins.",
941 ); 1146 );
942 my @col = qw(#Users Host Uptime Version Description); 1147 my @col = qw(#Users Host Uptime Version Description);
943 $table->add ($_, 0, new CFPlus::UI::Label 1148 $table->add_at ($_, 0, new CFPlus::UI::Label
944 can_hover => 1, can_events => 1, 1149 can_hover => 1, can_events => 1,
945 align => 0, fg => [1, 1, 0], 1150 align => 0, fg => [1, 1, 0],
946 text => $col[$_], tooltip => $tip[$_]) 1151 text => $col[$_], tooltip => $tip[$_])
947 for 0 .. $#col; 1152 for 0 .. $#col;
948 1153
… …
970 1175
971 $m = [$users, $host, $uptime, $version, $desc]; 1176 $m = [$users, $host, $uptime, $version, $desc];
972 1177
973 $y++; 1178 $y++;
974 1179
975 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1180 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
976 (new CFPlus::UI::Button 1181 (new CFPlus::UI::Button
977 text => "Use", 1182 text => "Use",
978 tooltip => "Put this server into the <b>Host:Port</b> field", 1183 tooltip => "Put this server into the <b>Host:Port</b> field",
979 on_activate => sub { 1184 on_activate => sub {
980 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1185 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
983 }, 1188 },
984 ), 1189 ),
985 (new CFPlus::UI::Empty expand => 1), 1190 (new CFPlus::UI::Empty expand => 1),
986 ]); 1191 ]);
987 1192
988 $table->add ($_, $y, new CFPlus::UI::Label 1193 $table->add_at ($_, $y, new CFPlus::UI::Label
989 max_w => $::WIDTH * 0.4, 1194 max_w => $::WIDTH * 0.4,
990 ellipsise => 0, 1195 ellipsise => 0,
991 align => $align[$_], 1196 align => $align[$_],
992 text => $m->[$_], 1197 text => $m->[$_],
993 tooltip => $tip[$_], 1198 tooltip => $tip[$_],
… …
1034 1239
1035 $vbox->add (new CFPlus::UI::FancyFrame 1240 $vbox->add (new CFPlus::UI::FancyFrame
1036 label => "Connection Settings", 1241 label => "Connection Settings",
1037 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1242 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1038 ); 1243 );
1039 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1244 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1040 1245
1041 { 1246 {
1042 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1247 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1043 1248
1044 $vbox->add ( 1249 $vbox->add (
1045 $HOST_ENTRY = new CFPlus::UI::Entry 1250 $HOST_ENTRY = new CFPlus::UI::Entry
1046 expand => 1, 1251 expand => 1,
1047 text => $CFG->{profile}{default}{host}, 1252 text => $CFG->{profile}{default}{host},
1048 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1253 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1049 on_changed => sub { 1254 on_changed => sub {
1050 my ($self, $value) = @_; 1255 my ($self, $value) = @_;
1051 $CFG->{profile}{default}{host} = $value; 1256 $CFG->{profile}{default}{host} = $value;
1052 0 1257 1
1053 } 1258 }
1054 ); 1259 );
1055 1260
1056 $vbox->add (new CFPlus::UI::Button 1261 $vbox->add (new CFPlus::UI::Button
1057 expand => 1, 1262 expand => 1,
1058 text => "Server List", 1263 text => "Server List",
1059 other => $METASERVER, 1264 other => $METASERVER,
1060 tooltip => "Show a list of available crossfire servers", 1265 tooltip => "Show a list of available crossfire servers",
1061 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1266 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1062 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1267 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1063 ); 1268 );
1064 } 1269 }
1065 1270
1066 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1271 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1067 $table->add (1, 4, new CFPlus::UI::Entry 1272 $table->add_at (1, 4, new CFPlus::UI::Entry
1068 text => $CFG->{profile}{default}{user}, 1273 text => $CFG->{profile}{default}{user},
1069 tooltip => "The name of your character on the server", 1274 tooltip => "The name of your character on the server",
1070 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1275 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1071 ); 1276 );
1072 1277
1073 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1278 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1074 $table->add (1, 5, new CFPlus::UI::Entry 1279 $table->add_at (1, 5, new CFPlus::UI::Entry
1075 text => $CFG->{profile}{default}{password}, 1280 text => $CFG->{profile}{default}{password},
1076 hidden => 1, 1281 hidden => 1,
1077 tooltip => "The password for your character", 1282 tooltip => "The password for your character",
1078 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1283 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1079 ); 1284 );
1080 1285
1081 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1286 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1082 $table->add (1, 7, new CFPlus::UI::Slider 1287 $table->add_at (1, 7, new CFPlus::UI::Slider
1083 force_w => 100, 1288 force_w => 100,
1084 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1289 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1085 tooltip => "This is the size of the portion of the map update the server sends you. " 1290 tooltip => "This is the size of the portion of the map update the server sends you. "
1086 . "If you set this to a high value you will be able to see further, " 1291 . "If you set this to a high value you will be able to see further, "
1087 . "but you also increase bandwidth requirements and latency. " 1292 . "but you also increase bandwidth requirements and latency. "
1088 . "This option is only used once at log-in.", 1293 . "This option is only used once at log-in.",
1089 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1294 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1090 ); 1295 );
1091 1296
1092 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1093 $table->add (1, 8, new CFPlus::UI::CheckBox
1094 state => $CFG->{face_prefetch},
1095 tooltip => "<b>Background Image Prefetch</b>\n\n"
1096 . "If enabled, the client automatically pre-fetches images from the server. "
1097 . "This might increase or create lag, but increases the chances "
1098 . "of faces being ready for display when you encounter them. "
1099 . "It also uses up server bandwidth on every connect, "
1100 . "so only set it if you really need to prefetch images. "
1101 . "This option can be set and unset any time.",
1102 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1103 );
1104
1105 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1297 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1106 $table->add (1, 9, new CFPlus::UI::Entry 1298 $table->add_at (1, 8, new CFPlus::UI::Entry
1107 text => $CFG->{output_rate}, 1299 text => $CFG->{output_rate},
1108 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1300 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1109 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1301 . "when sending data. When 0 or unset, the server "
1110 . "default will be used, which is usually around 100kb/s.", 1302 . "default will be used, which is usually around 100kb/s. Most servers will "
1303 . "dynamically find an optimal rate, so adjust this only when necessary.",
1111 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1304 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1112 ); 1305 );
1113 1306
1114 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1307 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1115 $table->add (1, 10, new CFPlus::UI::Entry 1308 $table->add_at (1, 9, new CFPlus::UI::Entry
1116 text => $CFG->{output_count}, 1309 text => $CFG->{output_count},
1117 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1310 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1118 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1311 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1119 ); 1312 );
1120 1313
1121 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1314 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1122 $table->add (1, 11, new CFPlus::UI::Entry 1315 $table->add_at (1, 10, new CFPlus::UI::Entry
1123 text => $CFG->{output_sync}, 1316 text => $CFG->{output_sync},
1124 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1317 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1125 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1318 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1126 ); 1319 );
1127 1320
1128 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1321 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1129 expand => 1, 1322 expand => 1,
1130 align => 0, 1323 align => 0,
1131 text => "Login", 1324 text => "Login",
1132 on_activate => sub { 1325 on_activate => sub {
1133 $CONN ? stop_game 1326 $CONN ? stop_game
1134 : start_game; 1327 : start_game;
1135 0 1328 1
1136 }, 1329 },
1137 ); 1330 );
1138 1331
1139 $vbox->add (new CFPlus::UI::FancyFrame 1332 $vbox->add (new CFPlus::UI::FancyFrame
1140 label => "Server Info", 1333 label => "Server Info",
… …
1147sub client_setup { 1340sub client_setup {
1148 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1341 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1149 1342
1150 my $row = 0; 1343 my $row = 0;
1151 1344
1152 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1153 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1154 text => $CFG->{say_command},
1155 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1156 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1157 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1158 on_changed => sub {
1159 my ($self, $value) = @_;
1160 $CFG->{say_command} = $value;
1161 0
1162 }
1163 );
1164
1165 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1345 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1166 $table->add (1, $row++, new CFPlus::UI::CheckBox 1346 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1167 state => $CFG->{show_tips}, 1347 state => $CFG->{show_tips},
1168 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1348 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1169 on_changed => sub { 1349 on_changed => sub {
1170 my ($self, $value) = @_; 1350 my ($self, $value) = @_;
1171 $CFG->{show_tips} = $value; 1351 $CFG->{show_tips} = $value;
1172 0 1352 0
1173 } 1353 }
1174 ); 1354 );
1175 1355
1176 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1356 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1357 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1178 text => $CFG->{logview_max_par}, 1358 text => $CFG->{logview_max_par},
1179 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1359 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1180 . "sends more messages than this number, older messages get removed to save memory and " 1360 . "sends more messages than this number, older messages get removed to save memory and "
1181 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1361 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1182 on_changed => sub { 1362 on_changed => sub {
1183 my ($self, $value) = @_; 1363 my ($self, $value) = @_;
1184 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1364 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1185 0 1365 0
1186 }, 1366 },
1187 ); 1367 );
1188 1368
1189 $table 1369 $table
1190} 1370}
1191 1371
1192sub message_window {
1193 my $window = new CFPlus::UI::Toplevel
1194 name => "message_window",
1195 title => "Messages",
1196 border_bg => [1, 1, 1, 1],
1197 x => "max",
1198 y => 0,
1199 force_w => $::WIDTH * 0.4,
1200 force_h => $::HEIGHT * 0.5,
1201 child => (my $vbox = new CFPlus::UI::VBox),
1202 has_close_button => 1;
1203
1204 $vbox->add ($LOGVIEW);
1205
1206 $vbox->add (my $input = new CFPlus::UI::Entry
1207 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1208 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1209 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1210 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1211 on_focus_in => sub {
1212 my ($input, $prev_focus) = @_;
1213
1214 delete $input->{refocus_map};
1215
1216 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1217 $input->{refocus_map} = 1;
1218 }
1219 delete $input->{auto_activated};
1220
1221 0
1222 },
1223 on_activate => sub {
1224 my ($input, $text) = @_;
1225 $input->set_text ('');
1226
1227 if ($text =~ /^\/(.*)/) {
1228 $::CONN->user_send ($1);
1229 } else {
1230 my $say_cmd = $::CFG->{say_command} || 'say';
1231 $::CONN->user_send ("$say_cmd $text");
1232 }
1233 if ($input->{refocus_map}) {
1234 delete $input->{refocus_map};
1235 $MAPWIDGET->focus_in
1236 }
1237
1238 0
1239 },
1240 on_escape => sub {
1241 $MAPWIDGET->grab_focus;
1242
1243 0
1244 },
1245 );
1246
1247 $CONSOLE = {
1248 window => $window,
1249 input => $input,
1250 };
1251
1252 $window
1253}
1254
1255sub autopickup_setup { 1372sub autopickup_setup {
1373 my $r = new CFPlus::UI::ScrolledWindow (
1374 expand => 1,
1375 scroll_y => 1
1376 );
1256 my $table = new CFPlus::UI::Table; 1377 $r->add (my $table = new CFPlus::UI::Table
1378 row_expand => [0],
1379 col_expand => [0, 1, 0, 1],
1380 );
1257 1381
1258 for ( 1382 for (
1259 ["General", 0, 0, 1383 ["General", 0, 0,
1260 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1384 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1261 ["Inhibit autopickup" => PICKUP_INHIBIT], 1385 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1296 ], 1420 ],
1297 ["Weight/Value ratio", 2, 17] 1421 ["Weight/Value ratio", 2, 17]
1298 ) 1422 )
1299 { 1423 {
1300 my ($title, $x, $y, @bits) = @$_; 1424 my ($title, $x, $y, @bits) = @$_;
1301 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1425 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1302 1426
1303 for (@bits) { 1427 for (@bits) {
1304 ++$y; 1428 ++$y;
1305 1429
1306 my $mask = $_->[1]; 1430 my $mask = $_->[1];
1307 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1431 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1308 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1432 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1309 state => $::CFG->{pickup} & $mask, 1433 state => $::CFG->{pickup} & $mask,
1310 on_changed => sub { 1434 on_changed => sub {
1311 my ($box, $value) = @_; 1435 my ($box, $value) = @_;
1312 1436
1313 if ($value) { 1437 if ($value) {
… …
1324 1448
1325 ${$_->[2]} = $checkbox if $_->[2]; 1449 ${$_->[2]} = $checkbox if $_->[2];
1326 } 1450 }
1327 } 1451 }
1328 1452
1329 $table->add (2, 18, new CFPlus::UI::ValSlider 1453 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1330 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1454 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1331 template => ">= 99", 1455 template => ">= 99",
1332 to_value => sub { ">= " . 5 * $_[0] }, 1456 to_value => sub { ">= " . 5 * $_[0] },
1333 on_changed => sub { 1457 on_changed => sub {
1334 my ($slider, $value) = @_; 1458 my ($slider, $value) = @_;
… …
1337 $::CFG->{pickup} |= int $value 1461 $::CFG->{pickup} |= int $value
1338 if $value; 1462 if $value;
1339 1; 1463 1;
1340 }); 1464 });
1341 1465
1342 $table->add (3, 18, new CFPlus::UI::Button 1466 $table->add_at (3, 18, new CFPlus::UI::Button
1343 text => "set", 1467 text => "set",
1344 on_activate => sub { 1468 on_activate => sub {
1345 $::CONN->send_command ("pickup $::CFG->{pickup}") 1469 $::CONN->send_command ("pickup $::CFG->{pickup}")
1346 if defined $::CONN; 1470 if defined $::CONN;
1347 0 1471 0
1348 }); 1472 });
1349 1473
1350 $table 1474 $r
1351} 1475}
1352 1476
1353my %SORT_ORDER = ( 1477my %SORT_ORDER = (
1354 type => undef, 1478 type => undef,
1355 mtime => sub { 1479 mtime => sub {
… …
1434 has_close_button => 1 1558 has_close_button => 1
1435 ; 1559 ;
1436 1560
1437 my $ntb = 1561 my $ntb =
1438 $PL_NOTEBOOK = 1562 $PL_NOTEBOOK =
1439 new CFPlus::UI::Notebook expand => 1, debug => 1; 1563 new CFPlus::UI::Notebook expand => 1;
1440 1564
1441 $ntb->add ( 1565 $ntb->add_tab (
1442 "Statistics (F2)" => $STATS_PAGE = stats_window, 1566 "Statistics (F2)" => $STATS_PAGE = stats_window,
1443 "Shows statistics, where all your Stats and Resistances are shown." 1567 "Shows statistics, where all your Stats and Resistances are shown."
1444 ); 1568 );
1445 $ntb->add ( 1569 $ntb->add_tab (
1446 "Skills (F3)" => $SKILL_PAGE = skill_window, 1570 "Skills (F3)" => $SKILL_PAGE = skill_window,
1447 "Shows all your Skills." 1571 "Shows all your Skills."
1448 ); 1572 );
1449 1573
1450 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1574 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1451 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1575 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1452 $ntb->add ( 1576 $ntb->add_tab (
1453 "Spellbook (F4)" => $spellsw, 1577 "Spellbook (F4)" => $spellsw,
1454 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1578 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1455 ); 1579 );
1456 $ntb->add ( 1580 $ntb->add_tab (
1457 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1581 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1458 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1582 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1459 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1583 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1460 ); 1584 );
1585 $ntb->add_tab (Pickup => autopickup_setup,
1586 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1461 1587
1462 $ntb->set_current_page ($INVENTORY_PAGE); 1588 $ntb->set_current_page ($INVENTORY_PAGE);
1463 1589
1464 $plwin->add ($ntb); 1590 $plwin->add ($ntb);
1465 $plwin 1591 $plwin
… …
1662 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1788 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1663 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1789 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1664 1790
1665 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1791 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1666 1792
1667 $table->add (0, 0, new CFPlus::UI::Button 1793 $table->add_at (0, 0, new CFPlus::UI::Button
1668 text => "Close", 1794 text => "Close",
1669 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1795 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1670 on_activate => $close, 1796 on_activate => $close,
1671 ); 1797 );
1672 1798
1673 $table->add (2, 0, new CFPlus::UI::Button 1799 $table->add_at (2, 0, new CFPlus::UI::Button
1674 text => "Next", 1800 text => "Next",
1675 tooltip => "Show the next <b>Tip of the day</b>.", 1801 tooltip => "Show the next <b>Tip of the day</b>.",
1676 on_activate => sub { 1802 on_activate => sub {
1677 $close->(); 1803 $close->();
1678 &show_tip_of_the_day; 1804 &show_tip_of_the_day;
… …
1687 CFPlus::SDL_Init 1813 CFPlus::SDL_Init
1688 and die "SDL::Init failed!\n"; 1814 and die "SDL::Init failed!\n";
1689} 1815}
1690 1816
1691sub video_init { 1817sub video_init {
1692 sdl_init;
1693
1694 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1818 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1695 1819
1696 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1820 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1697 1821
1698 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1822 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1699 $FULLSCREEN = $CFG->{fullscreen}; 1823 $FULLSCREEN = $CFG->{fullscreen};
1700 $FAST = $CFG->{fast}; 1824 $FAST = $CFG->{fast};
1701 1825
1702 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1826 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1703 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1827 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1704 1828
1705 $SDL_ACTIVE = 1; 1829 $SDL_ACTIVE = 1;
1706 $LAST_REFRESH = time - 0.01; 1830 $LAST_REFRESH = time - 0.01;
1707 1831
… …
1749 1873
1750 $MAPWIDGET = new CFPlus::MapWidget; 1874 $MAPWIDGET = new CFPlus::MapWidget;
1751 $MAPWIDGET->connect (activate_console => sub { 1875 $MAPWIDGET->connect (activate_console => sub {
1752 my ($mapwidget, $preset) = @_; 1876 my ($mapwidget, $preset) = @_;
1753 1877
1754 if ($CONSOLE) { 1878 $MESSAGE_WINDOW->activate_console ($preset)
1755 $CONSOLE->{input}->{auto_activated} = 1; 1879 if $MESSAGE_WINDOW;
1756 $CONSOLE->{input}->grab_focus;
1757
1758 if ($preset && $CONSOLE->{input}->get_text eq '') {
1759 $CONSOLE->{input}->set_text ($preset);
1760 }
1761 }
1762 }); 1880 });
1763 $MAPWIDGET->show; 1881 $MAPWIDGET->show;
1764 $MAPWIDGET->grab_focus; 1882 $MAPWIDGET->grab_focus;
1765
1766 $LOGVIEW = new CFPlus::UI::TextScroller
1767 expand => 1,
1768 font => $FONT_FIXED,
1769 fontsize => $::CFG->{log_fontsize},
1770 indent => -4,
1771 can_hover => 1,
1772 can_events => 1,
1773 max_par => $CFG->{logview_max_par},
1774 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1775 ;
1776 1883
1777 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1884 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1778 title => "Setup", 1885 title => "Setup",
1779 name => "setup_dialog", 1886 name => "setup_dialog",
1780 x => 'center', 1887 x => 'center',
… …
1784 force_h => $::HEIGHT * 0.6, 1891 force_h => $::HEIGHT * 0.6,
1785 has_close_button => 1, 1892 has_close_button => 1,
1786 ; 1893 ;
1787 1894
1788 $METASERVER = metaserver_dialog; 1895 $METASERVER = metaserver_dialog;
1896 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1789 1897
1790 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1898 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1791 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1899 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 1900
1793 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1901 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1794 "Configure the server to play on, your username, password and other server-related options."); 1902 "Configure the server to play on, your username, password and other server-related options.");
1795 $SETUP_NOTEBOOK->add (Client => client_setup, 1903 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1796 "Configure various client-specific settings."); 1904 "Configure various client-specific settings.");
1797 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1798 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1799 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1905 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1800 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1906 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1801 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1907 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1802 "Configure the use of audio, sound effects and background music."); 1908 "Configure the use of audio, sound effects and background music.");
1803 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1909 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1804 "Lets you define, edit and delete key bindings." 1910 "Lets you define, edit and delete key bindings."
1805 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1911 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1806 . "with nothing set and the recording started. After doing the actions you " 1912 . "with nothing set and the recording started. After doing the actions you "
1807 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1913 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1808 . "After pressing the combo the binding will be saved automatically and the " 1914 . "After pressing the combo the binding will be saved automatically and the "
1809 . "binding editor closes"); 1915 . "binding editor closes");
1810 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1916 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1811 "Some debuggin' options. Do not ask."); 1917 "Some debuggin' options. Do not ask.");
1812 1918
1813 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1919 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1814 1920
1815 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1921 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1816 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1922 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1817 1923
1818 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1924 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1819 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1925 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1820 1926
1821 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1927 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1822 1928
1823 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1929 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1856 } 1962 }
1857 1963
1858 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1964 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1859} 1965}
1860 1966
1861sub setup_build_button {
1862 my ($enabled) = @_;
1863 if ($enabled) {
1864 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1865 $BUILD_BUTTON ||= new CFPlus::UI::Button
1866 text => "Build",
1867 tooltip => "Opens the ingame builder",
1868 on_activate => sub {
1869 if ($CONN) {
1870 $CONN->send_ext_req (builder_player_items => sub {
1871 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1872 });
1873 }
1874 0
1875 };
1876 $BUTTONBAR->add ($BUILD_BUTTON);
1877 } else {
1878 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1879 }
1880}
1881
1882sub open_ingame_editor {
1883 my ($msg) = @_;
1884
1885 my $win = new CFPlus::UI::Toplevel
1886 x => 0,
1887 y => 'center',
1888 z => 4,
1889 name => 'builder_window',
1890 force_w => int $WIDTH * 1/4,
1891 force_h => int $HEIGHT * 3/4,
1892 title => "In game builder",
1893 has_close_button => 1;
1894
1895 my $r = new CFPlus::UI::ScrolledWindow (
1896 expand => 1,
1897 scroll_y => 1
1898 );
1899 $r->add (my $vb = new CFPlus::UI::VBox);
1900 $win->add ($r);
1901
1902
1903 $vb->add (
1904 new CFPlus::UI::Button
1905 text => "Disable build mode",
1906 on_activate => sub { $::IN_BUILD_MODE = undef }
1907 );
1908 $vb->add (
1909 new CFPlus::UI::Button
1910 text => "ERASE",
1911 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1912 );
1913
1914 for my $itemarchname (
1915 sort {
1916 $msg->{items}->{$a}->{build_arch_name}
1917 cmp $msg->{items}->{$b}->{build_arch_name}
1918 } keys %{$msg->{items}}
1919 ) {
1920 my $info = $msg->{items}->{$itemarchname};
1921 $vb->add (
1922 new CFPlus::UI::Button text => $info->{build_arch_name},
1923 on_activate => sub {
1924 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1925
1926 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1927 build_mode_query_arch_info ();
1928 }
1929 }
1930 );
1931 }
1932
1933 $win->show;
1934}
1935
1936sub build_mode_query_arch_info {
1937 my ($iteminfo) = $::IN_BUILD_MODE;
1938 my $itemarchname = $iteminfo->{item};
1939 my $info = $iteminfo->{info};
1940
1941 my $dialog = new CFPlus::UI::Toplevel
1942 x => "center",
1943 y => "center",
1944 z => 50,
1945 force_w => int $WIDTH * 1/2,
1946 title => "Enter information for placement of '$itemarchname'",
1947 has_close_button => 1;
1948
1949 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1950
1951 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1952 my $row = 0;
1953 if ($info->{has_name}) {
1954 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1955 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1956 }
1957 if ($info->{has_text}) {
1958 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1959 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1960 }
1961 if ($info->{has_connection}) {
1962 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1963 $table->add (1, $row++,
1964 new CFPlus::UI::Entry
1965 expand => 1,
1966 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1967 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1968 );
1969 }
1970
1971 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1972 $hb->add (new CFPlus::UI::Button
1973 text => "Close",
1974 expand => 1,
1975 on_activate => sub { $dialog->hide; 0 },
1976 );
1977 $dialog->show;
1978}
1979
1980sub video_shutdown { 1967sub video_shutdown {
1981 CFPlus::OpenGL::shutdown; 1968 CFPlus::OpenGL::shutdown;
1982 1969
1983 undef $SDL_ACTIVE; 1970 undef $SDL_ACTIVE;
1984} 1971}
1985 1972
1986my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1987my $bgmusic;#TODO#hack#d#
1988
1989sub audio_channel_finished {
1990 my ($channel) = @_;
1991
1992 #warn "channel $channel finished\n";#d#
1993}
1994
1995sub audio_music_finished {
1996 return unless $CFG->{bgm_enable};
1997
1998 # TODO: hack, do play loop and mood music
1999 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2000 $bgmusic->play (0);
2001
2002 push @bgmusic, shift @bgmusic;
2003}
2004
2005sub audio_init { 1973sub audio_init {
2006 if ($CFG->{audio_enable}) { 1974 if ($CFG->{audio_enable}) {
2007 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1975 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2008 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1976 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2009 1977
2010 unless ($SDL_MIXER) { 1978 unless ($SDL_MIXER) {
2011 status "Unable to open sound device: there will be no sound"; 1979 status "Unable to open sound device: there will be no sound";
2012 return; 1980 return;
2013 }
2014
2015 CFPlus::Mix_AllocateChannels 8;
2016 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2017
2018 audio_music_finished;
2019
2020 local $_;
2021 while (<$fh>) {
2022 next if /^\s*#/;
2023 next if /^\s*$/;
2024
2025 my ($file, $volume, $event) = split /\s+/, $_, 3;
2026
2027 push @SOUNDS, "$volume,$file";
2028
2029 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2030 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2031 $chunk->volume ($volume * 128 / 100);
2032 $chunk
2033 };
2034 }
2035 } else {
2036 status "unable to open sound config: $!";
2037 } 1981 }
1982
1983 CFPlus::Mix_AllocateChannels 16;
1984
1985 audio_music_finished;
1986 } else {
1987 undef $SDL_MIXER;
2038 } 1988 }
2039} 1989}
2040 1990
2041sub audio_shutdown { 1991sub audio_shutdown {
2042 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1992 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2043 undef $SDL_MIXER; 1993 undef $SDL_MIXER;
2044 @SOUNDS = (); 1994 @SOUNDS = ();
2045 %AUDIO_CHUNKS = (); 1995 %AUDIO_CHUNK = ();
2046} 1996}
2047 1997
2048my %animate_object; 1998my %animate_object;
2049my $animate_timer; 1999my $animate_timer;
2050 2000
2051my $fps = 9; 2001my $fps = 9;
2052
2053my %demo;#d#
2054 2002
2055sub force_refresh { 2003sub force_refresh {
2056 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2004 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2057 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2005 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2058 2006
2059 $CFPlus::UI::ROOT->draw; 2007 $CFPlus::UI::ROOT->draw;
2060 2008
2061 $WANT_REFRESH = 0; 2009 $WANT_REFRESH = 0;
2062 $CAN_REFRESH = 0; 2010 $CAN_REFRESH = 0;
2063 $LAST_REFRESH = $NOW; 2011 $LAST_REFRESH = $NOW;
2064 2012
2065 CFPlus::SDL_GL_SwapBuffers; 2013 CFPlus::SDL_GL_SwapBuffers;
2066} 2014}
2067 2015
2068my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2016my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2069 $NOW = time; 2017 $NOW = time;
2070 2018
2071 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2019 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2072 for CFPlus::SDL_PollEvent; 2020 for CFPlus::poll_events;
2073 2021
2074 if (%animate_object) { 2022 if (%animate_object) {
2075 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2023 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2076 $WANT_REFRESH++; 2024 ++$WANT_REFRESH;
2077 } 2025 }
2078 2026
2079 if ($WANT_REFRESH) { 2027 if ($WANT_REFRESH) {
2080 force_refresh; 2028 force_refresh;
2081 } else { 2029 } else {
… …
2090 2038
2091sub animation_stop { 2039sub animation_stop {
2092 my ($widget) = @_; 2040 my ($widget) = @_;
2093 delete $animate_object{$widget}; 2041 delete $animate_object{$widget};
2094} 2042}
2095
2096# check once/second for faces that need to be prefetched
2097# this should, of course, only run on demand, but
2098# SDL forces worse things on us....
2099
2100Event->timer (after => 1, interval => 0.25, cb => sub {
2101 $CONN->face_prefetch
2102 if $CONN;
2103});
2104 2043
2105%SDL_CB = ( 2044%SDL_CB = (
2106 CFPlus::SDL_QUIT => sub { 2045 CFPlus::SDL_QUIT => sub {
2107 exit; 2046 exit;
2108 }, 2047 },
… …
2111 CFPlus::SDL_VIDEOEXPOSE => sub { 2050 CFPlus::SDL_VIDEOEXPOSE => sub {
2112 CFPlus::UI::full_refresh; 2051 CFPlus::UI::full_refresh;
2113 }, 2052 },
2114 CFPlus::SDL_ACTIVEEVENT => sub { 2053 CFPlus::SDL_ACTIVEEVENT => sub {
2115# not useful, as APPACTIVE include sonly iconified state, not unmapped 2054# not useful, as APPACTIVE include sonly iconified state, not unmapped
2116# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2055# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2056# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2117# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2057# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2118# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2058# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2119# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2059# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2120 }, 2060 },
2121 CFPlus::SDL_KEYDOWN => sub { 2061 CFPlus::SDL_KEYDOWN => sub {
… …
2151 2091
2152 CFPlus::UI::set_layout ($::CFG->{layout}); 2092 CFPlus::UI::set_layout ($::CFG->{layout});
2153 2093
2154 my %DEF_CFG = ( 2094 my %DEF_CFG = (
2155 sdl_mode => 0, 2095 sdl_mode => 0,
2156 width => 640,
2157 height => 480,
2158 fullscreen => 0, 2096 fullscreen => 0,
2159 fast => 0, 2097 fast => 0,
2160 map_scale => 1, 2098 map_scale => 1,
2161 fow_enable => 1, 2099 fow_enable => 1,
2162 fow_intensity => 0.45, 2100 fow_intensity => 0,
2163 fow_smooth => 0,
2164 map_smoothing => 1, 2101 map_smoothing => 1,
2165 gui_fontsize => 1, 2102 gui_fontsize => 1,
2166 log_fontsize => 0.7, 2103 log_fontsize => 0.7,
2167 gauge_fontsize => 1, 2104 gauge_fontsize => 1,
2168 gauge_size => 0.35, 2105 gauge_size => 0.35,
2169 stat_fontsize => 0.7, 2106 stat_fontsize => 0.7,
2170 mapsize => 100, 2107 mapsize => 100,
2171 say_command => 'chat',
2172 audio_enable => 1, 2108 audio_enable => 1,
2173 bgm_enable => 1, 2109 bgm_enable => 1,
2174 bgm_volume => 0.25, 2110 bgm_volume => 0.25,
2175 face_prefetch => 0,
2176 output_sync => 1, 2111 output_sync => 1,
2177 output_count => 1, 2112 output_count => 1,
2178 output_rate => "", 2113 output_rate => "",
2179 pickup => 0, 2114 pickup => 0,
2180 inv_sort => "mtime", 2115 inv_sort => "mtime",
… …
2202 } 2137 }
2203 } 2138 }
2204 2139
2205 sdl_init; 2140 sdl_init;
2206 2141
2207 @SDL_MODES = reverse 2142 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2208 grep $_->[0] >= 640 && $_->[1] >= 480, 2143 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2209 CFPlus::SDL_ListModes;
2210
2211 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2144 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2145
2146 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2212 2147
2213 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2148 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2214 2149
2215 { 2150 {
2216 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2151 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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