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

Diff Legend

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