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.175 by root, Tue Jul 17 22:08:57 2007 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 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, 700, $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 # randomize music a bit so that the order is not always the same
349 $_->{stop_time} ||= rand for @have;
350
351 @MUSIC_HAVE = @have
352 if @have;
353
354 # default MUSIC_HAVE == MUSIC_DEFAULT
355 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
356 $fade_out = 700;
357 }
358
359 # if the currently playing song is acceptable, let it continue
360 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
361
362 my $NOW = time;
363
364 if ($MUSIC_PLAYING_META) {
365 $MUSIC_PLAYING_META->{stop_time} = $NOW;
366 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
367 CFPlus::MixMusic::fade_out $fade_out;
368 } else {
369 # sort by stop time, oldest first
370 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
371
372 # if the most recently-played piece played very recently,
373 # resume it, else choose the oldest piece for rotation.
374 audio_music_set_meta
375 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
376 ? $MUSIC_HAVE[-1]
377 : $MUSIC_HAVE[0];
378
379 audio_music_start;
380 }
381}
382
383sub audio_music_set_ambient {
384 my ($songs) = @_;
385
386 $MUSIC_WANT = $songs;
387 audio_music_push;
388}
389
390sub audio_music_finished {
391 if ($MUSIC_PLAYING_META) {
392 $MUSIC_PLAYING_META->{stop_time} = time;
393 }
394
395 # we compress multiple jingles of the same type
396 shift @MUSIC_JINGLE
397 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
398
399 $MUSIC_PLAYING_WIDGET->clear;
400
401 undef $MUSIC_PLAYER;
402 undef $MUSIC_PLAYING_META;
403 undef $MUSIC_PLAYING_DATA;
404
405 audio_music_push;
406}
407
408sub audio_init {
409 if ($CFG->{audio_enable}) {
410 $ENV{MIX_EFFECTSMAXSPEED} = 1;
411 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
412
413 unless ($SDL_MIXER) {
414 status "Unable to open sound device: there will be no sound";
415 return;
416 }
417
418 CFPlus::Mix_AllocateChannels 16;
419
420 audio_music_finished;
421 } else {
422 undef $SDL_MIXER;
423 }
424}
425
426sub audio_shutdown {
427 undef $MUSIC_PLAYER;
428 undef $MUSIC_PLAYING_META;
429 undef $MUSIC_PLAYING_DATA;
430
431 $MUSIC_WANT = [];
432 @MUSIC_JINGLE = ();
433 %AUDIO_PLAY = ();
434 %AUDIO_CHUNK = ();
435
436 CFPlus::Mix_CloseAudio if $SDL_MIXER;
437 undef $SDL_MIXER;
438}
439
440#############################################################################
204 441
205sub destroy_query_dialog { 442sub destroy_query_dialog {
206 (delete $_[0]{query_dialog})->destroy 443 (delete $_[0]{query_dialog})->destroy
207 if $_[0]{query_dialog}; 444 if $_[0]{query_dialog};
208} 445}
… …
272 ellipsise => 0, 509 ellipsise => 0,
273 markup => "\nOr use your keyboard and the text entry below:\n"; 510 markup => "\nOr use your keyboard and the text entry below:\n";
274 511
275 unshift @dialog, my $table = new CFPlus::UI::Table; 512 unshift @dialog, my $table = new CFPlus::UI::Table;
276 513
277 $table->add (0, 0, new CFPlus::UI::Button 514 $table->add_at (0, 0, new CFPlus::UI::Button
278 text => "Next Race", 515 text => "Next Race",
279 on_activate => sub { 516 on_activate => sub {
280 $conn->send ("reply n"); 517 $conn->send ("reply n");
281 destroy_query_dialog $conn; 518 destroy_query_dialog $conn;
282 0 519 0
283 }, 520 },
284 ); 521 );
285 $table->add (2, 0, new CFPlus::UI::Button 522 $table->add_at (2, 0, new CFPlus::UI::Button
286 text => "Accept", 523 text => "Accept",
287 on_activate => sub { 524 on_activate => sub {
288 $conn->send ("reply d"); 525 $conn->send ("reply d");
289 destroy_query_dialog $conn; 526 destroy_query_dialog $conn;
290 0 527 0
… …
333 markup => "\nOr use your keyboard and the text entry below:\n"; 570 markup => "\nOr use your keyboard and the text entry below:\n";
334 571
335 unshift @dialog, my $table = new CFPlus::UI::Table; 572 unshift @dialog, my $table = new CFPlus::UI::Table;
336 573
337 # left: re-roll 574 # left: re-roll
338 $table->add (0, 0, new CFPlus::UI::Button 575 $table->add_at (0, 0, new CFPlus::UI::Button
339 text => "Roll Again", 576 text => "Roll Again",
340 on_activate => sub { 577 on_activate => sub {
341 $conn->send ("reply y"); 578 $conn->send ("reply y");
342 destroy_query_dialog $conn; 579 destroy_query_dialog $conn;
343 0 580 0
… …
357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 594 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 595 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
359 ], 596 ],
360 ), 1 .. 2; 597 ), 1 .. 2;
361 598
362 $table->add (2, 0, new CFPlus::UI::Button 599 $table->add_at (2, 0, new CFPlus::UI::Button
363 text => "Swap Stats", 600 text => "Swap Stats",
364 on_activate => sub { 601 on_activate => sub {
365 $conn->{stat_change_with} = $sw2->{value}; 602 $conn->{stat_change_with} = $sw2->{value};
366 $conn->send ("reply $sw1->{value}"); 603 $conn->send ("reply $sw1->{value}");
367 destroy_query_dialog $conn; 604 destroy_query_dialog $conn;
368 0 605 0
369 }, 606 },
370 ); 607 );
371 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 608 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
372 609
373 # right: accept 610 # right: accept
374 $table->add (4, 0, new CFPlus::UI::Button 611 $table->add_at (4, 0, new CFPlus::UI::Button
375 text => "Accept", 612 text => "Accept",
376 on_activate => sub { 613 on_activate => sub {
377 $conn->send ("reply n"); 614 $conn->send ("reply n");
378 $STATS_PAGE->hide; 615 $STATS_PAGE->hide;
379 destroy_query_dialog $conn; 616 destroy_query_dialog $conn;
… …
460 maph => $mapsize, 697 maph => $mapsize,
461 698
462 client => "cfplus $CFPlus::VERSION $] $^O", 699 client => "cfplus $CFPlus::VERSION $] $^O",
463 700
464 map_widget => $MAPWIDGET, 701 map_widget => $MAPWIDGET,
465 logview => $LOGVIEW,
466 statusbox => $STATUSBOX, 702 statusbox => $STATUSBOX,
467 map => $MAP, 703 map => $MAP,
468 mapmap => $MAPMAP, 704 mapmap => $MAPMAP,
469 query => \&server_query, 705 query => \&server_query,
470 706
471 setup_req => { 707 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1, 708 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 }, 709 },
486 }; 710 };
487 711
488 if ($CONN) { 712 if ($CONN) {
489 CFPlus::lowdelay fileno $CONN->{fh}; 713 CFPlus::lowdelay fileno $CONN->{fh};
… …
501 $SETUP_DIALOG->show; 725 $SETUP_DIALOG->show;
502 $PL_WINDOW->hide; 726 $PL_WINDOW->hide;
503 $SPELL_LIST->clear_spells; 727 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 728 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505 729
506 &audio_music_set ([]); 730 &audio_music_set_ambient ([]);
507 731
508 return unless $CONN; 732 return unless $CONN;
509 733
510 status "connection closed"; 734 status "connection closed";
511 735
… …
521 745
522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 746 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
523 747
524 my $row = 0; 748 my $row = 0;
525 749
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 750 $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, 751 $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, 752 can_events => 1,
529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 753 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530 754
531 my $vidmode_tooltip = 755 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 756 "<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>."; 757 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534 758
535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 759 $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); 760 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
537 761
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 762 $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], 763 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
540 tooltip => $vidmode_tooltip); 764 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label 765 $hbox->add (my $mode_label = new CFPlus::UI::Label
… …
548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 772 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 773 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
550 }); 774 });
551 $mode_slider->emit (changed => $mode_slider->{range}[0]); 775 $mode_slider->emit (changed => $mode_slider->{range}[0]);
552 776
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 777 $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 778 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
555 state => $CFG->{fullscreen}, 779 state => $CFG->{fullscreen},
556 tooltip => "Bring the client into fullscreen mode.", 780 tooltip => "Bring the client into fullscreen mode.",
557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 781 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
558 ); 782 );
559 783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{force_opengl11},
787 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
788 . "higher memory usage and slower performance. It will, however, help tremendously on "
789 . "cards that claim to support a feature but fall back to software rendering. "
790 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
791 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
792 . "experience extremely low framerates and your card should do better, try this option.</b>",
793 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
794 );
795
796 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
797 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
798 state => $CFG->{texture_compression},
799 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
800 . "will save a lot of memory and increase performance. The compression algorithm "
801 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
802 . "forced OpenGL 1.1 mode.",
803 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
804 );
805
560 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 806 $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 807 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
562 state => $CFG->{fast}, 808 state => $CFG->{fast},
563 tooltip => "Lower the visual quality considerably to speed up rendering.", 809 tooltip => "Lower the visual quality considerably to speed up rendering.",
564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 810 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
565 ); 811 );
566 812
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 813 $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 814 $table->add_at (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 815 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.", 816 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 }, 817 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 ); 818 );
573 819
574 $table->add (1, $row++, new CFPlus::UI::Button 820 $table->add_at (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply", 821 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.", 822 tooltip => "Apply the video settings above.",
577 on_activate => sub { 823 on_activate => sub {
578 video_shutdown (); 824 video_shutdown ();
579 video_init (); 825 video_init ();
580 0 826 0
581 } 827 }
582 ); 828 );
583 829
584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 830 $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 831 $table->add_at (1, $row++, new CFPlus::UI::Slider
586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 832 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 833 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
589 ); 835 );
590 836
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 837 $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 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing}, 839 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 840 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. " 841 . "This increases load on the graphics subsystem and works only with TRT servers. "
596 . "Changes take effect at next connection only.", 842 . "Changes take effect at next login only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 843 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 ); 844 );
599 845
600 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 846 $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 847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
602 state => $CFG->{fow_enable}, 848 state => $CFG->{fow_enable},
603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 849 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 } 850 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
605 ); 851 );
606 852
607 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 853 $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 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 855 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.", 856 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 } 857 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
612 ); 858 );
613 859
614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
615 $table->add (1, $row++, new CFPlus::UI::CheckBox
616 state => $CFG->{fow_smooth},
617 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
618 on_changed => sub {
619 my ($self, $value) = @_;
620 $CFG->{fow_smooth} = $value;
621 0
622 }
623 );
624
625 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 860 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
626 $table->add (1, $row++, new CFPlus::UI::Slider 861 $table->add_at (1, $row++, new CFPlus::UI::Slider
627 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 862 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
628 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 863 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
864 . "but you still need to press apply to correctly re-layout the widget.",
629 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 865 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
630 ); 866 );
631 867
632 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 868 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
633 $table->add (1, $row++, new CFPlus::UI::Slider 869 $table->add_at (1, $row++, new CFPlus::UI::Slider
634 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 870 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
635 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 871 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
636 on_changed => sub { 872 on_changed => sub {
637 $CFG->{gauge_fontsize} = $_[1]; 873 $CFG->{gauge_fontsize} = $_[1];
638 &set_gauge_window_fontsize; 874 &set_gauge_window_fontsize;
639 0 875 0
640 } 876 }
641 ); 877 );
642 878
643 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 879 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
644 $table->add (1, $row++, new CFPlus::UI::Slider 880 $table->add_at (1, $row++, new CFPlus::UI::Slider
645 range => [$CFG->{gauge_size}, 0.2, 0.8], 881 range => [$CFG->{gauge_size}, 0.2, 0.8],
646 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 882 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
647 on_changed => sub { 883 on_changed => sub {
648 $CFG->{gauge_size} = $_[1]; 884 $CFG->{gauge_size} = $_[1];
649 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 885 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
655} 891}
656 892
657sub audio_setup { 893sub audio_setup {
658 my $vbox = new CFPlus::UI::VBox; 894 my $vbox = new CFPlus::UI::VBox;
659 895
660 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 896 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
661 897
662 my $row = 0; 898 my $row = 0;
663 899
664 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 900 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
665 $table->add (1, $row++, new CFPlus::UI::CheckBox 901 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
666 state => $CFG->{audio_enable}, 902 state => $CFG->{audio_enable},
667 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.", 903 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.",
668 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 904 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
669 ); 905 );
670# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 906# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
671# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 907# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
672# $CFG->{effects_volume} = $_[1]; 908# $CFG->{effects_volume} = $_[1];
673# }); 909# });
910
911 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
912 $table->add_at (1, $row, new CFPlus::UI::CheckBox
913 expand => 1, state => $CFG->{effects_enable},
914 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
915 on_changed => sub {
916 $CFG->{effects_enable} = $_[1];
917 $CONN->update_fx_want if $CONN;
918 0
919 }
920 );
921 $table->add_at (2, $row++, new CFPlus::UI::Slider
922 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
923 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
924 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
925 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
926 );
927
674 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 928 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
675 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
676 $hbox->add (new CFPlus::UI::CheckBox 929 $table->add_at (1, $row, new CFPlus::UI::CheckBox
677 expand => 1, state => $CFG->{bgm_enable}, 930 expand => 1, state => $CFG->{bgm_enable},
678 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 931 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
679 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 932 on_changed => sub {
933 $CFG->{bgm_enable} = $_[1];
934 $CONN->update_fx_want if $CONN;
935 audio_music_push;
936 0
937 }
680 ); 938 );
681 $hbox->add (new CFPlus::UI::Slider 939 $table->add_at (2, $row++, new CFPlus::UI::Slider
682 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 940 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
683 tooltip => "The volume of the background music. Changes are instant.", 941 tooltip => "The volume of the background music. Changes are instant.",
684 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 942 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
685 ); 943 );
686 944
687 $table->add (1, $row++, new CFPlus::UI::Button 945 $table->add_at (1, $row++, new CFPlus::UI::Button
688 expand => 1, align => 0, text => "Apply", 946 c_colspan => 2, expand => 1, align => 0, text => "Apply",
689 tooltip => "Apply the audio settings", 947 tooltip => "Apply the audio settings",
690 on_activate => sub { 948 on_activate => sub {
691 audio_shutdown (); 949 audio_shutdown ();
692 audio_init (); 950 audio_init ();
693 0 951 0
… …
735 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 993 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
736 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 994 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
737 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 995 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
738 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 996 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
739 997
740 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 998 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
999 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1000 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
741 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1001 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
742 1002
743 $GAUGES = { 1003 $GAUGES = {
1004 exp => $exp, prg => $prg, sklprg => $sklprg,
744 exp => $exp, win => $win, range => $rng, 1005 win => $win, range => $rng,
745 food => $fg, mana => $mg, hp => $hg, grace => $gg 1006 hp => $hg, mana => $mg, grace => $gg, food => $fg,
746 }; 1007 };
747 1008
748 &set_gauge_window_fontsize; 1009 &set_gauge_window_fontsize;
749 1010
750 $win 1011 $win
751} 1012}
752 1013
753sub debug_setup { 1014sub debug_setup {
754 my $table = new CFPlus::UI::Table; 1015 my $table = new CFPlus::UI::Table;
755 1016
756 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1017 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
757 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1018 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
758 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1019 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
759 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1020 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
760 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1021 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
761 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1022 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
762 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1023 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
763 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1024 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
764 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1025 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
765 1026
766 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1027 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1028
1029 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1030 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1031 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1032 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1033 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1034 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1035
1036 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1037
1038 $c->add_items ({
1039 type => "line_loop",
1040 color => [0, 1, 0],
1041 width => 9,
1042 coord_mode => "abs",
1043 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1044 });
1045
1046 $c->add_items ({
1047 type => "lines",
1048 color => [1, 1, 0],
1049 width => 2,
1050 coord_mode => "rel",
1051 coord => [[0,0], [1,1], [1,0], [0,1]],
1052 });
1053
1054 $c->add_items ({
1055 type => "polygon",
1056 color => [0, 0.43, 0],
1057 width => 2,
1058 coord_mode => "rel",
1059 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1060 });
767 1061
768 $table 1062 $table
769} 1063}
770 1064
771sub stats_window { 1065sub stats_window {
… …
819 [2, 4, st_spd => "Spd", 10.54], 1113 [2, 4, st_spd => "Spd", 10.54],
820 [2, 5, st_wspd => "WSp", 10.54], 1114 [2, 5, st_wspd => "WSp", 10.54],
821 ) { 1115 ) {
822 my ($col, $row, $id, $label, $template) = @$_; 1116 my ($col, $row, $id, $label, $template) = @$_;
823 1117
824 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1118 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
825 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1119 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
826 align => +1, template => $template, tooltip => "#stat_$label"); 1120 align => +1, template => $template, tooltip => "#stat_$label");
827 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1121 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
828 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1122 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
829 align => -1, text => $label, tooltip => "#stat_$label"); 1123 align => -1, text => $label, tooltip => "#stat_$label");
830 } 1124 }
831 1125
832 $vb->add (new CFPlus::UI::FancyFrame 1126 $vb->add (new CFPlus::UI::FancyFrame
… …
873 cold => ["Cold", 1167 cold => ["Cold",
874 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1168 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
875 ghit => ["Ghost hit", 1169 ghit => ["Ghost hit",
876 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1170 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
877 ); 1171 );
1172
878 for (qw/slow holyw conf fire depl magic 1173 for (qw/slow holyw conf fire depl magic
879 drain acid pois para deat phys 1174 drain acid pois para deat phys
880 blind fear tund elec cold ghit/) 1175 blind fear tund elec cold ghit/)
881 { 1176 {
882 $tbl2->add ($col, $row, 1177 $tbl2->add_at ($col, $row,
883 $STATWIDS->{"res_$_"} = 1178 $STATWIDS->{"res_$_"} =
884 new CFPlus::UI::Label 1179 new CFPlus::UI::Label
885 font => $FONT_FIXED, 1180 font => $FONT_FIXED,
886 template => "-100%", 1181 template => "-100%",
887 align => +1, 1182 align => +1,
888 valign => 0, 1183 valign => 0,
889 can_events => 1, 1184 can_events => 1,
890 can_hover => 1, 1185 can_hover => 1,
891 tooltip => $resist_names{$_}->[1], 1186 tooltip => $resist_names{$_}->[1],
892 ); 1187 );
893 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1188 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
894 font => $FONT_FIXED, 1189 font => $FONT_FIXED,
895 can_hover => 1, 1190 can_hover => 1,
896 can_events => 1, 1191 can_events => 1,
897 path => "ui/resist/resist_$_.png", 1192 path => "ui/resist/resist_$_.png",
898 tooltip => $resist_names{$_}->[1], 1193 tooltip => $resist_names{$_}->[1],
899 ); 1194 );
900 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1195 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
901 text => $resist_names{$_}->[0], 1196 text => $resist_names{$_}->[0],
902 font => $FONT_FIXED, 1197 font => $FONT_FIXED,
903 can_hover => 1, 1198 can_hover => 1,
904 can_events => 1, 1199 can_events => 1,
905 tooltip => $resist_names{$_}->[1], 1200 tooltip => $resist_names{$_}->[1],
… …
917 $r 1212 $r
918} 1213}
919 1214
920sub skill_window { 1215sub skill_window {
921 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1216 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1217
922 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1218 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1219
923 $sw 1220 $sw
924} 1221}
925 1222
926sub formsep($) { 1223sub formsep($) {
927 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1224 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
938 return if $METASERVER_ATIME > time; 1235 return if $METASERVER_ATIME > time;
939 $METASERVER_ATIME = time + 60; 1236 $METASERVER_ATIME = time + 60;
940 1237
941 my $table = $METASERVER->{table}; 1238 my $table = $METASERVER->{table};
942 $table->clear; 1239 $table->clear;
943 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1240 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
944 1241
945 my $ok = 0; 1242 my $ok = 0;
946 1243
947 CFPlus::background { 1244 CFPlus::background {
948 my $ua = CFPlus::lwp_useragent; 1245 my $ua = CFPlus::lwp_useragent;
… …
959 "The time this server has been running without being restarted.", 1256 "The time this server has been running without being restarted.",
960 "The server software version - a '+' indicates a Crossfire+ server.", 1257 "The server software version - a '+' indicates a Crossfire+ server.",
961 "Short information about this server provided by its admins.", 1258 "Short information about this server provided by its admins.",
962 ); 1259 );
963 my @col = qw(#Users Host Uptime Version Description); 1260 my @col = qw(#Users Host Uptime Version Description);
964 $table->add ($_, 0, new CFPlus::UI::Label 1261 $table->add_at ($_, 0, new CFPlus::UI::Label
965 can_hover => 1, can_events => 1, 1262 can_hover => 1, can_events => 1,
966 align => 0, fg => [1, 1, 0], 1263 align => 0, fg => [1, 1, 0],
967 text => $col[$_], tooltip => $tip[$_]) 1264 text => $col[$_], tooltip => $tip[$_])
968 for 0 .. $#col; 1265 for 0 .. $#col;
969 1266
… …
991 1288
992 $m = [$users, $host, $uptime, $version, $desc]; 1289 $m = [$users, $host, $uptime, $version, $desc];
993 1290
994 $y++; 1291 $y++;
995 1292
996 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1293 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
997 (new CFPlus::UI::Button 1294 (new CFPlus::UI::Button
998 text => "Use", 1295 text => "Use",
999 tooltip => "Put this server into the <b>Host:Port</b> field", 1296 tooltip => "Put this server into the <b>Host:Port</b> field",
1000 on_activate => sub { 1297 on_activate => sub {
1001 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1298 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1004 }, 1301 },
1005 ), 1302 ),
1006 (new CFPlus::UI::Empty expand => 1), 1303 (new CFPlus::UI::Empty expand => 1),
1007 ]); 1304 ]);
1008 1305
1009 $table->add ($_, $y, new CFPlus::UI::Label 1306 $table->add_at ($_, $y, new CFPlus::UI::Label
1010 max_w => $::WIDTH * 0.4, 1307 max_w => $::WIDTH * 0.4,
1011 ellipsise => 0, 1308 ellipsise => 0,
1012 align => $align[$_], 1309 align => $align[$_],
1013 text => $m->[$_], 1310 text => $m->[$_],
1014 tooltip => $tip[$_], 1311 tooltip => $tip[$_],
… …
1055 1352
1056 $vbox->add (new CFPlus::UI::FancyFrame 1353 $vbox->add (new CFPlus::UI::FancyFrame
1057 label => "Connection Settings", 1354 label => "Connection Settings",
1058 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1355 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1059 ); 1356 );
1060 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1357 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1061 1358
1062 { 1359 {
1063 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1360 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1064 1361
1065 $vbox->add ( 1362 $vbox->add (
1066 $HOST_ENTRY = new CFPlus::UI::Entry 1363 $HOST_ENTRY = new CFPlus::UI::Entry
1067 expand => 1, 1364 expand => 1,
1068 text => $CFG->{profile}{default}{host}, 1365 text => $CFG->{profile}{default}{host},
1069 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1366 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1070 on_changed => sub { 1367 on_changed => sub {
1071 my ($self, $value) = @_; 1368 my ($self, $value) = @_;
1072 $CFG->{profile}{default}{host} = $value; 1369 $CFG->{profile}{default}{host} = $value;
1073 0 1370 1
1074 } 1371 }
1075 ); 1372 );
1076 1373
1077 $vbox->add (new CFPlus::UI::Button 1374 $vbox->add (new CFPlus::UI::Button
1078 expand => 1, 1375 expand => 1,
1079 text => "Server List", 1376 text => "Server List",
1080 other => $METASERVER, 1377 other => $METASERVER,
1081 tooltip => "Show a list of available crossfire servers", 1378 tooltip => "Show a list of available crossfire servers",
1082 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1379 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1083 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1380 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1084 ); 1381 );
1085 } 1382 }
1086 1383
1087 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1384 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1088 $table->add (1, 4, new CFPlus::UI::Entry 1385 $table->add_at (1, 4, new CFPlus::UI::Entry
1089 text => $CFG->{profile}{default}{user}, 1386 text => $CFG->{profile}{default}{user},
1090 tooltip => "The name of your character on the server", 1387 tooltip => "The name of your character on the server",
1091 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1388 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1092 ); 1389 );
1093 1390
1094 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1391 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1095 $table->add (1, 5, new CFPlus::UI::Entry 1392 $table->add_at (1, 5, new CFPlus::UI::Entry
1096 text => $CFG->{profile}{default}{password}, 1393 text => $CFG->{profile}{default}{password},
1097 hidden => 1, 1394 hidden => 1,
1098 tooltip => "The password for your character", 1395 tooltip => "The password for your character",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1396 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1100 ); 1397 );
1101 1398
1102 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1399 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1103 $table->add (1, 7, new CFPlus::UI::Slider 1400 $table->add_at (1, 7, new CFPlus::UI::Slider
1104 force_w => 100, 1401 force_w => 100,
1105 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1402 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1106 tooltip => "This is the size of the portion of the map update the server sends you. " 1403 tooltip => "This is the size of the portion of the map update the server sends you. "
1107 . "If you set this to a high value you will be able to see further, " 1404 . "If you set this to a high value you will be able to see further, "
1108 . "but you also increase bandwidth requirements and latency. " 1405 . "but you also increase bandwidth requirements and latency. "
1109 . "This option is only used once at log-in.", 1406 . "This option is only used once at log-in.",
1110 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1407 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1111 ); 1408 );
1112 1409
1113 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1114 $table->add (1, 8, new CFPlus::UI::CheckBox
1115 state => $CFG->{face_prefetch},
1116 tooltip => "<b>Background Image Prefetch</b>\n\n"
1117 . "If enabled, the client automatically pre-fetches images from the server. "
1118 . "This might increase or create lag, but increases the chances "
1119 . "of faces being ready for display when you encounter them. "
1120 . "It also uses up server bandwidth on every connect, "
1121 . "so only set it if you really need to prefetch images. "
1122 . "This option can be set and unset any time.",
1123 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1124 );
1125
1126 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1410 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1127 $table->add (1, 9, new CFPlus::UI::Entry 1411 $table->add_at (1, 8, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate}, 1412 text => $CFG->{output_rate},
1129 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1413 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1414 . "when sending data. When 0 or unset, the server "
1131 . "default will be used, which is usually around 100kb/s.", 1415 . "default will be used, which is usually around 100kb/s. Most servers will "
1416 . "dynamically find an optimal rate, so adjust this only when necessary.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1417 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1133 ); 1418 );
1134 1419
1135 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1420 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1136 $table->add (1, 10, new CFPlus::UI::Entry 1421 $table->add_at (1, 9, new CFPlus::UI::Entry
1137 text => $CFG->{output_count}, 1422 text => $CFG->{output_count},
1138 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.",
1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1424 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1140 ); 1425 );
1141 1426
1142 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1427 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1143 $table->add (1, 11, new CFPlus::UI::Entry 1428 $table->add_at (1, 10, new CFPlus::UI::Entry
1144 text => $CFG->{output_sync}, 1429 text => $CFG->{output_sync},
1145 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1430 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1431 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1147 ); 1432 );
1148 1433
1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1434 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1150 expand => 1, 1435 expand => 1,
1151 align => 0, 1436 align => 0,
1152 text => "Login", 1437 text => "Login",
1153 on_activate => sub { 1438 on_activate => sub {
1154 $CONN ? stop_game 1439 $CONN ? stop_game
1155 : start_game; 1440 : start_game;
1156 0 1441 1
1157 }, 1442 },
1158 ); 1443 );
1159 1444
1160 $vbox->add (new CFPlus::UI::FancyFrame 1445 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info", 1446 label => "Server Info",
… …
1168sub client_setup { 1453sub client_setup {
1169 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1454 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1170 1455
1171 my $row = 0; 1456 my $row = 0;
1172 1457
1173 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1175 text => $CFG->{say_command},
1176 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. "
1177 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1178 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1179 on_changed => sub {
1180 my ($self, $value) = @_;
1181 $CFG->{say_command} = $value;
1182 0
1183 }
1184 );
1185
1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1458 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1187 $table->add (1, $row++, new CFPlus::UI::CheckBox 1459 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1188 state => $CFG->{show_tips}, 1460 state => $CFG->{show_tips},
1189 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1461 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1190 on_changed => sub { 1462 on_changed => sub {
1191 my ($self, $value) = @_; 1463 my ($self, $value) = @_;
1192 $CFG->{show_tips} = $value; 1464 $CFG->{show_tips} = $value;
1193 0 1465 0
1194 } 1466 }
1195 ); 1467 );
1196 1468
1197 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1469 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1470 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199 text => $CFG->{logview_max_par}, 1471 text => $CFG->{logview_max_par},
1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1472 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1201 . "sends more messages than this number, older messages get removed to save memory and " 1473 . "sends more messages than this number, older messages get removed to save memory and "
1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1474 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203 on_changed => sub { 1475 on_changed => sub {
1204 my ($self, $value) = @_; 1476 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1477 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1206 0 1478 0
1207 }, 1479 },
1208 ); 1480 );
1209 1481
1210 $table 1482 $table
1211}
1212
1213sub message_window {
1214 my $window = new CFPlus::UI::Toplevel
1215 name => "message_window",
1216 title => "Messages",
1217 border_bg => [1, 1, 1, 1],
1218 x => "max",
1219 y => 0,
1220 force_w => $::WIDTH * 0.4,
1221 force_h => $::HEIGHT * 0.5,
1222 child => (my $vbox = new CFPlus::UI::VBox),
1223 has_close_button => 1;
1224
1225 $vbox->add ($LOGVIEW);
1226
1227 $vbox->add (my $input = new CFPlus::UI::Entry
1228 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1229 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1230 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1231 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1232 on_focus_in => sub {
1233 my ($input, $prev_focus) = @_;
1234
1235 delete $input->{refocus_map};
1236
1237 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1238 $input->{refocus_map} = 1;
1239 }
1240 delete $input->{auto_activated};
1241
1242 0
1243 },
1244 on_activate => sub {
1245 my ($input, $text) = @_;
1246 $input->set_text ('');
1247
1248 if ($text =~ /^\/(.*)/) {
1249 $::CONN->user_send ($1);
1250 } else {
1251 my $say_cmd = $::CFG->{say_command} || 'say';
1252 $::CONN->user_send ("$say_cmd $text");
1253 }
1254 if ($input->{refocus_map}) {
1255 delete $input->{refocus_map};
1256 $MAPWIDGET->focus_in
1257 }
1258
1259 0
1260 },
1261 on_escape => sub {
1262 $MAPWIDGET->grab_focus;
1263
1264 0
1265 },
1266 );
1267
1268 $CONSOLE = {
1269 window => $window,
1270 input => $input,
1271 };
1272
1273 $window
1274} 1483}
1275 1484
1276sub autopickup_setup { 1485sub autopickup_setup {
1277 my $r = new CFPlus::UI::ScrolledWindow ( 1486 my $r = new CFPlus::UI::ScrolledWindow (
1278 expand => 1, 1487 expand => 1,
… …
1324 ], 1533 ],
1325 ["Weight/Value ratio", 2, 17] 1534 ["Weight/Value ratio", 2, 17]
1326 ) 1535 )
1327 { 1536 {
1328 my ($title, $x, $y, @bits) = @$_; 1537 my ($title, $x, $y, @bits) = @$_;
1329 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1538 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1330 1539
1331 for (@bits) { 1540 for (@bits) {
1332 ++$y; 1541 ++$y;
1333 1542
1334 my $mask = $_->[1]; 1543 my $mask = $_->[1];
1335 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1544 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1336 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1545 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1337 state => $::CFG->{pickup} & $mask, 1546 state => $::CFG->{pickup} & $mask,
1338 on_changed => sub { 1547 on_changed => sub {
1339 my ($box, $value) = @_; 1548 my ($box, $value) = @_;
1340 1549
1341 if ($value) { 1550 if ($value) {
… …
1352 1561
1353 ${$_->[2]} = $checkbox if $_->[2]; 1562 ${$_->[2]} = $checkbox if $_->[2];
1354 } 1563 }
1355 } 1564 }
1356 1565
1357 $table->add (2, 18, new CFPlus::UI::ValSlider 1566 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1358 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1567 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1359 template => ">= 99", 1568 template => ">= 99",
1360 to_value => sub { ">= " . 5 * $_[0] }, 1569 to_value => sub { ">= " . 5 * $_[0] },
1361 on_changed => sub { 1570 on_changed => sub {
1362 my ($slider, $value) = @_; 1571 my ($slider, $value) = @_;
… …
1365 $::CFG->{pickup} |= int $value 1574 $::CFG->{pickup} |= int $value
1366 if $value; 1575 if $value;
1367 1; 1576 1;
1368 }); 1577 });
1369 1578
1370 $table->add (3, 18, new CFPlus::UI::Button 1579 $table->add_at (3, 18, new CFPlus::UI::Button
1371 text => "set", 1580 text => "set",
1372 on_activate => sub { 1581 on_activate => sub {
1373 $::CONN->send_command ("pickup $::CFG->{pickup}") 1582 $::CONN->send_command ("pickup $::CFG->{pickup}")
1374 if defined $::CONN; 1583 if defined $::CONN;
1375 0 1584 0
… …
1427 $sw1->add ($INV = new CFPlus::UI::Inventory); 1636 $sw1->add ($INV = new CFPlus::UI::Inventory);
1428 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1637 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1429 1638
1430 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1639 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1431 1640
1432 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1641 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1433 1642
1434 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1643 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1435 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1644 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1436 1645
1437 # XXX: Call after $INVR = ... because set_opencont sets the items 1646 # XXX: Call after $INVR = ... because set_opencont sets the items
1438 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1647 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1439 1648
1440 $hb 1649 $hb
1650}
1651
1652sub media_window {
1653 my $vb = new CFPlus::UI::VBox;
1654
1655 $vb->add (new CFPlus::UI::FancyFrame
1656 label => "Currently playing music",
1657 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1658 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1659 );
1660
1661 $vb->add (new CFPlus::UI::FancyFrame
1662 label => "Other media used in this session",
1663 expand => 1,
1664 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1665 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1666 );
1667
1668 $vb
1669}
1670
1671sub add_license {
1672 my ($meta) = @_;
1673
1674 $meta = $meta->{data}
1675 or return;
1676
1677 $meta->{license} || $meta->{author} || $meta->{source}
1678 or return;
1679
1680 $LICENSE_WIDGET->add_paragraph ({
1681 fg => [1, 1, 1, 1],
1682 markup => "<small>"
1683 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1684 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1685 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1686 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1687 . "</small>",
1688 });
1689 $LICENSE_WIDGET->scroll_to_bottom;
1441} 1690}
1442 1691
1443sub toggle_player_page { 1692sub toggle_player_page {
1444 my ($widget) = @_; 1693 my ($widget) = @_;
1445 1694
… …
1464 1713
1465 my $ntb = 1714 my $ntb =
1466 $PL_NOTEBOOK = 1715 $PL_NOTEBOOK =
1467 new CFPlus::UI::Notebook expand => 1; 1716 new CFPlus::UI::Notebook expand => 1;
1468 1717
1469 $ntb->add ( 1718 $ntb->add_tab (
1470 "Statistics (F2)" => $STATS_PAGE = stats_window, 1719 "Statistics (F2)" => $STATS_PAGE = stats_window,
1471 "Shows statistics, where all your Stats and Resistances are shown." 1720 "Shows statistics, where all your Stats and Resistances are shown."
1472 ); 1721 );
1473 $ntb->add ( 1722 $ntb->add_tab (
1474 "Skills (F3)" => $SKILL_PAGE = skill_window, 1723 "Skills (F3)" => $SKILL_PAGE = skill_window,
1475 "Shows all your Skills." 1724 "Shows all your Skills."
1476 ); 1725 );
1477 1726
1478 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1727 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1479 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1728 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1480 $ntb->add ( 1729 $ntb->add_tab (
1481 "Spellbook (F4)" => $spellsw, 1730 "Spellbook (F4)" => $spellsw,
1482 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1731 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1483 ); 1732 );
1484 $ntb->add ( 1733 $ntb->add_tab (
1485 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1734 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1486 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1735 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1487 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1736 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1488 ); 1737 );
1489 $ntb->add (Pickup => autopickup_setup, 1738 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1490 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1739 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1740
1741 $ntb->add_tab (Media => media_window,
1742 "License, Author and Source info for media sent by the server.");
1491 1743
1492 $ntb->set_current_page ($INVENTORY_PAGE); 1744 $ntb->set_current_page ($INVENTORY_PAGE);
1493 1745
1494 $plwin->add ($ntb); 1746 $plwin->add ($ntb);
1495 $plwin 1747 $plwin
… …
1649 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1901 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1650 ); 1902 );
1651 $hb->add (new CFPlus::UI::Button 1903 $hb->add (new CFPlus::UI::Button
1652 text => "Quit anyway", 1904 text => "Quit anyway",
1653 expand => 1, 1905 expand => 1,
1654 on_activate => sub { exit }, 1906 on_activate => sub { Event::unloop_all },
1655 ); 1907 );
1656 } 1908 }
1657 1909
1658 $QUIT_DIALOG->show; 1910 $QUIT_DIALOG->show;
1659 $QUIT_DIALOG->grab_focus; 1911 $QUIT_DIALOG->grab_focus;
… …
1692 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1944 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1693 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1945 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1694 1946
1695 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1947 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1696 1948
1697 $table->add (0, 0, new CFPlus::UI::Button 1949 $table->add_at (0, 0, new CFPlus::UI::Button
1698 text => "Close", 1950 text => "Close",
1699 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>.", 1951 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>.",
1700 on_activate => $close, 1952 on_activate => $close,
1701 ); 1953 );
1702 1954
1703 $table->add (2, 0, new CFPlus::UI::Button 1955 $table->add_at (2, 0, new CFPlus::UI::Button
1704 text => "Next", 1956 text => "Next",
1705 tooltip => "Show the next <b>Tip of the day</b>.", 1957 tooltip => "Show the next <b>Tip of the day</b>.",
1706 on_activate => sub { 1958 on_activate => sub {
1707 $close->(); 1959 $close->();
1708 &show_tip_of_the_day; 1960 &show_tip_of_the_day;
… …
1732 1984
1733 $SDL_ACTIVE = 1; 1985 $SDL_ACTIVE = 1;
1734 $LAST_REFRESH = time - 0.01; 1986 $LAST_REFRESH = time - 0.01;
1735 1987
1736 CFPlus::OpenGL::init; 1988 CFPlus::OpenGL::init;
1989 CFPlus::Macro::init;
1737 1990
1738 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1991 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1739 1992
1740 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1993 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1741 1994
1742 ############################################################################# 1995 #############################################################################
1743 1996
1744 if ($DEBUG_STATUS) { 1997 if ($DEBUG_STATUS) {
1745 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1998 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1746 } else { 1999 } else {
1747 # create the widgets 2000 # create/configure the widgets
2001
2002 $CFPlus::UI::ROOT->connect (key_down => sub {
2003 my (undef, $ev) = @_;
2004
2005 if (my @macros = CFPlus::Macro::find $ev) {
2006 CFPlus::Macro::execute $_ for @macros;
2007
2008 return 1;
2009 }
2010
2011 0
2012 });
1748 2013
1749 $DEBUG_STATUS = new CFPlus::UI::Label 2014 $DEBUG_STATUS = new CFPlus::UI::Label
1750 padding => 0, 2015 padding => 0,
1751 z => 100, 2016 z => 100,
1752 force_x => "max", 2017 force_x => "max",
… …
1777 2042
1778 $MAPWIDGET = new CFPlus::MapWidget; 2043 $MAPWIDGET = new CFPlus::MapWidget;
1779 $MAPWIDGET->connect (activate_console => sub { 2044 $MAPWIDGET->connect (activate_console => sub {
1780 my ($mapwidget, $preset) = @_; 2045 my ($mapwidget, $preset) = @_;
1781 2046
1782 if ($CONSOLE) { 2047 $MESSAGE_WINDOW->activate_console ($preset)
1783 $CONSOLE->{input}->{auto_activated} = 1; 2048 if $MESSAGE_WINDOW;
1784 $CONSOLE->{input}->grab_focus;
1785
1786 if ($preset && $CONSOLE->{input}->get_text eq '') {
1787 $CONSOLE->{input}->set_text ($preset);
1788 }
1789 }
1790 }); 2049 });
1791 $MAPWIDGET->show; 2050 $MAPWIDGET->show;
1792 $MAPWIDGET->grab_focus; 2051 $MAPWIDGET->grab_focus;
1793 2052
1794 $LOGVIEW = new CFPlus::UI::TextScroller 2053 $COMPLETER = new CFPlus::MapWidget::Command::
1795 expand => 1, 2054 command => { },
1796 font => $FONT_FIXED, 2055 tooltip => "#completer_help",
1797 fontsize => $::CFG->{log_fontsize},
1798 indent => -4,
1799 can_hover => 1,
1800 can_events => 1,
1801 max_par => $CFG->{logview_max_par},
1802 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1803 ; 2056 ;
1804 2057
1805 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2058 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1806 title => "Setup", 2059 title => "Setup",
1807 name => "setup_dialog", 2060 name => "setup_dialog",
… …
1812 force_h => $::HEIGHT * 0.6, 2065 force_h => $::HEIGHT * 0.6,
1813 has_close_button => 1, 2066 has_close_button => 1,
1814 ; 2067 ;
1815 2068
1816 $METASERVER = metaserver_dialog; 2069 $METASERVER = metaserver_dialog;
2070 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1817 2071
1818 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2072 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1819 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2073 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1820 2074
1821 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2075 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1822 "Configure the server to play on, your username, password and other server-related options."); 2076 "Configure the server to play on, your username, password and other server-related options.");
1823 $SETUP_NOTEBOOK->add (Client => client_setup, 2077 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1824 "Configure various client-specific settings."); 2078 "Configure various client-specific settings.");
1825 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2079 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1826 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2080 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1827 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2081 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1828 "Configure the use of audio, sound effects and background music."); 2082 "Configure the use of audio, sound effects and background music.");
1829 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2083 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1830 "Lets you define, edit and delete key bindings." 2084 "Lets you define, edit and delete key bindings."
1831 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2085 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1832 . "with nothing set and the recording started. After doing the actions you " 2086 . "with nothing set and the recording started. After doing the actions you "
1833 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2087 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1834 . "After pressing the combo the binding will be saved automatically and the " 2088 . "After pressing the combo the binding will be saved automatically and the "
1835 . "binding editor closes"); 2089 . "binding editor closes");
1836 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2090 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1837 "Some debuggin' options. Do not ask."); 2091 "Some debuggin' options. Do not ask.");
1838 2092
1839 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2093 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1840 2094
1841 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2095 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1842 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2096 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1843 2097
1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2098 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1845 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2099 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1846 2100
1847 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 2101 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
1848 2102
1849 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2103 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1869 tooltip => "Terminates the program", 2123 tooltip => "Terminates the program",
1870 on_activate => sub { 2124 on_activate => sub {
1871 if ($CONN) { 2125 if ($CONN) {
1872 open_quit_dialog; 2126 open_quit_dialog;
1873 } else { 2127 } else {
1874 exit; 2128 Event::unloop_all;
1875 } 2129 }
1876 0 2130 0
1877 }, 2131 },
1878 ); 2132 );
1879 2133
1880 $BUTTONBAR->show; 2134 $BUTTONBAR->show;
1881 $SETUP_DIALOG->show; 2135 $SETUP_DIALOG->show;
2136 $MESSAGE_WINDOW->show;
1882 } 2137 }
1883 2138
1884 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2139 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1885}
1886
1887sub setup_build_button {
1888 my ($enabled) = @_;
1889 if ($enabled) {
1890 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1891 $BUILD_BUTTON ||= new CFPlus::UI::Button
1892 text => "Build",
1893 tooltip => "Opens the ingame builder",
1894 on_activate => sub {
1895 if ($CONN) {
1896 $CONN->send_ext_req (builder_player_items => sub {
1897 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1898 });
1899 }
1900 0
1901 };
1902 $BUTTONBAR->add ($BUILD_BUTTON);
1903 } else {
1904 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1905 }
1906}
1907
1908sub open_ingame_editor {
1909 my ($msg) = @_;
1910
1911 my $win = new CFPlus::UI::Toplevel
1912 x => 0,
1913 y => 'center',
1914 z => 4,
1915 name => 'builder_window',
1916 force_w => int $WIDTH * 1/4,
1917 force_h => int $HEIGHT * 3/4,
1918 title => "In game builder",
1919 has_close_button => 1;
1920
1921 my $r = new CFPlus::UI::ScrolledWindow (
1922 expand => 1,
1923 scroll_y => 1
1924 );
1925 $r->add (my $vb = new CFPlus::UI::VBox);
1926 $win->add ($r);
1927
1928
1929 $vb->add (
1930 new CFPlus::UI::Button
1931 text => "Disable build mode",
1932 on_activate => sub { $::IN_BUILD_MODE = undef }
1933 );
1934 $vb->add (
1935 new CFPlus::UI::Button
1936 text => "ERASE",
1937 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1938 );
1939
1940 for my $itemarchname (
1941 sort {
1942 $msg->{items}->{$a}->{build_arch_name}
1943 cmp $msg->{items}->{$b}->{build_arch_name}
1944 } keys %{$msg->{items}}
1945 ) {
1946 my $info = $msg->{items}->{$itemarchname};
1947 $vb->add (
1948 new CFPlus::UI::Button text => $info->{build_arch_name},
1949 on_activate => sub {
1950 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1951
1952 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1953 build_mode_query_arch_info ();
1954 }
1955 }
1956 );
1957 }
1958
1959 $win->show;
1960}
1961
1962sub build_mode_query_arch_info {
1963 my ($iteminfo) = $::IN_BUILD_MODE;
1964 my $itemarchname = $iteminfo->{item};
1965 my $info = $iteminfo->{info};
1966
1967 my $dialog = new CFPlus::UI::Toplevel
1968 x => "center",
1969 y => "center",
1970 z => 50,
1971 force_w => int $WIDTH * 1/2,
1972 title => "Enter information for placement of '$itemarchname'",
1973 has_close_button => 1;
1974
1975 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1976
1977 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1978 my $row = 0;
1979 if ($info->{has_name}) {
1980 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1981 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1982 }
1983 if ($info->{has_text}) {
1984 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1985 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1986 }
1987 if ($info->{has_connection}) {
1988 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1989 $table->add (1, $row++,
1990 new CFPlus::UI::Entry
1991 expand => 1,
1992 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1993 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1994 );
1995 }
1996
1997 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1998 $hb->add (new CFPlus::UI::Button
1999 text => "Close",
2000 expand => 1,
2001 on_activate => sub { $dialog->hide; 0 },
2002 );
2003 $dialog->show;
2004} 2140}
2005 2141
2006sub video_shutdown { 2142sub video_shutdown {
2007 CFPlus::OpenGL::shutdown; 2143 CFPlus::OpenGL::shutdown;
2008 2144
2009 undef $SDL_ACTIVE; 2145 undef $SDL_ACTIVE;
2010} 2146}
2011 2147
2012sub audio_channel_finished {
2013 my ($channel) = @_;
2014
2015 #warn "channel $channel finished\n";#d#
2016}
2017
2018sub audio_music_set {
2019 my ($songs) = @_;
2020
2021 my @want =
2022 grep $_,
2023 map $CONN->{music_meta}{$_},
2024 @$songs;
2025
2026 if (@want) {
2027 @MUSIC_WANT = @want;
2028 &audio_music_changed ();
2029 }
2030}
2031
2032sub audio_music_start {
2033 my $path = $MUSIC_PLAYING->{path}
2034 or return;
2035
2036 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2037 # music might have changed...
2038 $path eq $MUSIC_PLAYING->{path}
2039 or return &audio_music_start ();
2040
2041 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2042
2043 my $NOW = time;
2044
2045 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2046 my $pos = $MUSIC_PLAYING->{stop_pos};
2047 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2048 $MUSIC_START = time - $pos;
2049 } else {
2050 $MUSIC_PLAYER->play (0);
2051 $MUSIC_START = time;
2052 }
2053
2054 delete $MUSIC_PLAYING->{stop_time};
2055 delete $MUSIC_PLAYING->{stop_pos};
2056 }
2057}
2058
2059sub audio_music_changed {
2060 return unless $CFG->{bgm_enable};
2061
2062 # default MUSIC_WANT == MUSIC_DEFAULT
2063 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2064
2065 # if the currently playing song is acceptable, let it continue
2066 return if $MUSIC_PLAYING
2067 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2068
2069 my $NOW = time;
2070
2071 if ($MUSIC_PLAYING) {
2072 $MUSIC_PLAYING->{stop_time} = $NOW;
2073 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2074 CFPlus::MixMusic::fade_out 1000;
2075 } else {
2076 # sort by stop time, oldest first
2077 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2078
2079 # if the most recently-played piece played very recently,
2080 # resume it, else choose the oldest piece for rotation.
2081 $MUSIC_PLAYING =
2082 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2083 ? $MUSIC_WANT[-1]
2084 : $MUSIC_WANT[0];
2085
2086 audio_music_start;
2087 }
2088}
2089
2090sub audio_music_finished {
2091 $MUSIC_PLAYING = undef;
2092 undef $MUSIC_PLAYER;
2093
2094 audio_music_changed;
2095}
2096
2097sub audio_init {
2098 if ($CFG->{audio_enable}) {
2099 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2100 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2101
2102 unless ($SDL_MIXER) {
2103 status "Unable to open sound device: there will be no sound";
2104 return;
2105 }
2106
2107 CFPlus::Mix_AllocateChannels 8;
2108 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2109
2110 audio_music_finished;
2111
2112 local $_;
2113 while (<$fh>) {
2114 next if /^\s*#/;
2115 next if /^\s*$/;
2116
2117 my ($file, $volume, $event) = split /\s+/, $_, 3;
2118
2119 push @SOUNDS, "$volume,$file";
2120
2121 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2122 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2123 $chunk->volume ($volume * 128 / 100);
2124 $chunk
2125 };
2126 }
2127 } else {
2128 status "unable to open sound config: $!";
2129 }
2130 }
2131}
2132
2133sub audio_shutdown {
2134 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2135 undef $SDL_MIXER;
2136 @SOUNDS = ();
2137 %AUDIO_CHUNKS = ();
2138}
2139
2140my %animate_object; 2148my %animate_object;
2141my $animate_timer; 2149my $animate_timer;
2142 2150
2143my $fps = 9; 2151my $fps = 9;
2144 2152
2145my %demo;#d#
2146
2147sub force_refresh { 2153sub force_refresh {
2154 if ($ENV{CFPLUS_DEBUG} & 4) {
2148 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2155 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2149 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2156 debug sprintf "%3.2f", $fps;
2157 }
2150 2158
2151 $CFPlus::UI::ROOT->draw; 2159 $CFPlus::UI::ROOT->draw;
2152 2160 CFPlus::SDL_GL_SwapBuffers;
2153 $WANT_REFRESH = 0;
2154 $CAN_REFRESH = 0;
2155 $LAST_REFRESH = $NOW; 2161 $LAST_REFRESH = $NOW;
2156 2162 $WANT_REFRESH->stop;
2157 CFPlus::SDL_GL_SwapBuffers;
2158} 2163}
2159 2164
2165$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2166
2160my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2167my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2161 $NOW = time; 2168 $NOW = time;
2162 2169
2163 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2170 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2164 for CFPlus::poll_events; 2171 for CFPlus::poll_events;
2165 2172
2166 if (%animate_object) { 2173 if (%animate_object) {
2167 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2174 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2168 ++$WANT_REFRESH; 2175 $WANT_REFRESH->start;
2169 }
2170
2171 if ($WANT_REFRESH) {
2172 force_refresh;
2173 } else {
2174 $CAN_REFRESH = 1;
2175 } 2176 }
2176}); 2177});
2177 2178
2178sub animation_start { 2179sub animation_start {
2179 my ($widget) = @_; 2180 my ($widget) = @_;
… …
2183sub animation_stop { 2184sub animation_stop {
2184 my ($widget) = @_; 2185 my ($widget) = @_;
2185 delete $animate_object{$widget}; 2186 delete $animate_object{$widget};
2186} 2187}
2187 2188
2188# check once/second for faces that need to be prefetched
2189# this should, of course, only run on demand, but
2190# SDL forces worse things on us....
2191
2192Event->timer (after => 1, interval => 0.25, cb => sub {
2193 $CONN->face_prefetch
2194 if $CONN;
2195});
2196
2197%SDL_CB = ( 2189%SDL_CB = (
2198 CFPlus::SDL_QUIT => sub { 2190 CFPlus::SDL_QUIT => sub {
2199 exit; 2191 Event::unloop_all;
2200 }, 2192 },
2201 CFPlus::SDL_VIDEORESIZE => sub { 2193 CFPlus::SDL_VIDEORESIZE => sub {
2202 }, 2194 },
2203 CFPlus::SDL_VIDEOEXPOSE => sub { 2195 CFPlus::SDL_VIDEOEXPOSE => sub {
2204 CFPlus::UI::full_refresh; 2196 CFPlus::UI::full_refresh;
… …
2243 CFPlus::DB::Server::run; 2235 CFPlus::DB::Server::run;
2244 2236
2245 CFPlus::UI::set_layout ($::CFG->{layout}); 2237 CFPlus::UI::set_layout ($::CFG->{layout});
2246 2238
2247 my %DEF_CFG = ( 2239 my %DEF_CFG = (
2248 sdl_mode => 0, 2240 sdl_mode => 0,
2249 width => 640,
2250 height => 480,
2251 fullscreen => 0, 2241 fullscreen => 0,
2252 fast => 0, 2242 fast => 0,
2243 force_opengl11 => undef,
2244 texture_compression => 1,
2253 map_scale => 1, 2245 map_scale => 1,
2254 fow_enable => 1, 2246 fow_enable => 1,
2255 fow_intensity => 0, 2247 fow_intensity => 0,
2256 fow_smooth => 1,
2257 map_smoothing => 1, 2248 map_smoothing => 1,
2258 gui_fontsize => 1, 2249 gui_fontsize => 1,
2259 log_fontsize => 0.7, 2250 log_fontsize => 0.7,
2260 gauge_fontsize => 1, 2251 gauge_fontsize => 1,
2261 gauge_size => 0.35, 2252 gauge_size => 0.35,
2262 stat_fontsize => 0.7, 2253 stat_fontsize => 0.7,
2263 mapsize => 100, 2254 mapsize => 100,
2264 say_command => 'chat',
2265 audio_enable => 1, 2255 audio_enable => 1,
2256 effects_enable => 1,
2257 effects_volume => 1,
2266 bgm_enable => 1, 2258 bgm_enable => 1,
2267 bgm_volume => 0.25, 2259 bgm_volume => 0.5,
2268 face_prefetch => 0,
2269 output_sync => 1, 2260 output_sync => 1,
2270 output_count => 1, 2261 output_count => 1,
2271 output_rate => "", 2262 output_rate => "",
2272 pickup => 0, 2263 pickup => 0,
2273 inv_sort => "mtime", 2264 inv_sort => "mtime",
2274 default => "profile", # default profile 2265 default => "profile", # default profile
2275 show_tips => 1, 2266 show_tips => 1,
2276 logview_max_par => 1000, 2267 logview_max_par => 1000,
2277 ); 2268 );
2278 2269
2279 while (my ($k, $v) = each %DEF_CFG) { 2270 while (my ($k, $v) = each %DEF_CFG) {
2280 $CFG->{$k} = $v unless exists $CFG->{$k}; 2271 $CFG->{$k} = $v unless exists $CFG->{$k};
2281 } 2272 }
… …
2298 sdl_init; 2289 sdl_init;
2299 2290
2300 @SDL_MODES = CFPlus::SDL_ListModes 8, 8; 2291 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2301 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES; 2292 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2302 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2293 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2294
2295 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2303 2296
2304 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2297 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2305 2298
2306 { 2299 {
2307 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2300 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2336# } 2329# }
2337# my $t2 = Time::HiRes::time; 2330# my $t2 = Time::HiRes::time;
2338# warn $t2-$t1; 2331# warn $t2-$t1;
2339# } 2332# }
2340 2333
2341 $startup_done->();
2342
2343 video_init; 2334 video_init;
2344 audio_init; 2335 audio_init;
2345} 2336}
2346 2337
2347show_tip_of_the_day if $CFG->{show_tips}; 2338show_tip_of_the_day if $CFG->{show_tips};
2348 2339
2340Event->idle (cb => sub {
2341 $_[0]->w->cancel;
2342 $startup_done->();
2343});
2344
2349Event::loop; 2345Event::loop;
2346
2347#video_shutdown;
2348#audio_shutdown;
2350#CFPlus::SDL_Quit; 2349CFPlus::SDL_Quit;
2351#CFPlus::_exit 0;
2352
2353END {
2354 CFPlus::SDL_Quit;
2355 CFPlus::DB::Server::stop; 2350CFPlus::DB::Server::stop;
2356}
2357 2351
2358=head1 NAME 2352=head1 NAME
2359 2353
2360cfplus - A Crossfire+ and Crossfire game client 2354cfplus - A Crossfire TRT and Crossfire game client
2361 2355
2362=head1 SYNOPSIS 2356=head1 SYNOPSIS
2363 2357
2364Just run it - no commandline arguments are supported. 2358Just run it - no commandline arguments are supported.
2365 2359
2366=head1 USAGE 2360=head1 USAGE
2367 2361
2368cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2362cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2369fullscreen and interactively. 2363be used in fullscreen mode and interactively.
2370 2364
2371=head1 DEBUGGING 2365=head1 DEBUGGING
2372 2366
2373 2367
2374CFPLUS_DEBUG - environment variable 2368CFPLUS_DEBUG - environment variable

Diff Legend

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