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.156 by root, Sun Jun 24 19:17:47 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC

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

Diff Legend

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