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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC vs.
Revision 1.231 by elmex, Sun Oct 14 10:33:50 2007 UTC

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

Diff Legend

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