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.176 by root, Thu Jul 19 14:54:51 2007 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines