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

Diff Legend

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