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

Diff Legend

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