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.151 by root, Mon Apr 16 21:12:51 2007 UTC vs.
Revision 1.228 by root, Mon Oct 8 16:10:14 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3# do splash-screen thingy on win32
3my $startup_done = sub { }; 4my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN { 5BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 } 9 }
… …
29# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
30BEGIN { 29BEGIN {
31 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 32
33 my $root = $ENV{PAR_TEMP};
34
34 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 36 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 38 $zip->extractMember ($_, "$root/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 39 unless -e "$root/$1";
39 } 40 }
40 } 41 }
41 42
42 # TODO: pango-rc file, anybody? 43 if ($^O eq "MSWin32") {
44 # pango is relocatable on win32
45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
49 # unix, need to patch pango rc file
50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
52 local $/;
53 my $rc = <$fh>;
54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
43 55
44 unshift @INC, $ENV{PAR_TEMP}; 56 mkdir "$root/pango-modules";
57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
58 or die "$root/pango-modules/pango.modules: $!";
59 print $fh $rc;
60
61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
63 or die "$ENV{PANGO_RC_FILE}: $!";
64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
65 }
66
67 unshift @INC, $root;
45 } 68 }
46} 69}
47 70
48# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 73 if %PAR::LibCache;
51 74
52use Time::HiRes 'time'; 75use Time::HiRes 'time';
53use Event; 76use Event;
77use List::Util qw(max min);
54 78
55use Crossfire; 79use Crossfire;
56use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
57 81
58use Compress::LZF; 82use Compress::LZF;
… …
60use CFPlus; 84use CFPlus;
61use CFPlus::OpenGL (); 85use CFPlus::OpenGL ();
62use CFPlus::Protocol; 86use CFPlus::Protocol;
63use CFPlus::DB; 87use CFPlus::DB;
64use CFPlus::UI; 88use CFPlus::UI;
89use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
67use CFPlus::Pod; 95use CFPlus::Pod;
68use CFPlus::MapWidget; 96use CFPlus::MapWidget;
69use CFPlus::Macro; 97use CFPlus::Macro;
70 98
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
88our $CONN; 116our $CONN;
89our $PROFILE; # current profile 117our $PROFILE; # current profile
90our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
91 119
92our $WANT_REFRESH; 120our $WANT_REFRESH;
93our $CAN_REFRESH;
94 121
95our @SDL_MODES; 122our @SDL_MODES;
96our $WIDTH; 123our $WIDTH;
97our $HEIGHT; 124our $HEIGHT;
98our $FULLSCREEN; 125our $FULLSCREEN;
… …
102our $FONT_FIXED; 129our $FONT_FIXED;
103 130
104our $MAP; 131our $MAP;
105our $MAPMAP; 132our $MAPMAP;
106our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
107our $BUTTONBAR; 135our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 136our $METASERVER;
111our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 138our $QUIT_DIALOG;
113our $HOST_ENTRY; 139our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 140our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 147our $SETUP_KEYBOARD;
122 148
123our $PL_NOTEBOOK; 149our $PL_NOTEBOOK;
124our $PL_WINDOW; 150our $PL_WINDOW;
125 151
152our $MUSIC_PLAYING_WIDGET;
153our $LICENSE_WIDGET;
154
155our $PICKUP_PAGE;
126our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
127our $STATS_PAGE; 157our $STATS_PAGE;
128our $SKILL_PAGE; 158our $SKILL_PAGE;
129our $SPELL_PAGE; 159our $SPELL_PAGE;
130our $SPELL_LIST; 160our $SPELL_LIST;
… …
136our $STATWIDS; 166our $STATWIDS;
137 167
138our $SDL_ACTIVE; 168our $SDL_ACTIVE;
139our %SDL_CB; 169our %SDL_CB;
140 170
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 172our $STATUSBOX;
147our $DEBUG_STATUS; 173our $DEBUG_STATUS;
148 174
149our $INV; 175our $INV;
150our $INVR; 176our $INVR;
151our $INV_RIGHT_HB; 177our $INVR_HB;
152 178
153our $PICKUP_CFG; 179#############################################################################
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157 180
158sub status { 181sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 182 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 183}
161 184
162sub debug { 185sub debug {
163 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
164} 187}
165 188
166sub message { 189sub message {
190 $MESSAGE_WINDOW->message (@_);
191}
192
193#############################################################################
194#TODO: maybe move into own audio module...
195
196our $SDL_MIXER;
197
198our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
199our $MUSIC_WANT; # arryref of ambient music we want to play
200our @MUSIC_HAVE; # ambient music we have on disk
201our $MUSIC_START;
202our @MUSIC_JINGLE; # which jingles to play next
203our $MUSIC_PLAYING_DATA;
204our $MUSIC_PLAYING_META;
205our $MUSIC_PLAYER;
206our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
207
208our %AUDIO_CHUNK; # audio "files"
209our %AUDIO_PLAY; # which audio faces should be played
210
211sub audio_channel_finished {
212 my ($channel) = @_;
213
214# warn "channel $channel finished\n";#d#
215}
216
217sub audio_sound_push($) {
167 my ($para) = @_; 218 my ($face) = @_;
168 219
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 220 $CFG->{effects_enable}
221 or return;
170 222
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 223 $AUDIO_PLAY{$face}
224 or return;
172 225
173 $LOGVIEW->add_paragraph ($para); 226 if (my $chunk = $AUDIO_CHUNK{$face}) {
174 $LOGVIEW->scroll_to_bottom; 227 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
228 my (undef, $dx, $dy, $vol) = @$_;
229
230 my $channel = CFPlus::Channel::find;
231 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
232 $channel->set_position_r ($dx, $dy, 20);
233 $chunk->play ($channel);
234 }
235 } else {
236 # sound_meta not set means data is in flight either way
237 my $meta = $CONN->{face}[$face]
238 or return;
239
240 $meta->{data}
241 or return;
242
243 # if its a jingle, play it as ambient music
244 if ($meta->{data}{jingle}) {
245 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
246 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
247 &audio_music_push ($face);
248 }
249 } else {
250 # fetch from database
251 CFPlus::DB::get res_data => $meta->{name}, sub {
252 my $rwops = new CFPlus::RW $_[0];
253 my $chunk = new CFPlus::MixChunk $rwops
254 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
255 $chunk->volume (($meta->{data}{volume} || 1) * 128);
256 $AUDIO_CHUNK{$face} = $chunk;
257
258 audio_sound_push ($face);
259 };
260 }
261 }
175} 262}
263
264sub audio_sound_play {
265 my ($face, $dx, $dy, $vol) = @_;
266
267 $SDL_MIXER
268 or return;
269 $CFG->{effects_enable}
270 or return;
271
272 my $queue = $AUDIO_PLAY{$face} ||= [];
273 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
274 audio_sound_push $face
275 unless @$queue > 1;
276}
277
278sub audio_music_set_meta {
279 my ($meta) = @_;
280
281 $MUSIC_PLAYING_META = $meta;
282 $MUSIC_PLAYING_WIDGET->set_markup (
283 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
284 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
285 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
286 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
287 );
288}
289
290sub audio_music_update_volume {
291 return unless $MUSIC_PLAYING_META;
292 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
293 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
294 CFPlus::MixMusic::volume $base * $volume * 128;
295}
296
297sub audio_music_start {
298 my $meta = $MUSIC_PLAYING_META;
299
300 CFPlus::DB::get res_data => $meta->{name}, sub {
301 return unless $SDL_MIXER;
302
303 # music might have changed...
304 $meta eq $MUSIC_PLAYING_META
305 or return &audio_music_start ();
306
307 audio_music_update_volume;
308
309 $MUSIC_PLAYING_DATA = \$_[0];
310
311 my $rwops = $meta->{path}
312 ? new_from_file CFPlus::RW $meta->{path}
313 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
314
315 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
316 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
317
318 my $NOW = time;
319
320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
323 $MUSIC_START = time - $pos;
324 } else {
325 $MUSIC_PLAYER->play (0);
326 $MUSIC_START = time;
327 }
328
329 delete $meta->{stop_time};
330 delete $meta->{stop_pos};
331 }
332}
333
334sub audio_music_push {
335 return unless $SDL_MIXER;
336
337 my $fade_out;
338
339 if (@MUSIC_JINGLE) {
340 @MUSIC_HAVE = $MUSIC_JINGLE[0];
341 $fade_out = 333;
342 } else {
343 return unless $CFG->{bgm_enable};
344
345 my @have =
346 grep $_ && $_->{data},
347 map $CONN->{face}[$_],
348 @$MUSIC_WANT;
349
350 # randomize music a bit so that the order is not always the same
351 $_->{stop_time} ||= rand for @have;
352
353 @MUSIC_HAVE = @have
354 if @have;
355
356 # default MUSIC_HAVE == MUSIC_DEFAULT
357 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
358 $fade_out = 700;
359 }
360
361 # if the currently playing song is acceptable, let it continue
362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
363
364 my $NOW = time;
365
366 if ($MUSIC_PLAYING_META) {
367 $MUSIC_PLAYING_META->{stop_time} = $NOW;
368 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
369 CFPlus::MixMusic::fade_out $fade_out;
370 } else {
371 # sort by stop time, oldest first
372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
373
374 # if the most recently-played piece played very recently,
375 # resume it, else choose the oldest piece for rotation.
376 audio_music_set_meta
377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
378 ? $MUSIC_HAVE[-1]
379 : $MUSIC_HAVE[0];
380
381 audio_music_start;
382 }
383}
384
385sub audio_music_set_ambient {
386 my ($songs) = @_;
387
388 $MUSIC_WANT = $songs;
389 audio_music_push;
390}
391
392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
397 # we compress multiple jingles of the same type
398 shift @MUSIC_JINGLE
399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
400
401 $MUSIC_PLAYING_WIDGET->clear;
402
403 undef $MUSIC_PLAYER;
404 undef $MUSIC_PLAYING_META;
405 undef $MUSIC_PLAYING_DATA;
406
407 audio_music_push;
408}
409
410sub audio_init {
411 if ($CFG->{audio_enable}) {
412 $ENV{MIX_EFFECTSMAXSPEED} = 1;
413 $SDL_MIXER = !CFPlus::Mix_OpenAudio
414 $CFG->{audio_hw_frequency},
415 CFPlus::MIX_DEFAULT_FORMAT,
416 $CFG->{audio_hw_channels},
417 $CFG->{audio_hw_chunksize};
418
419 if ($SDL_MIXER) {
420 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
421
422 audio_music_finished;
423 } else {
424 status "Unable to open sound device: there will be no sound";
425 }
426 } else {
427 undef $SDL_MIXER;
428 }
429
430 sub audio_tab_update;
431 audio_tab_update;
432}
433
434sub audio_shutdown {
435 undef $MUSIC_PLAYER;
436 undef $MUSIC_PLAYING_META;
437 undef $MUSIC_PLAYING_DATA;
438
439 $MUSIC_WANT = [];
440 @MUSIC_JINGLE = ();
441 %AUDIO_PLAY = ();
442 %AUDIO_CHUNK = ();
443
444 CFPlus::Mix_CloseAudio if $SDL_MIXER;
445 undef $SDL_MIXER;
446}
447
448#############################################################################
176 449
177sub destroy_query_dialog { 450sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 451 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 452 if $_[0]{query_dialog};
180} 453}
… …
207 title => "Server Query", 480 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 481 child => my $vbox = new CFPlus::UI::VBox,
209 ; 482 ;
210 483
211 my @dialog = my $label = new CFPlus::UI::Label 484 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 485 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 486 ellipsise => 0,
214 text => $prompt; 487 text => $prompt;
215 488
216 if ($flags & CS_QUERY_YESNO) { 489 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 490 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 507 );
235 508
236 $dialog->grab_focus; 509 $dialog->grab_focus;
237 510
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 511 } 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) { 512 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
242 $MESSAGE_WINDOW->show; 513 $dialog->{tooltip} = "#charcreation_focus";
243 514
244 unshift @dialog, new CFPlus::UI::Label 515 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 516 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 517 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 518 markup => "\nOr use your keyboard and the text entry below:\n";
248 519
249 unshift @dialog, my $table = new CFPlus::UI::Table; 520 unshift @dialog, my $table = new CFPlus::UI::Table;
250 521
251 $table->add (0, 0, new CFPlus::UI::Button 522 $table->add_at (0, 0, new CFPlus::UI::Button
252 text => "Next Race", 523 text => "Next Race",
253 on_activate => sub { 524 on_activate => sub {
254 $conn->send ("reply n"); 525 $conn->send ("reply n");
255 destroy_query_dialog $conn; 526 destroy_query_dialog $conn;
256 0 527 0
257 }, 528 },
258 ); 529 );
259 $table->add (2, 0, new CFPlus::UI::Button 530 $table->add_at (2, 0, new CFPlus::UI::Button
260 text => "Accept", 531 text => "Accept",
261 on_activate => sub { 532 on_activate => sub {
262 $conn->send ("reply d"); 533 $conn->send ("reply d");
263 destroy_query_dialog $conn; 534 destroy_query_dialog $conn;
264 0 535 0
265 }, 536 },
266 ); 537 );
267 538
539 if ($conn->{chargen_race_description}) {
540 unshift @dialog, new CFPlus::UI::Label
541 max_w => $::WIDTH * 0.8,
542 ellipsise => 0,
543 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
544 ;
545 }
546
547 unshift @dialog, new CFPlus::UI::Face
548 face => $conn->{player}{face},
549 bg => [.2, .2, .2, 1],
550 min_w => 64,
551 min_h => 64,
552 ;
553
554 if ($conn->{chargen_race_title}) {
555 unshift @dialog, new CFPlus::UI::Label
556 allign => 1,
557 ellipsise => 0,
558 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
559 ;
560 }
561
268 unshift @dialog, new CFPlus::UI::Label 562 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 563 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 564 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 565 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 566 ;
… …
276 $conn->send ("reply $stat"); 570 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 571 destroy_query_dialog $conn;
278 return; 572 return;
279 } 573 }
280 574
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283
284 unshift @dialog, new CFPlus::UI::Label 575 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 576 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 577 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 578 markup => "\nOr use your keyboard and the text entry below:\n";
288 579
289 unshift @dialog, my $table = new CFPlus::UI::Table; 580 unshift @dialog, my $table = new CFPlus::UI::Table;
290 581
291 # left: re-roll 582 # left: re-roll
292 $table->add (0, 0, new CFPlus::UI::Button 583 $table->add_at (0, 0, new CFPlus::UI::Button
293 text => "Roll Again", 584 text => "Roll Again",
294 on_activate => sub { 585 on_activate => sub {
295 $conn->send ("reply y"); 586 $conn->send ("reply y");
296 destroy_query_dialog $conn; 587 destroy_query_dialog $conn;
297 0 588 0
… …
311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 602 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 603 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313 ], 604 ],
314 ), 1 .. 2; 605 ), 1 .. 2;
315 606
316 $table->add (2, 0, new CFPlus::UI::Button 607 $table->add_at (2, 0, new CFPlus::UI::Button
317 text => "Swap Stats", 608 text => "Swap Stats",
318 on_activate => sub { 609 on_activate => sub {
319 $conn->{stat_change_with} = $sw2->{value}; 610 $conn->{stat_change_with} = $sw2->{value};
320 $conn->send ("reply $sw1->{value}"); 611 $conn->send ("reply $sw1->{value}");
321 destroy_query_dialog $conn; 612 destroy_query_dialog $conn;
322 0 613 0
323 }, 614 },
324 ); 615 );
325 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 616 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326 617
327 # right: accept 618 # right: accept
328 $table->add (4, 0, new CFPlus::UI::Button 619 $table->add_at (4, 0, new CFPlus::UI::Button
329 text => "Accept", 620 text => "Accept",
330 on_activate => sub { 621 on_activate => sub {
331 $conn->send ("reply n"); 622 $conn->send ("reply n");
332 $STATS_PAGE->hide; 623 $STATS_PAGE->hide;
333 destroy_query_dialog $conn; 624 destroy_query_dialog $conn;
… …
414 maph => $mapsize, 705 maph => $mapsize,
415 706
416 client => "cfplus $CFPlus::VERSION $] $^O", 707 client => "cfplus $CFPlus::VERSION $] $^O",
417 708
418 map_widget => $MAPWIDGET, 709 map_widget => $MAPWIDGET,
419 logview => $LOGVIEW,
420 statusbox => $STATUSBOX, 710 statusbox => $STATUSBOX,
421 map => $MAP, 711 map => $MAP,
422 mapmap => $MAPMAP, 712 mapmap => $MAPMAP,
423 query => \&server_query, 713 query => \&server_query,
424 714
425 setup_req => { 715 setup_req => {
426 smoothing => $CFG->{map_smoothing}*1, 716 smoothing => $CFG->{map_smoothing}*1,
427 },
428
429 sound_play => sub {
430 my ($x, $y, $soundnum, $type) = @_;
431
432 $SDL_MIXER
433 or return;
434
435 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
436 or return;
437
438 $chunk->play;
439 }, 717 },
440 }; 718 };
441 719
442 if ($CONN) { 720 if ($CONN) {
443 CFPlus::lowdelay fileno $CONN->{fh}; 721 CFPlus::lowdelay fileno $CONN->{fh};
… …
453 $LOGIN_BUTTON->set_text ("Login"); 731 $LOGIN_BUTTON->set_text ("Login");
454 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 732 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
455 $SETUP_DIALOG->show; 733 $SETUP_DIALOG->show;
456 $PL_WINDOW->hide; 734 $PL_WINDOW->hide;
457 $SPELL_LIST->clear_spells; 735 $SPELL_LIST->clear_spells;
736 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
737
738 &audio_music_set_ambient ([]);
458 739
459 return unless $CONN; 740 return unless $CONN;
460 741
461 status "connection closed"; 742 status "connection closed";
462 743
… …
472 753
473 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 754 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
474 755
475 my $row = 0; 756 my $row = 0;
476 757
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 758 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
478 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 759 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
479 can_events => 1, 760 can_events => 1,
480 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 761 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481 762
763 my $vidmode_tooltip =
764 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
765 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
766
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 767 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
483 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 768 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
484 769
770 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
485 $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]); 771 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
486 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 772 tooltip => $vidmode_tooltip);
773 $hbox->add (my $mode_label = new CFPlus::UI::Label
774 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
775 can_events => 1, tooltip => $vidmode_tooltip);
487 776
488 $mode_slider->connect (changed => sub { 777 $mode_slider->connect (changed => sub {
489 my ($self, $value) = @_; 778 my ($self, $value) = @_;
490 779
491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 780 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 781 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
493 }); 782 });
494 $mode_slider->emit (changed => $mode_slider->{range}[0]); 783 $mode_slider->emit (changed => $mode_slider->{range}[0]);
495 784
496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 785 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
497 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 786 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
498 state => $CFG->{fullscreen}, 787 state => $CFG->{fullscreen},
499 tooltip => "Bring the client into fullscreen mode.", 788 tooltip => "Bring the client into fullscreen mode.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 789 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
501 ); 790 );
502 791
792 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
793 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
794 state => $CFG->{force_opengl11},
795 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
796 . "higher memory usage and slower performance. It will, however, help tremendously on "
797 . "cards that claim to support a feature but fall back to software rendering. "
798 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
799 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
800 . "experience extremely low framerates and your card should do better, try this option.</b>",
801 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
802 );
803
804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
805 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
806 state => $CFG->{texture_compression},
807 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
808 . "will save a lot of memory and increase performance. The compression algorithm "
809 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
810 . "forced OpenGL 1.1 mode.",
811 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
812 );
813
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fast}, 816 state => $CFG->{fast},
506 tooltip => "Lower the visual quality considerably to speed up rendering.", 817 tooltip => "Lower the visual quality considerably to speed up rendering.",
507 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
508 ); 819 );
509 820
510 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
511 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
512 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 823 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
513 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 824 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
514 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 825 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515 ); 826 );
516 827
517 $table->add (1, $row++, new CFPlus::UI::Button 828 $table->add_at (1, $row++, new CFPlus::UI::Button
518 expand => 1, align => 0, text => "Apply", 829 expand => 1, align => 0, text => "Apply",
519 tooltip => "Apply the video settings above.", 830 tooltip => "Apply the video settings above.",
520 on_activate => sub { 831 on_activate => sub {
521 video_shutdown (); 832 video_shutdown ();
522 video_init (); 833 video_init ();
523 0 834 0
524 } 835 }
525 ); 836 );
526 837
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 838 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
528 $table->add (1, $row++, new CFPlus::UI::Slider 839 $table->add_at (1, $row++, new CFPlus::UI::Slider
529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 840 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 841 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
531 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 842 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
532 ); 843 );
533 844
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 845 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
535 $table->add (1, $row++, new CFPlus::UI::CheckBox 846 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{map_smoothing}, 847 state => $CFG->{map_smoothing},
537 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 848 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
538 . "This increases load on the graphics subsystem and works only with 2.x servers. " 849 . "This increases load on the graphics subsystem and works only with TRT servers. "
539 . "Changes take effect at next connection only.", 850 . "Changes take effect at next login only.",
540 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 851 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
541 ); 852 );
542 853
543 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 854 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
544 $table->add (1, $row++, new CFPlus::UI::CheckBox 855 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
545 state => $CFG->{fow_enable}, 856 state => $CFG->{fow_enable},
546 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 857 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
547 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 858 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
548 ); 859 );
549 860
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 861 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
551 $table->add (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 863 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
553 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 864 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 865 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
555 ); 866 );
556 867
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{fow_smooth},
560 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
561 on_changed => sub {
562 my ($self, $value) = @_;
563 $CFG->{fow_smooth} = $value;
564 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
565 0
566 }
567 );
568
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 868 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
570 $table->add (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 870 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
572 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 871 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
872 . "but you still need to press apply to correctly re-layout the widget.",
573 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 873 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
574 ); 874 );
575 875
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 876 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
577 $table->add (1, $row++, new CFPlus::UI::Slider 877 $table->add_at (1, $row++, new CFPlus::UI::Slider
578 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 878 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
579 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 879 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
580 on_changed => sub { 880 on_changed => sub {
581 $CFG->{gauge_fontsize} = $_[1]; 881 $CFG->{gauge_fontsize} = $_[1];
582 &set_gauge_window_fontsize; 882 &set_gauge_window_fontsize;
583 0 883 0
584 } 884 }
585 ); 885 );
586 886
587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 887 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
588 $table->add (1, $row++, new CFPlus::UI::Slider 888 $table->add_at (1, $row++, new CFPlus::UI::Slider
589 range => [$CFG->{gauge_size}, 0.2, 0.8], 889 range => [$CFG->{gauge_size}, 0.2, 0.8],
590 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 890 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
591 on_changed => sub { 891 on_changed => sub {
592 $CFG->{gauge_size} = $_[1]; 892 $CFG->{gauge_size} = $_[1];
593 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 893 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
596 ); 896 );
597 897
598 $vbox 898 $vbox
599} 899}
600 900
901our $AUDIO_HW_CHUNKSIZE;
902our $AUDIO_INFO;
903
904sub audio_tab_update {
905 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
906
907 $AUDIO_HW_CHUNKSIZE->set_options ([
908 map {
909 my $ms = sprintf "%dms", 1000 * $_ / $CFG->{audio_hw_frequency};
910 [$_, $ms, "$ms ($_ samples)"],
911 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
912 ]);
913
914 my $text = !$freq
915 ? "audio is off"
916 : "Frequency (Hz): $freq\n"
917 . "Channels: $chans";
918
919 $AUDIO_INFO->set_text ($text);
920}
921
601sub audio_setup { 922sub audio_setup {
602 my $vbox = new CFPlus::UI::VBox; 923 my $vbox = new CFPlus::UI::VBox;
603 924
604 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 925 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
605 926
606 my $row = 0; 927 my $row = 0;
607 928
608 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 929 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
609 $table->add (1, $row++, new CFPlus::UI::CheckBox 930 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
610 state => $CFG->{audio_enable}, 931 state => $CFG->{audio_enable},
611 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.", 932 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.",
612 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 933 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
613 ); 934 );
935
614# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 936 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
615# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 937 $table->add_at (1, $row, new CFPlus::UI::CheckBox
938 expand => 1, state => $CFG->{effects_enable},
939 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
940 on_changed => sub {
616# $CFG->{effects_volume} = $_[1]; 941 $CFG->{effects_enable} = $_[1];
617# }); 942 $CONN->update_fx_want if $CONN;
943 1
944 }
945 );
946 $table->add_at (2, $row++, new CFPlus::UI::Slider
947 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
948 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
949 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
950 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
951 );
952
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 953 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
619 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
620 $hbox->add (new CFPlus::UI::CheckBox 954 $table->add_at (1, $row, new CFPlus::UI::CheckBox
621 expand => 1, state => $CFG->{bgm_enable}, 955 expand => 1, state => $CFG->{bgm_enable},
622 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 956 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
623 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 957 on_changed => sub {
958 $CFG->{bgm_enable} = $_[1];
959 $CONN->update_fx_want if $CONN;
960 audio_music_push;
961 1
962 }
624 ); 963 );
625 $hbox->add (new CFPlus::UI::Slider 964 $table->add_at (2, $row++, new CFPlus::UI::Slider
626 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 965 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
627 tooltip => "The volume of the background music. Changes are instant.", 966 tooltip => "The volume of the background music. Changes are instant.",
628 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 967 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
629 ); 968 );
630 969
970 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
971 $table->add_at (1, $row++, new CFPlus::UI::Selector
972 c_colspan => 2, expand => 1,
973 value => $CFG->{audio_hw_frequency},
974 options => [
975 [11025, "11 kHz" , "11kHz (low quality)"],
976 [22050, "22 kHz" , "22kHz (reduced quality)"],
977 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
978 [48000, "48 kHz" , "48kHz (studio quality)"],
979 ],
980 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
981 on_changed => sub {
982 $CFG->{audio_hw_frequency} = $_[1];
983 audio_tab_update;
984 1
985 }
986 );
987
988 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
989 $table->add_at (1, $row++, new CFPlus::UI::Selector
990 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_channels},
992 options => [
993 [1, "Mono" , "Mono (single channel, low quality)"],
994 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
995 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
996 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
997 ],
998 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
999 on_changed => sub {
1000 $CFG->{audio_hw_channels} = $_[1];
1001 audio_tab_update;
1002 1
1003 }
1004 );
1005
1006 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1007 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1008 c_colspan => 2, expand => 1,
1009 value => $CFG->{audio_hw_chunksize},
1010 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1011 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1012 on_changed => sub {
1013 $CFG->{audio_hw_chunksize} = $_[1]
1014 if $_[1];
1015 audio_tab_update;
1016 1
1017 }
1018 );
1019
1020 # should really be a slider
1021 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1022 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1023 c_colspan => 2, expand => 1,
1024 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1025 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1026 template => ">= 99",
1027 on_changed => sub {
1028 my ($slider, $value) = @_;
1029
1030 $CFG->{audio_mix_channels} = $value
1031 if $value;
1032 1;
1033 }
1034 );
1035
631 $table->add (1, $row++, new CFPlus::UI::Button 1036 $table->add_at (1, $row++, new CFPlus::UI::Button
632 expand => 1, align => 0, text => "Apply", 1037 c_colspan => 2, expand => 1, align => 0, text => "Apply",
633 tooltip => "Apply the audio settings", 1038 tooltip => "Apply the audio settings",
634 on_activate => sub { 1039 on_activate => sub {
635 audio_shutdown (); 1040 audio_shutdown ();
636 audio_init (); 1041 audio_init ();
637 0 1042 0
638 } 1043 }
639 ); 1044 );
1045
1046 $vbox->add (new CFPlus::UI::FancyFrame
1047 expand => 1,
1048 label => "Audio Info",
1049 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1050 );
1051
1052 audio_tab_update;
640 1053
641 $vbox 1054 $vbox
642} 1055}
643 1056
644sub set_gauge_window_fontsize { 1057sub set_gauge_window_fontsize {
… …
679 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1092 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
680 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1093 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
681 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1094 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
682 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1095 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
683 1096
684 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1097 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1098 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1099 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
685 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1100 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
686 1101
687 $GAUGES = { 1102 $GAUGES = {
1103 exp => $exp, prg => $prg, sklprg => $sklprg,
688 exp => $exp, win => $win, range => $rng, 1104 win => $win, range => $rng,
689 food => $fg, mana => $mg, hp => $hg, grace => $gg 1105 hp => $hg, mana => $mg, grace => $gg, food => $fg,
690 }; 1106 };
691 1107
692 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
693 1109
694 $win 1110 $win
695} 1111}
696 1112
697sub debug_setup { 1113sub debug_setup {
698 my $table = new CFPlus::UI::Table; 1114 my $table = new CFPlus::UI::Table;
699 1115
700 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1116 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
701 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1117 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
702 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1118 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
703 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1119 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
704 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1120 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
705 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1121 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
706 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1122 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
707 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1123 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
708 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 1124 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
709 1125
710 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
711
712 for my $x (0..2) {
713 for my $y (0 .. 2) {
714 $table->add ($x + 3, $y,
715 new CFPlus::UI::Entry
716 text => $default_smooth[$x * 3 + $y],
717 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
718 );
719 }
720 }
721
722 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1126 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1127
1128 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1129 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1130 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1131 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1132 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1133 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1134
1135 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1136
1137 $c->add_items ({
1138 type => "line_loop",
1139 color => [0, 1, 0],
1140 width => 9,
1141 coord_mode => "abs",
1142 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1143 });
1144
1145 $c->add_items ({
1146 type => "lines",
1147 color => [1, 1, 0],
1148 width => 2,
1149 coord_mode => "rel",
1150 coord => [[0,0], [1,1], [1,0], [0,1]],
1151 });
1152
1153 $c->add_items ({
1154 type => "polygon",
1155 color => [0, 0.43, 0],
1156 width => 2,
1157 coord_mode => "rel",
1158 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1159 });
723 1160
724 $table 1161 $table
725} 1162}
726 1163
727sub stats_window { 1164sub stats_window {
… …
775 [2, 4, st_spd => "Spd", 10.54], 1212 [2, 4, st_spd => "Spd", 10.54],
776 [2, 5, st_wspd => "WSp", 10.54], 1213 [2, 5, st_wspd => "WSp", 10.54],
777 ) { 1214 ) {
778 my ($col, $row, $id, $label, $template) = @$_; 1215 my ($col, $row, $id, $label, $template) = @$_;
779 1216
780 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1217 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
781 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1218 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
782 align => +1, template => $template, tooltip => "#stat_$label"); 1219 align => +1, template => $template, tooltip => "#stat_$label");
783 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1220 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
784 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1221 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
785 align => -1, text => $label, tooltip => "#stat_$label"); 1222 align => -1, text => $label, tooltip => "#stat_$label");
786 } 1223 }
787 1224
788 $vb->add (new CFPlus::UI::FancyFrame 1225 $vb->add (new CFPlus::UI::FancyFrame
… …
829 cold => ["Cold", 1266 cold => ["Cold",
830 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1267 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
831 ghit => ["Ghost hit", 1268 ghit => ["Ghost hit",
832 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1269 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
833 ); 1270 );
1271
834 for (qw/slow holyw conf fire depl magic 1272 for (qw/slow holyw conf fire depl magic
835 drain acid pois para deat phys 1273 drain acid pois para deat phys
836 blind fear tund elec cold ghit/) 1274 blind fear tund elec cold ghit/)
837 { 1275 {
838 $tbl2->add ($col, $row, 1276 $tbl2->add_at ($col, $row,
839 $STATWIDS->{"res_$_"} = 1277 $STATWIDS->{"res_$_"} =
840 new CFPlus::UI::Label 1278 new CFPlus::UI::Label
841 font => $FONT_FIXED, 1279 font => $FONT_FIXED,
842 template => "-100%", 1280 template => "-100%",
843 align => +1, 1281 align => +1,
844 valign => 0, 1282 valign => 0,
845 can_events => 1, 1283 can_events => 1,
846 can_hover => 1, 1284 can_hover => 1,
847 tooltip => $resist_names{$_}->[1], 1285 tooltip => $resist_names{$_}->[1],
848 ); 1286 );
849 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1287 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
850 font => $FONT_FIXED, 1288 font => $FONT_FIXED,
851 can_hover => 1, 1289 can_hover => 1,
852 can_events => 1, 1290 can_events => 1,
853 path => "ui/resist/resist_$_.png", 1291 path => "ui/resist/resist_$_.png",
854 tooltip => $resist_names{$_}->[1], 1292 tooltip => $resist_names{$_}->[1],
855 ); 1293 );
856 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1294 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
857 text => $resist_names{$_}->[0], 1295 text => $resist_names{$_}->[0],
858 font => $FONT_FIXED, 1296 font => $FONT_FIXED,
859 can_hover => 1, 1297 can_hover => 1,
860 can_events => 1, 1298 can_events => 1,
861 tooltip => $resist_names{$_}->[1], 1299 tooltip => $resist_names{$_}->[1],
… …
873 $r 1311 $r
874} 1312}
875 1313
876sub skill_window { 1314sub skill_window {
877 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1315 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1316
878 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1317 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1318
879 $sw 1319 $sw
880} 1320}
881 1321
882sub formsep($) { 1322sub formsep($) {
883 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1323 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
894 return if $METASERVER_ATIME > time; 1334 return if $METASERVER_ATIME > time;
895 $METASERVER_ATIME = time + 60; 1335 $METASERVER_ATIME = time + 60;
896 1336
897 my $table = $METASERVER->{table}; 1337 my $table = $METASERVER->{table};
898 $table->clear; 1338 $table->clear;
899 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1339 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
900 1340
901 my $ok = 0; 1341 my $ok = 0;
902 1342
903 CFPlus::background { 1343 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent; 1344 my $ua = CFPlus::lwp_useragent;
… …
915 "The time this server has been running without being restarted.", 1355 "The time this server has been running without being restarted.",
916 "The server software version - a '+' indicates a Crossfire+ server.", 1356 "The server software version - a '+' indicates a Crossfire+ server.",
917 "Short information about this server provided by its admins.", 1357 "Short information about this server provided by its admins.",
918 ); 1358 );
919 my @col = qw(#Users Host Uptime Version Description); 1359 my @col = qw(#Users Host Uptime Version Description);
920 $table->add ($_, 0, new CFPlus::UI::Label 1360 $table->add_at ($_, 0, new CFPlus::UI::Label
921 can_hover => 1, can_events => 1, 1361 can_hover => 1, can_events => 1,
922 align => 0, fg => [1, 1, 0], 1362 align => 0, fg => [1, 1, 0],
923 text => $col[$_], tooltip => $tip[$_]) 1363 text => $col[$_], tooltip => $tip[$_])
924 for 0 .. $#col; 1364 for 0 .. $#col;
925 1365
… …
947 1387
948 $m = [$users, $host, $uptime, $version, $desc]; 1388 $m = [$users, $host, $uptime, $version, $desc];
949 1389
950 $y++; 1390 $y++;
951 1391
952 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1392 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
953 (new CFPlus::UI::Button 1393 (new CFPlus::UI::Button
954 text => "Use", 1394 text => "Use",
955 tooltip => "Put this server into the <b>Host:Port</b> field", 1395 tooltip => "Put this server into the <b>Host:Port</b> field",
956 on_activate => sub { 1396 on_activate => sub {
957 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1397 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
960 }, 1400 },
961 ), 1401 ),
962 (new CFPlus::UI::Empty expand => 1), 1402 (new CFPlus::UI::Empty expand => 1),
963 ]); 1403 ]);
964 1404
965 $table->add ($_, $y, new CFPlus::UI::Label 1405 $table->add_at ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4, 1406 max_w => $::WIDTH * 0.4,
967 ellipsise => 0, 1407 ellipsise => 0,
968 align => $align[$_], 1408 align => $align[$_],
969 text => $m->[$_], 1409 text => $m->[$_],
970 tooltip => $tip[$_], 1410 tooltip => $tip[$_],
… …
1011 1451
1012 $vbox->add (new CFPlus::UI::FancyFrame 1452 $vbox->add (new CFPlus::UI::FancyFrame
1013 label => "Connection Settings", 1453 label => "Connection Settings",
1014 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1454 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1015 ); 1455 );
1016 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1456 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1017 1457
1018 { 1458 {
1019 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1459 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1020 1460
1021 $vbox->add ( 1461 $vbox->add (
1022 $HOST_ENTRY = new CFPlus::UI::Entry 1462 $HOST_ENTRY = new CFPlus::UI::Entry
1023 expand => 1, 1463 expand => 1,
1024 text => $CFG->{profile}{default}{host}, 1464 text => $CFG->{profile}{default}{host},
1025 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1465 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1026 on_changed => sub { 1466 on_changed => sub {
1027 my ($self, $value) = @_; 1467 my ($self, $value) = @_;
1028 $CFG->{profile}{default}{host} = $value; 1468 $CFG->{profile}{default}{host} = $value;
1029 0 1469 1
1030 } 1470 }
1031 ); 1471 );
1032 1472
1033 $vbox->add (new CFPlus::UI::Button 1473 $vbox->add (new CFPlus::UI::Button
1034 expand => 1, 1474 expand => 1,
1035 text => "Server List", 1475 text => "Server List",
1036 other => $METASERVER, 1476 other => $METASERVER,
1037 tooltip => "Show a list of available crossfire servers", 1477 tooltip => "Show a list of available crossfire servers",
1038 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1478 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1039 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1479 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1040 ); 1480 );
1041 } 1481 }
1042 1482
1043 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1483 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1044 $table->add (1, 4, new CFPlus::UI::Entry 1484 $table->add_at (1, 4, new CFPlus::UI::Entry
1045 text => $CFG->{profile}{default}{user}, 1485 text => $CFG->{profile}{default}{user},
1046 tooltip => "The name of your character on the server", 1486 tooltip => "The name of your character on the server",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1048 ); 1488 );
1049 1489
1050 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1490 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1051 $table->add (1, 5, new CFPlus::UI::Entry 1491 $table->add_at (1, 5, new CFPlus::UI::Entry
1052 text => $CFG->{profile}{default}{password}, 1492 text => $CFG->{profile}{default}{password},
1053 hidden => 1, 1493 hidden => 1,
1054 tooltip => "The password for your character", 1494 tooltip => "The password for your character",
1055 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1495 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1056 ); 1496 );
1057 1497
1058 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1498 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1059 $table->add (1, 7, new CFPlus::UI::Slider 1499 $table->add_at (1, 7, new CFPlus::UI::Slider
1060 force_w => 100, 1500 force_w => 100,
1061 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1501 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1062 tooltip => "This is the size of the portion of the map update the server sends you. " 1502 tooltip => "This is the size of the portion of the map update the server sends you. "
1063 . "If you set this to a high value you will be able to see further, " 1503 . "If you set this to a high value you will be able to see further, "
1064 . "but you also increase bandwidth requirements and latency. " 1504 . "but you also increase bandwidth requirements and latency. "
1065 . "This option is only used once at log-in.", 1505 . "This option is only used once at log-in.",
1066 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1506 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1067 ); 1507 );
1068 1508
1069 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1070 $table->add (1, 8, new CFPlus::UI::CheckBox
1071 state => $CFG->{face_prefetch},
1072 tooltip => "<b>Background Image Prefetch</b>\n\n"
1073 . "If enabled, the client automatically pre-fetches images from the server. "
1074 . "This might increase or create lag, but increases the chances "
1075 . "of faces being ready for display when you encounter them. "
1076 . "It also uses up server bandwidth on every connect, "
1077 . "so only set it if you really need to prefetch images. "
1078 . "This option can be set and unset any time.",
1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1080 );
1081
1082 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1509 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1083 $table->add (1, 9, new CFPlus::UI::Entry 1510 $table->add_at (1, 8, new CFPlus::UI::Entry
1084 text => $CFG->{output_rate}, 1511 text => $CFG->{output_rate},
1085 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1512 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1086 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1513 . "when sending data. When 0 or unset, the server "
1087 . "default will be used, which is usually around 100kb/s.", 1514 . "default will be used, which is usually around 100kb/s. Most servers will "
1515 . "dynamically find an optimal rate, so adjust this only when necessary.",
1088 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1516 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1089 ); 1517 );
1090 1518
1091 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1519 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092 $table->add (1, 10, new CFPlus::UI::Entry 1520 $table->add_at (1, 9, new CFPlus::UI::Entry
1093 text => $CFG->{output_count}, 1521 text => $CFG->{output_count},
1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1522 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1523 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1096 ); 1524 );
1097 1525
1098 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1526 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099 $table->add (1, 11, new CFPlus::UI::Entry 1527 $table->add_at (1, 10, new CFPlus::UI::Entry
1100 text => $CFG->{output_sync}, 1528 text => $CFG->{output_sync},
1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1529 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1530 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1103 ); 1531 );
1104 1532
1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1533 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1106 expand => 1, 1534 expand => 1,
1107 align => 0, 1535 align => 0,
1108 text => "Login", 1536 text => "Login",
1109 on_activate => sub { 1537 on_activate => sub {
1110 $CONN ? stop_game 1538 $CONN ? stop_game
1111 : start_game; 1539 : start_game;
1112 0 1540 1
1113 }, 1541 },
1114 ); 1542 );
1115 1543
1116 $vbox->add (new CFPlus::UI::FancyFrame 1544 $vbox->add (new CFPlus::UI::FancyFrame
1117 label => "Server Info", 1545 label => "Server Info",
… …
1124sub client_setup { 1552sub client_setup {
1125 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1553 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126 1554
1127 my $row = 0; 1555 my $row = 0;
1128 1556
1129 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1130 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1131 text => $CFG->{say_command},
1132 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. "
1133 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1134 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1135 on_changed => sub {
1136 my ($self, $value) = @_;
1137 $CFG->{say_command} = $value;
1138 0
1139 }
1140 );
1141
1142 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1557 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1143 $table->add (1, $row++, new CFPlus::UI::CheckBox 1558 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1144 state => $CFG->{show_tips}, 1559 state => $CFG->{show_tips},
1145 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1560 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1146 on_changed => sub { 1561 on_changed => sub {
1147 my ($self, $value) = @_; 1562 my ($self, $value) = @_;
1148 $CFG->{show_tips} = $value; 1563 $CFG->{show_tips} = $value;
1149 0 1564 0
1150 } 1565 }
1151 ); 1566 );
1152 1567
1153 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1568 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1154 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1569 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1155 text => $CFG->{logview_max_par}, 1570 text => $CFG->{logview_max_par},
1156 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1571 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1157 . "sends more messages than this number, older messages get removed to save memory and " 1572 . "sends more messages than this number, older messages get removed to save memory and "
1158 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1573 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159 on_changed => sub { 1574 on_changed => sub {
1160 my ($self, $value) = @_; 1575 my ($self, $value) = @_;
1161 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1576 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1162 0 1577 0
1163 }, 1578 },
1164 ); 1579 );
1165 1580
1166 $table 1581 $table
1167} 1582}
1168 1583
1169sub message_window {
1170 my $window = new CFPlus::UI::Toplevel
1171 name => "message_window",
1172 title => "Messages",
1173 border_bg => [1, 1, 1, 1],
1174 x => "max",
1175 y => 0,
1176 force_w => $::WIDTH * 0.4,
1177 force_h => $::HEIGHT * 0.5,
1178 child => (my $vbox = new CFPlus::UI::VBox),
1179 has_close_button => 1;
1180
1181 $vbox->add ($LOGVIEW);
1182
1183 $vbox->add (my $input = new CFPlus::UI::Entry
1184 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1185 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1186 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1187 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1188 on_focus_in => sub {
1189 my ($input, $prev_focus) = @_;
1190
1191 delete $input->{refocus_map};
1192
1193 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1194 $input->{refocus_map} = 1;
1195 }
1196 delete $input->{auto_activated};
1197
1198 0
1199 },
1200 on_activate => sub {
1201 my ($input, $text) = @_;
1202 $input->set_text ('');
1203
1204 if ($text =~ /^\/(.*)/) {
1205 $::CONN->user_send ($1);
1206 } else {
1207 my $say_cmd = $::CFG->{say_command} || 'say';
1208 $::CONN->user_send ("$say_cmd $text");
1209 }
1210 if ($input->{refocus_map}) {
1211 delete $input->{refocus_map};
1212 $MAPWIDGET->focus_in
1213 }
1214
1215 0
1216 },
1217 on_escape => sub {
1218 $MAPWIDGET->grab_focus;
1219
1220 0
1221 },
1222 );
1223
1224 $CONSOLE = {
1225 window => $window,
1226 input => $input,
1227 };
1228
1229 $window
1230}
1231
1232sub autopickup_setup { 1584sub autopickup_setup {
1585 my $r = new CFPlus::UI::ScrolledWindow (
1586 expand => 1,
1587 scroll_y => 1
1588 );
1233 my $table = new CFPlus::UI::Table; 1589 $r->add (my $table = new CFPlus::UI::Table
1590 row_expand => [0],
1591 col_expand => [0, 1, 0, 1],
1592 );
1234 1593
1235 for ( 1594 for (
1236 ["General", 0, 0, 1595 ["General", 0, 0,
1237 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1596 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1238 ["Inhibit autopickup" => PICKUP_INHIBIT], 1597 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1273 ], 1632 ],
1274 ["Weight/Value ratio", 2, 17] 1633 ["Weight/Value ratio", 2, 17]
1275 ) 1634 )
1276 { 1635 {
1277 my ($title, $x, $y, @bits) = @$_; 1636 my ($title, $x, $y, @bits) = @$_;
1278 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1637 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1279 1638
1280 for (@bits) { 1639 for (@bits) {
1281 ++$y; 1640 ++$y;
1282 1641
1283 my $mask = $_->[1]; 1642 my $mask = $_->[1];
1284 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1643 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1285 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1644 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1286 state => $::CFG->{pickup} & $mask, 1645 state => $::CFG->{pickup} & $mask,
1287 on_changed => sub { 1646 on_changed => sub {
1288 my ($box, $value) = @_; 1647 my ($box, $value) = @_;
1289 1648
1290 if ($value) { 1649 if ($value) {
… …
1301 1660
1302 ${$_->[2]} = $checkbox if $_->[2]; 1661 ${$_->[2]} = $checkbox if $_->[2];
1303 } 1662 }
1304 } 1663 }
1305 1664
1306 $table->add (2, 18, new CFPlus::UI::ValSlider 1665 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1307 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1666 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308 template => ">= 99", 1667 template => ">= 99",
1309 to_value => sub { ">= " . 5 * $_[0] }, 1668 to_value => sub { ">= " . 5 * $_[0] },
1310 on_changed => sub { 1669 on_changed => sub {
1311 my ($slider, $value) = @_; 1670 my ($slider, $value) = @_;
… …
1314 $::CFG->{pickup} |= int $value 1673 $::CFG->{pickup} |= int $value
1315 if $value; 1674 if $value;
1316 1; 1675 1;
1317 }); 1676 });
1318 1677
1319 $table->add (3, 18, new CFPlus::UI::Button 1678 $table->add_at (3, 18, new CFPlus::UI::Button
1320 text => "set", 1679 text => "set",
1321 on_activate => sub { 1680 on_activate => sub {
1322 $::CONN->send_command ("pickup $::CFG->{pickup}") 1681 $::CONN->send_command ("pickup $::CFG->{pickup}")
1323 if defined $::CONN; 1682 if defined $::CONN;
1324 0 1683 0
1325 }); 1684 });
1326 1685
1327 $table 1686 $r
1328} 1687}
1329 1688
1330my %SORT_ORDER = ( 1689my %SORT_ORDER = (
1331 type => undef, 1690 type => undef,
1332 mtime => sub { 1691 mtime => sub {
… …
1376 $sw1->add ($INV = new CFPlus::UI::Inventory); 1735 $sw1->add ($INV = new CFPlus::UI::Inventory);
1377 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1736 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1378 1737
1379 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1738 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1380 1739
1381 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1740 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1382 1741
1383 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1742 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1384 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1743 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1385 1744
1386 # XXX: Call after $INVR = ... because set_opencont sets the items 1745 # XXX: Call after $INVR = ... because set_opencont sets the items
1387 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1746 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1388 1747
1389 $hb 1748 $hb
1749}
1750
1751sub media_window {
1752 my $vb = new CFPlus::UI::VBox;
1753
1754 $vb->add (new CFPlus::UI::FancyFrame
1755 label => "Currently playing music",
1756 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1757 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1758 );
1759
1760 $vb->add (new CFPlus::UI::FancyFrame
1761 label => "Other media used in this session",
1762 expand => 1,
1763 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1764 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1765 );
1766
1767 $vb
1768}
1769
1770sub add_license {
1771 my ($meta) = @_;
1772
1773 $meta = $meta->{data}
1774 or return;
1775
1776 $meta->{license} || $meta->{author} || $meta->{source}
1777 or return;
1778
1779 $LICENSE_WIDGET->add_paragraph ({
1780 fg => [1, 1, 1, 1],
1781 markup => "<small>"
1782 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1783 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1784 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1785 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1786 . "</small>",
1787 });
1788 $LICENSE_WIDGET->scroll_to_bottom;
1390} 1789}
1391 1790
1392sub toggle_player_page { 1791sub toggle_player_page {
1393 my ($widget) = @_; 1792 my ($widget) = @_;
1394 1793
… …
1411 has_close_button => 1 1810 has_close_button => 1
1412 ; 1811 ;
1413 1812
1414 my $ntb = 1813 my $ntb =
1415 $PL_NOTEBOOK = 1814 $PL_NOTEBOOK =
1416 new CFPlus::UI::Notebook expand => 1, debug => 1; 1815 new CFPlus::UI::Notebook expand => 1;
1417 1816
1418 $ntb->add ( 1817 $ntb->add_tab (
1419 "Statistics (F2)" => $STATS_PAGE = stats_window, 1818 "Statistics (F2)" => $STATS_PAGE = stats_window,
1420 "Shows statistics, where all your Stats and Resistances are shown." 1819 "Shows statistics, where all your Stats and Resistances are shown."
1421 ); 1820 );
1422 $ntb->add ( 1821 $ntb->add_tab (
1423 "Skills (F3)" => $SKILL_PAGE = skill_window, 1822 "Skills (F3)" => $SKILL_PAGE = skill_window,
1424 "Shows all your Skills." 1823 "Shows all your Skills."
1425 ); 1824 );
1426 1825
1427 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1826 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1428 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1827 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1429 $ntb->add ( 1828 $ntb->add_tab (
1430 "Spellbook (F4)" => $spellsw, 1829 "Spellbook (F4)" => $spellsw,
1431 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1830 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1432 ); 1831 );
1433 $ntb->add ( 1832 $ntb->add_tab (
1434 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1833 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1435 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1834 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1436 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1835 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1437 ); 1836 );
1837 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1838 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1839
1840 $ntb->add_tab (Media => media_window,
1841 "License, Author and Source info for media sent by the server.");
1438 1842
1439 $ntb->set_current_page ($INVENTORY_PAGE); 1843 $ntb->set_current_page ($INVENTORY_PAGE);
1440 1844
1441 $plwin->add ($ntb); 1845 $plwin->add ($ntb);
1442 $plwin 1846 $plwin
… …
1596 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2000 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1597 ); 2001 );
1598 $hb->add (new CFPlus::UI::Button 2002 $hb->add (new CFPlus::UI::Button
1599 text => "Quit anyway", 2003 text => "Quit anyway",
1600 expand => 1, 2004 expand => 1,
1601 on_activate => sub { exit }, 2005 on_activate => sub { Event::unloop_all },
1602 ); 2006 );
1603 } 2007 }
1604 2008
1605 $QUIT_DIALOG->show; 2009 $QUIT_DIALOG->show;
1606 $QUIT_DIALOG->grab_focus; 2010 $QUIT_DIALOG->grab_focus;
… …
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2043 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1640 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 2044 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641 2045
1642 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 2046 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643 2047
1644 $table->add (0, 0, new CFPlus::UI::Button 2048 $table->add_at (0, 0, new CFPlus::UI::Button
1645 text => "Close", 2049 text => "Close",
1646 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>.", 2050 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>.",
1647 on_activate => $close, 2051 on_activate => $close,
1648 ); 2052 );
1649 2053
1650 $table->add (2, 0, new CFPlus::UI::Button 2054 $table->add_at (2, 0, new CFPlus::UI::Button
1651 text => "Next", 2055 text => "Next",
1652 tooltip => "Show the next <b>Tip of the day</b>.", 2056 tooltip => "Show the next <b>Tip of the day</b>.",
1653 on_activate => sub { 2057 on_activate => sub {
1654 $close->(); 2058 $close->();
1655 &show_tip_of_the_day; 2059 &show_tip_of_the_day;
… …
1664 CFPlus::SDL_Init 2068 CFPlus::SDL_Init
1665 and die "SDL::Init failed!\n"; 2069 and die "SDL::Init failed!\n";
1666} 2070}
1667 2071
1668sub video_init { 2072sub video_init {
1669 sdl_init;
1670
1671 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2073 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1672 2074
1673 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2075 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1674 2076
1675 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2077 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1676 $FULLSCREEN = $CFG->{fullscreen}; 2078 $FULLSCREEN = $CFG->{fullscreen};
1677 $FAST = $CFG->{fast}; 2079 $FAST = $CFG->{fast};
1678 2080
1679 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 2081 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1680 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2082 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1681 2083
1682 $SDL_ACTIVE = 1; 2084 $SDL_ACTIVE = 1;
1683 $LAST_REFRESH = time - 0.01; 2085 $LAST_REFRESH = time - 0.01;
1684 2086
1685 CFPlus::OpenGL::init; 2087 CFPlus::OpenGL::init;
2088 CFPlus::Macro::init;
1686 2089
1687 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2090 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1688 2091
1689 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2092 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1690 2093
1691 ############################################################################# 2094 #############################################################################
1692 2095
1693 if ($DEBUG_STATUS) { 2096 if ($DEBUG_STATUS) {
1694 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2097 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1695 } else { 2098 } else {
1696 # create the widgets 2099 # create/configure the widgets
2100
2101 $CFPlus::UI::ROOT->connect (key_down => sub {
2102 my (undef, $ev) = @_;
2103
2104 if (my @macros = CFPlus::Macro::find $ev) {
2105 CFPlus::Macro::execute $_ for @macros;
2106
2107 return 1;
2108 }
2109
2110 0
2111 });
1697 2112
1698 $DEBUG_STATUS = new CFPlus::UI::Label 2113 $DEBUG_STATUS = new CFPlus::UI::Label
1699 padding => 0, 2114 padding => 0,
1700 z => 100, 2115 z => 100,
1701 force_x => "max", 2116 force_x => "max",
… …
1726 2141
1727 $MAPWIDGET = new CFPlus::MapWidget; 2142 $MAPWIDGET = new CFPlus::MapWidget;
1728 $MAPWIDGET->connect (activate_console => sub { 2143 $MAPWIDGET->connect (activate_console => sub {
1729 my ($mapwidget, $preset) = @_; 2144 my ($mapwidget, $preset) = @_;
1730 2145
1731 if ($CONSOLE) { 2146 $MESSAGE_WINDOW->activate_console ($preset)
1732 $CONSOLE->{input}->{auto_activated} = 1; 2147 if $MESSAGE_WINDOW;
1733 $CONSOLE->{input}->grab_focus;
1734
1735 if ($preset && $CONSOLE->{input}->get_text eq '') {
1736 $CONSOLE->{input}->set_text ($preset);
1737 }
1738 }
1739 }); 2148 });
1740 $MAPWIDGET->show; 2149 $MAPWIDGET->show;
1741 $MAPWIDGET->grab_focus; 2150 $MAPWIDGET->grab_focus;
1742 2151
1743 $LOGVIEW = new CFPlus::UI::TextScroller 2152 $COMPLETER = new CFPlus::MapWidget::Command::
1744 expand => 1, 2153 command => { },
1745 font => $FONT_FIXED, 2154 tooltip => "#completer_help",
1746 fontsize => $::CFG->{log_fontsize},
1747 indent => -4,
1748 can_hover => 1,
1749 can_events => 1,
1750 max_par => $CFG->{logview_max_par},
1751 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1752 ; 2155 ;
1753 2156
1754 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2157 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1755 title => "Setup", 2158 title => "Setup",
1756 name => "setup_dialog", 2159 name => "setup_dialog",
… …
1761 force_h => $::HEIGHT * 0.6, 2164 force_h => $::HEIGHT * 0.6,
1762 has_close_button => 1, 2165 has_close_button => 1,
1763 ; 2166 ;
1764 2167
1765 $METASERVER = metaserver_dialog; 2168 $METASERVER = metaserver_dialog;
2169 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1766 2170
1767 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2171 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1768 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2172 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1769 2173
1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2174 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1771 "Configure the server to play on, your username, password and other server-related options."); 2175 "Configure the server to play on, your username, password and other server-related options.");
1772 $SETUP_NOTEBOOK->add (Client => client_setup, 2176 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1773 "Configure various client-specific settings."); 2177 "Configure various client-specific settings.");
1774 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1775 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1776 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2178 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1777 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2179 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1778 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2180 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1779 "Configure the use of audio, sound effects and background music."); 2181 "Configure the use of audio, sound effects and background music.");
1780 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2182 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1781 "Lets you define, edit and delete key bindings." 2183 "Lets you define, edit and delete key bindings."
1782 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2184 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1783 . "with nothing set and the recording started. After doing the actions you " 2185 . "with nothing set and the recording started. After doing the actions you "
1784 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2186 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1785 . "After pressing the combo the binding will be saved automatically and the " 2187 . "After pressing the combo the binding will be saved automatically and the "
1786 . "binding editor closes"); 2188 . "binding editor closes");
1787 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2189 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1788 "Some debuggin' options. Do not ask."); 2190 "Some debuggin' options. Do not ask.");
1789 2191
1790 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2192 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1791 2193
1792 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2194 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1793 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2195 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1794 2196
1795 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2197 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1796 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2198 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1797 2199
1798 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 2200 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
1799 2201
1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2202 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1820 tooltip => "Terminates the program", 2222 tooltip => "Terminates the program",
1821 on_activate => sub { 2223 on_activate => sub {
1822 if ($CONN) { 2224 if ($CONN) {
1823 open_quit_dialog; 2225 open_quit_dialog;
1824 } else { 2226 } else {
1825 exit; 2227 Event::unloop_all;
1826 } 2228 }
1827 0 2229 0
1828 }, 2230 },
1829 ); 2231 );
1830 2232
1831 $BUTTONBAR->show; 2233 $BUTTONBAR->show;
1832 $SETUP_DIALOG->show; 2234 $SETUP_DIALOG->show;
2235 $MESSAGE_WINDOW->show;
1833 } 2236 }
1834 2237
1835 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2238 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1836}
1837
1838sub setup_build_button {
1839 my ($enabled) = @_;
1840 if ($enabled) {
1841 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1842 $BUILD_BUTTON ||= new CFPlus::UI::Button
1843 text => "Build",
1844 tooltip => "Opens the ingame builder",
1845 on_activate => sub {
1846 if ($CONN) {
1847 $CONN->send_ext_req (builder_player_items => sub {
1848 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1849 });
1850 }
1851 0
1852 };
1853 $BUTTONBAR->add ($BUILD_BUTTON);
1854 } else {
1855 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1856 }
1857}
1858
1859sub open_ingame_editor {
1860 my ($msg) = @_;
1861
1862 my $win = new CFPlus::UI::Toplevel
1863 x => 0,
1864 y => 'center',
1865 z => 4,
1866 name => 'builder_window',
1867 force_w => int $WIDTH * 1/4,
1868 force_h => int $HEIGHT * 3/4,
1869 title => "In game builder",
1870 has_close_button => 1;
1871
1872 my $r = new CFPlus::UI::ScrolledWindow (
1873 expand => 1,
1874 scroll_y => 1
1875 );
1876 $r->add (my $vb = new CFPlus::UI::VBox);
1877 $win->add ($r);
1878
1879
1880 $vb->add (
1881 new CFPlus::UI::Button
1882 text => "Disable build mode",
1883 on_activate => sub { $::IN_BUILD_MODE = undef }
1884 );
1885 $vb->add (
1886 new CFPlus::UI::Button
1887 text => "ERASE",
1888 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1889 );
1890
1891 for my $itemarchname (
1892 sort {
1893 $msg->{items}->{$a}->{build_arch_name}
1894 cmp $msg->{items}->{$b}->{build_arch_name}
1895 } keys %{$msg->{items}}
1896 ) {
1897 my $info = $msg->{items}->{$itemarchname};
1898 $vb->add (
1899 new CFPlus::UI::Button text => $info->{build_arch_name},
1900 on_activate => sub {
1901 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1902
1903 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1904 build_mode_query_arch_info ();
1905 }
1906 }
1907 );
1908 }
1909
1910 $win->show;
1911}
1912
1913sub build_mode_query_arch_info {
1914 my ($iteminfo) = $::IN_BUILD_MODE;
1915 my $itemarchname = $iteminfo->{item};
1916 my $info = $iteminfo->{info};
1917
1918 my $dialog = new CFPlus::UI::Toplevel
1919 x => "center",
1920 y => "center",
1921 z => 50,
1922 force_w => int $WIDTH * 1/2,
1923 title => "Enter information for placement of '$itemarchname'",
1924 has_close_button => 1;
1925
1926 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927
1928 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929 my $row = 0;
1930 if ($info->{has_name}) {
1931 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1932 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933 }
1934 if ($info->{has_text}) {
1935 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1936 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937 }
1938 if ($info->{has_connection}) {
1939 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940 $table->add (1, $row++,
1941 new CFPlus::UI::Entry
1942 expand => 1,
1943 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1944 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1945 );
1946 }
1947
1948 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1949 $hb->add (new CFPlus::UI::Button
1950 text => "Close",
1951 expand => 1,
1952 on_activate => sub { $dialog->hide; 0 },
1953 );
1954 $dialog->show;
1955} 2239}
1956 2240
1957sub video_shutdown { 2241sub video_shutdown {
1958 CFPlus::OpenGL::shutdown; 2242 CFPlus::OpenGL::shutdown;
1959 2243
1960 undef $SDL_ACTIVE; 2244 undef $SDL_ACTIVE;
1961} 2245}
1962 2246
1963my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1964my $bgmusic;#TODO#hack#d#
1965
1966sub audio_channel_finished {
1967 my ($channel) = @_;
1968
1969 #warn "channel $channel finished\n";#d#
1970}
1971
1972sub audio_music_finished {
1973 return unless $CFG->{bgm_enable};
1974
1975 # TODO: hack, do play loop and mood music
1976 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1977 $bgmusic->play (0);
1978
1979 push @bgmusic, shift @bgmusic;
1980}
1981
1982sub audio_init {
1983 if ($CFG->{audio_enable}) {
1984 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1985 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1986
1987 unless ($SDL_MIXER) {
1988 status "Unable to open sound device: there will be no sound";
1989 return;
1990 }
1991
1992 CFPlus::Mix_AllocateChannels 8;
1993 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1994
1995 audio_music_finished;
1996
1997 local $_;
1998 while (<$fh>) {
1999 next if /^\s*#/;
2000 next if /^\s*$/;
2001
2002 my ($file, $volume, $event) = split /\s+/, $_, 3;
2003
2004 push @SOUNDS, "$volume,$file";
2005
2006 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2007 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2008 $chunk->volume ($volume * 128 / 100);
2009 $chunk
2010 };
2011 }
2012 } else {
2013 status "unable to open sound config: $!";
2014 }
2015 }
2016}
2017
2018sub audio_shutdown {
2019 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2020 undef $SDL_MIXER;
2021 @SOUNDS = ();
2022 %AUDIO_CHUNKS = ();
2023}
2024
2025my %animate_object; 2247my %animate_object;
2026my $animate_timer; 2248my $animate_timer;
2027 2249
2028my $fps = 9; 2250my $fps = 9;
2029 2251
2030my %demo;#d#
2031
2032sub force_refresh { 2252sub force_refresh {
2253 if ($ENV{CFPLUS_DEBUG} & 4) {
2033 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2254 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2034 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2255 debug sprintf "%3.2f", $fps;
2256 }
2035 2257
2036 $CFPlus::UI::ROOT->draw; 2258 $CFPlus::UI::ROOT->draw;
2037 2259 CFPlus::SDL_GL_SwapBuffers;
2038 $WANT_REFRESH = 0;
2039 $CAN_REFRESH = 0;
2040 $LAST_REFRESH = $NOW; 2260 $LAST_REFRESH = $NOW;
2041 2261 $WANT_REFRESH->stop;
2042 CFPlus::SDL_GL_SwapBuffers;
2043} 2262}
2044 2263
2264$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2265
2045my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2266my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2046 $NOW = time; 2267 $NOW = time;
2047 2268
2048 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2269 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2049 for CFPlus::SDL_PollEvent; 2270 for CFPlus::poll_events;
2050 2271
2051 if (%animate_object) { 2272 if (%animate_object) {
2052 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2273 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2053 $WANT_REFRESH++; 2274 $WANT_REFRESH->start;
2054 }
2055
2056 if ($WANT_REFRESH) {
2057 force_refresh;
2058 } else {
2059 $CAN_REFRESH = 1;
2060 } 2275 }
2061}); 2276});
2062 2277
2063sub animation_start { 2278sub animation_start {
2064 my ($widget) = @_; 2279 my ($widget) = @_;
… …
2068sub animation_stop { 2283sub animation_stop {
2069 my ($widget) = @_; 2284 my ($widget) = @_;
2070 delete $animate_object{$widget}; 2285 delete $animate_object{$widget};
2071} 2286}
2072 2287
2073# check once/second for faces that need to be prefetched
2074# this should, of course, only run on demand, but
2075# SDL forces worse things on us....
2076
2077Event->timer (after => 1, interval => 0.25, cb => sub {
2078 $CONN->face_prefetch
2079 if $CONN;
2080});
2081
2082%SDL_CB = ( 2288%SDL_CB = (
2083 CFPlus::SDL_QUIT => sub { 2289 CFPlus::SDL_QUIT => sub {
2084 exit; 2290 Event::unloop_all;
2085 }, 2291 },
2086 CFPlus::SDL_VIDEORESIZE => sub { 2292 CFPlus::SDL_VIDEORESIZE => sub {
2087 }, 2293 },
2088 CFPlus::SDL_VIDEOEXPOSE => sub { 2294 CFPlus::SDL_VIDEOEXPOSE => sub {
2089 CFPlus::UI::full_refresh; 2295 CFPlus::UI::full_refresh;
2090 }, 2296 },
2091 CFPlus::SDL_ACTIVEEVENT => sub { 2297 CFPlus::SDL_ACTIVEEVENT => sub {
2092# not useful, as APPACTIVE include sonly iconified state, not unmapped 2298# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2299# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2300# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2094# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2301# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2302# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2303# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2097 }, 2304 },
2098 CFPlus::SDL_KEYDOWN => sub { 2305 CFPlus::SDL_KEYDOWN => sub {
… …
2127 CFPlus::DB::Server::run; 2334 CFPlus::DB::Server::run;
2128 2335
2129 CFPlus::UI::set_layout ($::CFG->{layout}); 2336 CFPlus::UI::set_layout ($::CFG->{layout});
2130 2337
2131 my %DEF_CFG = ( 2338 my %DEF_CFG = (
2132 sdl_mode => 0, 2339 sdl_mode => 0,
2133 width => 640,
2134 height => 480,
2135 fullscreen => 0, 2340 fullscreen => 0,
2136 fast => 0, 2341 fast => 0,
2342 force_opengl11 => undef,
2343 texture_compression => 1,
2137 map_scale => 1, 2344 map_scale => 1,
2138 fow_enable => 1, 2345 fow_enable => 1,
2139 fow_intensity => 0.45, 2346 fow_intensity => 0,
2140 fow_smooth => 0,
2141 map_smoothing => 1, 2347 map_smoothing => 1,
2142 gui_fontsize => 1, 2348 gui_fontsize => 1,
2143 log_fontsize => 0.7, 2349 log_fontsize => 0.7,
2144 gauge_fontsize => 1, 2350 gauge_fontsize => 1,
2145 gauge_size => 0.35, 2351 gauge_size => 0.35,
2146 stat_fontsize => 0.7, 2352 stat_fontsize => 0.7,
2147 mapsize => 100, 2353 mapsize => 100,
2148 say_command => 'chat',
2149 audio_enable => 1, 2354 audio_enable => 1,
2355 audio_hw_channels => 2,
2356 audio_hw_frequency => 22050,
2357 audio_hw_chunksize => 2048,
2358 audio_mix_channels => 8,
2359 effects_enable => 1,
2360 effects_volume => 1,
2150 bgm_enable => 1, 2361 bgm_enable => 1,
2151 bgm_volume => 0.25, 2362 bgm_volume => 0.5,
2152 face_prefetch => 0,
2153 output_sync => 1, 2363 output_sync => 1,
2154 output_count => 1, 2364 output_count => 1,
2155 output_rate => "", 2365 output_rate => "",
2156 pickup => 0, 2366 pickup => 0,
2157 inv_sort => "mtime", 2367 inv_sort => "mtime",
2158 default => "profile", # default profile 2368 default => "profile", # default profile
2159 show_tips => 1, 2369 show_tips => 1,
2160 logview_max_par => 1000, 2370 logview_max_par => 1000,
2161 ); 2371 );
2162 2372
2163 while (my ($k, $v) = each %DEF_CFG) { 2373 while (my ($k, $v) = each %DEF_CFG) {
2164 $CFG->{$k} = $v unless exists $CFG->{$k}; 2374 $CFG->{$k} = $v unless exists $CFG->{$k};
2165 } 2375 }
… …
2179 } 2389 }
2180 } 2390 }
2181 2391
2182 sdl_init; 2392 sdl_init;
2183 2393
2184 @SDL_MODES = reverse 2394 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2185 grep $_->[0] >= 640 && $_->[1] >= 480, 2395 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2186 CFPlus::SDL_ListModes;
2187
2188 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2396 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2397
2398 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2189 2399
2190 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2400 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2191 2401
2192 { 2402 {
2193 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2403 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2222# } 2432# }
2223# my $t2 = Time::HiRes::time; 2433# my $t2 = Time::HiRes::time;
2224# warn $t2-$t1; 2434# warn $t2-$t1;
2225# } 2435# }
2226 2436
2227 $startup_done->();
2228
2229 video_init; 2437 video_init;
2230 audio_init; 2438 audio_init;
2231} 2439}
2232 2440
2233show_tip_of_the_day if $CFG->{show_tips}; 2441show_tip_of_the_day if $CFG->{show_tips};
2234 2442
2443Event->idle (cb => sub {
2444 $_[0]->w->cancel;
2445 $startup_done->();
2446});
2447
2235Event::loop; 2448Event::loop;
2449
2450#video_shutdown;
2451#audio_shutdown;
2236#CFPlus::SDL_Quit; 2452CFPlus::SDL_Quit;
2237#CFPlus::_exit 0;
2238
2239END {
2240 CFPlus::SDL_Quit;
2241 CFPlus::DB::Server::stop; 2453CFPlus::DB::Server::stop;
2242}
2243 2454
2244=head1 NAME 2455=head1 NAME
2245 2456
2246cfplus - A Crossfire+ and Crossfire game client 2457cfplus - A Crossfire TRT and Crossfire game client
2247 2458
2248=head1 SYNOPSIS 2459=head1 SYNOPSIS
2249 2460
2250Just run it - no commandline arguments are supported. 2461Just run it - no commandline arguments are supported.
2251 2462
2252=head1 USAGE 2463=head1 USAGE
2253 2464
2254cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2465cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2255fullscreen and interactively. 2466be used in fullscreen mode and interactively.
2256 2467
2257=head1 DEBUGGING 2468=head1 DEBUGGING
2258 2469
2259 2470
2260CFPLUS_DEBUG - environment variable 2471CFPLUS_DEBUG - environment variable

Diff Legend

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