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.141 by elmex, Sat Dec 16 17:33:26 2006 UTC vs.
Revision 1.228 by root, Mon Oct 8 16:10:14 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3# do splash-screen thingy on win32
3my $startup_done = sub { }; 4my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN { 5BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 } 9 }
… …
29# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
30BEGIN { 29BEGIN {
31 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 32
33 my $root = $ENV{PAR_TEMP};
34
34 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 36 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 38 $zip->extractMember ($_, "$root/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 39 unless -e "$root/$1";
39 } 40 }
40 } 41 }
41 42
42 # TODO: pango-rc file, anybody? 43 if ($^O eq "MSWin32") {
44 # pango is relocatable on win32
45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
49 # unix, need to patch pango rc file
50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
52 local $/;
53 my $rc = <$fh>;
54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
43 55
44 unshift @INC, $ENV{PAR_TEMP}; 56 mkdir "$root/pango-modules";
57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
58 or die "$root/pango-modules/pango.modules: $!";
59 print $fh $rc;
60
61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
63 or die "$ENV{PANGO_RC_FILE}: $!";
64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
65 }
66
67 unshift @INC, $root;
45 } 68 }
46} 69}
47 70
48# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 73 if %PAR::LibCache;
51 74
52use Time::HiRes 'time'; 75use Time::HiRes 'time';
53use Event; 76use Event;
77use List::Util qw(max min);
54 78
55use Crossfire; 79use Crossfire;
56use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
57 81
58use Compress::LZF; 82use Compress::LZF;
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 map {
909 my $ms = sprintf "%dms", 1000 * $_ / $CFG->{audio_hw_frequency};
910 [$_, $ms, "$ms ($_ samples)"],
911 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
912 ]);
913
914 my $text = !$freq
915 ? "audio is off"
916 : "Frequency (Hz): $freq\n"
917 . "Channels: $chans";
918
919 $AUDIO_INFO->set_text ($text);
580} 920}
581 921
582sub audio_setup { 922sub audio_setup {
583 my $vbox = new CFPlus::UI::VBox; 923 my $vbox = new CFPlus::UI::VBox;
584 924
585 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 925 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
586 926
587 my $row = 0; 927 my $row = 0;
588 928
589 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 929 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
590 $table->add (1, $row++, new CFPlus::UI::CheckBox 930 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{audio_enable}, 931 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.", 932 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
593 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 933 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
594 ); 934 );
935
595# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 936 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
596# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 937 $table->add_at (1, $row, new CFPlus::UI::CheckBox
938 expand => 1, state => $CFG->{effects_enable},
939 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
940 on_changed => sub {
597# $CFG->{effects_volume} = $_[1]; 941 $CFG->{effects_enable} = $_[1];
598# }); 942 $CONN->update_fx_want if $CONN;
943 1
944 }
945 );
946 $table->add_at (2, $row++, new CFPlus::UI::Slider
947 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
948 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
949 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
950 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
951 );
952
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 953 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
600 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
601 $hbox->add (new CFPlus::UI::CheckBox 954 $table->add_at (1, $row, new CFPlus::UI::CheckBox
602 expand => 1, state => $CFG->{bgm_enable}, 955 expand => 1, state => $CFG->{bgm_enable},
603 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 956 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
604 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 957 on_changed => sub {
958 $CFG->{bgm_enable} = $_[1];
959 $CONN->update_fx_want if $CONN;
960 audio_music_push;
961 1
962 }
605 ); 963 );
606 $hbox->add (new CFPlus::UI::Slider 964 $table->add_at (2, $row++, new CFPlus::UI::Slider
607 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 965 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
608 tooltip => "The volume of the background music. Changes are instant.", 966 tooltip => "The volume of the background music. Changes are instant.",
609 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 967 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
610 ); 968 );
611 969
970 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
971 $table->add_at (1, $row++, new CFPlus::UI::Selector
972 c_colspan => 2, expand => 1,
973 value => $CFG->{audio_hw_frequency},
974 options => [
975 [11025, "11 kHz" , "11kHz (low quality)"],
976 [22050, "22 kHz" , "22kHz (reduced quality)"],
977 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
978 [48000, "48 kHz" , "48kHz (studio quality)"],
979 ],
980 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
981 on_changed => sub {
982 $CFG->{audio_hw_frequency} = $_[1];
983 audio_tab_update;
984 1
985 }
986 );
987
988 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
989 $table->add_at (1, $row++, new CFPlus::UI::Selector
990 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_channels},
992 options => [
993 [1, "Mono" , "Mono (single channel, low quality)"],
994 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
995 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
996 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
997 ],
998 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
999 on_changed => sub {
1000 $CFG->{audio_hw_channels} = $_[1];
1001 audio_tab_update;
1002 1
1003 }
1004 );
1005
1006 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1007 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1008 c_colspan => 2, expand => 1,
1009 value => $CFG->{audio_hw_chunksize},
1010 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1011 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1012 on_changed => sub {
1013 $CFG->{audio_hw_chunksize} = $_[1]
1014 if $_[1];
1015 audio_tab_update;
1016 1
1017 }
1018 );
1019
1020 # should really be a slider
1021 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1022 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1023 c_colspan => 2, expand => 1,
1024 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1025 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1026 template => ">= 99",
1027 on_changed => sub {
1028 my ($slider, $value) = @_;
1029
1030 $CFG->{audio_mix_channels} = $value
1031 if $value;
1032 1;
1033 }
1034 );
1035
612 $table->add (1, $row++, new CFPlus::UI::Button 1036 $table->add_at (1, $row++, new CFPlus::UI::Button
613 expand => 1, align => 0, text => "Apply", 1037 c_colspan => 2, expand => 1, align => 0, text => "Apply",
614 tooltip => "Apply the audio settings", 1038 tooltip => "Apply the audio settings",
615 on_activate => sub { 1039 on_activate => sub {
616 audio_shutdown (); 1040 audio_shutdown ();
617 audio_init (); 1041 audio_init ();
618 0 1042 0
619 } 1043 }
620 ); 1044 );
1045
1046 $vbox->add (new CFPlus::UI::FancyFrame
1047 expand => 1,
1048 label => "Audio Info",
1049 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1050 );
1051
1052 audio_tab_update;
621 1053
622 $vbox 1054 $vbox
623} 1055}
624 1056
625sub set_gauge_window_fontsize { 1057sub set_gauge_window_fontsize {
… …
660 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1092 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
661 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1093 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
662 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1094 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
663 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1095 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
664 1096
665 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1097 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1098 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1099 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
666 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1100 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
667 1101
668 $GAUGES = { 1102 $GAUGES = {
1103 exp => $exp, prg => $prg, sklprg => $sklprg,
669 exp => $exp, win => $win, range => $rng, 1104 win => $win, range => $rng,
670 food => $fg, mana => $mg, hp => $hg, grace => $gg 1105 hp => $hg, mana => $mg, grace => $gg, food => $fg,
671 }; 1106 };
672 1107
673 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
674 1109
675 $win 1110 $win
676} 1111}
677 1112
678sub debug_setup { 1113sub debug_setup {
679 my $table = new CFPlus::UI::Table; 1114 my $table = new CFPlus::UI::Table;
680 1115
681 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1116 $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 }); 1117 $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"); 1118 $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 }); 1119 $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"); 1120 $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 }); 1121 $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"); 1122 $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 }); 1123 $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" } ); 1124 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690 1125
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# 1126 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1127
1128 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1129 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1130 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1131 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1132 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1133 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1134
1135 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1136
1137 $c->add_items ({
1138 type => "line_loop",
1139 color => [0, 1, 0],
1140 width => 9,
1141 coord_mode => "abs",
1142 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1143 });
1144
1145 $c->add_items ({
1146 type => "lines",
1147 color => [1, 1, 0],
1148 width => 2,
1149 coord_mode => "rel",
1150 coord => [[0,0], [1,1], [1,0], [0,1]],
1151 });
1152
1153 $c->add_items ({
1154 type => "polygon",
1155 color => [0, 0.43, 0],
1156 width => 2,
1157 coord_mode => "rel",
1158 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1159 });
704 1160
705 $table 1161 $table
706} 1162}
707 1163
708sub stats_window { 1164sub stats_window {
… …
756 [2, 4, st_spd => "Spd", 10.54], 1212 [2, 4, st_spd => "Spd", 10.54],
757 [2, 5, st_wspd => "WSp", 10.54], 1213 [2, 5, st_wspd => "WSp", 10.54],
758 ) { 1214 ) {
759 my ($col, $row, $id, $label, $template) = @$_; 1215 my ($col, $row, $id, $label, $template) = @$_;
760 1216
761 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1217 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
762 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1218 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
763 align => +1, template => $template, tooltip => "#stat_$label"); 1219 align => +1, template => $template, tooltip => "#stat_$label");
764 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1220 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
765 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1221 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
766 align => -1, text => $label, tooltip => "#stat_$label"); 1222 align => -1, text => $label, tooltip => "#stat_$label");
767 } 1223 }
768 1224
769 $vb->add (new CFPlus::UI::FancyFrame 1225 $vb->add (new CFPlus::UI::FancyFrame
… …
810 cold => ["Cold", 1266 cold => ["Cold",
811 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1267 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
812 ghit => ["Ghost hit", 1268 ghit => ["Ghost hit",
813 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1269 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
814 ); 1270 );
1271
815 for (qw/slow holyw conf fire depl magic 1272 for (qw/slow holyw conf fire depl magic
816 drain acid pois para deat phys 1273 drain acid pois para deat phys
817 blind fear tund elec cold ghit/) 1274 blind fear tund elec cold ghit/)
818 { 1275 {
819 $tbl2->add ($col, $row, 1276 $tbl2->add_at ($col, $row,
820 $STATWIDS->{"res_$_"} = 1277 $STATWIDS->{"res_$_"} =
821 new CFPlus::UI::Label 1278 new CFPlus::UI::Label
822 font => $FONT_FIXED, 1279 font => $FONT_FIXED,
823 template => "-100%", 1280 template => "-100%",
824 align => +1, 1281 align => +1,
825 valign => 0, 1282 valign => 0,
826 can_events => 1, 1283 can_events => 1,
827 can_hover => 1, 1284 can_hover => 1,
828 tooltip => $resist_names{$_}->[1], 1285 tooltip => $resist_names{$_}->[1],
829 ); 1286 );
830 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1287 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
831 font => $FONT_FIXED, 1288 font => $FONT_FIXED,
832 can_hover => 1, 1289 can_hover => 1,
833 can_events => 1, 1290 can_events => 1,
834 path => "ui/resist/resist_$_.png", 1291 path => "ui/resist/resist_$_.png",
835 tooltip => $resist_names{$_}->[1], 1292 tooltip => $resist_names{$_}->[1],
836 ); 1293 );
837 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1294 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
838 text => $resist_names{$_}->[0], 1295 text => $resist_names{$_}->[0],
839 font => $FONT_FIXED, 1296 font => $FONT_FIXED,
840 can_hover => 1, 1297 can_hover => 1,
841 can_events => 1, 1298 can_events => 1,
842 tooltip => $resist_names{$_}->[1], 1299 tooltip => $resist_names{$_}->[1],
… …
854 $r 1311 $r
855} 1312}
856 1313
857sub skill_window { 1314sub skill_window {
858 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1315 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1316
859 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1317 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1318
860 $sw 1319 $sw
861} 1320}
862 1321
863sub formsep($) { 1322sub formsep($) {
864 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1323 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
875 return if $METASERVER_ATIME > time; 1334 return if $METASERVER_ATIME > time;
876 $METASERVER_ATIME = time + 60; 1335 $METASERVER_ATIME = time + 60;
877 1336
878 my $table = $METASERVER->{table}; 1337 my $table = $METASERVER->{table};
879 $table->clear; 1338 $table->clear;
880 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1339 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
881 1340
882 my $ok = 0; 1341 my $ok = 0;
883 1342
884 CFPlus::background { 1343 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent; 1344 my $ua = CFPlus::lwp_useragent;
… …
896 "The time this server has been running without being restarted.", 1355 "The time this server has been running without being restarted.",
897 "The server software version - a '+' indicates a Crossfire+ server.", 1356 "The server software version - a '+' indicates a Crossfire+ server.",
898 "Short information about this server provided by its admins.", 1357 "Short information about this server provided by its admins.",
899 ); 1358 );
900 my @col = qw(#Users Host Uptime Version Description); 1359 my @col = qw(#Users Host Uptime Version Description);
901 $table->add ($_, 0, new CFPlus::UI::Label 1360 $table->add_at ($_, 0, new CFPlus::UI::Label
902 can_hover => 1, can_events => 1, 1361 can_hover => 1, can_events => 1,
903 align => 0, fg => [1, 1, 0], 1362 align => 0, fg => [1, 1, 0],
904 text => $col[$_], tooltip => $tip[$_]) 1363 text => $col[$_], tooltip => $tip[$_])
905 for 0 .. $#col; 1364 for 0 .. $#col;
906 1365
907 my @align = qw(1 0 1 1 -1); 1366 my @align = qw(1 0 1 1 -1);
908 1367
909 my $y = 0; 1368 my $y = 0;
910 for my $m (
911 sort {
912 $b->{version} <=> $a->{version}
913 or $b->{users} <=> $a->{users}
914 }
915 @{ $msg->{servers} } 1369 for my $m (@{ $msg->{servers} }) {
916 ) {
917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 1370 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
918 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 1371 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
919 1372
920 for ($desc) { 1373 for ($desc) {
921 s/<br>/\n/gi; 1374 s/<br>/\n/gi;
922 s/<li>/\n· /gi; 1375 s/<li>/\n· /gi;
923 s/<.*?>//sgi; 1376 s/<.*?>//sgi;
… …
934 1387
935 $m = [$users, $host, $uptime, $version, $desc]; 1388 $m = [$users, $host, $uptime, $version, $desc];
936 1389
937 $y++; 1390 $y++;
938 1391
939 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1392 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
940 (new CFPlus::UI::Button 1393 (new CFPlus::UI::Button
941 text => "Use", 1394 text => "Use",
942 tooltip => "Put this server into the <b>Host:Port</b> field", 1395 tooltip => "Put this server into the <b>Host:Port</b> field",
943 on_activate => sub { 1396 on_activate => sub {
944 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1397 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
947 }, 1400 },
948 ), 1401 ),
949 (new CFPlus::UI::Empty expand => 1), 1402 (new CFPlus::UI::Empty expand => 1),
950 ]); 1403 ]);
951 1404
952 $table->add ($_, $y, new CFPlus::UI::Label 1405 $table->add_at ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4, 1406 max_w => $::WIDTH * 0.4,
954 ellipsise => 0, 1407 ellipsise => 0,
955 align => $align[$_], 1408 align => $align[$_],
956 text => $m->[$_], 1409 text => $m->[$_],
957 tooltip => $tip[$_], 1410 tooltip => $tip[$_],
958 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1411 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
959 can_hover => 1, 1412 can_hover => 1,
960 can_events => 1, 1413 can_events => 1,
961 fontsize => 0.8) 1414 fontsize => 0.8)
962 for 0 .. $#$m; 1415 for 0 .. $#$m;
963 } 1416 }
… …
998 1451
999 $vbox->add (new CFPlus::UI::FancyFrame 1452 $vbox->add (new CFPlus::UI::FancyFrame
1000 label => "Connection Settings", 1453 label => "Connection Settings",
1001 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1454 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1002 ); 1455 );
1003 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1456 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1004 1457
1005 { 1458 {
1006 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1459 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1007 1460
1008 $vbox->add ( 1461 $vbox->add (
1009 $HOST_ENTRY = new CFPlus::UI::Entry 1462 $HOST_ENTRY = new CFPlus::UI::Entry
1010 expand => 1, 1463 expand => 1,
1011 text => $CFG->{profile}{default}{host}, 1464 text => $CFG->{profile}{default}{host},
1012 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1465 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1013 on_changed => sub { 1466 on_changed => sub {
1014 my ($self, $value) = @_; 1467 my ($self, $value) = @_;
1015 $CFG->{profile}{default}{host} = $value; 1468 $CFG->{profile}{default}{host} = $value;
1016 0 1469 1
1017 } 1470 }
1018 ); 1471 );
1019 1472
1020 $vbox->add (new CFPlus::UI::Button 1473 $vbox->add (new CFPlus::UI::Button
1021 expand => 1, 1474 expand => 1,
1022 text => "Server List", 1475 text => "Server List",
1023 other => $METASERVER, 1476 other => $METASERVER,
1024 tooltip => "Show a list of available crossfire servers", 1477 tooltip => "Show a list of available crossfire servers",
1025 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1478 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1026 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1479 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1027 ); 1480 );
1028 } 1481 }
1029 1482
1030 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1483 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1031 $table->add (1, 4, new CFPlus::UI::Entry 1484 $table->add_at (1, 4, new CFPlus::UI::Entry
1032 text => $CFG->{profile}{default}{user}, 1485 text => $CFG->{profile}{default}{user},
1033 tooltip => "The name of your character on the server", 1486 tooltip => "The name of your character on the server",
1034 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1035 ); 1488 );
1036 1489
1037 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1490 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1038 $table->add (1, 5, new CFPlus::UI::Entry 1491 $table->add_at (1, 5, new CFPlus::UI::Entry
1039 text => $CFG->{profile}{default}{password}, 1492 text => $CFG->{profile}{default}{password},
1040 hidden => 1, 1493 hidden => 1,
1041 tooltip => "The password for your character", 1494 tooltip => "The password for your character",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1495 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1043 ); 1496 );
1044 1497
1045 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1498 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1046 $table->add (1, 7, new CFPlus::UI::Slider 1499 $table->add_at (1, 7, new CFPlus::UI::Slider
1047 force_w => 100, 1500 force_w => 100,
1048 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1501 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1049 tooltip => "This is the size of the portion of the map update the server sends you. " 1502 tooltip => "This is the size of the portion of the map update the server sends you. "
1050 . "If you set this to a high value you will be able to see further, " 1503 . "If you set this to a high value you will be able to see further, "
1051 . "but you also increase bandwidth requirements and latency. " 1504 . "but you also increase bandwidth requirements and latency. "
1052 . "This option is only used once at log-in.", 1505 . "This option is only used once at log-in.",
1053 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1506 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1054 ); 1507 );
1055 1508
1056 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1509 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1057 $table->add (1, 8, new CFPlus::UI::CheckBox 1510 $table->add_at (1, 8, new CFPlus::UI::Entry
1058 state => $CFG->{face_prefetch}, 1511 text => $CFG->{output_rate},
1059 tooltip => "<b>Background Image Prefetch</b>\n\n" 1512 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1060 . "If enabled, the client automatically pre-fetches images from the server. " 1513 . "when sending data. When 0 or unset, the server "
1061 . "This might increase or create lag, but increases the chances " 1514 . "default will be used, which is usually around 100kb/s. Most servers will "
1062 . "of faces being ready for display when you encounter them. " 1515 . "dynamically find an optimal rate, so adjust this only when necessary.",
1063 . "It also uses up server bandwidth on every connect, "
1064 . "so only set it if you really need to prefetch images. "
1065 . "This option can be set and unset any time.",
1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1516 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1067 ); 1517 );
1068 1518
1069 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1519 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1070 $table->add (1, 9, new CFPlus::UI::Entry 1520 $table->add_at (1, 9, new CFPlus::UI::Entry
1071 text => $CFG->{output_count}, 1521 text => $CFG->{output_count},
1072 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1522 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1073 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1523 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1074 ); 1524 );
1075 1525
1076 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1526 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1077 $table->add (1, 10, new CFPlus::UI::Entry 1527 $table->add_at (1, 10, new CFPlus::UI::Entry
1078 text => $CFG->{output_sync}, 1528 text => $CFG->{output_sync},
1079 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1529 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1080 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1530 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1081 ); 1531 );
1082 1532
1083 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1533 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1084 expand => 1, 1534 expand => 1,
1085 align => 0, 1535 align => 0,
1086 text => "Login", 1536 text => "Login",
1087 on_activate => sub { 1537 on_activate => sub {
1088 $CONN ? stop_game 1538 $CONN ? stop_game
1089 : start_game; 1539 : start_game;
1090 0 1540 1
1091 }, 1541 },
1092 ); 1542 );
1093 1543
1094 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1544 $vbox->add (new CFPlus::UI::FancyFrame
1095 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1545 label => "Server Info",
1096 text => $CFG->{say_command}, 1546 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1097 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. "
1098 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1099 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1100 on_changed => sub {
1101 my ($self, $value) = @_;
1102 $CFG->{say_command} = $value;
1103 0
1104 }
1105 ); 1547 );
1106 1548
1549 $vbox
1550}
1551
1552sub client_setup {
1553 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1554
1555 my $row = 0;
1556
1107 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1557 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1108 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1558 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1109 state => $CFG->{show_tips}, 1559 state => $CFG->{show_tips},
1110 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1560 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1111 on_changed => sub { 1561 on_changed => sub {
1112 my ($self, $value) = @_; 1562 my ($self, $value) = @_;
1113 $CFG->{show_tips} = $value; 1563 $CFG->{show_tips} = $value;
1114 0 1564 0
1115 } 1565 }
1116 ); 1566 );
1117 1567
1118 $vbox->add (new CFPlus::UI::FancyFrame 1568 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1119 label => "Server Info", 1569 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1120 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1570 text => $CFG->{logview_max_par},
1121 ); 1571 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1122 1572 . "sends more messages than this number, older messages get removed to save memory and "
1123 $vbox 1573 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1124}
1125
1126sub message_window {
1127 my $window = new CFPlus::UI::Toplevel
1128 name => "message_window",
1129 title => "Messages",
1130 border_bg => [1, 1, 1, 1],
1131 x => "max",
1132 y => 0,
1133 force_w => $::WIDTH * 0.4,
1134 force_h => $::HEIGHT * 0.5,
1135 child => (my $vbox = new CFPlus::UI::VBox),
1136 has_close_button => 1;
1137
1138 $vbox->add ($LOGVIEW);
1139
1140 $vbox->add (my $input = new CFPlus::UI::Entry
1141 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1142 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1143 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1144 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1145 on_focus_in => sub { 1574 on_changed => sub {
1146 my ($input, $prev_focus) = @_; 1575 my ($self, $value) = @_;
1147 1576 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1148 delete $input->{refocus_map};
1149
1150 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1151 $input->{refocus_map} = 1;
1152 }
1153 delete $input->{auto_activated};
1154
1155 0 1577 0
1156 }, 1578 },
1157 on_activate => sub {
1158 my ($input, $text) = @_;
1159 $input->set_text ('');
1160
1161 if ($text =~ /^\/(.*)/) {
1162 $::CONN->user_send ($1);
1163 } else {
1164 my $say_cmd = $::CFG->{say_command} || 'say';
1165 $::CONN->user_send ("$say_cmd $text");
1166 }
1167 if ($input->{refocus_map}) {
1168 delete $input->{refocus_map};
1169 $MAPWIDGET->focus_in
1170 }
1171
1172 0
1173 },
1174 on_escape => sub {
1175 $MAPWIDGET->grab_focus;
1176
1177 0
1178 },
1179 );
1180
1181 $CONSOLE = {
1182 window => $window,
1183 input => $input,
1184 }; 1579 );
1185 1580
1186 $window 1581 $table
1187} 1582}
1188 1583
1189sub autopickup_setup { 1584sub autopickup_setup {
1585 my $r = new CFPlus::UI::ScrolledWindow (
1586 expand => 1,
1587 scroll_y => 1
1588 );
1190 my $table = new CFPlus::UI::Table; 1589 $r->add (my $table = new CFPlus::UI::Table
1590 row_expand => [0],
1591 col_expand => [0, 1, 0, 1],
1592 );
1191 1593
1192 for ( 1594 for (
1193 ["General", 0, 0, 1595 ["General", 0, 0,
1194 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1596 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1195 ["Inhibit autopickup" => PICKUP_INHIBIT], 1597 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1230 ], 1632 ],
1231 ["Weight/Value ratio", 2, 17] 1633 ["Weight/Value ratio", 2, 17]
1232 ) 1634 )
1233 { 1635 {
1234 my ($title, $x, $y, @bits) = @$_; 1636 my ($title, $x, $y, @bits) = @$_;
1235 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1637 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1236 1638
1237 for (@bits) { 1639 for (@bits) {
1238 ++$y; 1640 ++$y;
1239 1641
1240 my $mask = $_->[1]; 1642 my $mask = $_->[1];
1241 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1643 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1242 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1644 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1243 state => $::CFG->{pickup} & $mask, 1645 state => $::CFG->{pickup} & $mask,
1244 on_changed => sub { 1646 on_changed => sub {
1245 my ($box, $value) = @_; 1647 my ($box, $value) = @_;
1246 1648
1247 if ($value) { 1649 if ($value) {
… …
1258 1660
1259 ${$_->[2]} = $checkbox if $_->[2]; 1661 ${$_->[2]} = $checkbox if $_->[2];
1260 } 1662 }
1261 } 1663 }
1262 1664
1263 $table->add (2, 18, new CFPlus::UI::ValSlider 1665 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1666 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99", 1667 template => ">= 99",
1266 to_value => sub { ">= " . 5 * $_[0] }, 1668 to_value => sub { ">= " . 5 * $_[0] },
1267 on_changed => sub { 1669 on_changed => sub {
1268 my ($slider, $value) = @_; 1670 my ($slider, $value) = @_;
… …
1271 $::CFG->{pickup} |= int $value 1673 $::CFG->{pickup} |= int $value
1272 if $value; 1674 if $value;
1273 1; 1675 1;
1274 }); 1676 });
1275 1677
1276 $table->add (3, 18, new CFPlus::UI::Button 1678 $table->add_at (3, 18, new CFPlus::UI::Button
1277 text => "set", 1679 text => "set",
1278 on_activate => sub { 1680 on_activate => sub {
1279 $::CONN->send_command ("pickup $::CFG->{pickup}") 1681 $::CONN->send_command ("pickup $::CFG->{pickup}")
1280 if defined $::CONN; 1682 if defined $::CONN;
1281 0 1683 0
1282 }); 1684 });
1283 1685
1284 $table 1686 $r
1285} 1687}
1286 1688
1287my %SORT_ORDER = ( 1689my %SORT_ORDER = (
1288 type => undef, 1690 type => undef,
1289 mtime => sub { 1691 mtime => sub {
… …
1333 $sw1->add ($INV = new CFPlus::UI::Inventory); 1735 $sw1->add ($INV = new CFPlus::UI::Inventory);
1334 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1736 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1335 1737
1336 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1738 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1337 1739
1338 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1740 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1339 1741
1340 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1742 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1341 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1743 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1342 1744
1343 # XXX: Call after $INVR = ... because set_opencont sets the items 1745 # XXX: Call after $INVR = ... because set_opencont sets the items
1344 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1746 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1345 1747
1346 $hb 1748 $hb
1749}
1750
1751sub media_window {
1752 my $vb = new CFPlus::UI::VBox;
1753
1754 $vb->add (new CFPlus::UI::FancyFrame
1755 label => "Currently playing music",
1756 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1757 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1758 );
1759
1760 $vb->add (new CFPlus::UI::FancyFrame
1761 label => "Other media used in this session",
1762 expand => 1,
1763 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1764 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1765 );
1766
1767 $vb
1768}
1769
1770sub add_license {
1771 my ($meta) = @_;
1772
1773 $meta = $meta->{data}
1774 or return;
1775
1776 $meta->{license} || $meta->{author} || $meta->{source}
1777 or return;
1778
1779 $LICENSE_WIDGET->add_paragraph ({
1780 fg => [1, 1, 1, 1],
1781 markup => "<small>"
1782 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1783 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1784 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1785 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1786 . "</small>",
1787 });
1788 $LICENSE_WIDGET->scroll_to_bottom;
1347} 1789}
1348 1790
1349sub toggle_player_page { 1791sub toggle_player_page {
1350 my ($widget) = @_; 1792 my ($widget) = @_;
1351 1793
… …
1368 has_close_button => 1 1810 has_close_button => 1
1369 ; 1811 ;
1370 1812
1371 my $ntb = 1813 my $ntb =
1372 $PL_NOTEBOOK = 1814 $PL_NOTEBOOK =
1373 new CFPlus::UI::Notebook expand => 1, debug => 1; 1815 new CFPlus::UI::Notebook expand => 1;
1374 1816
1375 $ntb->add ( 1817 $ntb->add_tab (
1376 "Statistics (F2)" => $STATS_PAGE = stats_window, 1818 "Statistics (F2)" => $STATS_PAGE = stats_window,
1377 "Shows statistics, where all your Stats and Resistances are shown." 1819 "Shows statistics, where all your Stats and Resistances are shown."
1378 ); 1820 );
1379 $ntb->add ( 1821 $ntb->add_tab (
1380 "Skills (F3)" => $SKILL_PAGE = skill_window, 1822 "Skills (F3)" => $SKILL_PAGE = skill_window,
1381 "Shows all your Skills." 1823 "Shows all your Skills."
1382 ); 1824 );
1383 1825
1384 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1826 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1385 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1827 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1386 $ntb->add ( 1828 $ntb->add_tab (
1387 "Spellbook (F4)" => $spellsw, 1829 "Spellbook (F4)" => $spellsw,
1388 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1830 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1389 ); 1831 );
1390 $ntb->add ( 1832 $ntb->add_tab (
1391 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1833 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1392 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1834 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1393 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1835 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1394 ); 1836 );
1837 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1838 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1839
1840 $ntb->add_tab (Media => media_window,
1841 "License, Author and Source info for media sent by the server.");
1395 1842
1396 $ntb->set_current_page ($INVENTORY_PAGE); 1843 $ntb->set_current_page ($INVENTORY_PAGE);
1397 1844
1398 $plwin->add ($ntb); 1845 $plwin->add ($ntb);
1399 $plwin 1846 $plwin
… …
1553 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2000 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1554 ); 2001 );
1555 $hb->add (new CFPlus::UI::Button 2002 $hb->add (new CFPlus::UI::Button
1556 text => "Quit anyway", 2003 text => "Quit anyway",
1557 expand => 1, 2004 expand => 1,
1558 on_activate => sub { exit }, 2005 on_activate => sub { Event::unloop_all },
1559 ); 2006 );
1560 } 2007 }
1561 2008
1562 $QUIT_DIALOG->show; 2009 $QUIT_DIALOG->show;
1563 $QUIT_DIALOG->grab_focus; 2010 $QUIT_DIALOG->grab_focus;
… …
1565 2012
1566sub show_tip_of_the_day { 2013sub show_tip_of_the_day {
1567 # find all tips 2014 # find all tips
1568 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 2015 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1569 2016
1570 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 2017 CFPlus::DB::get state => "tip_of_the_day", sub {
2018 my ($todindex) = @_;
1571 $todindex = 0 if $todindex >= @tod; 2019 $todindex = 0 if $todindex >= @tod;
1572 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 2020 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1573 2021
1574 # create dialog 2022 # create dialog
1575 my $dialog; 2023 my $dialog;
1576 2024
1577 my $close = sub { 2025 my $close = sub {
1578 $dialog->destroy; 2026 $dialog->destroy;
2027 };
2028
2029 $dialog = new CFPlus::UI::Toplevel
2030 x => "center",
2031 y => "center",
2032 z => 3,
2033 name => 'tip_of_the_day',
2034 force_w => int $WIDTH * 4/9,
2035 force_h => int $WIDTH * 2/9,
2036 title => "Tip of the day #" . (1 + $todindex),
2037 child => my $vbox = new CFPlus::UI::VBox,
2038 has_close_button => 1,
2039 on_delete => $close,
2040 ;
2041
2042 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
2043 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
2044 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
2045
2046 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
2047
2048 $table->add_at (0, 0, new CFPlus::UI::Button
2049 text => "Close",
2050 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
2051 on_activate => $close,
2052 );
2053
2054 $table->add_at (2, 0, new CFPlus::UI::Button
2055 text => "Next",
2056 tooltip => "Show the next <b>Tip of the day</b>.",
2057 on_activate => sub {
2058 $close->();
2059 &show_tip_of_the_day;
2060 },
2061 );
2062
2063 $dialog->show;
1579 }; 2064 };
1580
1581 $dialog = new CFPlus::UI::Toplevel
1582 x => "center",
1583 y => "center",
1584 z => 3,
1585 name => 'tip_of_the_day',
1586 force_w => int $WIDTH * 4/9,
1587 force_h => int $WIDTH * 2/9,
1588 title => "Tip of the day #" . (1 + $todindex),
1589 child => my $vbox = new CFPlus::UI::VBox,
1590 has_close_button => 1,
1591 on_delete => $close,
1592 ;
1593
1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1595 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1596 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1597
1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1599
1600 $table->add (0, 0, new CFPlus::UI::Button
1601 text => "Close",
1602 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>.",
1603 on_activate => $close,
1604 );
1605
1606 $table->add (2, 0, new CFPlus::UI::Button
1607 text => "Next",
1608 tooltip => "Show the next <b>Tip of the day</b>.",
1609 on_activate => sub {
1610 $close->();
1611 &show_tip_of_the_day;
1612 },
1613 );
1614
1615 $dialog->show;
1616} 2065}
1617 2066
1618sub sdl_init { 2067sub sdl_init {
1619 CFPlus::SDL_Init 2068 CFPlus::SDL_Init
1620 and die "SDL::Init failed!\n"; 2069 and die "SDL::Init failed!\n";
1621} 2070}
1622 2071
1623sub video_init { 2072sub video_init {
1624 sdl_init;
1625
1626 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2073 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1627 2074
1628 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2075 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1629 2076
1630 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2077 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1631 $FULLSCREEN = $CFG->{fullscreen}; 2078 $FULLSCREEN = $CFG->{fullscreen};
1632 $FAST = $CFG->{fast}; 2079 $FAST = $CFG->{fast};
1633 2080
1634 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 2081 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1635 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2082 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1636 2083
1637 $SDL_ACTIVE = 1; 2084 $SDL_ACTIVE = 1;
1638 $LAST_REFRESH = time - 0.01; 2085 $LAST_REFRESH = time - 0.01;
1639 2086
1640 CFPlus::OpenGL::init; 2087 CFPlus::OpenGL::init;
2088 CFPlus::Macro::init;
1641 2089
1642 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2090 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1643 2091
1644 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2092 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1645 2093
1646 ############################################################################# 2094 #############################################################################
1647 2095
1648 if ($DEBUG_STATUS) { 2096 if ($DEBUG_STATUS) {
1649 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2097 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1650 } else { 2098 } else {
1651 # create the widgets 2099 # create/configure the widgets
2100
2101 $CFPlus::UI::ROOT->connect (key_down => sub {
2102 my (undef, $ev) = @_;
2103
2104 if (my @macros = CFPlus::Macro::find $ev) {
2105 CFPlus::Macro::execute $_ for @macros;
2106
2107 return 1;
2108 }
2109
2110 0
2111 });
1652 2112
1653 $DEBUG_STATUS = new CFPlus::UI::Label 2113 $DEBUG_STATUS = new CFPlus::UI::Label
1654 padding => 0, 2114 padding => 0,
1655 z => 100, 2115 z => 100,
1656 force_x => "max", 2116 force_x => "max",
… …
1681 2141
1682 $MAPWIDGET = new CFPlus::MapWidget; 2142 $MAPWIDGET = new CFPlus::MapWidget;
1683 $MAPWIDGET->connect (activate_console => sub { 2143 $MAPWIDGET->connect (activate_console => sub {
1684 my ($mapwidget, $preset) = @_; 2144 my ($mapwidget, $preset) = @_;
1685 2145
1686 if ($CONSOLE) { 2146 $MESSAGE_WINDOW->activate_console ($preset)
1687 $CONSOLE->{input}->{auto_activated} = 1; 2147 if $MESSAGE_WINDOW;
1688 $CONSOLE->{input}->grab_focus;
1689
1690 if ($preset && $CONSOLE->{input}->get_text eq '') {
1691 $CONSOLE->{input}->set_text ($preset);
1692 }
1693 }
1694 }); 2148 });
1695 $MAPWIDGET->show; 2149 $MAPWIDGET->show;
1696 $MAPWIDGET->grab_focus; 2150 $MAPWIDGET->grab_focus;
1697 2151
1698 $LOGVIEW = new CFPlus::UI::TextScroller 2152 $COMPLETER = new CFPlus::MapWidget::Command::
1699 expand => 1, 2153 command => { },
1700 font => $FONT_FIXED, 2154 tooltip => "#completer_help",
1701 fontsize => $::CFG->{log_fontsize},
1702 indent => -4,
1703 can_hover => 1,
1704 can_events => 1,
1705 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1706 ; 2155 ;
1707 2156
1708 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2157 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1709 title => "Setup", 2158 title => "Setup",
1710 name => "setup_dialog", 2159 name => "setup_dialog",
… …
1715 force_h => $::HEIGHT * 0.6, 2164 force_h => $::HEIGHT * 0.6,
1716 has_close_button => 1, 2165 has_close_button => 1,
1717 ; 2166 ;
1718 2167
1719 $METASERVER = metaserver_dialog; 2168 $METASERVER = metaserver_dialog;
2169 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1720 2170
1721 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2171 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1722 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2172 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1723 2173
1724 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2174 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1725 "Configure the server to play on, your username, password and other server-related options."); 2175 "Configure the server to play on, your username, password and other server-related options.");
1726 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2176 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1727 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2177 "Configure various client-specific settings.");
1728 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2178 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1729 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2179 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1730 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2180 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1731 "Configure the use of audio, sound effects and background music."); 2181 "Configure the use of audio, sound effects and background music.");
1732 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2182 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1733 "Lets you define, edit and delete key bindings." 2183 "Lets you define, edit and delete key bindings."
1734 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2184 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1735 . "with nothing set and the recording started. After doing the actions you " 2185 . "with nothing set and the recording started. After doing the actions you "
1736 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2186 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1737 . "After pressing the combo the binding will be saved automatically and the " 2187 . "After pressing the combo the binding will be saved automatically and the "
1738 . "binding editor closes"); 2188 . "binding editor closes");
1739 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2189 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1740 "Some debuggin' options. Do not ask."); 2190 "Some debuggin' options. Do not ask.");
1741 2191
1742 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2192 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1743 2193
1744 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2194 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1745 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2195 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1746 2196
1747 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2197 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1748 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2198 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1749 2199
1750 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2200 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1751 2201
1752 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2202 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1772 tooltip => "Terminates the program", 2222 tooltip => "Terminates the program",
1773 on_activate => sub { 2223 on_activate => sub {
1774 if ($CONN) { 2224 if ($CONN) {
1775 open_quit_dialog; 2225 open_quit_dialog;
1776 } else { 2226 } else {
1777 exit; 2227 Event::unloop_all;
1778 } 2228 }
1779 0 2229 0
1780 }, 2230 },
1781 ); 2231 );
1782 2232
1783 $BUTTONBAR->show; 2233 $BUTTONBAR->show;
1784 $SETUP_DIALOG->show; 2234 $SETUP_DIALOG->show;
2235 $MESSAGE_WINDOW->show;
1785 } 2236 }
1786 2237
1787 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2238 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1788}
1789
1790sub setup_build_button {
1791 my ($enabled) = @_;
1792 if ($enabled) {
1793 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1794 $BUILD_BUTTON ||= new CFPlus::UI::Button
1795 text => "Build",
1796 tooltip => "Opens the ingame builder",
1797 on_activate => sub {
1798 if ($CONN) {
1799 $CONN->send_ext_req (builder_player_items => sub {
1800 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1801 });
1802 }
1803 0
1804 };
1805 $BUTTONBAR->add ($BUILD_BUTTON);
1806 } else {
1807 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1808 }
1809}
1810
1811sub open_ingame_editor {
1812 my ($msg) = @_;
1813
1814 my $win = new CFPlus::UI::Toplevel
1815 x => 0,
1816 y => 'center',
1817 z => 4,
1818 name => 'builder_window',
1819 force_w => int $WIDTH * 1/4,
1820 force_h => int $HEIGHT * 3/4,
1821 title => "In game builder",
1822 has_close_button => 1;
1823
1824 my $r = new CFPlus::UI::ScrolledWindow (
1825 expand => 1,
1826 scroll_y => 1
1827 );
1828 $r->add (my $vb = new CFPlus::UI::VBox);
1829 $win->add ($r);
1830
1831
1832 $vb->add (
1833 new CFPlus::UI::Button
1834 text => "Disable build mode",
1835 on_activate => sub { $::IN_BUILD_MODE = undef }
1836 );
1837 $vb->add (
1838 new CFPlus::UI::Button
1839 text => "ERASE",
1840 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1841 );
1842
1843 for my $itemarchname (
1844 sort {
1845 $msg->{items}->{$a}->{build_arch_name}
1846 cmp $msg->{items}->{$b}->{build_arch_name}
1847 } keys %{$msg->{items}}
1848 ) {
1849 my $info = $msg->{items}->{$itemarchname};
1850 $vb->add (
1851 new CFPlus::UI::Button text => $info->{build_arch_name},
1852 on_activate => sub {
1853 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1854
1855 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1856 build_mode_query_arch_info ();
1857 }
1858 }
1859 );
1860 }
1861
1862 $win->show;
1863}
1864
1865sub build_mode_query_arch_info {
1866 my ($iteminfo) = $::IN_BUILD_MODE;
1867 my $itemarchname = $iteminfo->{item};
1868 my $info = $iteminfo->{info};
1869
1870 my $dialog = new CFPlus::UI::Toplevel
1871 x => "center",
1872 y => "center",
1873 z => 50,
1874 force_w => int $WIDTH * 1/2,
1875 title => "Enter information for placement of '$itemarchname'",
1876 has_close_button => 1;
1877
1878 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1879
1880 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1881 my $row = 0;
1882 if ($info->{has_name}) {
1883 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1884 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1885 }
1886 if ($info->{has_text}) {
1887 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1888 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1889 }
1890 if ($info->{has_connection}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1892 $table->add (1, $row++,
1893 new CFPlus::UI::Entry
1894 expand => 1,
1895 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1896 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1897 );
1898 }
1899
1900 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1901 $hb->add (new CFPlus::UI::Button
1902 text => "Close",
1903 expand => 1,
1904 on_activate => sub { $dialog->hide; 0 },
1905 );
1906 $dialog->show;
1907} 2239}
1908 2240
1909sub video_shutdown { 2241sub video_shutdown {
1910 CFPlus::OpenGL::shutdown; 2242 CFPlus::OpenGL::shutdown;
1911 2243
1912 undef $SDL_ACTIVE; 2244 undef $SDL_ACTIVE;
1913} 2245}
1914 2246
1915my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1916my $bgmusic;#TODO#hack#d#
1917
1918sub audio_channel_finished {
1919 my ($channel) = @_;
1920
1921 #warn "channel $channel finished\n";#d#
1922}
1923
1924sub audio_music_finished {
1925 return unless $CFG->{bgm_enable};
1926
1927 # TODO: hack, do play loop and mood music
1928 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1929 $bgmusic->play (0);
1930
1931 push @bgmusic, shift @bgmusic;
1932}
1933
1934sub audio_init {
1935 if ($CFG->{audio_enable}) {
1936 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1937 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1938
1939 unless ($SDL_MIXER) {
1940 status "Unable to open sound device: there will be no sound";
1941 return;
1942 }
1943
1944 CFPlus::Mix_AllocateChannels 8;
1945 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1946
1947 audio_music_finished;
1948
1949 local $_;
1950 while (<$fh>) {
1951 next if /^\s*#/;
1952 next if /^\s*$/;
1953
1954 my ($file, $volume, $event) = split /\s+/, $_, 3;
1955
1956 push @SOUNDS, "$volume,$file";
1957
1958 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1959 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1960 $chunk->volume ($volume * 128 / 100);
1961 $chunk
1962 };
1963 }
1964 } else {
1965 status "unable to open sound config: $!";
1966 }
1967 }
1968}
1969
1970sub audio_shutdown {
1971 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1972 undef $SDL_MIXER;
1973 @SOUNDS = ();
1974 %AUDIO_CHUNKS = ();
1975}
1976
1977my %animate_object; 2247my %animate_object;
1978my $animate_timer; 2248my $animate_timer;
1979 2249
1980my $fps = 9; 2250my $fps = 9;
1981 2251
1982my %demo;#d#
1983
1984sub force_refresh { 2252sub force_refresh {
2253 if ($ENV{CFPLUS_DEBUG} & 4) {
1985 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2254 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1986 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2255 debug sprintf "%3.2f", $fps;
2256 }
1987 2257
1988 $CFPlus::UI::ROOT->draw; 2258 $CFPlus::UI::ROOT->draw;
1989 2259 CFPlus::SDL_GL_SwapBuffers;
1990 $WANT_REFRESH = 0;
1991 $CAN_REFRESH = 0;
1992 $LAST_REFRESH = $NOW; 2260 $LAST_REFRESH = $NOW;
1993 2261 $WANT_REFRESH->stop;
1994 CFPlus::SDL_GL_SwapBuffers;
1995} 2262}
1996 2263
2264$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2265
1997my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2266my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1998 $NOW = time; 2267 $NOW = time;
1999 2268
2000 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2269 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2001 for CFPlus::SDL_PollEvent; 2270 for CFPlus::poll_events;
2002 2271
2003 if (%animate_object) { 2272 if (%animate_object) {
2004 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2273 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2005 $WANT_REFRESH++; 2274 $WANT_REFRESH->start;
2006 }
2007
2008 if ($WANT_REFRESH) {
2009 force_refresh;
2010 } else {
2011 $CAN_REFRESH = 1;
2012 } 2275 }
2013}); 2276});
2014 2277
2015sub animation_start { 2278sub animation_start {
2016 my ($widget) = @_; 2279 my ($widget) = @_;
… …
2020sub animation_stop { 2283sub animation_stop {
2021 my ($widget) = @_; 2284 my ($widget) = @_;
2022 delete $animate_object{$widget}; 2285 delete $animate_object{$widget};
2023} 2286}
2024 2287
2025# check once/second for faces that need to be prefetched
2026# this should, of course, only run on demand, but
2027# SDL forces worse things on us....
2028
2029Event->timer (after => 1, interval => 0.25, cb => sub {
2030 $CONN->face_prefetch
2031 if $CONN;
2032});
2033
2034%SDL_CB = ( 2288%SDL_CB = (
2035 CFPlus::SDL_QUIT => sub { 2289 CFPlus::SDL_QUIT => sub {
2036 Event::unloop -1; 2290 Event::unloop_all;
2037 }, 2291 },
2038 CFPlus::SDL_VIDEORESIZE => sub { 2292 CFPlus::SDL_VIDEORESIZE => sub {
2039 }, 2293 },
2040 CFPlus::SDL_VIDEOEXPOSE => sub { 2294 CFPlus::SDL_VIDEOEXPOSE => sub {
2041 CFPlus::UI::full_refresh; 2295 CFPlus::UI::full_refresh;
2042 }, 2296 },
2043 CFPlus::SDL_ACTIVEEVENT => sub { 2297 CFPlus::SDL_ACTIVEEVENT => sub {
2044# not useful, as APPACTIVE include sonly iconified state, not unmapped 2298# not useful, as APPACTIVE include sonly iconified state, not unmapped
2045# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2299# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2300# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2046# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2301# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2047# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2302# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2048# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2303# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2049 }, 2304 },
2050 CFPlus::SDL_KEYDOWN => sub { 2305 CFPlus::SDL_KEYDOWN => sub {
… …
2074 2329
2075$SIG{INT} = $SIG{TERM} = sub { exit }; 2330$SIG{INT} = $SIG{TERM} = sub { exit };
2076 2331
2077{ 2332{
2078 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2333 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2334 CFPlus::DB::Server::run;
2335
2079 CFPlus::UI::set_layout ($::CFG->{layout}); 2336 CFPlus::UI::set_layout ($::CFG->{layout});
2080 2337
2081 my %DEF_CFG = ( 2338 my %DEF_CFG = (
2082 sdl_mode => 0, 2339 sdl_mode => 0,
2083 width => 640,
2084 height => 480,
2085 fullscreen => 0, 2340 fullscreen => 0,
2086 fast => 0, 2341 fast => 0,
2342 force_opengl11 => undef,
2343 texture_compression => 1,
2087 map_scale => 1, 2344 map_scale => 1,
2088 fow_enable => 1, 2345 fow_enable => 1,
2089 fow_intensity => 0.45, 2346 fow_intensity => 0,
2090 fow_smooth => 0, 2347 map_smoothing => 1,
2091 gui_fontsize => 1, 2348 gui_fontsize => 1,
2092 log_fontsize => 0.7, 2349 log_fontsize => 0.7,
2093 gauge_fontsize => 1, 2350 gauge_fontsize => 1,
2094 gauge_size => 0.35, 2351 gauge_size => 0.35,
2095 stat_fontsize => 0.7, 2352 stat_fontsize => 0.7,
2096 mapsize => 100, 2353 mapsize => 100,
2097 say_command => 'chat',
2098 audio_enable => 1, 2354 audio_enable => 1,
2355 audio_hw_channels => 2,
2356 audio_hw_frequency => 22050,
2357 audio_hw_chunksize => 2048,
2358 audio_mix_channels => 8,
2359 effects_enable => 1,
2360 effects_volume => 1,
2099 bgm_enable => 1, 2361 bgm_enable => 1,
2100 bgm_volume => 0.25, 2362 bgm_volume => 0.5,
2101 face_prefetch => 0,
2102 output_sync => 1, 2363 output_sync => 1,
2103 output_count => 1, 2364 output_count => 1,
2365 output_rate => "",
2104 pickup => 0, 2366 pickup => 0,
2105 inv_sort => "mtime", 2367 inv_sort => "mtime",
2106 default => "profile", # default profile 2368 default => "profile", # default profile
2107 show_tips => 1, 2369 show_tips => 1,
2370 logview_max_par => 1000,
2108 ); 2371 );
2109 2372
2110 while (my ($k, $v) = each %DEF_CFG) { 2373 while (my ($k, $v) = each %DEF_CFG) {
2111 $CFG->{$k} = $v unless exists $CFG->{$k}; 2374 $CFG->{$k} = $v unless exists $CFG->{$k};
2112 } 2375 }
… …
2126 } 2389 }
2127 } 2390 }
2128 2391
2129 sdl_init; 2392 sdl_init;
2130 2393
2131 @SDL_MODES = reverse 2394 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2132 grep $_->[0] >= 640 && $_->[1] >= 480, 2395 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2133 CFPlus::SDL_ListModes;
2134
2135 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2396 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2397
2398 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2136 2399
2137 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2400 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2138 2401
2139 { 2402 {
2140 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2403 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2169# } 2432# }
2170# my $t2 = Time::HiRes::time; 2433# my $t2 = Time::HiRes::time;
2171# warn $t2-$t1; 2434# warn $t2-$t1;
2172# } 2435# }
2173 2436
2174 $startup_done->();
2175
2176 video_init; 2437 video_init;
2177 audio_init; 2438 audio_init;
2178} 2439}
2179 2440
2180show_tip_of_the_day if $CFG->{show_tips}; 2441show_tip_of_the_day if $CFG->{show_tips};
2181 2442
2443Event->idle (cb => sub {
2444 $_[0]->w->cancel;
2445 $startup_done->();
2446});
2447
2182Event::loop; 2448Event::loop;
2449
2450#video_shutdown;
2451#audio_shutdown;
2183#CFPlus::SDL_Quit; 2452CFPlus::SDL_Quit;
2184#CFPlus::_exit 0; 2453CFPlus::DB::Server::stop;
2185
2186END { CFPlus::SDL_Quit }
2187 2454
2188=head1 NAME 2455=head1 NAME
2189 2456
2190cfplus - A Crossfire+ and Crossfire game client 2457cfplus - A Crossfire TRT and Crossfire game client
2191 2458
2192=head1 SYNOPSIS 2459=head1 SYNOPSIS
2193 2460
2194Just run it - no commandline arguments are supported. 2461Just run it - no commandline arguments are supported.
2195 2462
2196=head1 USAGE 2463=head1 USAGE
2197 2464
2198cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2465cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2199fullscreen and interactively. 2466be used in fullscreen mode and interactively.
2200 2467
2201=head1 DEBUGGING 2468=head1 DEBUGGING
2202 2469
2203 2470
2204CFPLUS_DEBUG - environment variable 2471CFPLUS_DEBUG - environment variable

Diff Legend

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