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

Diff Legend

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