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

Diff Legend

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