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

Diff Legend

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