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.158 by root, Sun Jul 1 03:12:35 2007 UTC vs.
Revision 1.217 by root, Sun Aug 19 14:09:28 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
43 44
44 if ($^O eq "MSWin32") { 45 if ($^O eq "MSWin32") {
45 # relocatable 46 # relocatable
46 } else { 47 } else {
47 # unix, need to patch pango rc file 48 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules" 49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!"; 50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
50 local $/; 51 local $/;
51 my $rc = <$fh>; 52 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
53 54
54 mkdir "$tmp/pango-modules"; 55 mkdir "$tmp/pango-modules";
… …
70unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
71 if %PAR::LibCache; 72 if %PAR::LibCache;
72 73
73use Time::HiRes 'time'; 74use Time::HiRes 'time';
74use Event; 75use Event;
76use List::Util qw(max min);
75 77
76use Crossfire; 78use Crossfire;
77use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
78 80
79use Compress::LZF; 81use Compress::LZF;
… …
81use CFPlus; 83use CFPlus;
82use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
83use CFPlus::Protocol; 85use CFPlus::Protocol;
84use CFPlus::DB; 86use CFPlus::DB;
85use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
86use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
87use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
88use CFPlus::Pod; 92use CFPlus::Pod;
89use CFPlus::MapWidget; 93use CFPlus::MapWidget;
90use CFPlus::Macro; 94use CFPlus::Macro;
91 95
92$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
109our $CONN; 113our $CONN;
110our $PROFILE; # current profile 114our $PROFILE; # current profile
111our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
112 116
113our $WANT_REFRESH; 117our $WANT_REFRESH;
114our $CAN_REFRESH;
115 118
116our @SDL_MODES; 119our @SDL_MODES;
117our $WIDTH; 120our $WIDTH;
118our $HEIGHT; 121our $HEIGHT;
119our $FULLSCREEN; 122our $FULLSCREEN;
… …
124 127
125our $MAP; 128our $MAP;
126our $MAPMAP; 129our $MAPMAP;
127our $MAPWIDGET; 130our $MAPWIDGET;
128our $BUTTONBAR; 131our $BUTTONBAR;
129our $LOGVIEW;
130our $CONSOLE;
131our $METASERVER; 132our $METASERVER;
132our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
133our $QUIT_DIALOG; 134our $QUIT_DIALOG;
134our $HOST_ENTRY; 135our $HOST_ENTRY;
135our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
142our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
143 144
144our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
145our $PL_WINDOW; 146our $PL_WINDOW;
146 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
147our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
148our $STATS_PAGE; 152our $STATS_PAGE;
149our $SKILL_PAGE; 153our $SKILL_PAGE;
150our $SPELL_PAGE; 154our $SPELL_PAGE;
151our $SPELL_LIST; 155our $SPELL_LIST;
… …
157our $STATWIDS; 161our $STATWIDS;
158 162
159our $SDL_ACTIVE; 163our $SDL_ACTIVE;
160our %SDL_CB; 164our %SDL_CB;
161 165
162our $SDL_MIXER;
163our @SOUNDS; # event => file mapping
164our %AUDIO_CHUNKS; # audio files
165
166our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
167our $STATUSBOX; 167our $STATUSBOX;
168our $DEBUG_STATUS; 168our $DEBUG_STATUS;
169 169
170our $INV; 170our $INV;
171our $INVR; 171our $INVR;
172our $INV_RIGHT_HB; 172our $INVR_HB;
173 173
174our $PICKUP_CFG; 174#############################################################################
175
176our $IN_BUILD_MODE;
177our $BUILD_BUTTON;
178 175
179sub status { 176sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
181} 178}
182 179
… …
184 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
185} 182}
186 183
187sub message { 184sub message {
188 my ($para) = @_; 185 my ($para) = @_;
189 186 $MESSAGE_WINDOW->message ($para);
190 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
191
192 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
193
194 $LOGVIEW->add_paragraph ($para);
195 $LOGVIEW->scroll_to_bottom;
196} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face}
234 or return;
235
236 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) {
238 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face);
241 }
242 } else {
243 # fetch from database
244 CFPlus::DB::get res_data => $meta->{name}, sub {
245 my $rwops = new CFPlus::RW $_[0];
246 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
249 $AUDIO_CHUNK{$face} = $chunk;
250
251 audio_sound_push ($face);
252 };
253 }
254 }
255}
256
257sub audio_sound_play {
258 my ($face, $dx, $dy, $vol) = @_;
259
260 $SDL_MIXER
261 or return;
262 $CFG->{effects_enable}
263 or return;
264
265 my $queue = $AUDIO_PLAY{$face} ||= [];
266 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
267 audio_sound_push $face
268 unless @$queue > 1;
269}
270
271sub audio_music_set_meta {
272 my ($meta) = @_;
273
274 $MUSIC_PLAYING_META = $meta;
275 $MUSIC_PLAYING_WIDGET->set_markup (
276 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
277 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
278 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
279 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
280 );
281}
282
283sub audio_music_update_volume {
284 return unless $MUSIC_PLAYING_META;
285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
286 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
287 CFPlus::MixMusic::volume $base * $volume * 128;
288}
289
290sub audio_music_start {
291 my $meta = $MUSIC_PLAYING_META;
292
293 CFPlus::DB::get res_data => $meta->{name}, sub {
294 return unless $SDL_MIXER;
295
296 # music might have changed...
297 $meta eq $MUSIC_PLAYING_META
298 or return &audio_music_start ();
299
300 audio_music_update_volume;
301
302 $MUSIC_PLAYING_DATA = \$_[0];
303
304 my $rwops = $meta->{path}
305 ? new_from_file CFPlus::RW $meta->{path}
306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
307
308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
310
311 my $NOW = time;
312
313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
315 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
316 $MUSIC_START = time - $pos;
317 } else {
318 $MUSIC_PLAYER->play (0);
319 $MUSIC_START = time;
320 }
321
322 delete $meta->{stop_time};
323 delete $meta->{stop_pos};
324 }
325}
326
327sub audio_music_push {
328 return unless $SDL_MIXER;
329
330 my $fade_out;
331
332 if (@MUSIC_JINGLE) {
333 @MUSIC_HAVE = $MUSIC_JINGLE[0];
334 $fade_out = 333;
335 } else {
336 return unless $CFG->{bgm_enable};
337
338 my @have =
339 grep $_,
340 map $CONN->{music_meta}{$_},
341 @$MUSIC_WANT;
342
343 @MUSIC_HAVE = @have
344 if @have;
345
346 # default MUSIC_HAVE == MUSIC_DEFAULT
347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
348 $fade_out = 1000;
349 }
350
351 # if the currently playing song is acceptable, let it continue
352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
353
354 my $NOW = time;
355
356 if ($MUSIC_PLAYING_META) {
357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
358 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
359 CFPlus::MixMusic::fade_out $fade_out;
360 } else {
361 # sort by stop time, oldest first
362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
363
364 # if the most recently-played piece played very recently,
365 # resume it, else choose the oldest piece for rotation.
366 audio_music_set_meta
367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
368 ? $MUSIC_HAVE[-1]
369 : $MUSIC_HAVE[0];
370
371 audio_music_start;
372 }
373}
374
375sub audio_music_set_ambient {
376 my ($songs) = @_;
377
378 $MUSIC_WANT = $songs;
379 audio_music_push;
380}
381
382sub audio_music_finished {
383 # we compress multiple jingles of the same type
384 shift @MUSIC_JINGLE
385 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
386
387 $MUSIC_PLAYING_WIDGET->clear;
388
389 undef $MUSIC_PLAYER;
390 undef $MUSIC_PLAYING_META;
391 undef $MUSIC_PLAYING_DATA;
392
393 audio_music_push;
394}
395
396sub audio_init {
397 if ($CFG->{audio_enable}) {
398 $ENV{MIX_EFFECTSMAXSPEED} = 1;
399 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
400
401 unless ($SDL_MIXER) {
402 status "Unable to open sound device: there will be no sound";
403 return;
404 }
405
406 CFPlus::Mix_AllocateChannels 16;
407
408 audio_music_finished;
409 } else {
410 undef $SDL_MIXER;
411 }
412}
413
414sub audio_shutdown {
415 undef $MUSIC_PLAYER;
416 undef $MUSIC_PLAYING_META;
417 undef $MUSIC_PLAYING_DATA;
418
419 $MUSIC_WANT = [];
420 @MUSIC_JINGLE = ();
421 %AUDIO_PLAY = ();
422 %AUDIO_CHUNK = ();
423
424 CFPlus::Mix_CloseAudio if $SDL_MIXER;
425 undef $SDL_MIXER;
426}
427
428#############################################################################
197 429
198sub destroy_query_dialog { 430sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
201} 433}
… …
265 ellipsise => 0, 497 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 498 markup => "\nOr use your keyboard and the text entry below:\n";
267 499
268 unshift @dialog, my $table = new CFPlus::UI::Table; 500 unshift @dialog, my $table = new CFPlus::UI::Table;
269 501
270 $table->add (0, 0, new CFPlus::UI::Button 502 $table->add_at (0, 0, new CFPlus::UI::Button
271 text => "Next Race", 503 text => "Next Race",
272 on_activate => sub { 504 on_activate => sub {
273 $conn->send ("reply n"); 505 $conn->send ("reply n");
274 destroy_query_dialog $conn; 506 destroy_query_dialog $conn;
275 0 507 0
276 }, 508 },
277 ); 509 );
278 $table->add (2, 0, new CFPlus::UI::Button 510 $table->add_at (2, 0, new CFPlus::UI::Button
279 text => "Accept", 511 text => "Accept",
280 on_activate => sub { 512 on_activate => sub {
281 $conn->send ("reply d"); 513 $conn->send ("reply d");
282 destroy_query_dialog $conn; 514 destroy_query_dialog $conn;
283 0 515 0
… …
318 $conn->send ("reply $stat"); 550 $conn->send ("reply $stat");
319 destroy_query_dialog $conn; 551 destroy_query_dialog $conn;
320 return; 552 return;
321 } 553 }
322 554
323 $STATS_PAGE->show;
324 $MESSAGE_WINDOW->hide;
325
326 unshift @dialog, new CFPlus::UI::Label 555 unshift @dialog, new CFPlus::UI::Label
327 max_w => $::WIDTH * 0.4, 556 max_w => $::WIDTH * 0.4,
328 ellipsise => 0, 557 ellipsise => 0,
329 markup => "\nOr use your keyboard and the text entry below:\n"; 558 markup => "\nOr use your keyboard and the text entry below:\n";
330 559
331 unshift @dialog, my $table = new CFPlus::UI::Table; 560 unshift @dialog, my $table = new CFPlus::UI::Table;
332 561
333 # left: re-roll 562 # left: re-roll
334 $table->add (0, 0, new CFPlus::UI::Button 563 $table->add_at (0, 0, new CFPlus::UI::Button
335 text => "Roll Again", 564 text => "Roll Again",
336 on_activate => sub { 565 on_activate => sub {
337 $conn->send ("reply y"); 566 $conn->send ("reply y");
338 destroy_query_dialog $conn; 567 destroy_query_dialog $conn;
339 0 568 0
… …
353 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 582 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
354 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 583 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
355 ], 584 ],
356 ), 1 .. 2; 585 ), 1 .. 2;
357 586
358 $table->add (2, 0, new CFPlus::UI::Button 587 $table->add_at (2, 0, new CFPlus::UI::Button
359 text => "Swap Stats", 588 text => "Swap Stats",
360 on_activate => sub { 589 on_activate => sub {
361 $conn->{stat_change_with} = $sw2->{value}; 590 $conn->{stat_change_with} = $sw2->{value};
362 $conn->send ("reply $sw1->{value}"); 591 $conn->send ("reply $sw1->{value}");
363 destroy_query_dialog $conn; 592 destroy_query_dialog $conn;
364 0 593 0
365 }, 594 },
366 ); 595 );
367 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 596 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
368 597
369 # right: accept 598 # right: accept
370 $table->add (4, 0, new CFPlus::UI::Button 599 $table->add_at (4, 0, new CFPlus::UI::Button
371 text => "Accept", 600 text => "Accept",
372 on_activate => sub { 601 on_activate => sub {
373 $conn->send ("reply n"); 602 $conn->send ("reply n");
374 $STATS_PAGE->hide; 603 $STATS_PAGE->hide;
375 destroy_query_dialog $conn; 604 destroy_query_dialog $conn;
… …
456 maph => $mapsize, 685 maph => $mapsize,
457 686
458 client => "cfplus $CFPlus::VERSION $] $^O", 687 client => "cfplus $CFPlus::VERSION $] $^O",
459 688
460 map_widget => $MAPWIDGET, 689 map_widget => $MAPWIDGET,
461 logview => $LOGVIEW,
462 statusbox => $STATUSBOX, 690 statusbox => $STATUSBOX,
463 map => $MAP, 691 map => $MAP,
464 mapmap => $MAPMAP, 692 mapmap => $MAPMAP,
465 query => \&server_query, 693 query => \&server_query,
466 694
467 setup_req => { 695 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1, 696 smoothing => $CFG->{map_smoothing}*1,
469 },
470
471 sound_play => sub {
472 my ($x, $y, $soundnum, $type) = @_;
473
474 $SDL_MIXER
475 or return;
476
477 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
478 or return;
479
480 $chunk->play;
481 }, 697 },
482 }; 698 };
483 699
484 if ($CONN) { 700 if ($CONN) {
485 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
… …
497 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
498 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
499 $SPELL_LIST->clear_spells; 715 $SPELL_LIST->clear_spells;
500 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
501 717
718 &audio_music_set_ambient ([]);
719
502 return unless $CONN; 720 return unless $CONN;
503 721
504 status "connection closed"; 722 status "connection closed";
505 723
506 destroy_query_dialog $CONN; 724 destroy_query_dialog $CONN;
… …
515 733
516 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 734 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
517 735
518 my $row = 0; 736 my $row = 0;
519 737
520 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 738 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
521 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 739 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
522 can_events => 1, 740 can_events => 1,
523 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 741 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
524 742
743 my $vidmode_tooltip =
744 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
745 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
746
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
526 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 748 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
527 749
750 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
528 $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]); 751 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
529 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 752 tooltip => $vidmode_tooltip);
753 $hbox->add (my $mode_label = new CFPlus::UI::Label
754 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
755 can_events => 1, tooltip => $vidmode_tooltip);
530 756
531 $mode_slider->connect (changed => sub { 757 $mode_slider->connect (changed => sub {
532 my ($self, $value) = @_; 758 my ($self, $value) = @_;
533 759
534 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 760 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
535 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 761 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
536 }); 762 });
537 $mode_slider->emit (changed => $mode_slider->{range}[0]); 763 $mode_slider->emit (changed => $mode_slider->{range}[0]);
538 764
539 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 765 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
540 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
541 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
542 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
543 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
544 ); 770 );
545 771
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{force_opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
782 );
783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{texture_compression},
787 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
788 . "will save a lot of memory and increase performance. The compression algorithm "
789 . "can differ form card to card, so your mileage may vary.",
790 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
791 );
792
546 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
547 $table->add (1, $row++, new CFPlus::UI::CheckBox 794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
548 state => $CFG->{fast}, 795 state => $CFG->{fast},
549 tooltip => "Lower the visual quality considerably to speed up rendering.", 796 tooltip => "Lower the visual quality considerably to speed up rendering.",
550 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 797 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
551 ); 798 );
552 799
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 800 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
554 $table->add (1, $row++, new CFPlus::UI::Slider 801 $table->add_at (1, $row++, new CFPlus::UI::Slider
555 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 802 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
556 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 803 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
557 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 804 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
558 ); 805 );
559 806
560 $table->add (1, $row++, new CFPlus::UI::Button 807 $table->add_at (1, $row++, new CFPlus::UI::Button
561 expand => 1, align => 0, text => "Apply", 808 expand => 1, align => 0, text => "Apply",
562 tooltip => "Apply the video settings above.", 809 tooltip => "Apply the video settings above.",
563 on_activate => sub { 810 on_activate => sub {
564 video_shutdown (); 811 video_shutdown ();
565 video_init (); 812 video_init ();
566 0 813 0
567 } 814 }
568 ); 815 );
569 816
570 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 817 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
571 $table->add (1, $row++, new CFPlus::UI::Slider 818 $table->add_at (1, $row++, new CFPlus::UI::Slider
572 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 819 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
573 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 820 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
574 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 821 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
575 ); 822 );
576 823
577 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
578 $table->add (1, $row++, new CFPlus::UI::CheckBox 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
579 state => $CFG->{map_smoothing}, 826 state => $CFG->{map_smoothing},
580 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 827 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
581 . "This increases load on the graphics subsystem and works only with 2.x servers. " 828 . "This increases load on the graphics subsystem and works only with TRT servers. "
582 . "Changes take effect at next connection only.", 829 . "Changes take effect at next login only.",
583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 830 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
584 ); 831 );
585 832
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 833 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox 834 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{fow_enable}, 835 state => $CFG->{fow_enable},
589 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 836 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
590 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 837 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
591 ); 838 );
592 839
593 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 840 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
594 $table->add (1, $row++, new CFPlus::UI::Slider 841 $table->add_at (1, $row++, new CFPlus::UI::Slider
595 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 842 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
596 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 843 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 844 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
598 ); 845 );
599 846
600 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
601 $table->add (1, $row++, new CFPlus::UI::CheckBox
602 state => $CFG->{fow_smooth},
603 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
604 on_changed => sub {
605 my ($self, $value) = @_;
606 $CFG->{fow_smooth} = $value;
607 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
608 0
609 }
610 );
611
612 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 847 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
613 $table->add (1, $row++, new CFPlus::UI::Slider 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
614 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 849 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
615 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 850 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
851 . "but you still need to press apply to correctly re-layout the widget.",
616 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 852 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
617 ); 853 );
618 854
619 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 855 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
620 $table->add (1, $row++, new CFPlus::UI::Slider 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
621 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 857 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
622 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 858 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
623 on_changed => sub { 859 on_changed => sub {
624 $CFG->{gauge_fontsize} = $_[1]; 860 $CFG->{gauge_fontsize} = $_[1];
625 &set_gauge_window_fontsize; 861 &set_gauge_window_fontsize;
626 0 862 0
627 } 863 }
628 ); 864 );
629 865
630 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 866 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
631 $table->add (1, $row++, new CFPlus::UI::Slider 867 $table->add_at (1, $row++, new CFPlus::UI::Slider
632 range => [$CFG->{gauge_size}, 0.2, 0.8], 868 range => [$CFG->{gauge_size}, 0.2, 0.8],
633 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 869 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
634 on_changed => sub { 870 on_changed => sub {
635 $CFG->{gauge_size} = $_[1]; 871 $CFG->{gauge_size} = $_[1];
636 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 872 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
642} 878}
643 879
644sub audio_setup { 880sub audio_setup {
645 my $vbox = new CFPlus::UI::VBox; 881 my $vbox = new CFPlus::UI::VBox;
646 882
647 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 883 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
648 884
649 my $row = 0; 885 my $row = 0;
650 886
651 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 887 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
652 $table->add (1, $row++, new CFPlus::UI::CheckBox 888 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
653 state => $CFG->{audio_enable}, 889 state => $CFG->{audio_enable},
654 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.", 890 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.",
655 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 891 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
656 ); 892 );
657# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 893# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
658# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 894# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
659# $CFG->{effects_volume} = $_[1]; 895# $CFG->{effects_volume} = $_[1];
660# }); 896# });
897
898 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
899 $table->add_at (1, $row, new CFPlus::UI::CheckBox
900 expand => 1, state => $CFG->{effects_enable},
901 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
902 on_changed => sub {
903 $CFG->{effects_enable} = $_[1];
904 $CONN->update_fx_want if $CONN;
905 0
906 }
907 );
908 $table->add_at (2, $row++, new CFPlus::UI::Slider
909 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
910 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
911 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
912 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
913 );
914
661 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 915 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
662 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
663 $hbox->add (new CFPlus::UI::CheckBox 916 $table->add_at (1, $row, new CFPlus::UI::CheckBox
664 expand => 1, state => $CFG->{bgm_enable}, 917 expand => 1, state => $CFG->{bgm_enable},
665 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 918 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
666 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 919 on_changed => sub {
920 $CFG->{bgm_enable} = $_[1];
921 $CONN->update_fx_want if $CONN;
922 0
923 }
667 ); 924 );
668 $hbox->add (new CFPlus::UI::Slider 925 $table->add_at (2, $row++, new CFPlus::UI::Slider
669 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 926 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
670 tooltip => "The volume of the background music. Changes are instant.", 927 tooltip => "The volume of the background music. Changes are instant.",
671 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 928 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
672 ); 929 );
673 930
674 $table->add (1, $row++, new CFPlus::UI::Button 931 $table->add_at (1, $row++, new CFPlus::UI::Button
675 expand => 1, align => 0, text => "Apply", 932 c_colspan => 2, expand => 1, align => 0, text => "Apply",
676 tooltip => "Apply the audio settings", 933 tooltip => "Apply the audio settings",
677 on_activate => sub { 934 on_activate => sub {
678 audio_shutdown (); 935 audio_shutdown ();
679 audio_init (); 936 audio_init ();
680 0 937 0
… …
738} 995}
739 996
740sub debug_setup { 997sub debug_setup {
741 my $table = new CFPlus::UI::Table; 998 my $table = new CFPlus::UI::Table;
742 999
743 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1000 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
744 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1001 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
745 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1002 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
746 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1003 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
747 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1004 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
748 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1005 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
749 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1006 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
750 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1007 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
751 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1008 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
752 1009
753 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
754
755 for my $x (0..2) {
756 for my $y (0 .. 2) {
757 $table->add ($x + 3, $y,
758 new CFPlus::UI::Entry
759 text => $default_smooth[$x * 3 + $y],
760 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
761 );
762 }
763 }
764
765 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1010 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1011
1012 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1013 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1014 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1015 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1016 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1017 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1018
1019 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1020
1021 $c->add_items ({
1022 type => "line_loop",
1023 color => [0, 1, 0],
1024 width => 9,
1025 coord_mode => "abs",
1026 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1027 });
1028
1029 $c->add_items ({
1030 type => "lines",
1031 color => [1, 1, 0],
1032 width => 2,
1033 coord_mode => "rel",
1034 coord => [[0,0], [1,1], [1,0], [0,1]],
1035 });
1036
1037 $c->add_items ({
1038 type => "polygon",
1039 color => [0, 0.43, 0],
1040 width => 2,
1041 coord_mode => "rel",
1042 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1043 });
766 1044
767 $table 1045 $table
768} 1046}
769 1047
770sub stats_window { 1048sub stats_window {
… …
818 [2, 4, st_spd => "Spd", 10.54], 1096 [2, 4, st_spd => "Spd", 10.54],
819 [2, 5, st_wspd => "WSp", 10.54], 1097 [2, 5, st_wspd => "WSp", 10.54],
820 ) { 1098 ) {
821 my ($col, $row, $id, $label, $template) = @$_; 1099 my ($col, $row, $id, $label, $template) = @$_;
822 1100
823 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1101 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
824 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1102 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
825 align => +1, template => $template, tooltip => "#stat_$label"); 1103 align => +1, template => $template, tooltip => "#stat_$label");
826 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1104 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
827 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1105 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
828 align => -1, text => $label, tooltip => "#stat_$label"); 1106 align => -1, text => $label, tooltip => "#stat_$label");
829 } 1107 }
830 1108
831 $vb->add (new CFPlus::UI::FancyFrame 1109 $vb->add (new CFPlus::UI::FancyFrame
… …
872 cold => ["Cold", 1150 cold => ["Cold",
873 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1151 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
874 ghit => ["Ghost hit", 1152 ghit => ["Ghost hit",
875 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1153 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
876 ); 1154 );
1155
877 for (qw/slow holyw conf fire depl magic 1156 for (qw/slow holyw conf fire depl magic
878 drain acid pois para deat phys 1157 drain acid pois para deat phys
879 blind fear tund elec cold ghit/) 1158 blind fear tund elec cold ghit/)
880 { 1159 {
881 $tbl2->add ($col, $row, 1160 $tbl2->add_at ($col, $row,
882 $STATWIDS->{"res_$_"} = 1161 $STATWIDS->{"res_$_"} =
883 new CFPlus::UI::Label 1162 new CFPlus::UI::Label
884 font => $FONT_FIXED, 1163 font => $FONT_FIXED,
885 template => "-100%", 1164 template => "-100%",
886 align => +1, 1165 align => +1,
887 valign => 0, 1166 valign => 0,
888 can_events => 1, 1167 can_events => 1,
889 can_hover => 1, 1168 can_hover => 1,
890 tooltip => $resist_names{$_}->[1], 1169 tooltip => $resist_names{$_}->[1],
891 ); 1170 );
892 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1171 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
893 font => $FONT_FIXED, 1172 font => $FONT_FIXED,
894 can_hover => 1, 1173 can_hover => 1,
895 can_events => 1, 1174 can_events => 1,
896 path => "ui/resist/resist_$_.png", 1175 path => "ui/resist/resist_$_.png",
897 tooltip => $resist_names{$_}->[1], 1176 tooltip => $resist_names{$_}->[1],
898 ); 1177 );
899 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1178 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
900 text => $resist_names{$_}->[0], 1179 text => $resist_names{$_}->[0],
901 font => $FONT_FIXED, 1180 font => $FONT_FIXED,
902 can_hover => 1, 1181 can_hover => 1,
903 can_events => 1, 1182 can_events => 1,
904 tooltip => $resist_names{$_}->[1], 1183 tooltip => $resist_names{$_}->[1],
… …
937 return if $METASERVER_ATIME > time; 1216 return if $METASERVER_ATIME > time;
938 $METASERVER_ATIME = time + 60; 1217 $METASERVER_ATIME = time + 60;
939 1218
940 my $table = $METASERVER->{table}; 1219 my $table = $METASERVER->{table};
941 $table->clear; 1220 $table->clear;
942 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1221 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
943 1222
944 my $ok = 0; 1223 my $ok = 0;
945 1224
946 CFPlus::background { 1225 CFPlus::background {
947 my $ua = CFPlus::lwp_useragent; 1226 my $ua = CFPlus::lwp_useragent;
… …
958 "The time this server has been running without being restarted.", 1237 "The time this server has been running without being restarted.",
959 "The server software version - a '+' indicates a Crossfire+ server.", 1238 "The server software version - a '+' indicates a Crossfire+ server.",
960 "Short information about this server provided by its admins.", 1239 "Short information about this server provided by its admins.",
961 ); 1240 );
962 my @col = qw(#Users Host Uptime Version Description); 1241 my @col = qw(#Users Host Uptime Version Description);
963 $table->add ($_, 0, new CFPlus::UI::Label 1242 $table->add_at ($_, 0, new CFPlus::UI::Label
964 can_hover => 1, can_events => 1, 1243 can_hover => 1, can_events => 1,
965 align => 0, fg => [1, 1, 0], 1244 align => 0, fg => [1, 1, 0],
966 text => $col[$_], tooltip => $tip[$_]) 1245 text => $col[$_], tooltip => $tip[$_])
967 for 0 .. $#col; 1246 for 0 .. $#col;
968 1247
… …
990 1269
991 $m = [$users, $host, $uptime, $version, $desc]; 1270 $m = [$users, $host, $uptime, $version, $desc];
992 1271
993 $y++; 1272 $y++;
994 1273
995 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1274 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
996 (new CFPlus::UI::Button 1275 (new CFPlus::UI::Button
997 text => "Use", 1276 text => "Use",
998 tooltip => "Put this server into the <b>Host:Port</b> field", 1277 tooltip => "Put this server into the <b>Host:Port</b> field",
999 on_activate => sub { 1278 on_activate => sub {
1000 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1279 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1003 }, 1282 },
1004 ), 1283 ),
1005 (new CFPlus::UI::Empty expand => 1), 1284 (new CFPlus::UI::Empty expand => 1),
1006 ]); 1285 ]);
1007 1286
1008 $table->add ($_, $y, new CFPlus::UI::Label 1287 $table->add_at ($_, $y, new CFPlus::UI::Label
1009 max_w => $::WIDTH * 0.4, 1288 max_w => $::WIDTH * 0.4,
1010 ellipsise => 0, 1289 ellipsise => 0,
1011 align => $align[$_], 1290 align => $align[$_],
1012 text => $m->[$_], 1291 text => $m->[$_],
1013 tooltip => $tip[$_], 1292 tooltip => $tip[$_],
… …
1054 1333
1055 $vbox->add (new CFPlus::UI::FancyFrame 1334 $vbox->add (new CFPlus::UI::FancyFrame
1056 label => "Connection Settings", 1335 label => "Connection Settings",
1057 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1336 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1058 ); 1337 );
1059 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1338 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1060 1339
1061 { 1340 {
1062 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1341 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1063 1342
1064 $vbox->add ( 1343 $vbox->add (
1065 $HOST_ENTRY = new CFPlus::UI::Entry 1344 $HOST_ENTRY = new CFPlus::UI::Entry
1066 expand => 1, 1345 expand => 1,
1067 text => $CFG->{profile}{default}{host}, 1346 text => $CFG->{profile}{default}{host},
1068 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1347 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1069 on_changed => sub { 1348 on_changed => sub {
1070 my ($self, $value) = @_; 1349 my ($self, $value) = @_;
1071 $CFG->{profile}{default}{host} = $value; 1350 $CFG->{profile}{default}{host} = $value;
1072 0 1351 1
1073 } 1352 }
1074 ); 1353 );
1075 1354
1076 $vbox->add (new CFPlus::UI::Button 1355 $vbox->add (new CFPlus::UI::Button
1077 expand => 1, 1356 expand => 1,
1078 text => "Server List", 1357 text => "Server List",
1079 other => $METASERVER, 1358 other => $METASERVER,
1080 tooltip => "Show a list of available crossfire servers", 1359 tooltip => "Show a list of available crossfire servers",
1081 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1360 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1082 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1361 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1083 ); 1362 );
1084 } 1363 }
1085 1364
1086 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1365 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1087 $table->add (1, 4, new CFPlus::UI::Entry 1366 $table->add_at (1, 4, new CFPlus::UI::Entry
1088 text => $CFG->{profile}{default}{user}, 1367 text => $CFG->{profile}{default}{user},
1089 tooltip => "The name of your character on the server", 1368 tooltip => "The name of your character on the server",
1090 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1369 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1091 ); 1370 );
1092 1371
1093 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1372 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1094 $table->add (1, 5, new CFPlus::UI::Entry 1373 $table->add_at (1, 5, new CFPlus::UI::Entry
1095 text => $CFG->{profile}{default}{password}, 1374 text => $CFG->{profile}{default}{password},
1096 hidden => 1, 1375 hidden => 1,
1097 tooltip => "The password for your character", 1376 tooltip => "The password for your character",
1098 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1377 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1099 ); 1378 );
1100 1379
1101 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1380 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1102 $table->add (1, 7, new CFPlus::UI::Slider 1381 $table->add_at (1, 7, new CFPlus::UI::Slider
1103 force_w => 100, 1382 force_w => 100,
1104 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1383 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1105 tooltip => "This is the size of the portion of the map update the server sends you. " 1384 tooltip => "This is the size of the portion of the map update the server sends you. "
1106 . "If you set this to a high value you will be able to see further, " 1385 . "If you set this to a high value you will be able to see further, "
1107 . "but you also increase bandwidth requirements and latency. " 1386 . "but you also increase bandwidth requirements and latency. "
1108 . "This option is only used once at log-in.", 1387 . "This option is only used once at log-in.",
1109 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1388 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1110 ); 1389 );
1111 1390
1112 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1113 $table->add (1, 8, new CFPlus::UI::CheckBox
1114 state => $CFG->{face_prefetch},
1115 tooltip => "<b>Background Image Prefetch</b>\n\n"
1116 . "If enabled, the client automatically pre-fetches images from the server. "
1117 . "This might increase or create lag, but increases the chances "
1118 . "of faces being ready for display when you encounter them. "
1119 . "It also uses up server bandwidth on every connect, "
1120 . "so only set it if you really need to prefetch images. "
1121 . "This option can be set and unset any time.",
1122 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1123 );
1124
1125 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1391 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1126 $table->add (1, 9, new CFPlus::UI::Entry 1392 $table->add_at (1, 8, new CFPlus::UI::Entry
1127 text => $CFG->{output_rate}, 1393 text => $CFG->{output_rate},
1128 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1394 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1129 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1395 . "when sending data. When 0 or unset, the server "
1130 . "default will be used, which is usually around 100kb/s.", 1396 . "default will be used, which is usually around 100kb/s. Most servers will "
1397 . "dynamically find an optimal rate, so adjust this only when necessary.",
1131 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1398 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1132 ); 1399 );
1133 1400
1134 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1401 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1135 $table->add (1, 10, new CFPlus::UI::Entry 1402 $table->add_at (1, 9, new CFPlus::UI::Entry
1136 text => $CFG->{output_count}, 1403 text => $CFG->{output_count},
1137 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1404 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1138 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1405 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1139 ); 1406 );
1140 1407
1141 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1408 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1142 $table->add (1, 11, new CFPlus::UI::Entry 1409 $table->add_at (1, 10, new CFPlus::UI::Entry
1143 text => $CFG->{output_sync}, 1410 text => $CFG->{output_sync},
1144 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1411 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1145 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1412 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1146 ); 1413 );
1147 1414
1148 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1415 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1149 expand => 1, 1416 expand => 1,
1150 align => 0, 1417 align => 0,
1151 text => "Login", 1418 text => "Login",
1152 on_activate => sub { 1419 on_activate => sub {
1153 $CONN ? stop_game 1420 $CONN ? stop_game
1154 : start_game; 1421 : start_game;
1155 0 1422 1
1156 }, 1423 },
1157 ); 1424 );
1158 1425
1159 $vbox->add (new CFPlus::UI::FancyFrame 1426 $vbox->add (new CFPlus::UI::FancyFrame
1160 label => "Server Info", 1427 label => "Server Info",
… …
1167sub client_setup { 1434sub client_setup {
1168 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1435 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1169 1436
1170 my $row = 0; 1437 my $row = 0;
1171 1438
1172 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1173 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1174 text => $CFG->{say_command},
1175 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. "
1176 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1177 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1178 on_changed => sub {
1179 my ($self, $value) = @_;
1180 $CFG->{say_command} = $value;
1181 0
1182 }
1183 );
1184
1185 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1439 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1186 $table->add (1, $row++, new CFPlus::UI::CheckBox 1440 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1187 state => $CFG->{show_tips}, 1441 state => $CFG->{show_tips},
1188 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1442 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1189 on_changed => sub { 1443 on_changed => sub {
1190 my ($self, $value) = @_; 1444 my ($self, $value) = @_;
1191 $CFG->{show_tips} = $value; 1445 $CFG->{show_tips} = $value;
1192 0 1446 0
1193 } 1447 }
1194 ); 1448 );
1195 1449
1196 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1450 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1197 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1451 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1198 text => $CFG->{logview_max_par}, 1452 text => $CFG->{logview_max_par},
1199 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1453 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1200 . "sends more messages than this number, older messages get removed to save memory and " 1454 . "sends more messages than this number, older messages get removed to save memory and "
1201 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1455 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1202 on_changed => sub { 1456 on_changed => sub {
1203 my ($self, $value) = @_; 1457 my ($self, $value) = @_;
1204 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1458 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1205 0 1459 0
1206 }, 1460 },
1207 ); 1461 );
1208 1462
1209 $table 1463 $table
1210} 1464}
1211 1465
1212sub message_window {
1213 my $window = new CFPlus::UI::Toplevel
1214 name => "message_window",
1215 title => "Messages",
1216 border_bg => [1, 1, 1, 1],
1217 x => "max",
1218 y => 0,
1219 force_w => $::WIDTH * 0.4,
1220 force_h => $::HEIGHT * 0.5,
1221 child => (my $vbox = new CFPlus::UI::VBox),
1222 has_close_button => 1;
1223
1224 $vbox->add ($LOGVIEW);
1225
1226 $vbox->add (my $input = new CFPlus::UI::Entry
1227 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1228 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1229 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1230 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1231 on_focus_in => sub {
1232 my ($input, $prev_focus) = @_;
1233
1234 delete $input->{refocus_map};
1235
1236 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1237 $input->{refocus_map} = 1;
1238 }
1239 delete $input->{auto_activated};
1240
1241 0
1242 },
1243 on_activate => sub {
1244 my ($input, $text) = @_;
1245 $input->set_text ('');
1246
1247 if ($text =~ /^\/(.*)/) {
1248 $::CONN->user_send ($1);
1249 } else {
1250 my $say_cmd = $::CFG->{say_command} || 'say';
1251 $::CONN->user_send ("$say_cmd $text");
1252 }
1253 if ($input->{refocus_map}) {
1254 delete $input->{refocus_map};
1255 $MAPWIDGET->focus_in
1256 }
1257
1258 0
1259 },
1260 on_escape => sub {
1261 $MAPWIDGET->grab_focus;
1262
1263 0
1264 },
1265 );
1266
1267 $CONSOLE = {
1268 window => $window,
1269 input => $input,
1270 };
1271
1272 $window
1273}
1274
1275sub autopickup_setup { 1466sub autopickup_setup {
1467 my $r = new CFPlus::UI::ScrolledWindow (
1468 expand => 1,
1469 scroll_y => 1
1470 );
1276 my $table = new CFPlus::UI::Table; 1471 $r->add (my $table = new CFPlus::UI::Table
1472 row_expand => [0],
1473 col_expand => [0, 1, 0, 1],
1474 );
1277 1475
1278 for ( 1476 for (
1279 ["General", 0, 0, 1477 ["General", 0, 0,
1280 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1478 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1281 ["Inhibit autopickup" => PICKUP_INHIBIT], 1479 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1316 ], 1514 ],
1317 ["Weight/Value ratio", 2, 17] 1515 ["Weight/Value ratio", 2, 17]
1318 ) 1516 )
1319 { 1517 {
1320 my ($title, $x, $y, @bits) = @$_; 1518 my ($title, $x, $y, @bits) = @$_;
1321 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1519 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1322 1520
1323 for (@bits) { 1521 for (@bits) {
1324 ++$y; 1522 ++$y;
1325 1523
1326 my $mask = $_->[1]; 1524 my $mask = $_->[1];
1327 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1525 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1328 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1526 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1329 state => $::CFG->{pickup} & $mask, 1527 state => $::CFG->{pickup} & $mask,
1330 on_changed => sub { 1528 on_changed => sub {
1331 my ($box, $value) = @_; 1529 my ($box, $value) = @_;
1332 1530
1333 if ($value) { 1531 if ($value) {
… …
1344 1542
1345 ${$_->[2]} = $checkbox if $_->[2]; 1543 ${$_->[2]} = $checkbox if $_->[2];
1346 } 1544 }
1347 } 1545 }
1348 1546
1349 $table->add (2, 18, new CFPlus::UI::ValSlider 1547 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1350 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1548 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1351 template => ">= 99", 1549 template => ">= 99",
1352 to_value => sub { ">= " . 5 * $_[0] }, 1550 to_value => sub { ">= " . 5 * $_[0] },
1353 on_changed => sub { 1551 on_changed => sub {
1354 my ($slider, $value) = @_; 1552 my ($slider, $value) = @_;
… …
1357 $::CFG->{pickup} |= int $value 1555 $::CFG->{pickup} |= int $value
1358 if $value; 1556 if $value;
1359 1; 1557 1;
1360 }); 1558 });
1361 1559
1362 $table->add (3, 18, new CFPlus::UI::Button 1560 $table->add_at (3, 18, new CFPlus::UI::Button
1363 text => "set", 1561 text => "set",
1364 on_activate => sub { 1562 on_activate => sub {
1365 $::CONN->send_command ("pickup $::CFG->{pickup}") 1563 $::CONN->send_command ("pickup $::CFG->{pickup}")
1366 if defined $::CONN; 1564 if defined $::CONN;
1367 0 1565 0
1368 }); 1566 });
1369 1567
1370 $table 1568 $r
1371} 1569}
1372 1570
1373my %SORT_ORDER = ( 1571my %SORT_ORDER = (
1374 type => undef, 1572 type => undef,
1375 mtime => sub { 1573 mtime => sub {
… …
1419 $sw1->add ($INV = new CFPlus::UI::Inventory); 1617 $sw1->add ($INV = new CFPlus::UI::Inventory);
1420 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1618 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1421 1619
1422 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1620 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1423 1621
1424 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1622 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1425 1623
1426 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1624 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1427 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1625 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1428 1626
1429 # XXX: Call after $INVR = ... because set_opencont sets the items 1627 # XXX: Call after $INVR = ... because set_opencont sets the items
1430 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1628 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1431 1629
1432 $hb 1630 $hb
1631}
1632
1633sub media_window {
1634 my $vb = new CFPlus::UI::VBox;
1635
1636 $vb->add (new CFPlus::UI::FancyFrame
1637 label => "Currently playing music",
1638 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1639 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1640 );
1641
1642 $vb->add (new CFPlus::UI::FancyFrame
1643 label => "Other media used in this session",
1644 expand => 1,
1645 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1646 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1647 );
1648
1649 $vb
1650}
1651
1652sub add_license {
1653 my ($meta) = @_;
1654
1655 $meta = $meta->{meta}
1656 or return;
1657
1658 $meta->{license} || $meta->{author} || $meta->{source}
1659 or return;
1660
1661 $LICENSE_WIDGET->add_paragraph ({
1662 fg => [1, 1, 1, 1],
1663 markup => "<small>"
1664 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1665 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1666 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1667 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1668 . "</small>",
1669 });
1670 $LICENSE_WIDGET->scroll_to_bottom;
1433} 1671}
1434 1672
1435sub toggle_player_page { 1673sub toggle_player_page {
1436 my ($widget) = @_; 1674 my ($widget) = @_;
1437 1675
… …
1456 1694
1457 my $ntb = 1695 my $ntb =
1458 $PL_NOTEBOOK = 1696 $PL_NOTEBOOK =
1459 new CFPlus::UI::Notebook expand => 1; 1697 new CFPlus::UI::Notebook expand => 1;
1460 1698
1461 $ntb->add ( 1699 $ntb->add_tab (
1462 "Statistics (F2)" => $STATS_PAGE = stats_window, 1700 "Statistics (F2)" => $STATS_PAGE = stats_window,
1463 "Shows statistics, where all your Stats and Resistances are shown." 1701 "Shows statistics, where all your Stats and Resistances are shown."
1464 ); 1702 );
1465 $ntb->add ( 1703 $ntb->add_tab (
1466 "Skills (F3)" => $SKILL_PAGE = skill_window, 1704 "Skills (F3)" => $SKILL_PAGE = skill_window,
1467 "Shows all your Skills." 1705 "Shows all your Skills."
1468 ); 1706 );
1469 1707
1470 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1708 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1471 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1709 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1472 $ntb->add ( 1710 $ntb->add_tab (
1473 "Spellbook (F4)" => $spellsw, 1711 "Spellbook (F4)" => $spellsw,
1474 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1712 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1475 ); 1713 );
1476 $ntb->add ( 1714 $ntb->add_tab (
1477 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1715 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1478 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1716 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1479 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1717 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1480 ); 1718 );
1481 $ntb->add (Pickup => autopickup_setup, 1719 $ntb->add_tab (Pickup => autopickup_setup,
1482 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1720 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1721
1722 $ntb->add_tab (Media => media_window,
1723 "License, Author and Source info for media sent by the server.");
1483 1724
1484 $ntb->set_current_page ($INVENTORY_PAGE); 1725 $ntb->set_current_page ($INVENTORY_PAGE);
1485 1726
1486 $plwin->add ($ntb); 1727 $plwin->add ($ntb);
1487 $plwin 1728 $plwin
… …
1641 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1882 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1642 ); 1883 );
1643 $hb->add (new CFPlus::UI::Button 1884 $hb->add (new CFPlus::UI::Button
1644 text => "Quit anyway", 1885 text => "Quit anyway",
1645 expand => 1, 1886 expand => 1,
1646 on_activate => sub { exit }, 1887 on_activate => sub { Event::unloop_all },
1647 ); 1888 );
1648 } 1889 }
1649 1890
1650 $QUIT_DIALOG->show; 1891 $QUIT_DIALOG->show;
1651 $QUIT_DIALOG->grab_focus; 1892 $QUIT_DIALOG->grab_focus;
… …
1684 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1925 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1685 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1926 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1686 1927
1687 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1928 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1688 1929
1689 $table->add (0, 0, new CFPlus::UI::Button 1930 $table->add_at (0, 0, new CFPlus::UI::Button
1690 text => "Close", 1931 text => "Close",
1691 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>.", 1932 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>.",
1692 on_activate => $close, 1933 on_activate => $close,
1693 ); 1934 );
1694 1935
1695 $table->add (2, 0, new CFPlus::UI::Button 1936 $table->add_at (2, 0, new CFPlus::UI::Button
1696 text => "Next", 1937 text => "Next",
1697 tooltip => "Show the next <b>Tip of the day</b>.", 1938 tooltip => "Show the next <b>Tip of the day</b>.",
1698 on_activate => sub { 1939 on_activate => sub {
1699 $close->(); 1940 $close->();
1700 &show_tip_of_the_day; 1941 &show_tip_of_the_day;
… …
1709 CFPlus::SDL_Init 1950 CFPlus::SDL_Init
1710 and die "SDL::Init failed!\n"; 1951 and die "SDL::Init failed!\n";
1711} 1952}
1712 1953
1713sub video_init { 1954sub video_init {
1714 sdl_init;
1715
1716 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1955 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1717 1956
1718 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1957 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1719 1958
1720 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1959 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1721 $FULLSCREEN = $CFG->{fullscreen}; 1960 $FULLSCREEN = $CFG->{fullscreen};
1722 $FAST = $CFG->{fast}; 1961 $FAST = $CFG->{fast};
1723 1962
1724 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1963 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1725 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1964 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1726 1965
1727 $SDL_ACTIVE = 1; 1966 $SDL_ACTIVE = 1;
1728 $LAST_REFRESH = time - 0.01; 1967 $LAST_REFRESH = time - 0.01;
1729 1968
… …
1771 2010
1772 $MAPWIDGET = new CFPlus::MapWidget; 2011 $MAPWIDGET = new CFPlus::MapWidget;
1773 $MAPWIDGET->connect (activate_console => sub { 2012 $MAPWIDGET->connect (activate_console => sub {
1774 my ($mapwidget, $preset) = @_; 2013 my ($mapwidget, $preset) = @_;
1775 2014
1776 if ($CONSOLE) { 2015 $MESSAGE_WINDOW->activate_console ($preset)
1777 $CONSOLE->{input}->{auto_activated} = 1; 2016 if $MESSAGE_WINDOW;
1778 $CONSOLE->{input}->grab_focus;
1779
1780 if ($preset && $CONSOLE->{input}->get_text eq '') {
1781 $CONSOLE->{input}->set_text ($preset);
1782 }
1783 }
1784 }); 2017 });
1785 $MAPWIDGET->show; 2018 $MAPWIDGET->show;
1786 $MAPWIDGET->grab_focus; 2019 $MAPWIDGET->grab_focus;
1787
1788 $LOGVIEW = new CFPlus::UI::TextScroller
1789 expand => 1,
1790 font => $FONT_FIXED,
1791 fontsize => $::CFG->{log_fontsize},
1792 indent => -4,
1793 can_hover => 1,
1794 can_events => 1,
1795 max_par => $CFG->{logview_max_par},
1796 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1797 ;
1798 2020
1799 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2021 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1800 title => "Setup", 2022 title => "Setup",
1801 name => "setup_dialog", 2023 name => "setup_dialog",
1802 x => 'center', 2024 x => 'center',
… …
1806 force_h => $::HEIGHT * 0.6, 2028 force_h => $::HEIGHT * 0.6,
1807 has_close_button => 1, 2029 has_close_button => 1,
1808 ; 2030 ;
1809 2031
1810 $METASERVER = metaserver_dialog; 2032 $METASERVER = metaserver_dialog;
2033 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1811 2034
1812 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2035 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1813 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2036 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1814 2037
1815 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2038 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1816 "Configure the server to play on, your username, password and other server-related options."); 2039 "Configure the server to play on, your username, password and other server-related options.");
1817 $SETUP_NOTEBOOK->add (Client => client_setup, 2040 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1818 "Configure various client-specific settings."); 2041 "Configure various client-specific settings.");
1819 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2042 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1820 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2043 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1821 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2044 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1822 "Configure the use of audio, sound effects and background music."); 2045 "Configure the use of audio, sound effects and background music.");
1823 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2046 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1824 "Lets you define, edit and delete key bindings." 2047 "Lets you define, edit and delete key bindings."
1825 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2048 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1826 . "with nothing set and the recording started. After doing the actions you " 2049 . "with nothing set and the recording started. After doing the actions you "
1827 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2050 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1828 . "After pressing the combo the binding will be saved automatically and the " 2051 . "After pressing the combo the binding will be saved automatically and the "
1829 . "binding editor closes"); 2052 . "binding editor closes");
1830 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2053 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1831 "Some debuggin' options. Do not ask."); 2054 "Some debuggin' options. Do not ask.");
1832 2055
1833 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2056 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1834 2057
1835 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2058 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1836 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2059 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1837 2060
1838 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2061 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1839 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2062 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1840 2063
1841 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 2064 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
1842 2065
1843 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2066 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1863 tooltip => "Terminates the program", 2086 tooltip => "Terminates the program",
1864 on_activate => sub { 2087 on_activate => sub {
1865 if ($CONN) { 2088 if ($CONN) {
1866 open_quit_dialog; 2089 open_quit_dialog;
1867 } else { 2090 } else {
1868 exit; 2091 Event::unloop_all;
1869 } 2092 }
1870 0 2093 0
1871 }, 2094 },
1872 ); 2095 );
1873 2096
1874 $BUTTONBAR->show; 2097 $BUTTONBAR->show;
1875 $SETUP_DIALOG->show; 2098 $SETUP_DIALOG->show;
2099 $MESSAGE_WINDOW->show;
1876 } 2100 }
1877 2101
1878 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2102 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1879}
1880
1881sub setup_build_button {
1882 my ($enabled) = @_;
1883 if ($enabled) {
1884 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1885 $BUILD_BUTTON ||= new CFPlus::UI::Button
1886 text => "Build",
1887 tooltip => "Opens the ingame builder",
1888 on_activate => sub {
1889 if ($CONN) {
1890 $CONN->send_ext_req (builder_player_items => sub {
1891 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1892 });
1893 }
1894 0
1895 };
1896 $BUTTONBAR->add ($BUILD_BUTTON);
1897 } else {
1898 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1899 }
1900}
1901
1902sub open_ingame_editor {
1903 my ($msg) = @_;
1904
1905 my $win = new CFPlus::UI::Toplevel
1906 x => 0,
1907 y => 'center',
1908 z => 4,
1909 name => 'builder_window',
1910 force_w => int $WIDTH * 1/4,
1911 force_h => int $HEIGHT * 3/4,
1912 title => "In game builder",
1913 has_close_button => 1;
1914
1915 my $r = new CFPlus::UI::ScrolledWindow (
1916 expand => 1,
1917 scroll_y => 1
1918 );
1919 $r->add (my $vb = new CFPlus::UI::VBox);
1920 $win->add ($r);
1921
1922
1923 $vb->add (
1924 new CFPlus::UI::Button
1925 text => "Disable build mode",
1926 on_activate => sub { $::IN_BUILD_MODE = undef }
1927 );
1928 $vb->add (
1929 new CFPlus::UI::Button
1930 text => "ERASE",
1931 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1932 );
1933
1934 for my $itemarchname (
1935 sort {
1936 $msg->{items}->{$a}->{build_arch_name}
1937 cmp $msg->{items}->{$b}->{build_arch_name}
1938 } keys %{$msg->{items}}
1939 ) {
1940 my $info = $msg->{items}->{$itemarchname};
1941 $vb->add (
1942 new CFPlus::UI::Button text => $info->{build_arch_name},
1943 on_activate => sub {
1944 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1945
1946 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1947 build_mode_query_arch_info ();
1948 }
1949 }
1950 );
1951 }
1952
1953 $win->show;
1954}
1955
1956sub build_mode_query_arch_info {
1957 my ($iteminfo) = $::IN_BUILD_MODE;
1958 my $itemarchname = $iteminfo->{item};
1959 my $info = $iteminfo->{info};
1960
1961 my $dialog = new CFPlus::UI::Toplevel
1962 x => "center",
1963 y => "center",
1964 z => 50,
1965 force_w => int $WIDTH * 1/2,
1966 title => "Enter information for placement of '$itemarchname'",
1967 has_close_button => 1;
1968
1969 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1970
1971 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1972 my $row = 0;
1973 if ($info->{has_name}) {
1974 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1975 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1976 }
1977 if ($info->{has_text}) {
1978 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1979 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1980 }
1981 if ($info->{has_connection}) {
1982 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1983 $table->add (1, $row++,
1984 new CFPlus::UI::Entry
1985 expand => 1,
1986 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1987 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1988 );
1989 }
1990
1991 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1992 $hb->add (new CFPlus::UI::Button
1993 text => "Close",
1994 expand => 1,
1995 on_activate => sub { $dialog->hide; 0 },
1996 );
1997 $dialog->show;
1998} 2103}
1999 2104
2000sub video_shutdown { 2105sub video_shutdown {
2001 CFPlus::OpenGL::shutdown; 2106 CFPlus::OpenGL::shutdown;
2002 2107
2003 undef $SDL_ACTIVE; 2108 undef $SDL_ACTIVE;
2004} 2109}
2005 2110
2006my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2007my $bgmusic;#TODO#hack#d#
2008
2009sub audio_channel_finished {
2010 my ($channel) = @_;
2011
2012 #warn "channel $channel finished\n";#d#
2013}
2014
2015sub audio_music_finished {
2016 return unless $CFG->{bgm_enable};
2017
2018 # TODO: hack, do play loop and mood music
2019 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2020 $bgmusic->play (0);
2021
2022 push @bgmusic, shift @bgmusic;
2023}
2024
2025sub audio_init {
2026 if ($CFG->{audio_enable}) {
2027 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2028 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2029
2030 unless ($SDL_MIXER) {
2031 status "Unable to open sound device: there will be no sound";
2032 return;
2033 }
2034
2035 CFPlus::Mix_AllocateChannels 8;
2036 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2037
2038 audio_music_finished;
2039
2040 local $_;
2041 while (<$fh>) {
2042 next if /^\s*#/;
2043 next if /^\s*$/;
2044
2045 my ($file, $volume, $event) = split /\s+/, $_, 3;
2046
2047 push @SOUNDS, "$volume,$file";
2048
2049 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2050 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2051 $chunk->volume ($volume * 128 / 100);
2052 $chunk
2053 };
2054 }
2055 } else {
2056 status "unable to open sound config: $!";
2057 }
2058 }
2059}
2060
2061sub audio_shutdown {
2062 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2063 undef $SDL_MIXER;
2064 @SOUNDS = ();
2065 %AUDIO_CHUNKS = ();
2066}
2067
2068my %animate_object; 2111my %animate_object;
2069my $animate_timer; 2112my $animate_timer;
2070 2113
2071my $fps = 9; 2114my $fps = 9;
2072 2115
2073my %demo;#d#
2074
2075sub force_refresh { 2116sub force_refresh {
2117 if ($ENV{CFPLUS_DEBUG} & 4) {
2076 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2118 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2077 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2119 debug sprintf "%3.2f", $fps;
2120 }
2078 2121
2079 $CFPlus::UI::ROOT->draw; 2122 $CFPlus::UI::ROOT->draw;
2080 2123 CFPlus::SDL_GL_SwapBuffers;
2081 $WANT_REFRESH = 0;
2082 $CAN_REFRESH = 0;
2083 $LAST_REFRESH = $NOW; 2124 $LAST_REFRESH = $NOW;
2084 2125 $WANT_REFRESH->stop;
2085 CFPlus::SDL_GL_SwapBuffers;
2086} 2126}
2087 2127
2128$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2129
2088my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2130my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2089 $NOW = time; 2131 $NOW = time;
2090 2132
2091 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2133 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2092 for CFPlus::SDL_PollEvent; 2134 for CFPlus::poll_events;
2093 2135
2094 if (%animate_object) { 2136 if (%animate_object) {
2095 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2137 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2096 $WANT_REFRESH++; 2138 $WANT_REFRESH->start;
2097 }
2098
2099 if ($WANT_REFRESH) {
2100 force_refresh;
2101 } else {
2102 $CAN_REFRESH = 1;
2103 } 2139 }
2104}); 2140});
2105 2141
2106sub animation_start { 2142sub animation_start {
2107 my ($widget) = @_; 2143 my ($widget) = @_;
… …
2110 2146
2111sub animation_stop { 2147sub animation_stop {
2112 my ($widget) = @_; 2148 my ($widget) = @_;
2113 delete $animate_object{$widget}; 2149 delete $animate_object{$widget};
2114} 2150}
2115
2116# check once/second for faces that need to be prefetched
2117# this should, of course, only run on demand, but
2118# SDL forces worse things on us....
2119
2120Event->timer (after => 1, interval => 0.25, cb => sub {
2121 $CONN->face_prefetch
2122 if $CONN;
2123});
2124 2151
2125%SDL_CB = ( 2152%SDL_CB = (
2126 CFPlus::SDL_QUIT => sub { 2153 CFPlus::SDL_QUIT => sub {
2127 exit; 2154 exit;
2128 }, 2155 },
… …
2131 CFPlus::SDL_VIDEOEXPOSE => sub { 2158 CFPlus::SDL_VIDEOEXPOSE => sub {
2132 CFPlus::UI::full_refresh; 2159 CFPlus::UI::full_refresh;
2133 }, 2160 },
2134 CFPlus::SDL_ACTIVEEVENT => sub { 2161 CFPlus::SDL_ACTIVEEVENT => sub {
2135# not useful, as APPACTIVE include sonly iconified state, not unmapped 2162# not useful, as APPACTIVE include sonly iconified state, not unmapped
2136# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2163# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2164# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2137# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2165# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2138# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2166# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2139# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2167# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2140 }, 2168 },
2141 CFPlus::SDL_KEYDOWN => sub { 2169 CFPlus::SDL_KEYDOWN => sub {
… …
2170 CFPlus::DB::Server::run; 2198 CFPlus::DB::Server::run;
2171 2199
2172 CFPlus::UI::set_layout ($::CFG->{layout}); 2200 CFPlus::UI::set_layout ($::CFG->{layout});
2173 2201
2174 my %DEF_CFG = ( 2202 my %DEF_CFG = (
2175 sdl_mode => 0, 2203 sdl_mode => 0,
2176 width => 640,
2177 height => 480,
2178 fullscreen => 0, 2204 fullscreen => 0,
2179 fast => 0, 2205 fast => 0,
2206 force_opengl11 => undef,
2207 texture_compression => 1,
2180 map_scale => 1, 2208 map_scale => 1,
2181 fow_enable => 1, 2209 fow_enable => 1,
2182 fow_intensity => 0.45, 2210 fow_intensity => 0,
2183 fow_smooth => 0,
2184 map_smoothing => 1, 2211 map_smoothing => 1,
2185 gui_fontsize => 1, 2212 gui_fontsize => 1,
2186 log_fontsize => 0.7, 2213 log_fontsize => 0.7,
2187 gauge_fontsize => 1, 2214 gauge_fontsize => 1,
2188 gauge_size => 0.35, 2215 gauge_size => 0.35,
2189 stat_fontsize => 0.7, 2216 stat_fontsize => 0.7,
2190 mapsize => 100, 2217 mapsize => 100,
2191 say_command => 'chat',
2192 audio_enable => 1, 2218 audio_enable => 1,
2219 effects_enable => 1,
2220 effects_volume => 1,
2193 bgm_enable => 1, 2221 bgm_enable => 1,
2194 bgm_volume => 0.25, 2222 bgm_volume => 0.5,
2195 face_prefetch => 0,
2196 output_sync => 1, 2223 output_sync => 1,
2197 output_count => 1, 2224 output_count => 1,
2198 output_rate => "", 2225 output_rate => "",
2199 pickup => 0, 2226 pickup => 0,
2200 inv_sort => "mtime", 2227 inv_sort => "mtime",
2201 default => "profile", # default profile 2228 default => "profile", # default profile
2202 show_tips => 1, 2229 show_tips => 1,
2203 logview_max_par => 1000, 2230 logview_max_par => 1000,
2204 ); 2231 );
2205 2232
2206 while (my ($k, $v) = each %DEF_CFG) { 2233 while (my ($k, $v) = each %DEF_CFG) {
2207 $CFG->{$k} = $v unless exists $CFG->{$k}; 2234 $CFG->{$k} = $v unless exists $CFG->{$k};
2208 } 2235 }
… …
2222 } 2249 }
2223 } 2250 }
2224 2251
2225 sdl_init; 2252 sdl_init;
2226 2253
2227 @SDL_MODES = reverse 2254 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2228 grep $_->[0] >= 640 && $_->[1] >= 480, 2255 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2229 CFPlus::SDL_ListModes;
2230
2231 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2256 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2257
2258 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2232 2259
2233 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2260 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2234 2261
2235 { 2262 {
2236 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2263 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2274} 2301}
2275 2302
2276show_tip_of_the_day if $CFG->{show_tips}; 2303show_tip_of_the_day if $CFG->{show_tips};
2277 2304
2278Event::loop; 2305Event::loop;
2306
2307#video_shutdown;
2308#audio_shutdown;
2279#CFPlus::SDL_Quit; 2309CFPlus::SDL_Quit;
2280#CFPlus::_exit 0;
2281
2282END {
2283 CFPlus::SDL_Quit;
2284 CFPlus::DB::Server::stop; 2310CFPlus::DB::Server::stop;
2285}
2286 2311
2287=head1 NAME 2312=head1 NAME
2288 2313
2289cfplus - A Crossfire+ and Crossfire game client 2314cfplus - A Crossfire TRT and Crossfire game client
2290 2315
2291=head1 SYNOPSIS 2316=head1 SYNOPSIS
2292 2317
2293Just run it - no commandline arguments are supported. 2318Just run it - no commandline arguments are supported.
2294 2319
2295=head1 USAGE 2320=head1 USAGE
2296 2321
2297cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2322cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2298fullscreen and interactively. 2323be used in fullscreen mode and interactively.
2299 2324
2300=head1 DEBUGGING 2325=head1 DEBUGGING
2301 2326
2302 2327
2303CFPLUS_DEBUG - environment variable 2328CFPLUS_DEBUG - environment variable

Diff Legend

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