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.161 by root, Thu Jul 5 06:57:03 2007 UTC vs.
Revision 1.211 by root, Sun Aug 12 01:49:25 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;
… …
445 675
446 my ($host, $port) = split /:/, $PROFILE->{host}; 676 my ($host, $port) = split /:/, $PROFILE->{host};
447 677
448 $MAP = new CFPlus::Map; 678 $MAP = new CFPlus::Map;
449 679
450 warn "connecting...\n";#d#
451 $CONN = eval { 680 $CONN = eval {
452 new CFPlus::Protocol 681 new CFPlus::Protocol
453 host => $host, 682 host => $host,
454 port => $port || 13327, 683 port => $port || 13327,
455 user => $PROFILE->{user}, 684 user => $PROFILE->{user},
… …
458 maph => $mapsize, 687 maph => $mapsize,
459 688
460 client => "cfplus $CFPlus::VERSION $] $^O", 689 client => "cfplus $CFPlus::VERSION $] $^O",
461 690
462 map_widget => $MAPWIDGET, 691 map_widget => $MAPWIDGET,
463 logview => $LOGVIEW,
464 statusbox => $STATUSBOX, 692 statusbox => $STATUSBOX,
465 map => $MAP, 693 map => $MAP,
466 mapmap => $MAPMAP, 694 mapmap => $MAPMAP,
467 query => \&server_query, 695 query => \&server_query,
468 696
469 setup_req => { 697 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1, 698 smoothing => $CFG->{map_smoothing}*1,
471 }, 699 },
472
473 sound_play => sub {
474 my ($x, $y, $soundnum, $type) = @_;
475
476 $SDL_MIXER
477 or return;
478
479 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
480 or return;
481
482 $chunk->play;
483 },
484 }; 700 };
485 warn "connected<$CONN,$@>\n";#d#
486 701
487 if ($CONN) { 702 if ($CONN) {
488 CFPlus::lowdelay fileno $CONN->{fh}; 703 CFPlus::lowdelay fileno $CONN->{fh};
489 704
490 status "login successful"; 705 status "login successful";
… …
500 $SETUP_DIALOG->show; 715 $SETUP_DIALOG->show;
501 $PL_WINDOW->hide; 716 $PL_WINDOW->hide;
502 $SPELL_LIST->clear_spells; 717 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 718 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
504 719
720 &audio_music_set_ambient ([]);
721
505 return unless $CONN; 722 return unless $CONN;
506 723
507 status "connection closed"; 724 status "connection closed";
508 725
509 destroy_query_dialog $CONN; 726 destroy_query_dialog $CONN;
… …
518 735
519 $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]);
520 737
521 my $row = 0; 738 my $row = 0;
522 739
523 $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");
524 $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,
525 can_events => 1, 742 can_events => 1,
526 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 743 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
527 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
528 $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");
529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 750 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
530 751
752 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
531 $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],
532 $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);
533 758
534 $mode_slider->connect (changed => sub { 759 $mode_slider->connect (changed => sub {
535 my ($self, $value) = @_; 760 my ($self, $value) = @_;
536 761
537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 762 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 763 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
539 }); 764 });
540 $mode_slider->emit (changed => $mode_slider->{range}[0]); 765 $mode_slider->emit (changed => $mode_slider->{range}[0]);
541 766
542 $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");
543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 768 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
544 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
545 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
546 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
547 ); 772 );
548 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
549 $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");
550 $table->add (1, $row++, new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
551 state => $CFG->{fast}, 788 state => $CFG->{fast},
552 tooltip => "Lower the visual quality considerably to speed up rendering.", 789 tooltip => "Lower the visual quality considerably to speed up rendering.",
553 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
554 ); 791 );
555 792
556 $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");
557 $table->add (1, $row++, new CFPlus::UI::Slider 794 $table->add_at (1, $row++, new CFPlus::UI::Slider
558 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 795 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
559 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.",
560 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 797 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
561 ); 798 );
562 799
563 $table->add (1, $row++, new CFPlus::UI::Button 800 $table->add_at (1, $row++, new CFPlus::UI::Button
564 expand => 1, align => 0, text => "Apply", 801 expand => 1, align => 0, text => "Apply",
565 tooltip => "Apply the video settings above.", 802 tooltip => "Apply the video settings above.",
566 on_activate => sub { 803 on_activate => sub {
567 video_shutdown (); 804 video_shutdown ();
568 video_init (); 805 video_init ();
569 0 806 0
570 } 807 }
571 ); 808 );
572 809
573 $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");
574 $table->add (1, $row++, new CFPlus::UI::Slider 811 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 812 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 813 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
577 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 }
578 ); 815 );
579 816
580 $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");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox 818 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{map_smoothing}, 819 state => $CFG->{map_smoothing},
583 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. "
584 . "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. "
585 . "Changes take effect at next connection only.", 822 . "Changes take effect at next login only.",
586 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 823 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
587 ); 824 );
588 825
589 $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");
590 $table->add (1, $row++, new CFPlus::UI::CheckBox 827 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{fow_enable}, 828 state => $CFG->{fow_enable},
592 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.",
593 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 830 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
594 ); 831 );
595 832
596 $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");
597 $table->add (1, $row++, new CFPlus::UI::Slider 834 $table->add_at (1, $row++, new CFPlus::UI::Slider
598 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 835 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
599 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.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 837 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
601 ); 838 );
602 839
603 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
604 $table->add (1, $row++, new CFPlus::UI::CheckBox
605 state => $CFG->{fow_smooth},
606 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
607 on_changed => sub {
608 my ($self, $value) = @_;
609 $CFG->{fow_smooth} = $value;
610 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
611 0
612 }
613 );
614
615 $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");
616 $table->add (1, $row++, new CFPlus::UI::Slider 841 $table->add_at (1, $row++, new CFPlus::UI::Slider
617 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 842 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
618 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.",
619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 845 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
620 ); 846 );
621 847
622 $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");
623 $table->add (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
624 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 850 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
625 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.",
626 on_changed => sub { 852 on_changed => sub {
627 $CFG->{gauge_fontsize} = $_[1]; 853 $CFG->{gauge_fontsize} = $_[1];
628 &set_gauge_window_fontsize; 854 &set_gauge_window_fontsize;
629 0 855 0
630 } 856 }
631 ); 857 );
632 858
633 $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");
634 $table->add (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
635 range => [$CFG->{gauge_size}, 0.2, 0.8], 861 range => [$CFG->{gauge_size}, 0.2, 0.8],
636 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.",
637 on_changed => sub { 863 on_changed => sub {
638 $CFG->{gauge_size} = $_[1]; 864 $CFG->{gauge_size} = $_[1];
639 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 865 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
645} 871}
646 872
647sub audio_setup { 873sub audio_setup {
648 my $vbox = new CFPlus::UI::VBox; 874 my $vbox = new CFPlus::UI::VBox;
649 875
650 $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]);
651 877
652 my $row = 0; 878 my $row = 0;
653 879
654 $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");
655 $table->add (1, $row++, new CFPlus::UI::CheckBox 881 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
656 state => $CFG->{audio_enable}, 882 state => $CFG->{audio_enable},
657 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.",
658 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 884 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
659 ); 885 );
660# $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");
661# $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 {
662# $CFG->{effects_volume} = $_[1]; 888# $CFG->{effects_volume} = $_[1];
663# }); 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
664 $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");
665 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
666 $hbox->add (new CFPlus::UI::CheckBox 909 $table->add_at (1, $row, new CFPlus::UI::CheckBox
667 expand => 1, state => $CFG->{bgm_enable}, 910 expand => 1, state => $CFG->{bgm_enable},
668 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.",
669 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 }
670 ); 917 );
671 $hbox->add (new CFPlus::UI::Slider 918 $table->add_at (2, $row++, new CFPlus::UI::Slider
672 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 919 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
673 tooltip => "The volume of the background music. Changes are instant.", 920 tooltip => "The volume of the background music. Changes are instant.",
674 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 }
675 ); 922 );
676 923
677 $table->add (1, $row++, new CFPlus::UI::Button 924 $table->add_at (1, $row++, new CFPlus::UI::Button
678 expand => 1, align => 0, text => "Apply", 925 c_colspan => 2, expand => 1, align => 0, text => "Apply",
679 tooltip => "Apply the audio settings", 926 tooltip => "Apply the audio settings",
680 on_activate => sub { 927 on_activate => sub {
681 audio_shutdown (); 928 audio_shutdown ();
682 audio_init (); 929 audio_init ();
683 0 930 0
… …
741} 988}
742 989
743sub debug_setup { 990sub debug_setup {
744 my $table = new CFPlus::UI::Table; 991 my $table = new CFPlus::UI::Table;
745 992
746 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 993 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
747 $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 });
748 $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");
749 $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 });
750 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 997 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
751 $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 });
752 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 999 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
753 $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 });
754 $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() } );
755 1002
756 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
757
758 for my $x (0..2) {
759 for my $y (0 .. 2) {
760 $table->add ($x + 3, $y,
761 new CFPlus::UI::Entry
762 text => $default_smooth[$x * 3 + $y],
763 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
764 );
765 }
766 }
767
768 $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 });
769 1037
770 $table 1038 $table
771} 1039}
772 1040
773sub stats_window { 1041sub stats_window {
… …
821 [2, 4, st_spd => "Spd", 10.54], 1089 [2, 4, st_spd => "Spd", 10.54],
822 [2, 5, st_wspd => "WSp", 10.54], 1090 [2, 5, st_wspd => "WSp", 10.54],
823 ) { 1091 ) {
824 my ($col, $row, $id, $label, $template) = @$_; 1092 my ($col, $row, $id, $label, $template) = @$_;
825 1093
826 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1094 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
827 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1095 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
828 align => +1, template => $template, tooltip => "#stat_$label"); 1096 align => +1, template => $template, tooltip => "#stat_$label");
829 $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
830 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,
831 align => -1, text => $label, tooltip => "#stat_$label"); 1099 align => -1, text => $label, tooltip => "#stat_$label");
832 } 1100 }
833 1101
834 $vb->add (new CFPlus::UI::FancyFrame 1102 $vb->add (new CFPlus::UI::FancyFrame
… …
875 cold => ["Cold", 1143 cold => ["Cold",
876 "<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, ...)"],
877 ghit => ["Ghost hit", 1145 ghit => ["Ghost hit",
878 "<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)"],
879 ); 1147 );
1148
880 for (qw/slow holyw conf fire depl magic 1149 for (qw/slow holyw conf fire depl magic
881 drain acid pois para deat phys 1150 drain acid pois para deat phys
882 blind fear tund elec cold ghit/) 1151 blind fear tund elec cold ghit/)
883 { 1152 {
884 $tbl2->add ($col, $row, 1153 $tbl2->add_at ($col, $row,
885 $STATWIDS->{"res_$_"} = 1154 $STATWIDS->{"res_$_"} =
886 new CFPlus::UI::Label 1155 new CFPlus::UI::Label
887 font => $FONT_FIXED, 1156 font => $FONT_FIXED,
888 template => "-100%", 1157 template => "-100%",
889 align => +1, 1158 align => +1,
890 valign => 0, 1159 valign => 0,
891 can_events => 1, 1160 can_events => 1,
892 can_hover => 1, 1161 can_hover => 1,
893 tooltip => $resist_names{$_}->[1], 1162 tooltip => $resist_names{$_}->[1],
894 ); 1163 );
895 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1164 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
896 font => $FONT_FIXED, 1165 font => $FONT_FIXED,
897 can_hover => 1, 1166 can_hover => 1,
898 can_events => 1, 1167 can_events => 1,
899 path => "ui/resist/resist_$_.png", 1168 path => "ui/resist/resist_$_.png",
900 tooltip => $resist_names{$_}->[1], 1169 tooltip => $resist_names{$_}->[1],
901 ); 1170 );
902 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1171 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
903 text => $resist_names{$_}->[0], 1172 text => $resist_names{$_}->[0],
904 font => $FONT_FIXED, 1173 font => $FONT_FIXED,
905 can_hover => 1, 1174 can_hover => 1,
906 can_events => 1, 1175 can_events => 1,
907 tooltip => $resist_names{$_}->[1], 1176 tooltip => $resist_names{$_}->[1],
… …
940 return if $METASERVER_ATIME > time; 1209 return if $METASERVER_ATIME > time;
941 $METASERVER_ATIME = time + 60; 1210 $METASERVER_ATIME = time + 60;
942 1211
943 my $table = $METASERVER->{table}; 1212 my $table = $METASERVER->{table};
944 $table->clear; 1213 $table->clear;
945 $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...");
946 1215
947 my $ok = 0; 1216 my $ok = 0;
948 1217
949 CFPlus::background { 1218 CFPlus::background {
950 my $ua = CFPlus::lwp_useragent; 1219 my $ua = CFPlus::lwp_useragent;
… …
961 "The time this server has been running without being restarted.", 1230 "The time this server has been running without being restarted.",
962 "The server software version - a '+' indicates a Crossfire+ server.", 1231 "The server software version - a '+' indicates a Crossfire+ server.",
963 "Short information about this server provided by its admins.", 1232 "Short information about this server provided by its admins.",
964 ); 1233 );
965 my @col = qw(#Users Host Uptime Version Description); 1234 my @col = qw(#Users Host Uptime Version Description);
966 $table->add ($_, 0, new CFPlus::UI::Label 1235 $table->add_at ($_, 0, new CFPlus::UI::Label
967 can_hover => 1, can_events => 1, 1236 can_hover => 1, can_events => 1,
968 align => 0, fg => [1, 1, 0], 1237 align => 0, fg => [1, 1, 0],
969 text => $col[$_], tooltip => $tip[$_]) 1238 text => $col[$_], tooltip => $tip[$_])
970 for 0 .. $#col; 1239 for 0 .. $#col;
971 1240
… …
993 1262
994 $m = [$users, $host, $uptime, $version, $desc]; 1263 $m = [$users, $host, $uptime, $version, $desc];
995 1264
996 $y++; 1265 $y++;
997 1266
998 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1267 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
999 (new CFPlus::UI::Button 1268 (new CFPlus::UI::Button
1000 text => "Use", 1269 text => "Use",
1001 tooltip => "Put this server into the <b>Host:Port</b> field", 1270 tooltip => "Put this server into the <b>Host:Port</b> field",
1002 on_activate => sub { 1271 on_activate => sub {
1003 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1272 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1006 }, 1275 },
1007 ), 1276 ),
1008 (new CFPlus::UI::Empty expand => 1), 1277 (new CFPlus::UI::Empty expand => 1),
1009 ]); 1278 ]);
1010 1279
1011 $table->add ($_, $y, new CFPlus::UI::Label 1280 $table->add_at ($_, $y, new CFPlus::UI::Label
1012 max_w => $::WIDTH * 0.4, 1281 max_w => $::WIDTH * 0.4,
1013 ellipsise => 0, 1282 ellipsise => 0,
1014 align => $align[$_], 1283 align => $align[$_],
1015 text => $m->[$_], 1284 text => $m->[$_],
1016 tooltip => $tip[$_], 1285 tooltip => $tip[$_],
… …
1057 1326
1058 $vbox->add (new CFPlus::UI::FancyFrame 1327 $vbox->add (new CFPlus::UI::FancyFrame
1059 label => "Connection Settings", 1328 label => "Connection Settings",
1060 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]),
1061 ); 1330 );
1062 $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");
1063 1332
1064 { 1333 {
1065 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1334 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1066 1335
1067 $vbox->add ( 1336 $vbox->add (
1068 $HOST_ENTRY = new CFPlus::UI::Entry 1337 $HOST_ENTRY = new CFPlus::UI::Entry
1069 expand => 1, 1338 expand => 1,
1070 text => $CFG->{profile}{default}{host}, 1339 text => $CFG->{profile}{default}{host},
1071 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",
1072 on_changed => sub { 1341 on_changed => sub {
1073 my ($self, $value) = @_; 1342 my ($self, $value) = @_;
1074 $CFG->{profile}{default}{host} = $value; 1343 $CFG->{profile}{default}{host} = $value;
1075 0 1344 1
1076 } 1345 }
1077 ); 1346 );
1078 1347
1079 $vbox->add (new CFPlus::UI::Button 1348 $vbox->add (new CFPlus::UI::Button
1080 expand => 1, 1349 expand => 1,
1081 text => "Server List", 1350 text => "Server List",
1082 other => $METASERVER, 1351 other => $METASERVER,
1083 tooltip => "Show a list of available crossfire servers", 1352 tooltip => "Show a list of available crossfire servers",
1084 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1353 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1085 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1354 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1086 ); 1355 );
1087 } 1356 }
1088 1357
1089 $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");
1090 $table->add (1, 4, new CFPlus::UI::Entry 1359 $table->add_at (1, 4, new CFPlus::UI::Entry
1091 text => $CFG->{profile}{default}{user}, 1360 text => $CFG->{profile}{default}{user},
1092 tooltip => "The name of your character on the server", 1361 tooltip => "The name of your character on the server",
1093 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1362 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1094 ); 1363 );
1095 1364
1096 $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");
1097 $table->add (1, 5, new CFPlus::UI::Entry 1366 $table->add_at (1, 5, new CFPlus::UI::Entry
1098 text => $CFG->{profile}{default}{password}, 1367 text => $CFG->{profile}{default}{password},
1099 hidden => 1, 1368 hidden => 1,
1100 tooltip => "The password for your character", 1369 tooltip => "The password for your character",
1101 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1370 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1102 ); 1371 );
1103 1372
1104 $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");
1105 $table->add (1, 7, new CFPlus::UI::Slider 1374 $table->add_at (1, 7, new CFPlus::UI::Slider
1106 force_w => 100, 1375 force_w => 100,
1107 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1376 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1108 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. "
1109 . "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, "
1110 . "but you also increase bandwidth requirements and latency. " 1379 . "but you also increase bandwidth requirements and latency. "
1111 . "This option is only used once at log-in.", 1380 . "This option is only used once at log-in.",
1112 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 },
1113 ); 1382 );
1114 1383
1115 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1116 $table->add (1, 8, new CFPlus::UI::CheckBox
1117 state => $CFG->{face_prefetch},
1118 tooltip => "<b>Background Image Prefetch</b>\n\n"
1119 . "If enabled, the client automatically pre-fetches images from the server. "
1120 . "This might increase or create lag, but increases the chances "
1121 . "of faces being ready for display when you encounter them. "
1122 . "It also uses up server bandwidth on every connect, "
1123 . "so only set it if you really need to prefetch images. "
1124 . "This option can be set and unset any time.",
1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1126 );
1127
1128 $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");
1129 $table->add (1, 9, new CFPlus::UI::Entry 1385 $table->add_at (1, 8, new CFPlus::UI::Entry
1130 text => $CFG->{output_rate}, 1386 text => $CFG->{output_rate},
1131 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 "
1132 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1388 . "when sending data. When 0 or unset, the server "
1133 . "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.",
1134 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1391 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1135 ); 1392 );
1136 1393
1137 $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");
1138 $table->add (1, 10, new CFPlus::UI::Entry 1395 $table->add_at (1, 9, new CFPlus::UI::Entry
1139 text => $CFG->{output_count}, 1396 text => $CFG->{output_count},
1140 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.",
1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1398 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1142 ); 1399 );
1143 1400
1144 $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");
1145 $table->add (1, 11, new CFPlus::UI::Entry 1402 $table->add_at (1, 10, new CFPlus::UI::Entry
1146 text => $CFG->{output_sync}, 1403 text => $CFG->{output_sync},
1147 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.",
1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1405 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1149 ); 1406 );
1150 1407
1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1408 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1152 expand => 1, 1409 expand => 1,
1153 align => 0, 1410 align => 0,
1154 text => "Login", 1411 text => "Login",
1155 on_activate => sub { 1412 on_activate => sub {
1156 $CONN ? stop_game 1413 $CONN ? stop_game
1157 : start_game; 1414 : start_game;
1158 0 1415 1
1159 }, 1416 },
1160 ); 1417 );
1161 1418
1162 $vbox->add (new CFPlus::UI::FancyFrame 1419 $vbox->add (new CFPlus::UI::FancyFrame
1163 label => "Server Info", 1420 label => "Server Info",
… …
1170sub client_setup { 1427sub client_setup {
1171 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];
1172 1429
1173 my $row = 0; 1430 my $row = 0;
1174 1431
1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1176 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1177 text => $CFG->{say_command},
1178 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. "
1179 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1180 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1181 on_changed => sub {
1182 my ($self, $value) = @_;
1183 $CFG->{say_command} = $value;
1184 0
1185 }
1186 );
1187
1188 $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");
1189 $table->add (1, $row++, new CFPlus::UI::CheckBox 1433 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1190 state => $CFG->{show_tips}, 1434 state => $CFG->{show_tips},
1191 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?",
1192 on_changed => sub { 1436 on_changed => sub {
1193 my ($self, $value) = @_; 1437 my ($self, $value) = @_;
1194 $CFG->{show_tips} = $value; 1438 $CFG->{show_tips} = $value;
1195 0 1439 0
1196 } 1440 }
1197 ); 1441 );
1198 1442
1199 $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");
1200 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1444 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1201 text => $CFG->{logview_max_par}, 1445 text => $CFG->{logview_max_par},
1202 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 "
1203 . "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 "
1204 . "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.",
1205 on_changed => sub { 1449 on_changed => sub {
1206 my ($self, $value) = @_; 1450 my ($self, $value) = @_;
1207 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1451 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1208 0 1452 0
1209 }, 1453 },
1210 ); 1454 );
1211 1455
1212 $table 1456 $table
1213} 1457}
1214 1458
1215sub message_window {
1216 my $window = new CFPlus::UI::Toplevel
1217 name => "message_window",
1218 title => "Messages",
1219 border_bg => [1, 1, 1, 1],
1220 x => "max",
1221 y => 0,
1222 force_w => $::WIDTH * 0.4,
1223 force_h => $::HEIGHT * 0.5,
1224 child => (my $vbox = new CFPlus::UI::VBox),
1225 has_close_button => 1;
1226
1227 $vbox->add ($LOGVIEW);
1228
1229 $vbox->add (my $input = new CFPlus::UI::Entry
1230 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1231 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1232 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1233 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1234 on_focus_in => sub {
1235 my ($input, $prev_focus) = @_;
1236
1237 delete $input->{refocus_map};
1238
1239 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1240 $input->{refocus_map} = 1;
1241 }
1242 delete $input->{auto_activated};
1243
1244 0
1245 },
1246 on_activate => sub {
1247 my ($input, $text) = @_;
1248 $input->set_text ('');
1249
1250 if ($text =~ /^\/(.*)/) {
1251 $::CONN->user_send ($1);
1252 } else {
1253 my $say_cmd = $::CFG->{say_command} || 'say';
1254 $::CONN->user_send ("$say_cmd $text");
1255 }
1256 if ($input->{refocus_map}) {
1257 delete $input->{refocus_map};
1258 $MAPWIDGET->focus_in
1259 }
1260
1261 0
1262 },
1263 on_escape => sub {
1264 $MAPWIDGET->grab_focus;
1265
1266 0
1267 },
1268 );
1269
1270 $CONSOLE = {
1271 window => $window,
1272 input => $input,
1273 };
1274
1275 $window
1276}
1277
1278sub autopickup_setup { 1459sub autopickup_setup {
1460 my $r = new CFPlus::UI::ScrolledWindow (
1461 expand => 1,
1462 scroll_y => 1
1463 );
1279 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 );
1280 1468
1281 for ( 1469 for (
1282 ["General", 0, 0, 1470 ["General", 0, 0,
1283 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1471 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1284 ["Inhibit autopickup" => PICKUP_INHIBIT], 1472 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1319 ], 1507 ],
1320 ["Weight/Value ratio", 2, 17] 1508 ["Weight/Value ratio", 2, 17]
1321 ) 1509 )
1322 { 1510 {
1323 my ($title, $x, $y, @bits) = @$_; 1511 my ($title, $x, $y, @bits) = @$_;
1324 $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]);
1325 1513
1326 for (@bits) { 1514 for (@bits) {
1327 ++$y; 1515 ++$y;
1328 1516
1329 my $mask = $_->[1]; 1517 my $mask = $_->[1];
1330 $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);
1331 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1519 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1332 state => $::CFG->{pickup} & $mask, 1520 state => $::CFG->{pickup} & $mask,
1333 on_changed => sub { 1521 on_changed => sub {
1334 my ($box, $value) = @_; 1522 my ($box, $value) = @_;
1335 1523
1336 if ($value) { 1524 if ($value) {
… …
1347 1535
1348 ${$_->[2]} = $checkbox if $_->[2]; 1536 ${$_->[2]} = $checkbox if $_->[2];
1349 } 1537 }
1350 } 1538 }
1351 1539
1352 $table->add (2, 18, new CFPlus::UI::ValSlider 1540 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1353 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1541 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1354 template => ">= 99", 1542 template => ">= 99",
1355 to_value => sub { ">= " . 5 * $_[0] }, 1543 to_value => sub { ">= " . 5 * $_[0] },
1356 on_changed => sub { 1544 on_changed => sub {
1357 my ($slider, $value) = @_; 1545 my ($slider, $value) = @_;
… …
1360 $::CFG->{pickup} |= int $value 1548 $::CFG->{pickup} |= int $value
1361 if $value; 1549 if $value;
1362 1; 1550 1;
1363 }); 1551 });
1364 1552
1365 $table->add (3, 18, new CFPlus::UI::Button 1553 $table->add_at (3, 18, new CFPlus::UI::Button
1366 text => "set", 1554 text => "set",
1367 on_activate => sub { 1555 on_activate => sub {
1368 $::CONN->send_command ("pickup $::CFG->{pickup}") 1556 $::CONN->send_command ("pickup $::CFG->{pickup}")
1369 if defined $::CONN; 1557 if defined $::CONN;
1370 0 1558 0
1371 }); 1559 });
1372 1560
1373 $table 1561 $r
1374} 1562}
1375 1563
1376my %SORT_ORDER = ( 1564my %SORT_ORDER = (
1377 type => undef, 1565 type => undef,
1378 mtime => sub { 1566 mtime => sub {
… …
1433 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1621 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1434 1622
1435 $hb 1623 $hb
1436} 1624}
1437 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
1438sub toggle_player_page { 1666sub toggle_player_page {
1439 my ($widget) = @_; 1667 my ($widget) = @_;
1440 1668
1441 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1669 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1442 $PL_WINDOW->hide; 1670 $PL_WINDOW->hide;
… …
1459 1687
1460 my $ntb = 1688 my $ntb =
1461 $PL_NOTEBOOK = 1689 $PL_NOTEBOOK =
1462 new CFPlus::UI::Notebook expand => 1; 1690 new CFPlus::UI::Notebook expand => 1;
1463 1691
1464 $ntb->add ( 1692 $ntb->add_tab (
1465 "Statistics (F2)" => $STATS_PAGE = stats_window, 1693 "Statistics (F2)" => $STATS_PAGE = stats_window,
1466 "Shows statistics, where all your Stats and Resistances are shown." 1694 "Shows statistics, where all your Stats and Resistances are shown."
1467 ); 1695 );
1468 $ntb->add ( 1696 $ntb->add_tab (
1469 "Skills (F3)" => $SKILL_PAGE = skill_window, 1697 "Skills (F3)" => $SKILL_PAGE = skill_window,
1470 "Shows all your Skills." 1698 "Shows all your Skills."
1471 ); 1699 );
1472 1700
1473 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);
1474 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1702 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1475 $ntb->add ( 1703 $ntb->add_tab (
1476 "Spellbook (F4)" => $spellsw, 1704 "Spellbook (F4)" => $spellsw,
1477 "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."
1478 ); 1706 );
1479 $ntb->add ( 1707 $ntb->add_tab (
1480 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1708 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1481 "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 :). "
1482 . "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."
1483 ); 1711 );
1484 $ntb->add (Pickup => autopickup_setup, 1712 $ntb->add_tab (Pickup => autopickup_setup,
1485 "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.");
1486 1717
1487 $ntb->set_current_page ($INVENTORY_PAGE); 1718 $ntb->set_current_page ($INVENTORY_PAGE);
1488 1719
1489 $plwin->add ($ntb); 1720 $plwin->add ($ntb);
1490 $plwin 1721 $plwin
… …
1687 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1918 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1688 $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]);
1689 1920
1690 $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]);
1691 1922
1692 $table->add (0, 0, new CFPlus::UI::Button 1923 $table->add_at (0, 0, new CFPlus::UI::Button
1693 text => "Close", 1924 text => "Close",
1694 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>.",
1695 on_activate => $close, 1926 on_activate => $close,
1696 ); 1927 );
1697 1928
1698 $table->add (2, 0, new CFPlus::UI::Button 1929 $table->add_at (2, 0, new CFPlus::UI::Button
1699 text => "Next", 1930 text => "Next",
1700 tooltip => "Show the next <b>Tip of the day</b>.", 1931 tooltip => "Show the next <b>Tip of the day</b>.",
1701 on_activate => sub { 1932 on_activate => sub {
1702 $close->(); 1933 $close->();
1703 &show_tip_of_the_day; 1934 &show_tip_of_the_day;
… …
1712 CFPlus::SDL_Init 1943 CFPlus::SDL_Init
1713 and die "SDL::Init failed!\n"; 1944 and die "SDL::Init failed!\n";
1714} 1945}
1715 1946
1716sub video_init { 1947sub video_init {
1717 sdl_init;
1718
1719 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1948 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1720 1949
1721 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1950 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1722 1951
1723 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1952 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1724 $FULLSCREEN = $CFG->{fullscreen}; 1953 $FULLSCREEN = $CFG->{fullscreen};
1725 $FAST = $CFG->{fast}; 1954 $FAST = $CFG->{fast};
1726 1955
1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1956 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1957 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1729 1958
1730 $SDL_ACTIVE = 1; 1959 $SDL_ACTIVE = 1;
1731 $LAST_REFRESH = time - 0.01; 1960 $LAST_REFRESH = time - 0.01;
1732 1961
… …
1774 2003
1775 $MAPWIDGET = new CFPlus::MapWidget; 2004 $MAPWIDGET = new CFPlus::MapWidget;
1776 $MAPWIDGET->connect (activate_console => sub { 2005 $MAPWIDGET->connect (activate_console => sub {
1777 my ($mapwidget, $preset) = @_; 2006 my ($mapwidget, $preset) = @_;
1778 2007
1779 if ($CONSOLE) { 2008 $MESSAGE_WINDOW->activate_console ($preset)
1780 $CONSOLE->{input}->{auto_activated} = 1; 2009 if $MESSAGE_WINDOW;
1781 $CONSOLE->{input}->grab_focus;
1782
1783 if ($preset && $CONSOLE->{input}->get_text eq '') {
1784 $CONSOLE->{input}->set_text ($preset);
1785 }
1786 }
1787 }); 2010 });
1788 $MAPWIDGET->show; 2011 $MAPWIDGET->show;
1789 $MAPWIDGET->grab_focus; 2012 $MAPWIDGET->grab_focus;
1790
1791 $LOGVIEW = new CFPlus::UI::TextScroller
1792 expand => 1,
1793 font => $FONT_FIXED,
1794 fontsize => $::CFG->{log_fontsize},
1795 indent => -4,
1796 can_hover => 1,
1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1800 ;
1801 2013
1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2014 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1803 title => "Setup", 2015 title => "Setup",
1804 name => "setup_dialog", 2016 name => "setup_dialog",
1805 x => 'center', 2017 x => 'center',
… …
1809 force_h => $::HEIGHT * 0.6, 2021 force_h => $::HEIGHT * 0.6,
1810 has_close_button => 1, 2022 has_close_button => 1,
1811 ; 2023 ;
1812 2024
1813 $METASERVER = metaserver_dialog; 2025 $METASERVER = metaserver_dialog;
2026 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1814 2027
1815 $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,
1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2029 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1817 2030
1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2031 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1819 "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.");
1820 $SETUP_NOTEBOOK->add (Client => client_setup, 2033 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1821 "Configure various client-specific settings."); 2034 "Configure various client-specific settings.");
1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2035 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1823 "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.");
1824 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2037 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1825 "Configure the use of audio, sound effects and background music."); 2038 "Configure the use of audio, sound effects and background music.");
1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2039 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1827 "Lets you define, edit and delete key bindings." 2040 "Lets you define, edit and delete key bindings."
1828 . "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 "
1829 . "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 "
1830 . "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. "
1831 . "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 "
1832 . "binding editor closes"); 2045 . "binding editor closes");
1833 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2046 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1834 "Some debuggin' options. Do not ask."); 2047 "Some debuggin' options. Do not ask.");
1835 2048
1836 $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
1837 2050
1838 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2051 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1839 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.");
1840 2053
1841 $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,
1842 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.");
1843 2056
1844 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
1845 2058
1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2059 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1879 } 2092 }
1880 2093
1881 $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]);
1882} 2095}
1883 2096
1884sub setup_build_button {
1885 my ($enabled) = @_;
1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1889 text => "Build",
1890 tooltip => "Opens the ingame builder",
1891 on_activate => sub {
1892 if ($CONN) {
1893 $CONN->send_ext_req (builder_player_items => sub {
1894 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1895 });
1896 }
1897 0
1898 };
1899 $BUTTONBAR->add ($BUILD_BUTTON);
1900 } else {
1901 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1902 }
1903}
1904
1905sub open_ingame_editor {
1906 my ($msg) = @_;
1907
1908 my $win = new CFPlus::UI::Toplevel
1909 x => 0,
1910 y => 'center',
1911 z => 4,
1912 name => 'builder_window',
1913 force_w => int $WIDTH * 1/4,
1914 force_h => int $HEIGHT * 3/4,
1915 title => "In game builder",
1916 has_close_button => 1;
1917
1918 my $r = new CFPlus::UI::ScrolledWindow (
1919 expand => 1,
1920 scroll_y => 1
1921 );
1922 $r->add (my $vb = new CFPlus::UI::VBox);
1923 $win->add ($r);
1924
1925
1926 $vb->add (
1927 new CFPlus::UI::Button
1928 text => "Disable build mode",
1929 on_activate => sub { $::IN_BUILD_MODE = undef }
1930 );
1931 $vb->add (
1932 new CFPlus::UI::Button
1933 text => "ERASE",
1934 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1935 );
1936
1937 for my $itemarchname (
1938 sort {
1939 $msg->{items}->{$a}->{build_arch_name}
1940 cmp $msg->{items}->{$b}->{build_arch_name}
1941 } keys %{$msg->{items}}
1942 ) {
1943 my $info = $msg->{items}->{$itemarchname};
1944 $vb->add (
1945 new CFPlus::UI::Button text => $info->{build_arch_name},
1946 on_activate => sub {
1947 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1948
1949 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1950 build_mode_query_arch_info ();
1951 }
1952 }
1953 );
1954 }
1955
1956 $win->show;
1957}
1958
1959sub build_mode_query_arch_info {
1960 my ($iteminfo) = $::IN_BUILD_MODE;
1961 my $itemarchname = $iteminfo->{item};
1962 my $info = $iteminfo->{info};
1963
1964 my $dialog = new CFPlus::UI::Toplevel
1965 x => "center",
1966 y => "center",
1967 z => 50,
1968 force_w => int $WIDTH * 1/2,
1969 title => "Enter information for placement of '$itemarchname'",
1970 has_close_button => 1;
1971
1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1973
1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1975 my $row = 0;
1976 if ($info->{has_name}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1979 }
1980 if ($info->{has_text}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1982 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1983 }
1984 if ($info->{has_connection}) {
1985 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1986 $table->add (1, $row++,
1987 new CFPlus::UI::Entry
1988 expand => 1,
1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1991 );
1992 }
1993
1994 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1995 $hb->add (new CFPlus::UI::Button
1996 text => "Close",
1997 expand => 1,
1998 on_activate => sub { $dialog->hide; 0 },
1999 );
2000 $dialog->show;
2001}
2002
2003sub video_shutdown { 2097sub video_shutdown {
2004 CFPlus::OpenGL::shutdown; 2098 CFPlus::OpenGL::shutdown;
2005 2099
2006 undef $SDL_ACTIVE; 2100 undef $SDL_ACTIVE;
2007} 2101}
2008 2102
2009my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2010my $bgmusic;#TODO#hack#d#
2011
2012sub audio_channel_finished {
2013 my ($channel) = @_;
2014
2015 #warn "channel $channel finished\n";#d#
2016}
2017
2018sub audio_music_finished {
2019 return unless $CFG->{bgm_enable};
2020
2021 # TODO: hack, do play loop and mood music
2022 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2023 $bgmusic->play (0);
2024
2025 push @bgmusic, shift @bgmusic;
2026}
2027
2028sub audio_init {
2029 if ($CFG->{audio_enable}) {
2030 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2031 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2032
2033 unless ($SDL_MIXER) {
2034 status "Unable to open sound device: there will be no sound";
2035 return;
2036 }
2037
2038 CFPlus::Mix_AllocateChannels 8;
2039 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2040
2041 audio_music_finished;
2042
2043 local $_;
2044 while (<$fh>) {
2045 next if /^\s*#/;
2046 next if /^\s*$/;
2047
2048 my ($file, $volume, $event) = split /\s+/, $_, 3;
2049
2050 push @SOUNDS, "$volume,$file";
2051
2052 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2053 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2054 $chunk->volume ($volume * 128 / 100);
2055 $chunk
2056 };
2057 }
2058 } else {
2059 status "unable to open sound config: $!";
2060 }
2061 }
2062}
2063
2064sub audio_shutdown {
2065 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2066 undef $SDL_MIXER;
2067 @SOUNDS = ();
2068 %AUDIO_CHUNKS = ();
2069}
2070
2071my %animate_object; 2103my %animate_object;
2072my $animate_timer; 2104my $animate_timer;
2073 2105
2074my $fps = 9; 2106my $fps = 9;
2075 2107
2076my %demo;#d#
2077
2078sub force_refresh { 2108sub force_refresh {
2109 if ($ENV{CFPLUS_DEBUG} & 4) {
2079 $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;
2080 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2111 debug sprintf "%3.2f", $fps;
2112 }
2081 2113
2082 $CFPlus::UI::ROOT->draw; 2114 $CFPlus::UI::ROOT->draw;
2083 2115 CFPlus::SDL_GL_SwapBuffers;
2084 $WANT_REFRESH = 0;
2085 $CAN_REFRESH = 0;
2086 $LAST_REFRESH = $NOW; 2116 $LAST_REFRESH = $NOW;
2087 2117 $WANT_REFRESH->stop;
2088 CFPlus::SDL_GL_SwapBuffers;
2089} 2118}
2090 2119
2120$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2121
2091my $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 {
2092 $NOW = time; 2123 $NOW = time;
2093 2124
2094 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2125 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2095 for CFPlus::SDL_PollEvent; 2126 for CFPlus::poll_events;
2096 2127
2097 if (%animate_object) { 2128 if (%animate_object) {
2098 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2129 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2099 $WANT_REFRESH++; 2130 $WANT_REFRESH->start;
2100 }
2101
2102 if ($WANT_REFRESH) {
2103 force_refresh;
2104 } else {
2105 $CAN_REFRESH = 1;
2106 } 2131 }
2107}); 2132});
2108 2133
2109sub animation_start { 2134sub animation_start {
2110 my ($widget) = @_; 2135 my ($widget) = @_;
… …
2113 2138
2114sub animation_stop { 2139sub animation_stop {
2115 my ($widget) = @_; 2140 my ($widget) = @_;
2116 delete $animate_object{$widget}; 2141 delete $animate_object{$widget};
2117} 2142}
2118
2119# check once/second for faces that need to be prefetched
2120# this should, of course, only run on demand, but
2121# SDL forces worse things on us....
2122
2123Event->timer (after => 1, interval => 0.25, cb => sub {
2124 $CONN->face_prefetch
2125 if $CONN;
2126});
2127 2143
2128%SDL_CB = ( 2144%SDL_CB = (
2129 CFPlus::SDL_QUIT => sub { 2145 CFPlus::SDL_QUIT => sub {
2130 exit; 2146 exit;
2131 }, 2147 },
… …
2134 CFPlus::SDL_VIDEOEXPOSE => sub { 2150 CFPlus::SDL_VIDEOEXPOSE => sub {
2135 CFPlus::UI::full_refresh; 2151 CFPlus::UI::full_refresh;
2136 }, 2152 },
2137 CFPlus::SDL_ACTIVEEVENT => sub { 2153 CFPlus::SDL_ACTIVEEVENT => sub {
2138# not useful, as APPACTIVE include sonly iconified state, not unmapped 2154# not useful, as APPACTIVE include sonly iconified state, not unmapped
2139# 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#
2140# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2157# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2141# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2158# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2142# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2159# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2143 }, 2160 },
2144 CFPlus::SDL_KEYDOWN => sub { 2161 CFPlus::SDL_KEYDOWN => sub {
… …
2174 2191
2175 CFPlus::UI::set_layout ($::CFG->{layout}); 2192 CFPlus::UI::set_layout ($::CFG->{layout});
2176 2193
2177 my %DEF_CFG = ( 2194 my %DEF_CFG = (
2178 sdl_mode => 0, 2195 sdl_mode => 0,
2179 width => 640,
2180 height => 480,
2181 fullscreen => 0, 2196 fullscreen => 0,
2182 fast => 0, 2197 fast => 0,
2198 opengl11 => 0,
2183 map_scale => 1, 2199 map_scale => 1,
2184 fow_enable => 1, 2200 fow_enable => 1,
2185 fow_intensity => 0.45, 2201 fow_intensity => 0,
2186 fow_smooth => 0,
2187 map_smoothing => 1, 2202 map_smoothing => 1,
2188 gui_fontsize => 1, 2203 gui_fontsize => 1,
2189 log_fontsize => 0.7, 2204 log_fontsize => 0.7,
2190 gauge_fontsize => 1, 2205 gauge_fontsize => 1,
2191 gauge_size => 0.35, 2206 gauge_size => 0.35,
2192 stat_fontsize => 0.7, 2207 stat_fontsize => 0.7,
2193 mapsize => 100, 2208 mapsize => 100,
2194 say_command => 'chat',
2195 audio_enable => 1, 2209 audio_enable => 1,
2210 effects_enable => 1,
2211 effects_volume => 1,
2196 bgm_enable => 1, 2212 bgm_enable => 1,
2197 bgm_volume => 0.25, 2213 bgm_volume => 0.5,
2198 face_prefetch => 0,
2199 output_sync => 1, 2214 output_sync => 1,
2200 output_count => 1, 2215 output_count => 1,
2201 output_rate => "", 2216 output_rate => "",
2202 pickup => 0, 2217 pickup => 0,
2203 inv_sort => "mtime", 2218 inv_sort => "mtime",
… …
2225 } 2240 }
2226 } 2241 }
2227 2242
2228 sdl_init; 2243 sdl_init;
2229 2244
2230 @SDL_MODES = reverse 2245 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2231 grep $_->[0] >= 640 && $_->[1] >= 480, 2246 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2232 CFPlus::SDL_ListModes;
2233
2234 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2247 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2248
2249 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2235 2250
2236 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2251 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2237 2252
2238 { 2253 {
2239 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2254 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2281Event::loop; 2296Event::loop;
2282#CFPlus::SDL_Quit; 2297#CFPlus::SDL_Quit;
2283#CFPlus::_exit 0; 2298#CFPlus::_exit 0;
2284 2299
2285END { 2300END {
2301 video_shutdown;
2302 audio_shutdown;
2286 CFPlus::SDL_Quit; 2303 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop; 2304 CFPlus::DB::Server::stop;
2288} 2305}
2289 2306
2290=head1 NAME 2307=head1 NAME
2291 2308
2292cfplus - A Crossfire+ and Crossfire game client 2309cfplus - A Crossfire TRT and Crossfire game client
2293 2310
2294=head1 SYNOPSIS 2311=head1 SYNOPSIS
2295 2312
2296Just run it - no commandline arguments are supported. 2313Just run it - no commandline arguments are supported.
2297 2314
2298=head1 USAGE 2315=head1 USAGE
2299 2316
2300cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2317cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2301fullscreen and interactively. 2318be used in fullscreen mode and interactively.
2302 2319
2303=head1 DEBUGGING 2320=head1 DEBUGGING
2304 2321
2305 2322
2306CFPLUS_DEBUG - environment variable 2323CFPLUS_DEBUG - environment variable

Diff Legend

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