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

Diff Legend

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