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.161 by root, Thu Jul 5 06:57:03 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 { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN { 5BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 } 9 }
… …
30# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
31BEGIN { 29BEGIN {
32 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
33 @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
34 32
35 my $tmp = $ENV{PAR_TEMP}; 33 my $root = $ENV{PAR_TEMP};
36 34
37 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
38 for ($zip->memberNames) { 36 for ($zip->memberNames) {
39 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
40 $zip->extractMember ($_, "$tmp/$1") 38 $zip->extractMember ($_, "$root/$1")
41 unless -e "$tmp/$1"; 39 unless -e "$root/$1";
42 } 40 }
43 } 41 }
44 42
45 if ($^O eq "MSWin32") { 43 if ($^O eq "MSWin32") {
46 # relocatable 44 # pango is relocatable on win32
47 } else { 45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
48 # unix, need to patch pango rc file 49 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!"; 51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/; 52 local $/;
52 my $rc = <$fh>; 53 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
54 55
55 mkdir "$tmp/pango-modules"; 56 mkdir "$root/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" 57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!"; 58 or die "$root/pango-modules/pango.modules: $!";
58 print $fh $rc; 59 print $fh $rc;
59 60
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!"; 63 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; 64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
64 } 65 }
65 66
66 unshift @INC, $tmp; 67 unshift @INC, $root;
67 } 68 }
68} 69}
69 70
70# 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
71unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 73 if %PAR::LibCache;
73 74
74use Time::HiRes 'time'; 75use Time::HiRes 'time';
75use Event; 76use Event;
77use List::Util qw(max min);
76 78
77use Crossfire; 79use Crossfire;
78use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
79 81
80use Compress::LZF; 82use Compress::LZF;
… …
82use CFPlus; 84use CFPlus;
83use CFPlus::OpenGL (); 85use CFPlus::OpenGL ();
84use CFPlus::Protocol; 86use CFPlus::Protocol;
85use CFPlus::DB; 87use CFPlus::DB;
86use CFPlus::UI; 88use CFPlus::UI;
89use CFPlus::UI::Canvas;
87use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
89use CFPlus::Pod; 95use CFPlus::Pod;
90use CFPlus::MapWidget; 96use CFPlus::MapWidget;
91use CFPlus::Macro; 97use CFPlus::Macro;
92 98
93$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
110our $CONN; 116our $CONN;
111our $PROFILE; # current profile 117our $PROFILE; # current profile
112our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
113 119
114our $WANT_REFRESH; 120our $WANT_REFRESH;
115our $CAN_REFRESH;
116 121
117our @SDL_MODES; 122our @SDL_MODES;
118our $WIDTH; 123our $WIDTH;
119our $HEIGHT; 124our $HEIGHT;
120our $FULLSCREEN; 125our $FULLSCREEN;
… …
124our $FONT_FIXED; 129our $FONT_FIXED;
125 130
126our $MAP; 131our $MAP;
127our $MAPMAP; 132our $MAPMAP;
128our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
129our $BUTTONBAR; 135our $BUTTONBAR;
130our $LOGVIEW;
131our $CONSOLE;
132our $METASERVER; 136our $METASERVER;
133our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 138our $QUIT_DIALOG;
135our $HOST_ENTRY; 139our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE; 140our $FULLSCREEN_ENABLE;
… …
138our $SERVER_INFO; 142our $SERVER_INFO;
139 143
140our $SETUP_DIALOG; 144our $SETUP_DIALOG;
141our $SETUP_NOTEBOOK; 145our $SETUP_NOTEBOOK;
142our $SETUP_SERVER; 146our $SETUP_SERVER;
147our $SETUP_LOGIN;
143our $SETUP_KEYBOARD; 148our $SETUP_KEYBOARD;
144 149
145our $PL_NOTEBOOK; 150our $PL_NOTEBOOK;
146our $PL_WINDOW; 151our $PL_WINDOW;
147 152
153our $MUSIC_PLAYING_WIDGET;
154our $LICENSE_WIDGET;
155
156our $PICKUP_PAGE;
148our $INVENTORY_PAGE; 157our $INVENTORY_PAGE;
149our $STATS_PAGE; 158our $STATS_PAGE;
150our $SKILL_PAGE; 159our $SKILL_PAGE;
151our $SPELL_PAGE; 160our $SPELL_PAGE;
152our $SPELL_LIST; 161our $SPELL_LIST;
… …
158our $STATWIDS; 167our $STATWIDS;
159 168
160our $SDL_ACTIVE; 169our $SDL_ACTIVE;
161our %SDL_CB; 170our %SDL_CB;
162 171
163our $SDL_MIXER;
164our @SOUNDS; # event => file mapping
165our %AUDIO_CHUNKS; # audio files
166
167our $ALT_ENTER_MESSAGE; 172our $ALT_ENTER_MESSAGE;
168our $STATUSBOX; 173our $STATUSBOX;
169our $DEBUG_STATUS; 174our $DEBUG_STATUS;
170 175
171our $INV; 176our $INV;
172our $INVR; 177our $INVR;
173our $INV_RIGHT_HB; 178our $INVR_HB;
174 179
175our $PICKUP_CFG; 180#############################################################################
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
179 181
180sub status { 182sub status {
181 $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]);
182} 184}
183 185
184sub debug { 186sub debug {
185 $DEBUG_STATUS->set_text ($_[0]); 187 $DEBUG_STATUS->set_text ($_[0]);
186} 188}
187 189
188sub 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($) {
189 my ($para) = @_; 219 my ($face) = @_;
190 220
191 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 221 $CFG->{effects_enable}
222 or return;
192 223
193 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 224 $AUDIO_PLAY{$face}
225 or return;
194 226
195 $LOGVIEW->add_paragraph ($para); 227 if (my $chunk = $AUDIO_CHUNK{$face}) {
196 $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 }
197} 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#############################################################################
198 450
199sub destroy_query_dialog { 451sub destroy_query_dialog {
200 (delete $_[0]{query_dialog})->destroy 452 (delete $_[0]{query_dialog})->destroy
201 if $_[0]{query_dialog}; 453 if $_[0]{query_dialog};
202} 454}
… …
266 ellipsise => 0, 518 ellipsise => 0,
267 markup => "\nOr use your keyboard and the text entry below:\n"; 519 markup => "\nOr use your keyboard and the text entry below:\n";
268 520
269 unshift @dialog, my $table = new CFPlus::UI::Table; 521 unshift @dialog, my $table = new CFPlus::UI::Table;
270 522
271 $table->add (0, 0, new CFPlus::UI::Button 523 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Next Race", 524 text => "Next Race",
273 on_activate => sub { 525 on_activate => sub {
274 $conn->send ("reply n"); 526 $conn->send ("reply n");
275 destroy_query_dialog $conn; 527 destroy_query_dialog $conn;
276 0 528 0
277 }, 529 },
278 ); 530 );
279 $table->add (2, 0, new CFPlus::UI::Button 531 $table->add_at (2, 0, new CFPlus::UI::Button
280 text => "Accept", 532 text => "Accept",
281 on_activate => sub { 533 on_activate => sub {
282 $conn->send ("reply d"); 534 $conn->send ("reply d");
283 destroy_query_dialog $conn; 535 destroy_query_dialog $conn;
284 0 536 0
… …
319 $conn->send ("reply $stat"); 571 $conn->send ("reply $stat");
320 destroy_query_dialog $conn; 572 destroy_query_dialog $conn;
321 return; 573 return;
322 } 574 }
323 575
324 $STATS_PAGE->show;
325 $MESSAGE_WINDOW->hide;
326
327 unshift @dialog, new CFPlus::UI::Label 576 unshift @dialog, new CFPlus::UI::Label
328 max_w => $::WIDTH * 0.4, 577 max_w => $::WIDTH * 0.4,
329 ellipsise => 0, 578 ellipsise => 0,
330 markup => "\nOr use your keyboard and the text entry below:\n"; 579 markup => "\nOr use your keyboard and the text entry below:\n";
331 580
332 unshift @dialog, my $table = new CFPlus::UI::Table; 581 unshift @dialog, my $table = new CFPlus::UI::Table;
333 582
334 # left: re-roll 583 # left: re-roll
335 $table->add (0, 0, new CFPlus::UI::Button 584 $table->add_at (0, 0, new CFPlus::UI::Button
336 text => "Roll Again", 585 text => "Roll Again",
337 on_activate => sub { 586 on_activate => sub {
338 $conn->send ("reply y"); 587 $conn->send ("reply y");
339 destroy_query_dialog $conn; 588 destroy_query_dialog $conn;
340 0 589 0
… …
354 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 603 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
355 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 604 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
356 ], 605 ],
357 ), 1 .. 2; 606 ), 1 .. 2;
358 607
359 $table->add (2, 0, new CFPlus::UI::Button 608 $table->add_at (2, 0, new CFPlus::UI::Button
360 text => "Swap Stats", 609 text => "Swap Stats",
361 on_activate => sub { 610 on_activate => sub {
362 $conn->{stat_change_with} = $sw2->{value}; 611 $conn->{stat_change_with} = $sw2->{value};
363 $conn->send ("reply $sw1->{value}"); 612 $conn->send ("reply $sw1->{value}");
364 destroy_query_dialog $conn; 613 destroy_query_dialog $conn;
365 0 614 0
366 }, 615 },
367 ); 616 );
368 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 617 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
369 618
370 # right: accept 619 # right: accept
371 $table->add (4, 0, new CFPlus::UI::Button 620 $table->add_at (4, 0, new CFPlus::UI::Button
372 text => "Accept", 621 text => "Accept",
373 on_activate => sub { 622 on_activate => sub {
374 $conn->send ("reply n"); 623 $conn->send ("reply n");
375 $STATS_PAGE->hide; 624 $STATS_PAGE->hide;
376 destroy_query_dialog $conn; 625 destroy_query_dialog $conn;
… …
445 694
446 my ($host, $port) = split /:/, $PROFILE->{host}; 695 my ($host, $port) = split /:/, $PROFILE->{host};
447 696
448 $MAP = new CFPlus::Map; 697 $MAP = new CFPlus::Map;
449 698
450 warn "connecting...\n";#d#
451 $CONN = eval { 699 $CONN = eval {
452 new CFPlus::Protocol 700 new CFPlus::Protocol
453 host => $host, 701 host => $host,
454 port => $port || 13327, 702 port => $port || 13327,
455 user => $PROFILE->{user}, 703 user => $PROFILE->{user},
… …
458 maph => $mapsize, 706 maph => $mapsize,
459 707
460 client => "cfplus $CFPlus::VERSION $] $^O", 708 client => "cfplus $CFPlus::VERSION $] $^O",
461 709
462 map_widget => $MAPWIDGET, 710 map_widget => $MAPWIDGET,
463 logview => $LOGVIEW,
464 statusbox => $STATUSBOX, 711 statusbox => $STATUSBOX,
465 map => $MAP, 712 map => $MAP,
466 mapmap => $MAPMAP, 713 mapmap => $MAPMAP,
467 query => \&server_query, 714 query => \&server_query,
468 715
469 setup_req => { 716 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1, 717 smoothing => $CFG->{map_smoothing}*1,
471 }, 718 },
472
473 sound_play => sub {
474 my ($x, $y, $soundnum, $type) = @_;
475
476 $SDL_MIXER
477 or return;
478
479 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
480 or return;
481
482 $chunk->play;
483 },
484 }; 719 };
485 warn "connected<$CONN,$@>\n";#d#
486 720
487 if ($CONN) { 721 if ($CONN) {
488 CFPlus::lowdelay fileno $CONN->{fh}; 722 CFPlus::lowdelay fileno $CONN->{fh};
489 723
490 status "login successful"; 724 status "login successful";
… …
493 stop_game(); 727 stop_game();
494 } 728 }
495} 729}
496 730
497sub stop_game { 731sub stop_game {
498 $LOGIN_BUTTON->set_text ("Login"); 732 $LOGIN_BUTTON->set_text ("Login / Register");
499 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 733 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
500 $SETUP_DIALOG->show; 734 $SETUP_DIALOG->show;
501 $PL_WINDOW->hide; 735 $PL_WINDOW->hide;
502 $SPELL_LIST->clear_spells; 736 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 737 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
504 738
739 &audio_music_set_ambient ([]);
740
505 return unless $CONN; 741 return unless $CONN;
506 742
507 status "connection closed"; 743 status "connection closed";
508 744
509 destroy_query_dialog $CONN; 745 destroy_query_dialog $CONN;
… …
518 754
519 $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]);
520 756
521 my $row = 0; 757 my $row = 0;
522 758
523 $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");
524 $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,
525 can_events => 1, 761 can_events => 1,
526 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 762 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
527 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
528 $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");
529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 769 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
530 770
771 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
531 $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],
532 $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);
533 777
534 $mode_slider->connect (changed => sub { 778 $mode_slider->connect (changed => sub {
535 my ($self, $value) = @_; 779 my ($self, $value) = @_;
536 780
537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 781 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 782 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
539 }); 783 });
540 $mode_slider->emit (changed => $mode_slider->{range}[0]); 784 $mode_slider->emit (changed => $mode_slider->{range}[0]);
541 785
542 $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");
543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
544 state => $CFG->{fullscreen}, 788 state => $CFG->{fullscreen},
545 tooltip => "Bring the client into fullscreen mode.", 789 tooltip => "Bring the client into fullscreen mode.",
546 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
547 ); 791 );
548 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
549 $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");
550 $table->add (1, $row++, new CFPlus::UI::CheckBox 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
551 state => $CFG->{fast}, 817 state => $CFG->{fast},
552 tooltip => "Lower the visual quality considerably to speed up rendering.", 818 tooltip => "Lower the visual quality considerably to speed up rendering.",
553 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 819 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
554 ); 820 );
555 821
556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 822 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
557 $table->add (1, $row++, new CFPlus::UI::Slider 823 $table->add_at (1, $row++, new CFPlus::UI::Slider
558 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 824 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
559 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 825 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
560 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 826 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
561 ); 827 );
562 828
563 $table->add (1, $row++, new CFPlus::UI::Button 829 $table->add_at (1, $row++, new CFPlus::UI::Button
564 expand => 1, align => 0, text => "Apply", 830 expand => 1, align => 0, text => "Apply",
565 tooltip => "Apply the video settings above.", 831 tooltip => "Apply the video settings above.",
566 on_activate => sub { 832 on_activate => sub {
567 video_shutdown (); 833 video_shutdown ();
568 video_init (); 834 video_init ();
569 0 835 0
570 } 836 }
571 ); 837 );
572 838
573 $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");
574 $table->add (1, $row++, new CFPlus::UI::Slider 840 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 841 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 842 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
577 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 }
578 ); 844 );
579 845
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox 847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{map_smoothing}, 848 state => $CFG->{map_smoothing},
583 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 849 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
584 . "This increases load on the graphics subsystem and works only with 2.x servers. " 850 . "This increases load on the graphics subsystem and works only with TRT servers. "
585 . "Changes take effect at next connection only.", 851 . "Changes take effect at next login only.",
586 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 852 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
587 ); 853 );
588 854
589 $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");
590 $table->add (1, $row++, new CFPlus::UI::CheckBox 856 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{fow_enable}, 857 state => $CFG->{fow_enable},
592 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.",
593 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
594 ); 860 );
595 861
596 $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");
597 $table->add (1, $row++, new CFPlus::UI::Slider 863 $table->add_at (1, $row++, new CFPlus::UI::Slider
598 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 864 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
599 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.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 866 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
601 ); 867 );
602 868
603 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
604 $table->add (1, $row++, new CFPlus::UI::CheckBox
605 state => $CFG->{fow_smooth},
606 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
607 on_changed => sub {
608 my ($self, $value) = @_;
609 $CFG->{fow_smooth} = $value;
610 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
611 0
612 }
613 );
614
615 $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");
616 $table->add (1, $row++, new CFPlus::UI::Slider 870 $table->add_at (1, $row++, new CFPlus::UI::Slider
617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 871 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
618 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.",
619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 874 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
620 ); 875 );
621 876
622 $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");
623 $table->add (1, $row++, new CFPlus::UI::Slider 878 $table->add_at (1, $row++, new CFPlus::UI::Slider
624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 879 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
625 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.",
626 on_changed => sub { 881 on_changed => sub {
627 $CFG->{gauge_fontsize} = $_[1]; 882 $CFG->{gauge_fontsize} = $_[1];
628 &set_gauge_window_fontsize; 883 &set_gauge_window_fontsize;
629 0 884 0
630 } 885 }
631 ); 886 );
632 887
633 $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");
634 $table->add (1, $row++, new CFPlus::UI::Slider 889 $table->add_at (1, $row++, new CFPlus::UI::Slider
635 range => [$CFG->{gauge_size}, 0.2, 0.8], 890 range => [$CFG->{gauge_size}, 0.2, 0.8],
636 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.",
637 on_changed => sub { 892 on_changed => sub {
638 $CFG->{gauge_size} = $_[1]; 893 $CFG->{gauge_size} = $_[1];
639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 894 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
642 ); 897 );
643 898
644 $vbox 899 $vbox
645} 900}
646 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);
923}
924
647sub audio_setup { 925sub audio_setup {
648 my $vbox = new CFPlus::UI::VBox; 926 my $vbox = new CFPlus::UI::VBox;
649 927
650 $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]);
651 929
652 my $row = 0; 930 my $row = 0;
653 931
654 $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");
655 $table->add (1, $row++, new CFPlus::UI::CheckBox 933 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
656 state => $CFG->{audio_enable}, 934 state => $CFG->{audio_enable},
657 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.",
658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 936 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
659 ); 937 );
938
660# $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");
661# $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 {
662# $CFG->{effects_volume} = $_[1]; 944 $CFG->{effects_enable} = $_[1];
663# }); 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
664 $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");
665 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
666 $hbox->add (new CFPlus::UI::CheckBox 957 $table->add_at (1, $row, new CFPlus::UI::CheckBox
667 expand => 1, state => $CFG->{bgm_enable}, 958 expand => 1, state => $CFG->{bgm_enable},
668 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.",
669 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 }
670 ); 966 );
671 $hbox->add (new CFPlus::UI::Slider 967 $table->add_at (2, $row++, new CFPlus::UI::Slider
672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 968 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
673 tooltip => "The volume of the background music. Changes are instant.", 969 tooltip => "The volume of the background music. Changes are instant.",
674 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 }
675 ); 971 );
676 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
677 $table->add (1, $row++, new CFPlus::UI::Button 1040 $table->add_at (1, $row++, new CFPlus::UI::Button
678 expand => 1, align => 0, text => "Apply", 1041 c_colspan => 2, expand => 1, align => 0, text => "Apply",
679 tooltip => "Apply the audio settings", 1042 tooltip => "Apply the audio settings",
680 on_activate => sub { 1043 on_activate => sub {
681 audio_shutdown (); 1044 audio_shutdown ();
682 audio_init (); 1045 audio_init ();
683 0 1046 0
684 } 1047 }
685 ); 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;
686 1057
687 $vbox 1058 $vbox
688} 1059}
689 1060
690sub set_gauge_window_fontsize { 1061sub set_gauge_window_fontsize {
… …
725 $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");
726 $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");
727 $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");
728 $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");
729 1100
730 $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);
731 $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");
732 1105
733 $GAUGES = { 1106 $GAUGES = {
1107 exp => $exp, prg => $prg, sklprg => $sklprg,
734 exp => $exp, win => $win, range => $rng, 1108 win => $win, range => $rng,
735 food => $fg, mana => $mg, hp => $hg, grace => $gg 1109 hp => $hg, mana => $mg, grace => $gg, food => $fg,
736 }; 1110 };
737 1111
738 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
739 1113
740 $win 1114 $win
741} 1115}
742 1116
743sub debug_setup { 1117sub debug_setup {
744 my $table = new CFPlus::UI::Table; 1118 my $table = new CFPlus::UI::Table;
745 1119
746 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1120 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
747 $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 });
748 $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");
749 $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 });
750 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1124 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
751 $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 });
752 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1126 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
753 $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 });
754 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1128 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
755 1129
756 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
757
758 for my $x (0..2) {
759 for my $y (0 .. 2) {
760 $table->add ($x + 3, $y,
761 new CFPlus::UI::Entry
762 text => $default_smooth[$x * 3 + $y],
763 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
764 );
765 }
766 }
767
768 $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 });
769 1164
770 $table 1165 $table
771} 1166}
772 1167
773sub stats_window { 1168sub stats_window {
… …
821 [2, 4, st_spd => "Spd", 10.54], 1216 [2, 4, st_spd => "Spd", 10.54],
822 [2, 5, st_wspd => "WSp", 10.54], 1217 [2, 5, st_wspd => "WSp", 10.54],
823 ) { 1218 ) {
824 my ($col, $row, $id, $label, $template) = @$_; 1219 my ($col, $row, $id, $label, $template) = @$_;
825 1220
826 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1221 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
827 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1222 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
828 align => +1, template => $template, tooltip => "#stat_$label"); 1223 align => +1, template => $template, tooltip => "#stat_$label");
829 $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
830 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,
831 align => -1, text => $label, tooltip => "#stat_$label"); 1226 align => -1, text => $label, tooltip => "#stat_$label");
832 } 1227 }
833 1228
834 $vb->add (new CFPlus::UI::FancyFrame 1229 $vb->add (new CFPlus::UI::FancyFrame
… …
875 cold => ["Cold", 1270 cold => ["Cold",
876 "<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, ...)"],
877 ghit => ["Ghost hit", 1272 ghit => ["Ghost hit",
878 "<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)"],
879 ); 1274 );
1275
880 for (qw/slow holyw conf fire depl magic 1276 for (qw/slow holyw conf fire depl magic
881 drain acid pois para deat phys 1277 drain acid pois para deat phys
882 blind fear tund elec cold ghit/) 1278 blind fear tund elec cold ghit/)
883 { 1279 {
884 $tbl2->add ($col, $row, 1280 $tbl2->add_at ($col, $row,
885 $STATWIDS->{"res_$_"} = 1281 $STATWIDS->{"res_$_"} =
886 new CFPlus::UI::Label 1282 new CFPlus::UI::Label
887 font => $FONT_FIXED, 1283 font => $FONT_FIXED,
888 template => "-100%", 1284 template => "-100%",
889 align => +1, 1285 align => +1,
890 valign => 0, 1286 valign => 0,
891 can_events => 1, 1287 can_events => 1,
892 can_hover => 1, 1288 can_hover => 1,
893 tooltip => $resist_names{$_}->[1], 1289 tooltip => $resist_names{$_}->[1],
894 ); 1290 );
895 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1291 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
896 font => $FONT_FIXED, 1292 font => $FONT_FIXED,
897 can_hover => 1, 1293 can_hover => 1,
898 can_events => 1, 1294 can_events => 1,
899 path => "ui/resist/resist_$_.png", 1295 path => "ui/resist/resist_$_.png",
900 tooltip => $resist_names{$_}->[1], 1296 tooltip => $resist_names{$_}->[1],
901 ); 1297 );
902 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1298 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
903 text => $resist_names{$_}->[0], 1299 text => $resist_names{$_}->[0],
904 font => $FONT_FIXED, 1300 font => $FONT_FIXED,
905 can_hover => 1, 1301 can_hover => 1,
906 can_events => 1, 1302 can_events => 1,
907 tooltip => $resist_names{$_}->[1], 1303 tooltip => $resist_names{$_}->[1],
… …
919 $r 1315 $r
920} 1316}
921 1317
922sub skill_window { 1318sub skill_window {
923 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1319 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1320
924 $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
925 $sw 1323 $sw
926} 1324}
927 1325
928sub formsep($) { 1326sub formsep($) {
929 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1327 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
940 return if $METASERVER_ATIME > time; 1338 return if $METASERVER_ATIME > time;
941 $METASERVER_ATIME = time + 60; 1339 $METASERVER_ATIME = time + 60;
942 1340
943 my $table = $METASERVER->{table}; 1341 my $table = $METASERVER->{table};
944 $table->clear; 1342 $table->clear;
945 $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...");
946 1344
947 my $ok = 0; 1345 my $ok = 0;
948 1346
949 CFPlus::background { 1347 CFPlus::background {
950 my $ua = CFPlus::lwp_useragent; 1348 my $ua = CFPlus::lwp_useragent;
… …
961 "The time this server has been running without being restarted.", 1359 "The time this server has been running without being restarted.",
962 "The server software version - a '+' indicates a Crossfire+ server.", 1360 "The server software version - a '+' indicates a Crossfire+ server.",
963 "Short information about this server provided by its admins.", 1361 "Short information about this server provided by its admins.",
964 ); 1362 );
965 my @col = qw(#Users Host Uptime Version Description); 1363 my @col = qw(#Users Host Uptime Version Description);
966 $table->add ($_, 0, new CFPlus::UI::Label 1364 $table->add_at ($_, 0, new CFPlus::UI::Label
967 can_hover => 1, can_events => 1, 1365 can_hover => 1, can_events => 1,
968 align => 0, fg => [1, 1, 0], 1366 align => 0, fg => [1, 1, 0],
969 text => $col[$_], tooltip => $tip[$_]) 1367 text => $col[$_], tooltip => $tip[$_])
970 for 0 .. $#col; 1368 for 0 .. $#col;
971 1369
… …
993 1391
994 $m = [$users, $host, $uptime, $version, $desc]; 1392 $m = [$users, $host, $uptime, $version, $desc];
995 1393
996 $y++; 1394 $y++;
997 1395
998 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1396 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
999 (new CFPlus::UI::Button 1397 (new CFPlus::UI::Button
1000 text => "Use", 1398 text => "Use",
1001 tooltip => "Put this server into the <b>Host:Port</b> field", 1399 tooltip => "Put this server into the <b>Host:Port</b> field",
1002 on_activate => sub { 1400 on_activate => sub {
1003 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1401 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1006 }, 1404 },
1007 ), 1405 ),
1008 (new CFPlus::UI::Empty expand => 1), 1406 (new CFPlus::UI::Empty expand => 1),
1009 ]); 1407 ]);
1010 1408
1011 $table->add ($_, $y, new CFPlus::UI::Label 1409 $table->add_at ($_, $y, new CFPlus::UI::Label
1012 max_w => $::WIDTH * 0.4, 1410 max_w => $::WIDTH * 0.4,
1013 ellipsise => 0, 1411 ellipsise => 0,
1014 align => $align[$_], 1412 align => $align[$_],
1015 text => $m->[$_], 1413 text => $m->[$_],
1016 tooltip => $tip[$_], 1414 tooltip => $tip[$_],
… …
1050 ; 1448 ;
1051 1449
1052 $dialog 1450 $dialog
1053} 1451}
1054 1452
1055sub server_setup { 1453sub login_setup {
1056 my $vbox = new CFPlus::UI::VBox; 1454 my $vbox = new CFPlus::UI::VBox;
1057 1455
1058 $vbox->add (new CFPlus::UI::FancyFrame 1456 $vbox->add (new CFPlus::UI::FancyFrame
1059 label => "Connection Settings", 1457 label => "Login Settings",
1060 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]),
1061 ); 1459 );
1062 $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");
1063 1461
1064 { 1462 {
1065 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1463 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1066 1464
1067 $vbox->add ( 1465 $vbox->add (
1068 $HOST_ENTRY = new CFPlus::UI::Entry 1466 $HOST_ENTRY = new CFPlus::UI::Entry
1069 expand => 1, 1467 expand => 1,
1070 text => $CFG->{profile}{default}{host}, 1468 text => $CFG->{profile}{default}{host},
1071 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",
1072 on_changed => sub { 1470 on_changed => sub {
1073 my ($self, $value) = @_; 1471 my ($self, $value) = @_;
1074 $CFG->{profile}{default}{host} = $value; 1472 $CFG->{profile}{default}{host} = $value;
1075 0 1473 1
1076 } 1474 }
1077 ); 1475 );
1078 1476
1079 $vbox->add (new CFPlus::UI::Button 1477 $vbox->add (new CFPlus::UI::Button
1080 expand => 1, 1478 expand => 1,
1081 text => "Server List", 1479 text => "Server List",
1082 other => $METASERVER, 1480 other => $METASERVER,
1083 tooltip => "Show a list of available crossfire servers", 1481 tooltip => "Show a list of available crossfire servers",
1084 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1482 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1085 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1483 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1086 ); 1484 );
1087 } 1485 }
1088 1486
1089 $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");
1090 $table->add (1, 4, new CFPlus::UI::Entry 1488 $table->add_at (1, 4, new CFPlus::UI::Entry
1091 text => $CFG->{profile}{default}{user}, 1489 text => $CFG->{profile}{default}{user},
1092 tooltip => "The name of your character on the server", 1490 tooltip => "The name of your character on the server",
1093 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1491 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1094 ); 1492 );
1095 1493
1096 $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");
1097 $table->add (1, 5, new CFPlus::UI::Entry 1495 $table->add_at (1, 5, new CFPlus::UI::Entry
1098 text => $CFG->{profile}{default}{password}, 1496 text => $CFG->{profile}{default}{password},
1099 hidden => 1, 1497 hidden => 1,
1100 tooltip => "The password for your character", 1498 tooltip => "The password for your character",
1101 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1499 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1102 ); 1500 );
1103 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
1104 $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");
1105 $table->add (1, 7, new CFPlus::UI::Slider 1526 $table->add_at (1, 1, new CFPlus::UI::Slider
1106 force_w => 100, 1527 force_w => 100,
1107 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1528 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1108 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. "
1109 . "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, "
1110 . "but you also increase bandwidth requirements and latency. " 1531 . "but you also increase bandwidth requirements and latency. "
1111 . "This option is only used once at log-in.", 1532 . "This option is only used once at log-in.",
1112 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 },
1113 ); 1534 );
1114 1535
1115 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1116 $table->add (1, 8, new CFPlus::UI::CheckBox
1117 state => $CFG->{face_prefetch},
1118 tooltip => "<b>Background Image Prefetch</b>\n\n"
1119 . "If enabled, the client automatically pre-fetches images from the server. "
1120 . "This might increase or create lag, but increases the chances "
1121 . "of faces being ready for display when you encounter them. "
1122 . "It also uses up server bandwidth on every connect, "
1123 . "so only set it if you really need to prefetch images. "
1124 . "This option can be set and unset any time.",
1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1126 );
1127
1128 $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");
1129 $table->add (1, 9, new CFPlus::UI::Entry 1537 $table->add_at (1, 2, new CFPlus::UI::Entry
1130 text => $CFG->{output_rate}, 1538 text => $CFG->{output_rate},
1131 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 "
1132 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1540 . "when sending data. When 0 or unset, the server "
1133 . "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.",
1134 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1543 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1135 ); 1544 );
1136 1545
1137 $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");
1138 $table->add (1, 10, new CFPlus::UI::Entry 1547 $table->add_at (1, 3, new CFPlus::UI::Entry
1139 text => $CFG->{output_count}, 1548 text => $CFG->{output_count},
1140 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.",
1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1550 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1142 ); 1551 );
1143 1552
1144 $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");
1145 $table->add (1, 11, new CFPlus::UI::Entry 1554 $table->add_at (1, 4, new CFPlus::UI::Entry
1146 text => $CFG->{output_sync}, 1555 text => $CFG->{output_sync},
1147 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.",
1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1557 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1149 );
1150
1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1152 expand => 1,
1153 align => 0,
1154 text => "Login",
1155 on_activate => sub {
1156 $CONN ? stop_game
1157 : start_game;
1158 0
1159 },
1160 ); 1558 );
1161 1559
1162 $vbox->add (new CFPlus::UI::FancyFrame 1560 $vbox->add (new CFPlus::UI::FancyFrame
1163 label => "Server Info", 1561 label => "Server Info",
1164 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1562 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
… …
1170sub client_setup { 1568sub client_setup {
1171 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1569 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1172 1570
1173 my $row = 0; 1571 my $row = 0;
1174 1572
1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1176 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1177 text => $CFG->{say_command},
1178 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. "
1179 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1180 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1181 on_changed => sub {
1182 my ($self, $value) = @_;
1183 $CFG->{say_command} = $value;
1184 0
1185 }
1186 );
1187
1188 $table->add (0, $row, 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");
1189 $table->add (1, $row++, new CFPlus::UI::CheckBox 1574 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1190 state => $CFG->{show_tips}, 1575 state => $CFG->{show_tips},
1191 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?",
1192 on_changed => sub { 1577 on_changed => sub {
1193 my ($self, $value) = @_; 1578 my ($self, $value) = @_;
1194 $CFG->{show_tips} = $value; 1579 $CFG->{show_tips} = $value;
1195 0 1580 0
1196 } 1581 }
1197 ); 1582 );
1198 1583
1199 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1584 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1200 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1585 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1201 text => $CFG->{logview_max_par}, 1586 text => $CFG->{logview_max_par},
1202 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1587 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1203 . "sends more messages than this number, older messages get removed to save memory and " 1588 . "sends more messages than this number, older messages get removed to save memory and "
1204 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1589 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1205 on_changed => sub { 1590 on_changed => sub {
1206 my ($self, $value) = @_; 1591 my ($self, $value) = @_;
1207 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1592 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1208 0 1593 0
1209 }, 1594 },
1210 ); 1595 );
1211 1596
1212 $table 1597 $table
1213} 1598}
1214 1599
1215sub message_window {
1216 my $window = new CFPlus::UI::Toplevel
1217 name => "message_window",
1218 title => "Messages",
1219 border_bg => [1, 1, 1, 1],
1220 x => "max",
1221 y => 0,
1222 force_w => $::WIDTH * 0.4,
1223 force_h => $::HEIGHT * 0.5,
1224 child => (my $vbox = new CFPlus::UI::VBox),
1225 has_close_button => 1;
1226
1227 $vbox->add ($LOGVIEW);
1228
1229 $vbox->add (my $input = new CFPlus::UI::Entry
1230 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1231 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1232 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1233 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1234 on_focus_in => sub {
1235 my ($input, $prev_focus) = @_;
1236
1237 delete $input->{refocus_map};
1238
1239 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1240 $input->{refocus_map} = 1;
1241 }
1242 delete $input->{auto_activated};
1243
1244 0
1245 },
1246 on_activate => sub {
1247 my ($input, $text) = @_;
1248 $input->set_text ('');
1249
1250 if ($text =~ /^\/(.*)/) {
1251 $::CONN->user_send ($1);
1252 } else {
1253 my $say_cmd = $::CFG->{say_command} || 'say';
1254 $::CONN->user_send ("$say_cmd $text");
1255 }
1256 if ($input->{refocus_map}) {
1257 delete $input->{refocus_map};
1258 $MAPWIDGET->focus_in
1259 }
1260
1261 0
1262 },
1263 on_escape => sub {
1264 $MAPWIDGET->grab_focus;
1265
1266 0
1267 },
1268 );
1269
1270 $CONSOLE = {
1271 window => $window,
1272 input => $input,
1273 };
1274
1275 $window
1276}
1277
1278sub autopickup_setup { 1600sub autopickup_setup {
1601 my $r = new CFPlus::UI::ScrolledWindow (
1602 expand => 1,
1603 scroll_y => 1
1604 );
1279 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 );
1280 1609
1281 for ( 1610 for (
1282 ["General", 0, 0, 1611 ["General", 0, 0,
1283 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1612 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1284 ["Inhibit autopickup" => PICKUP_INHIBIT], 1613 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1319 ], 1648 ],
1320 ["Weight/Value ratio", 2, 17] 1649 ["Weight/Value ratio", 2, 17]
1321 ) 1650 )
1322 { 1651 {
1323 my ($title, $x, $y, @bits) = @$_; 1652 my ($title, $x, $y, @bits) = @$_;
1324 $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]);
1325 1654
1326 for (@bits) { 1655 for (@bits) {
1327 ++$y; 1656 ++$y;
1328 1657
1329 my $mask = $_->[1]; 1658 my $mask = $_->[1];
1330 $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);
1331 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1660 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1332 state => $::CFG->{pickup} & $mask, 1661 state => $::CFG->{pickup} & $mask,
1333 on_changed => sub { 1662 on_changed => sub {
1334 my ($box, $value) = @_; 1663 my ($box, $value) = @_;
1335 1664
1336 if ($value) { 1665 if ($value) {
… …
1347 1676
1348 ${$_->[2]} = $checkbox if $_->[2]; 1677 ${$_->[2]} = $checkbox if $_->[2];
1349 } 1678 }
1350 } 1679 }
1351 1680
1352 $table->add (2, 18, new CFPlus::UI::ValSlider 1681 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1353 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1682 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1354 template => ">= 99", 1683 template => ">= 99",
1355 to_value => sub { ">= " . 5 * $_[0] }, 1684 to_value => sub { ">= " . 5 * $_[0] },
1356 on_changed => sub { 1685 on_changed => sub {
1357 my ($slider, $value) = @_; 1686 my ($slider, $value) = @_;
… …
1360 $::CFG->{pickup} |= int $value 1689 $::CFG->{pickup} |= int $value
1361 if $value; 1690 if $value;
1362 1; 1691 1;
1363 }); 1692 });
1364 1693
1365 $table->add (3, 18, new CFPlus::UI::Button 1694 $table->add_at (3, 18, new CFPlus::UI::Button
1366 text => "set", 1695 text => "set",
1367 on_activate => sub { 1696 on_activate => sub {
1368 $::CONN->send_command ("pickup $::CFG->{pickup}") 1697 $::CONN->send_command ("pickup $::CFG->{pickup}")
1369 if defined $::CONN; 1698 if defined $::CONN;
1370 0 1699 0
1371 }); 1700 });
1372 1701
1373 $table 1702 $r
1374} 1703}
1375 1704
1376my %SORT_ORDER = ( 1705my %SORT_ORDER = (
1377 type => undef, 1706 type => undef,
1378 mtime => sub { 1707 mtime => sub {
… …
1422 $sw1->add ($INV = new CFPlus::UI::Inventory); 1751 $sw1->add ($INV = new CFPlus::UI::Inventory);
1423 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1752 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1424 1753
1425 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1754 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1426 1755
1427 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1756 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1428 1757
1429 $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);
1430 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1759 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1431 1760
1432 # XXX: Call after $INVR = ... because set_opencont sets the items 1761 # XXX: Call after $INVR = ... because set_opencont sets the items
1433 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1762 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1434 1763
1435 $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;
1436} 1805}
1437 1806
1438sub toggle_player_page { 1807sub toggle_player_page {
1439 my ($widget) = @_; 1808 my ($widget) = @_;
1440 1809
… …
1459 1828
1460 my $ntb = 1829 my $ntb =
1461 $PL_NOTEBOOK = 1830 $PL_NOTEBOOK =
1462 new CFPlus::UI::Notebook expand => 1; 1831 new CFPlus::UI::Notebook expand => 1;
1463 1832
1464 $ntb->add ( 1833 $ntb->add_tab (
1465 "Statistics (F2)" => $STATS_PAGE = stats_window, 1834 "Statistics (F2)" => $STATS_PAGE = stats_window,
1466 "Shows statistics, where all your Stats and Resistances are shown." 1835 "Shows statistics, where all your Stats and Resistances are shown."
1467 ); 1836 );
1468 $ntb->add ( 1837 $ntb->add_tab (
1469 "Skills (F3)" => $SKILL_PAGE = skill_window, 1838 "Skills (F3)" => $SKILL_PAGE = skill_window,
1470 "Shows all your Skills." 1839 "Shows all your Skills."
1471 ); 1840 );
1472 1841
1473 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);
1474 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1843 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1475 $ntb->add ( 1844 $ntb->add_tab (
1476 "Spellbook (F4)" => $spellsw, 1845 "Spellbook (F4)" => $spellsw,
1477 "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."
1478 ); 1847 );
1479 $ntb->add ( 1848 $ntb->add_tab (
1480 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1849 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1481 "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 :). "
1482 . "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."
1483 ); 1852 );
1484 $ntb->add (Pickup => autopickup_setup, 1853 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1485 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 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.");
1486 1858
1487 $ntb->set_current_page ($INVENTORY_PAGE); 1859 $ntb->set_current_page ($INVENTORY_PAGE);
1488 1860
1489 $plwin->add ($ntb); 1861 $plwin->add ($ntb);
1490 $plwin 1862 $plwin
… …
1644 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2016 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1645 ); 2017 );
1646 $hb->add (new CFPlus::UI::Button 2018 $hb->add (new CFPlus::UI::Button
1647 text => "Quit anyway", 2019 text => "Quit anyway",
1648 expand => 1, 2020 expand => 1,
1649 on_activate => sub { exit }, 2021 on_activate => sub { Event::unloop_all },
1650 ); 2022 );
1651 } 2023 }
1652 2024
1653 $QUIT_DIALOG->show; 2025 $QUIT_DIALOG->show;
1654 $QUIT_DIALOG->grab_focus; 2026 $QUIT_DIALOG->grab_focus;
… …
1687 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2059 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1688 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 2060 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1689 2061
1690 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 2062 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1691 2063
1692 $table->add (0, 0, new CFPlus::UI::Button 2064 $table->add_at (0, 0, new CFPlus::UI::Button
1693 text => "Close", 2065 text => "Close",
1694 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>.", 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>.",
1695 on_activate => $close, 2067 on_activate => $close,
1696 ); 2068 );
1697 2069
1698 $table->add (2, 0, new CFPlus::UI::Button 2070 $table->add_at (2, 0, new CFPlus::UI::Button
1699 text => "Next", 2071 text => "Next",
1700 tooltip => "Show the next <b>Tip of the day</b>.", 2072 tooltip => "Show the next <b>Tip of the day</b>.",
1701 on_activate => sub { 2073 on_activate => sub {
1702 $close->(); 2074 $close->();
1703 &show_tip_of_the_day; 2075 &show_tip_of_the_day;
… …
1712 CFPlus::SDL_Init 2084 CFPlus::SDL_Init
1713 and die "SDL::Init failed!\n"; 2085 and die "SDL::Init failed!\n";
1714} 2086}
1715 2087
1716sub video_init { 2088sub video_init {
1717 sdl_init;
1718
1719 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2089 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1720 2090
1721 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2091 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1722 2092
1723 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2093 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1724 $FULLSCREEN = $CFG->{fullscreen}; 2094 $FULLSCREEN = $CFG->{fullscreen};
1725 $FAST = $CFG->{fast}; 2095 $FAST = $CFG->{fast};
1726 2096
1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 2097 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2098 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1729 2099
1730 $SDL_ACTIVE = 1; 2100 $SDL_ACTIVE = 1;
1731 $LAST_REFRESH = time - 0.01; 2101 $LAST_REFRESH = time - 0.01;
1732 2102
1733 CFPlus::OpenGL::init; 2103 CFPlus::OpenGL::init;
2104 CFPlus::Macro::init;
1734 2105
1735 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2106 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1736 2107
1737 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2108 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1738 2109
1739 ############################################################################# 2110 #############################################################################
1740 2111
1741 if ($DEBUG_STATUS) { 2112 if ($DEBUG_STATUS) {
1742 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2113 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1743 } else { 2114 } else {
1744 # 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 });
1745 2128
1746 $DEBUG_STATUS = new CFPlus::UI::Label 2129 $DEBUG_STATUS = new CFPlus::UI::Label
1747 padding => 0, 2130 padding => 0,
1748 z => 100, 2131 z => 100,
1749 force_x => "max", 2132 force_x => "max",
… …
1774 2157
1775 $MAPWIDGET = new CFPlus::MapWidget; 2158 $MAPWIDGET = new CFPlus::MapWidget;
1776 $MAPWIDGET->connect (activate_console => sub { 2159 $MAPWIDGET->connect (activate_console => sub {
1777 my ($mapwidget, $preset) = @_; 2160 my ($mapwidget, $preset) = @_;
1778 2161
1779 if ($CONSOLE) { 2162 $MESSAGE_WINDOW->activate_console ($preset)
1780 $CONSOLE->{input}->{auto_activated} = 1; 2163 if $MESSAGE_WINDOW;
1781 $CONSOLE->{input}->grab_focus;
1782
1783 if ($preset && $CONSOLE->{input}->get_text eq '') {
1784 $CONSOLE->{input}->set_text ($preset);
1785 }
1786 }
1787 }); 2164 });
1788 $MAPWIDGET->show; 2165 $MAPWIDGET->show;
1789 $MAPWIDGET->grab_focus; 2166 $MAPWIDGET->grab_focus;
1790 2167
1791 $LOGVIEW = new CFPlus::UI::TextScroller 2168 $COMPLETER = new CFPlus::MapWidget::Command::
1792 expand => 1, 2169 command => { },
1793 font => $FONT_FIXED, 2170 tooltip => "#completer_help",
1794 fontsize => $::CFG->{log_fontsize},
1795 indent => -4,
1796 can_hover => 1,
1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1800 ; 2171 ;
1801 2172
1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2173 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1803 title => "Setup", 2174 title => "Setup",
1804 name => "setup_dialog", 2175 name => "setup_dialog",
… …
1809 force_h => $::HEIGHT * 0.6, 2180 force_h => $::HEIGHT * 0.6,
1810 has_close_button => 1, 2181 has_close_button => 1,
1811 ; 2182 ;
1812 2183
1813 $METASERVER = metaserver_dialog; 2184 $METASERVER = metaserver_dialog;
2185 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1814 2186
1815 $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,
1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2188 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1817 2189
2190 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2191 "Configure the server to play on, your username and password.");
1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2192 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1819 "Configure the server to play on, your username, password and other server-related options."); 2193 "Configure other server related options.");
1820 $SETUP_NOTEBOOK->add (Client => client_setup, 2194 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1821 "Configure various client-specific settings."); 2195 "Configure various client-specific settings.");
1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2196 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1823 "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.");
1824 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2198 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1825 "Configure the use of audio, sound effects and background music."); 2199 "Configure the use of audio, sound effects and background music.");
1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2200 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1827 "Lets you define, edit and delete key bindings." 2201 "Lets you define, edit and delete key bindings."
1828 . "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 "
1829 . "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 "
1830 . "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. "
1831 . "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 "
1832 . "binding editor closes"); 2206 . "binding editor closes");
1833 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2207 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1834 "Some debuggin' options. Do not ask."); 2208 "Some debuggin' options. Do not ask.");
1835 2209
1836 $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
1837 2211
1838 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2212 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1839 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.");
1840 2214
1841 $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,
1842 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.");
1843 2217
1844 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
1845 2219
1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2220 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1866 tooltip => "Terminates the program", 2240 tooltip => "Terminates the program",
1867 on_activate => sub { 2241 on_activate => sub {
1868 if ($CONN) { 2242 if ($CONN) {
1869 open_quit_dialog; 2243 open_quit_dialog;
1870 } else { 2244 } else {
1871 exit; 2245 Event::unloop_all;
1872 } 2246 }
1873 0 2247 0
1874 }, 2248 },
1875 ); 2249 );
1876 2250
1877 $BUTTONBAR->show; 2251 $BUTTONBAR->show;
1878 $SETUP_DIALOG->show; 2252 $SETUP_DIALOG->show;
2253 $MESSAGE_WINDOW->show;
1879 } 2254 }
1880 2255
1881 $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]);
1882}
1883
1884sub setup_build_button {
1885 my ($enabled) = @_;
1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1889 text => "Build",
1890 tooltip => "Opens the ingame builder",
1891 on_activate => sub {
1892 if ($CONN) {
1893 $CONN->send_ext_req (builder_player_items => sub {
1894 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1895 });
1896 }
1897 0
1898 };
1899 $BUTTONBAR->add ($BUILD_BUTTON);
1900 } else {
1901 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1902 }
1903}
1904
1905sub open_ingame_editor {
1906 my ($msg) = @_;
1907
1908 my $win = new CFPlus::UI::Toplevel
1909 x => 0,
1910 y => 'center',
1911 z => 4,
1912 name => 'builder_window',
1913 force_w => int $WIDTH * 1/4,
1914 force_h => int $HEIGHT * 3/4,
1915 title => "In game builder",
1916 has_close_button => 1;
1917
1918 my $r = new CFPlus::UI::ScrolledWindow (
1919 expand => 1,
1920 scroll_y => 1
1921 );
1922 $r->add (my $vb = new CFPlus::UI::VBox);
1923 $win->add ($r);
1924
1925
1926 $vb->add (
1927 new CFPlus::UI::Button
1928 text => "Disable build mode",
1929 on_activate => sub { $::IN_BUILD_MODE = undef }
1930 );
1931 $vb->add (
1932 new CFPlus::UI::Button
1933 text => "ERASE",
1934 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1935 );
1936
1937 for my $itemarchname (
1938 sort {
1939 $msg->{items}->{$a}->{build_arch_name}
1940 cmp $msg->{items}->{$b}->{build_arch_name}
1941 } keys %{$msg->{items}}
1942 ) {
1943 my $info = $msg->{items}->{$itemarchname};
1944 $vb->add (
1945 new CFPlus::UI::Button text => $info->{build_arch_name},
1946 on_activate => sub {
1947 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1948
1949 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1950 build_mode_query_arch_info ();
1951 }
1952 }
1953 );
1954 }
1955
1956 $win->show;
1957}
1958
1959sub build_mode_query_arch_info {
1960 my ($iteminfo) = $::IN_BUILD_MODE;
1961 my $itemarchname = $iteminfo->{item};
1962 my $info = $iteminfo->{info};
1963
1964 my $dialog = new CFPlus::UI::Toplevel
1965 x => "center",
1966 y => "center",
1967 z => 50,
1968 force_w => int $WIDTH * 1/2,
1969 title => "Enter information for placement of '$itemarchname'",
1970 has_close_button => 1;
1971
1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1973
1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1975 my $row = 0;
1976 if ($info->{has_name}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1979 }
1980 if ($info->{has_text}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1982 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1983 }
1984 if ($info->{has_connection}) {
1985 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1986 $table->add (1, $row++,
1987 new CFPlus::UI::Entry
1988 expand => 1,
1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1991 );
1992 }
1993
1994 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1995 $hb->add (new CFPlus::UI::Button
1996 text => "Close",
1997 expand => 1,
1998 on_activate => sub { $dialog->hide; 0 },
1999 );
2000 $dialog->show;
2001} 2257}
2002 2258
2003sub video_shutdown { 2259sub video_shutdown {
2004 CFPlus::OpenGL::shutdown; 2260 CFPlus::OpenGL::shutdown;
2005 2261
2006 undef $SDL_ACTIVE; 2262 undef $SDL_ACTIVE;
2007} 2263}
2008 2264
2009my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2010my $bgmusic;#TODO#hack#d#
2011
2012sub audio_channel_finished {
2013 my ($channel) = @_;
2014
2015 #warn "channel $channel finished\n";#d#
2016}
2017
2018sub audio_music_finished {
2019 return unless $CFG->{bgm_enable};
2020
2021 # TODO: hack, do play loop and mood music
2022 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2023 $bgmusic->play (0);
2024
2025 push @bgmusic, shift @bgmusic;
2026}
2027
2028sub audio_init {
2029 if ($CFG->{audio_enable}) {
2030 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2031 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2032
2033 unless ($SDL_MIXER) {
2034 status "Unable to open sound device: there will be no sound";
2035 return;
2036 }
2037
2038 CFPlus::Mix_AllocateChannels 8;
2039 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2040
2041 audio_music_finished;
2042
2043 local $_;
2044 while (<$fh>) {
2045 next if /^\s*#/;
2046 next if /^\s*$/;
2047
2048 my ($file, $volume, $event) = split /\s+/, $_, 3;
2049
2050 push @SOUNDS, "$volume,$file";
2051
2052 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2053 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2054 $chunk->volume ($volume * 128 / 100);
2055 $chunk
2056 };
2057 }
2058 } else {
2059 status "unable to open sound config: $!";
2060 }
2061 }
2062}
2063
2064sub audio_shutdown {
2065 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2066 undef $SDL_MIXER;
2067 @SOUNDS = ();
2068 %AUDIO_CHUNKS = ();
2069}
2070
2071my %animate_object; 2265my %animate_object;
2072my $animate_timer; 2266my $animate_timer;
2073 2267
2074my $fps = 9; 2268my $fps = 9;
2075 2269
2076my %demo;#d#
2077
2078sub force_refresh { 2270sub force_refresh {
2271 if ($ENV{CFPLUS_DEBUG} & 4) {
2079 $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;
2080 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2273 debug sprintf "%3.2f", $fps;
2274 }
2081 2275
2082 $CFPlus::UI::ROOT->draw; 2276 $CFPlus::UI::ROOT->draw;
2083 2277 CFPlus::SDL_GL_SwapBuffers;
2084 $WANT_REFRESH = 0;
2085 $CAN_REFRESH = 0;
2086 $LAST_REFRESH = $NOW; 2278 $LAST_REFRESH = $NOW;
2087 2279 $WANT_REFRESH->stop;
2088 CFPlus::SDL_GL_SwapBuffers;
2089} 2280}
2090 2281
2282$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2283
2091my $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 {
2092 $NOW = time; 2285 $NOW = time;
2093 2286
2094 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2287 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2095 for CFPlus::SDL_PollEvent; 2288 for CFPlus::poll_events;
2096 2289
2097 if (%animate_object) { 2290 if (%animate_object) {
2098 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2291 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2099 $WANT_REFRESH++; 2292 $WANT_REFRESH->start;
2100 }
2101
2102 if ($WANT_REFRESH) {
2103 force_refresh;
2104 } else {
2105 $CAN_REFRESH = 1;
2106 } 2293 }
2107}); 2294});
2108 2295
2109sub animation_start { 2296sub animation_start {
2110 my ($widget) = @_; 2297 my ($widget) = @_;
… …
2114sub animation_stop { 2301sub animation_stop {
2115 my ($widget) = @_; 2302 my ($widget) = @_;
2116 delete $animate_object{$widget}; 2303 delete $animate_object{$widget};
2117} 2304}
2118 2305
2119# check once/second for faces that need to be prefetched
2120# this should, of course, only run on demand, but
2121# SDL forces worse things on us....
2122
2123Event->timer (after => 1, interval => 0.25, cb => sub {
2124 $CONN->face_prefetch
2125 if $CONN;
2126});
2127
2128%SDL_CB = ( 2306%SDL_CB = (
2129 CFPlus::SDL_QUIT => sub { 2307 CFPlus::SDL_QUIT => sub {
2130 exit; 2308 Event::unloop_all;
2131 }, 2309 },
2132 CFPlus::SDL_VIDEORESIZE => sub { 2310 CFPlus::SDL_VIDEORESIZE => sub {
2133 }, 2311 },
2134 CFPlus::SDL_VIDEOEXPOSE => sub { 2312 CFPlus::SDL_VIDEOEXPOSE => sub {
2135 CFPlus::UI::full_refresh; 2313 CFPlus::UI::full_refresh;
2136 }, 2314 },
2137 CFPlus::SDL_ACTIVEEVENT => sub { 2315 CFPlus::SDL_ACTIVEEVENT => sub {
2138# not useful, as APPACTIVE include sonly iconified state, not unmapped 2316# not useful, as APPACTIVE include sonly iconified state, not unmapped
2139# 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#
2140# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2319# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2141# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2320# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2142# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2321# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2143 }, 2322 },
2144 CFPlus::SDL_KEYDOWN => sub { 2323 CFPlus::SDL_KEYDOWN => sub {
… …
2173 CFPlus::DB::Server::run; 2352 CFPlus::DB::Server::run;
2174 2353
2175 CFPlus::UI::set_layout ($::CFG->{layout}); 2354 CFPlus::UI::set_layout ($::CFG->{layout});
2176 2355
2177 my %DEF_CFG = ( 2356 my %DEF_CFG = (
2178 sdl_mode => 0, 2357 sdl_mode => 0,
2179 width => 640,
2180 height => 480,
2181 fullscreen => 0, 2358 fullscreen => 0,
2182 fast => 0, 2359 fast => 0,
2360 force_opengl11 => undef,
2361 texture_compression => 1,
2183 map_scale => 1, 2362 map_scale => 1,
2184 fow_enable => 1, 2363 fow_enable => 1,
2185 fow_intensity => 0.45, 2364 fow_intensity => 0,
2186 fow_smooth => 0,
2187 map_smoothing => 1, 2365 map_smoothing => 1,
2188 gui_fontsize => 1, 2366 gui_fontsize => 1,
2189 log_fontsize => 0.7, 2367 log_fontsize => 0.7,
2190 gauge_fontsize => 1, 2368 gauge_fontsize => 1,
2191 gauge_size => 0.35, 2369 gauge_size => 0.35,
2192 stat_fontsize => 0.7, 2370 stat_fontsize => 0.7,
2193 mapsize => 100, 2371 mapsize => 100,
2194 say_command => 'chat',
2195 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,
2196 bgm_enable => 1, 2379 bgm_enable => 1,
2197 bgm_volume => 0.25, 2380 bgm_volume => 0.5,
2198 face_prefetch => 0,
2199 output_sync => 1, 2381 output_sync => 1,
2200 output_count => 1, 2382 output_count => 1,
2201 output_rate => "", 2383 output_rate => "",
2202 pickup => 0, 2384 pickup => 0,
2203 inv_sort => "mtime", 2385 inv_sort => "mtime",
2204 default => "profile", # default profile 2386 default => "profile", # default profile
2205 show_tips => 1, 2387 show_tips => 1,
2206 logview_max_par => 1000, 2388 logview_max_par => 1000,
2207 ); 2389 );
2208 2390
2209 while (my ($k, $v) = each %DEF_CFG) { 2391 while (my ($k, $v) = each %DEF_CFG) {
2210 $CFG->{$k} = $v unless exists $CFG->{$k}; 2392 $CFG->{$k} = $v unless exists $CFG->{$k};
2211 } 2393 }
… …
2225 } 2407 }
2226 } 2408 }
2227 2409
2228 sdl_init; 2410 sdl_init;
2229 2411
2230 @SDL_MODES = reverse 2412 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2231 grep $_->[0] >= 640 && $_->[1] >= 480, 2413 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2232 CFPlus::SDL_ListModes;
2233
2234 @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;
2235 2417
2236 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2418 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2237 2419
2238 { 2420 {
2239 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2421 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2268# } 2450# }
2269# my $t2 = Time::HiRes::time; 2451# my $t2 = Time::HiRes::time;
2270# warn $t2-$t1; 2452# warn $t2-$t1;
2271# } 2453# }
2272 2454
2273 $startup_done->();
2274
2275 video_init; 2455 video_init;
2276 audio_init; 2456 audio_init;
2277} 2457}
2278 2458
2279show_tip_of_the_day if $CFG->{show_tips}; 2459show_tip_of_the_day if $CFG->{show_tips};
2280 2460
2461Event->idle (cb => sub {
2462 $_[0]->w->cancel;
2463 $startup_done->();
2464});
2465
2281Event::loop; 2466Event::loop;
2467
2468#video_shutdown;
2469#audio_shutdown;
2282#CFPlus::SDL_Quit; 2470CFPlus::SDL_Quit;
2283#CFPlus::_exit 0;
2284
2285END {
2286 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop; 2471CFPlus::DB::Server::stop;
2288}
2289 2472
2290=head1 NAME 2473=head1 NAME
2291 2474
2292cfplus - A Crossfire+ and Crossfire game client 2475cfplus - A Crossfire TRT and Crossfire game client
2293 2476
2294=head1 SYNOPSIS 2477=head1 SYNOPSIS
2295 2478
2296Just run it - no commandline arguments are supported. 2479Just run it - no commandline arguments are supported.
2297 2480
2298=head1 USAGE 2481=head1 USAGE
2299 2482
2300cfplus 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
2301fullscreen and interactively. 2484be used in fullscreen mode and interactively.
2302 2485
2303=head1 DEBUGGING 2486=head1 DEBUGGING
2304 2487
2305 2488
2306CFPLUS_DEBUG - environment variable 2489CFPLUS_DEBUG - environment variable

Diff Legend

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