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.168 by root, Sat Jul 14 12:05:53 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_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, 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#############################################################################
204 434
205sub destroy_query_dialog { 435sub destroy_query_dialog {
206 (delete $_[0]{query_dialog})->destroy 436 (delete $_[0]{query_dialog})->destroy
207 if $_[0]{query_dialog}; 437 if $_[0]{query_dialog};
208} 438}
… …
272 ellipsise => 0, 502 ellipsise => 0,
273 markup => "\nOr use your keyboard and the text entry below:\n"; 503 markup => "\nOr use your keyboard and the text entry below:\n";
274 504
275 unshift @dialog, my $table = new CFPlus::UI::Table; 505 unshift @dialog, my $table = new CFPlus::UI::Table;
276 506
277 $table->add (0, 0, new CFPlus::UI::Button 507 $table->add_at (0, 0, new CFPlus::UI::Button
278 text => "Next Race", 508 text => "Next Race",
279 on_activate => sub { 509 on_activate => sub {
280 $conn->send ("reply n"); 510 $conn->send ("reply n");
281 destroy_query_dialog $conn; 511 destroy_query_dialog $conn;
282 0 512 0
283 }, 513 },
284 ); 514 );
285 $table->add (2, 0, new CFPlus::UI::Button 515 $table->add_at (2, 0, new CFPlus::UI::Button
286 text => "Accept", 516 text => "Accept",
287 on_activate => sub { 517 on_activate => sub {
288 $conn->send ("reply d"); 518 $conn->send ("reply d");
289 destroy_query_dialog $conn; 519 destroy_query_dialog $conn;
290 0 520 0
… …
325 $conn->send ("reply $stat"); 555 $conn->send ("reply $stat");
326 destroy_query_dialog $conn; 556 destroy_query_dialog $conn;
327 return; 557 return;
328 } 558 }
329 559
330 $STATS_PAGE->show;
331 $MESSAGE_WINDOW->hide;
332
333 unshift @dialog, new CFPlus::UI::Label 560 unshift @dialog, new CFPlus::UI::Label
334 max_w => $::WIDTH * 0.4, 561 max_w => $::WIDTH * 0.4,
335 ellipsise => 0, 562 ellipsise => 0,
336 markup => "\nOr use your keyboard and the text entry below:\n"; 563 markup => "\nOr use your keyboard and the text entry below:\n";
337 564
338 unshift @dialog, my $table = new CFPlus::UI::Table; 565 unshift @dialog, my $table = new CFPlus::UI::Table;
339 566
340 # left: re-roll 567 # left: re-roll
341 $table->add (0, 0, new CFPlus::UI::Button 568 $table->add_at (0, 0, new CFPlus::UI::Button
342 text => "Roll Again", 569 text => "Roll Again",
343 on_activate => sub { 570 on_activate => sub {
344 $conn->send ("reply y"); 571 $conn->send ("reply y");
345 destroy_query_dialog $conn; 572 destroy_query_dialog $conn;
346 0 573 0
… …
360 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 587 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
361 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 588 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
362 ], 589 ],
363 ), 1 .. 2; 590 ), 1 .. 2;
364 591
365 $table->add (2, 0, new CFPlus::UI::Button 592 $table->add_at (2, 0, new CFPlus::UI::Button
366 text => "Swap Stats", 593 text => "Swap Stats",
367 on_activate => sub { 594 on_activate => sub {
368 $conn->{stat_change_with} = $sw2->{value}; 595 $conn->{stat_change_with} = $sw2->{value};
369 $conn->send ("reply $sw1->{value}"); 596 $conn->send ("reply $sw1->{value}");
370 destroy_query_dialog $conn; 597 destroy_query_dialog $conn;
371 0 598 0
372 }, 599 },
373 ); 600 );
374 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 601 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
375 602
376 # right: accept 603 # right: accept
377 $table->add (4, 0, new CFPlus::UI::Button 604 $table->add_at (4, 0, new CFPlus::UI::Button
378 text => "Accept", 605 text => "Accept",
379 on_activate => sub { 606 on_activate => sub {
380 $conn->send ("reply n"); 607 $conn->send ("reply n");
381 $STATS_PAGE->hide; 608 $STATS_PAGE->hide;
382 destroy_query_dialog $conn; 609 destroy_query_dialog $conn;
… …
463 maph => $mapsize, 690 maph => $mapsize,
464 691
465 client => "cfplus $CFPlus::VERSION $] $^O", 692 client => "cfplus $CFPlus::VERSION $] $^O",
466 693
467 map_widget => $MAPWIDGET, 694 map_widget => $MAPWIDGET,
468 logview => $LOGVIEW,
469 statusbox => $STATUSBOX, 695 statusbox => $STATUSBOX,
470 map => $MAP, 696 map => $MAP,
471 mapmap => $MAPMAP, 697 mapmap => $MAPMAP,
472 query => \&server_query, 698 query => \&server_query,
473 699
474 setup_req => { 700 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1, 701 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 }, 702 },
489 }; 703 };
490 704
491 if ($CONN) { 705 if ($CONN) {
492 CFPlus::lowdelay fileno $CONN->{fh}; 706 CFPlus::lowdelay fileno $CONN->{fh};
… …
504 $SETUP_DIALOG->show; 718 $SETUP_DIALOG->show;
505 $PL_WINDOW->hide; 719 $PL_WINDOW->hide;
506 $SPELL_LIST->clear_spells; 720 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 721 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508 722
509 &audio_music_set ([]); 723 &audio_music_set_ambient ([]);
510 724
511 return unless $CONN; 725 return unless $CONN;
512 726
513 status "connection closed"; 727 status "connection closed";
514 728
… …
524 738
525 $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]);
526 740
527 my $row = 0; 741 my $row = 0;
528 742
529 $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");
530 $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,
531 can_events => 1, 745 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 746 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533 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
534 $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");
535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 753 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
536 754
755 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
537 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 756 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 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);
539 761
540 $mode_slider->connect (changed => sub { 762 $mode_slider->connect (changed => sub {
541 my ($self, $value) = @_; 763 my ($self, $value) = @_;
542 764
543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 765 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 766 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
545 }); 767 });
546 $mode_slider->emit (changed => $mode_slider->{range}[0]); 768 $mode_slider->emit (changed => $mode_slider->{range}[0]);
547 769
548 $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");
549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 771 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
550 state => $CFG->{fullscreen}, 772 state => $CFG->{fullscreen},
551 tooltip => "Bring the client into fullscreen mode.", 773 tooltip => "Bring the client into fullscreen mode.",
552 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 774 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
553 ); 775 );
554 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
555 $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");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox 800 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{fast}, 801 state => $CFG->{fast},
558 tooltip => "Lower the visual quality considerably to speed up rendering.", 802 tooltip => "Lower the visual quality considerably to speed up rendering.",
559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 803 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
560 ); 804 );
561 805
562 $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");
563 $table->add (1, $row++, new CFPlus::UI::Slider 807 $table->add_at (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 808 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 809 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 810 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 ); 811 );
568 812
569 $table->add (1, $row++, new CFPlus::UI::Button 813 $table->add_at (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply", 814 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.", 815 tooltip => "Apply the video settings above.",
572 on_activate => sub { 816 on_activate => sub {
573 video_shutdown (); 817 video_shutdown ();
574 video_init (); 818 video_init ();
575 0 819 0
576 } 820 }
577 ); 821 );
578 822
579 $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");
580 $table->add (1, $row++, new CFPlus::UI::Slider 824 $table->add_at (1, $row++, new CFPlus::UI::Slider
581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 825 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 826 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
583 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 }
584 ); 828 );
585 829
586 $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");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox 831 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing}, 832 state => $CFG->{map_smoothing},
589 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. "
590 . "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. "
591 . "Changes take effect at next connection only.", 835 . "Changes take effect at next login only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 836 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
593 ); 837 );
594 838
595 $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");
596 $table->add (1, $row++, new CFPlus::UI::CheckBox 840 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
597 state => $CFG->{fow_enable}, 841 state => $CFG->{fow_enable},
598 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.",
599 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 843 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
600 ); 844 );
601 845
602 $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");
603 $table->add (1, $row++, new CFPlus::UI::Slider 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
604 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 848 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
605 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 849 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
606 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 850 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
607 ); 851 );
608 852
609 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
610 $table->add (1, $row++, new CFPlus::UI::CheckBox
611 state => $CFG->{fow_smooth},
612 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
613 on_changed => sub {
614 my ($self, $value) = @_;
615 $CFG->{fow_smooth} = $value;
616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
617 0
618 }
619 );
620
621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 853 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
622 $table->add (1, $row++, new CFPlus::UI::Slider 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 855 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
624 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 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.",
625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 858 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
626 ); 859 );
627 860
628 $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");
629 $table->add (1, $row++, new CFPlus::UI::Slider 862 $table->add_at (1, $row++, new CFPlus::UI::Slider
630 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 863 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
631 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 864 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
632 on_changed => sub { 865 on_changed => sub {
633 $CFG->{gauge_fontsize} = $_[1]; 866 $CFG->{gauge_fontsize} = $_[1];
634 &set_gauge_window_fontsize; 867 &set_gauge_window_fontsize;
635 0 868 0
636 } 869 }
637 ); 870 );
638 871
639 $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");
640 $table->add (1, $row++, new CFPlus::UI::Slider 873 $table->add_at (1, $row++, new CFPlus::UI::Slider
641 range => [$CFG->{gauge_size}, 0.2, 0.8], 874 range => [$CFG->{gauge_size}, 0.2, 0.8],
642 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.",
643 on_changed => sub { 876 on_changed => sub {
644 $CFG->{gauge_size} = $_[1]; 877 $CFG->{gauge_size} = $_[1];
645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 878 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
651} 884}
652 885
653sub audio_setup { 886sub audio_setup {
654 my $vbox = new CFPlus::UI::VBox; 887 my $vbox = new CFPlus::UI::VBox;
655 888
656 $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]);
657 890
658 my $row = 0; 891 my $row = 0;
659 892
660 $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");
661 $table->add (1, $row++, new CFPlus::UI::CheckBox 894 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
662 state => $CFG->{audio_enable}, 895 state => $CFG->{audio_enable},
663 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
664 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 897 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
665 ); 898 );
666# $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");
667# $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 {
668# $CFG->{effects_volume} = $_[1]; 901# $CFG->{effects_volume} = $_[1];
669# }); 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
670 $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");
671 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
672 $hbox->add (new CFPlus::UI::CheckBox 922 $table->add_at (1, $row, new CFPlus::UI::CheckBox
673 expand => 1, state => $CFG->{bgm_enable}, 923 expand => 1, state => $CFG->{bgm_enable},
674 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.",
675 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 }
676 ); 931 );
677 $hbox->add (new CFPlus::UI::Slider 932 $table->add_at (2, $row++, new CFPlus::UI::Slider
678 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 933 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
679 tooltip => "The volume of the background music. Changes are instant.", 934 tooltip => "The volume of the background music. Changes are instant.",
680 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 }
681 ); 936 );
682 937
683 $table->add (1, $row++, new CFPlus::UI::Button 938 $table->add_at (1, $row++, new CFPlus::UI::Button
684 expand => 1, align => 0, text => "Apply", 939 c_colspan => 2, expand => 1, align => 0, text => "Apply",
685 tooltip => "Apply the audio settings", 940 tooltip => "Apply the audio settings",
686 on_activate => sub { 941 on_activate => sub {
687 audio_shutdown (); 942 audio_shutdown ();
688 audio_init (); 943 audio_init ();
689 0 944 0
… …
731 $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");
732 $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");
733 $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");
734 $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");
735 990
736 $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);
737 $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");
738 995
739 $GAUGES = { 996 $GAUGES = {
997 exp => $exp, prg => $prg, sklprg => $sklprg,
740 exp => $exp, win => $win, range => $rng, 998 win => $win, range => $rng,
741 food => $fg, mana => $mg, hp => $hg, grace => $gg 999 hp => $hg, mana => $mg, grace => $gg, food => $fg,
742 }; 1000 };
743 1001
744 &set_gauge_window_fontsize; 1002 &set_gauge_window_fontsize;
745 1003
746 $win 1004 $win
747} 1005}
748 1006
749sub debug_setup { 1007sub debug_setup {
750 my $table = new CFPlus::UI::Table; 1008 my $table = new CFPlus::UI::Table;
751 1009
752 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1010 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
753 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1011 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
754 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1012 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
755 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1013 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1014 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
757 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1015 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1016 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1017 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1018 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
761 1019
762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
763
764 for my $x (0..2) {
765 for my $y (0 .. 2) {
766 $table->add ($x + 3, $y,
767 new CFPlus::UI::Entry
768 text => $default_smooth[$x * 3 + $y],
769 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
770 );
771 }
772 }
773
774 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 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 });
775 1054
776 $table 1055 $table
777} 1056}
778 1057
779sub stats_window { 1058sub stats_window {
… …
827 [2, 4, st_spd => "Spd", 10.54], 1106 [2, 4, st_spd => "Spd", 10.54],
828 [2, 5, st_wspd => "WSp", 10.54], 1107 [2, 5, st_wspd => "WSp", 10.54],
829 ) { 1108 ) {
830 my ($col, $row, $id, $label, $template) = @$_; 1109 my ($col, $row, $id, $label, $template) = @$_;
831 1110
832 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1111 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
833 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1112 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
834 align => +1, template => $template, tooltip => "#stat_$label"); 1113 align => +1, template => $template, tooltip => "#stat_$label");
835 $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
836 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,
837 align => -1, text => $label, tooltip => "#stat_$label"); 1116 align => -1, text => $label, tooltip => "#stat_$label");
838 } 1117 }
839 1118
840 $vb->add (new CFPlus::UI::FancyFrame 1119 $vb->add (new CFPlus::UI::FancyFrame
… …
881 cold => ["Cold", 1160 cold => ["Cold",
882 "<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, ...)"],
883 ghit => ["Ghost hit", 1162 ghit => ["Ghost hit",
884 "<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)"],
885 ); 1164 );
1165
886 for (qw/slow holyw conf fire depl magic 1166 for (qw/slow holyw conf fire depl magic
887 drain acid pois para deat phys 1167 drain acid pois para deat phys
888 blind fear tund elec cold ghit/) 1168 blind fear tund elec cold ghit/)
889 { 1169 {
890 $tbl2->add ($col, $row, 1170 $tbl2->add_at ($col, $row,
891 $STATWIDS->{"res_$_"} = 1171 $STATWIDS->{"res_$_"} =
892 new CFPlus::UI::Label 1172 new CFPlus::UI::Label
893 font => $FONT_FIXED, 1173 font => $FONT_FIXED,
894 template => "-100%", 1174 template => "-100%",
895 align => +1, 1175 align => +1,
896 valign => 0, 1176 valign => 0,
897 can_events => 1, 1177 can_events => 1,
898 can_hover => 1, 1178 can_hover => 1,
899 tooltip => $resist_names{$_}->[1], 1179 tooltip => $resist_names{$_}->[1],
900 ); 1180 );
901 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1181 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
902 font => $FONT_FIXED, 1182 font => $FONT_FIXED,
903 can_hover => 1, 1183 can_hover => 1,
904 can_events => 1, 1184 can_events => 1,
905 path => "ui/resist/resist_$_.png", 1185 path => "ui/resist/resist_$_.png",
906 tooltip => $resist_names{$_}->[1], 1186 tooltip => $resist_names{$_}->[1],
907 ); 1187 );
908 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1188 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
909 text => $resist_names{$_}->[0], 1189 text => $resist_names{$_}->[0],
910 font => $FONT_FIXED, 1190 font => $FONT_FIXED,
911 can_hover => 1, 1191 can_hover => 1,
912 can_events => 1, 1192 can_events => 1,
913 tooltip => $resist_names{$_}->[1], 1193 tooltip => $resist_names{$_}->[1],
… …
925 $r 1205 $r
926} 1206}
927 1207
928sub skill_window { 1208sub skill_window {
929 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1209 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1210
930 $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
931 $sw 1213 $sw
932} 1214}
933 1215
934sub formsep($) { 1216sub formsep($) {
935 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1217 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
946 return if $METASERVER_ATIME > time; 1228 return if $METASERVER_ATIME > time;
947 $METASERVER_ATIME = time + 60; 1229 $METASERVER_ATIME = time + 60;
948 1230
949 my $table = $METASERVER->{table}; 1231 my $table = $METASERVER->{table};
950 $table->clear; 1232 $table->clear;
951 $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...");
952 1234
953 my $ok = 0; 1235 my $ok = 0;
954 1236
955 CFPlus::background { 1237 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent; 1238 my $ua = CFPlus::lwp_useragent;
… …
967 "The time this server has been running without being restarted.", 1249 "The time this server has been running without being restarted.",
968 "The server software version - a '+' indicates a Crossfire+ server.", 1250 "The server software version - a '+' indicates a Crossfire+ server.",
969 "Short information about this server provided by its admins.", 1251 "Short information about this server provided by its admins.",
970 ); 1252 );
971 my @col = qw(#Users Host Uptime Version Description); 1253 my @col = qw(#Users Host Uptime Version Description);
972 $table->add ($_, 0, new CFPlus::UI::Label 1254 $table->add_at ($_, 0, new CFPlus::UI::Label
973 can_hover => 1, can_events => 1, 1255 can_hover => 1, can_events => 1,
974 align => 0, fg => [1, 1, 0], 1256 align => 0, fg => [1, 1, 0],
975 text => $col[$_], tooltip => $tip[$_]) 1257 text => $col[$_], tooltip => $tip[$_])
976 for 0 .. $#col; 1258 for 0 .. $#col;
977 1259
… …
999 1281
1000 $m = [$users, $host, $uptime, $version, $desc]; 1282 $m = [$users, $host, $uptime, $version, $desc];
1001 1283
1002 $y++; 1284 $y++;
1003 1285
1004 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1286 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1005 (new CFPlus::UI::Button 1287 (new CFPlus::UI::Button
1006 text => "Use", 1288 text => "Use",
1007 tooltip => "Put this server into the <b>Host:Port</b> field", 1289 tooltip => "Put this server into the <b>Host:Port</b> field",
1008 on_activate => sub { 1290 on_activate => sub {
1009 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1291 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1012 }, 1294 },
1013 ), 1295 ),
1014 (new CFPlus::UI::Empty expand => 1), 1296 (new CFPlus::UI::Empty expand => 1),
1015 ]); 1297 ]);
1016 1298
1017 $table->add ($_, $y, new CFPlus::UI::Label 1299 $table->add_at ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4, 1300 max_w => $::WIDTH * 0.4,
1019 ellipsise => 0, 1301 ellipsise => 0,
1020 align => $align[$_], 1302 align => $align[$_],
1021 text => $m->[$_], 1303 text => $m->[$_],
1022 tooltip => $tip[$_], 1304 tooltip => $tip[$_],
… …
1063 1345
1064 $vbox->add (new CFPlus::UI::FancyFrame 1346 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings", 1347 label => "Connection Settings",
1066 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]),
1067 ); 1349 );
1068 $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");
1069 1351
1070 { 1352 {
1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1353 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1072 1354
1073 $vbox->add ( 1355 $vbox->add (
1074 $HOST_ENTRY = new CFPlus::UI::Entry 1356 $HOST_ENTRY = new CFPlus::UI::Entry
1075 expand => 1, 1357 expand => 1,
1076 text => $CFG->{profile}{default}{host}, 1358 text => $CFG->{profile}{default}{host},
1077 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",
1078 on_changed => sub { 1360 on_changed => sub {
1079 my ($self, $value) = @_; 1361 my ($self, $value) = @_;
1080 $CFG->{profile}{default}{host} = $value; 1362 $CFG->{profile}{default}{host} = $value;
1081 0 1363 1
1082 } 1364 }
1083 ); 1365 );
1084 1366
1085 $vbox->add (new CFPlus::UI::Button 1367 $vbox->add (new CFPlus::UI::Button
1086 expand => 1, 1368 expand => 1,
1087 text => "Server List", 1369 text => "Server List",
1088 other => $METASERVER, 1370 other => $METASERVER,
1089 tooltip => "Show a list of available crossfire servers", 1371 tooltip => "Show a list of available crossfire servers",
1090 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1372 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1091 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1373 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1092 ); 1374 );
1093 } 1375 }
1094 1376
1095 $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");
1096 $table->add (1, 4, new CFPlus::UI::Entry 1378 $table->add_at (1, 4, new CFPlus::UI::Entry
1097 text => $CFG->{profile}{default}{user}, 1379 text => $CFG->{profile}{default}{user},
1098 tooltip => "The name of your character on the server", 1380 tooltip => "The name of your character on the server",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1381 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1100 ); 1382 );
1101 1383
1102 $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");
1103 $table->add (1, 5, new CFPlus::UI::Entry 1385 $table->add_at (1, 5, new CFPlus::UI::Entry
1104 text => $CFG->{profile}{default}{password}, 1386 text => $CFG->{profile}{default}{password},
1105 hidden => 1, 1387 hidden => 1,
1106 tooltip => "The password for your character", 1388 tooltip => "The password for your character",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1389 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1108 ); 1390 );
1109 1391
1110 $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");
1111 $table->add (1, 7, new CFPlus::UI::Slider 1393 $table->add_at (1, 7, new CFPlus::UI::Slider
1112 force_w => 100, 1394 force_w => 100,
1113 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1395 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1114 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. "
1115 . "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, "
1116 . "but you also increase bandwidth requirements and latency. " 1398 . "but you also increase bandwidth requirements and latency. "
1117 . "This option is only used once at log-in.", 1399 . "This option is only used once at log-in.",
1118 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1400 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1119 ); 1401 );
1120 1402
1121 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1122 $table->add (1, 8, new CFPlus::UI::CheckBox
1123 state => $CFG->{face_prefetch},
1124 tooltip => "<b>Background Image Prefetch</b>\n\n"
1125 . "If enabled, the client automatically pre-fetches images from the server. "
1126 . "This might increase or create lag, but increases the chances "
1127 . "of faces being ready for display when you encounter them. "
1128 . "It also uses up server bandwidth on every connect, "
1129 . "so only set it if you really need to prefetch images. "
1130 . "This option can be set and unset any time.",
1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1132 );
1133
1134 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1403 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1135 $table->add (1, 9, new CFPlus::UI::Entry 1404 $table->add_at (1, 8, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate}, 1405 text => $CFG->{output_rate},
1137 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 "
1138 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1407 . "when sending data. When 0 or unset, the server "
1139 . "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.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1410 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1141 ); 1411 );
1142 1412
1143 $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");
1144 $table->add (1, 10, new CFPlus::UI::Entry 1414 $table->add_at (1, 9, new CFPlus::UI::Entry
1145 text => $CFG->{output_count}, 1415 text => $CFG->{output_count},
1146 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1416 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1417 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1148 ); 1418 );
1149 1419
1150 $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");
1151 $table->add (1, 11, new CFPlus::UI::Entry 1421 $table->add_at (1, 10, new CFPlus::UI::Entry
1152 text => $CFG->{output_sync}, 1422 text => $CFG->{output_sync},
1153 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1423 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1424 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1155 ); 1425 );
1156 1426
1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1427 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1158 expand => 1, 1428 expand => 1,
1159 align => 0, 1429 align => 0,
1160 text => "Login", 1430 text => "Login",
1161 on_activate => sub { 1431 on_activate => sub {
1162 $CONN ? stop_game 1432 $CONN ? stop_game
1163 : start_game; 1433 : start_game;
1164 0 1434 1
1165 }, 1435 },
1166 ); 1436 );
1167 1437
1168 $vbox->add (new CFPlus::UI::FancyFrame 1438 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info", 1439 label => "Server Info",
… …
1176sub client_setup { 1446sub client_setup {
1177 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];
1178 1448
1179 my $row = 0; 1449 my $row = 0;
1180 1450
1181 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1183 text => $CFG->{say_command},
1184 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1185 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1186 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1187 on_changed => sub {
1188 my ($self, $value) = @_;
1189 $CFG->{say_command} = $value;
1190 0
1191 }
1192 );
1193
1194 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1451 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1195 $table->add (1, $row++, new CFPlus::UI::CheckBox 1452 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1196 state => $CFG->{show_tips}, 1453 state => $CFG->{show_tips},
1197 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?",
1198 on_changed => sub { 1455 on_changed => sub {
1199 my ($self, $value) = @_; 1456 my ($self, $value) = @_;
1200 $CFG->{show_tips} = $value; 1457 $CFG->{show_tips} = $value;
1201 0 1458 0
1202 } 1459 }
1203 ); 1460 );
1204 1461
1205 $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");
1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1463 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1207 text => $CFG->{logview_max_par}, 1464 text => $CFG->{logview_max_par},
1208 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 "
1209 . "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 "
1210 . "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.",
1211 on_changed => sub { 1468 on_changed => sub {
1212 my ($self, $value) = @_; 1469 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1470 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1214 0 1471 0
1215 }, 1472 },
1216 ); 1473 );
1217 1474
1218 $table 1475 $table
1219} 1476}
1220 1477
1221sub message_window {
1222 my $window = new CFPlus::UI::Toplevel
1223 name => "message_window",
1224 title => "Messages",
1225 border_bg => [1, 1, 1, 1],
1226 x => "max",
1227 y => 0,
1228 force_w => $::WIDTH * 0.4,
1229 force_h => $::HEIGHT * 0.5,
1230 child => (my $vbox = new CFPlus::UI::VBox),
1231 has_close_button => 1;
1232
1233 $vbox->add ($LOGVIEW);
1234
1235 $vbox->add (my $input = new CFPlus::UI::Entry
1236 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1237 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1238 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1239 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1240 on_focus_in => sub {
1241 my ($input, $prev_focus) = @_;
1242
1243 delete $input->{refocus_map};
1244
1245 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1246 $input->{refocus_map} = 1;
1247 }
1248 delete $input->{auto_activated};
1249
1250 0
1251 },
1252 on_activate => sub {
1253 my ($input, $text) = @_;
1254 $input->set_text ('');
1255
1256 if ($text =~ /^\/(.*)/) {
1257 $::CONN->user_send ($1);
1258 } else {
1259 my $say_cmd = $::CFG->{say_command} || 'say';
1260 $::CONN->user_send ("$say_cmd $text");
1261 }
1262 if ($input->{refocus_map}) {
1263 delete $input->{refocus_map};
1264 $MAPWIDGET->focus_in
1265 }
1266
1267 0
1268 },
1269 on_escape => sub {
1270 $MAPWIDGET->grab_focus;
1271
1272 0
1273 },
1274 );
1275
1276 $CONSOLE = {
1277 window => $window,
1278 input => $input,
1279 };
1280
1281 $window
1282}
1283
1284sub autopickup_setup { 1478sub autopickup_setup {
1479 my $r = new CFPlus::UI::ScrolledWindow (
1480 expand => 1,
1481 scroll_y => 1
1482 );
1285 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 );
1286 1487
1287 for ( 1488 for (
1288 ["General", 0, 0, 1489 ["General", 0, 0,
1289 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1490 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1290 ["Inhibit autopickup" => PICKUP_INHIBIT], 1491 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1325 ], 1526 ],
1326 ["Weight/Value ratio", 2, 17] 1527 ["Weight/Value ratio", 2, 17]
1327 ) 1528 )
1328 { 1529 {
1329 my ($title, $x, $y, @bits) = @$_; 1530 my ($title, $x, $y, @bits) = @$_;
1330 $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]);
1331 1532
1332 for (@bits) { 1533 for (@bits) {
1333 ++$y; 1534 ++$y;
1334 1535
1335 my $mask = $_->[1]; 1536 my $mask = $_->[1];
1336 $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);
1337 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1538 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1338 state => $::CFG->{pickup} & $mask, 1539 state => $::CFG->{pickup} & $mask,
1339 on_changed => sub { 1540 on_changed => sub {
1340 my ($box, $value) = @_; 1541 my ($box, $value) = @_;
1341 1542
1342 if ($value) { 1543 if ($value) {
… …
1353 1554
1354 ${$_->[2]} = $checkbox if $_->[2]; 1555 ${$_->[2]} = $checkbox if $_->[2];
1355 } 1556 }
1356 } 1557 }
1357 1558
1358 $table->add (2, 18, new CFPlus::UI::ValSlider 1559 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1359 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1560 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1360 template => ">= 99", 1561 template => ">= 99",
1361 to_value => sub { ">= " . 5 * $_[0] }, 1562 to_value => sub { ">= " . 5 * $_[0] },
1362 on_changed => sub { 1563 on_changed => sub {
1363 my ($slider, $value) = @_; 1564 my ($slider, $value) = @_;
… …
1366 $::CFG->{pickup} |= int $value 1567 $::CFG->{pickup} |= int $value
1367 if $value; 1568 if $value;
1368 1; 1569 1;
1369 }); 1570 });
1370 1571
1371 $table->add (3, 18, new CFPlus::UI::Button 1572 $table->add_at (3, 18, new CFPlus::UI::Button
1372 text => "set", 1573 text => "set",
1373 on_activate => sub { 1574 on_activate => sub {
1374 $::CONN->send_command ("pickup $::CFG->{pickup}") 1575 $::CONN->send_command ("pickup $::CFG->{pickup}")
1375 if defined $::CONN; 1576 if defined $::CONN;
1376 0 1577 0
1377 }); 1578 });
1378 1579
1379 $table 1580 $r
1380} 1581}
1381 1582
1382my %SORT_ORDER = ( 1583my %SORT_ORDER = (
1383 type => undef, 1584 type => undef,
1384 mtime => sub { 1585 mtime => sub {
… …
1428 $sw1->add ($INV = new CFPlus::UI::Inventory); 1629 $sw1->add ($INV = new CFPlus::UI::Inventory);
1429 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1630 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1430 1631
1431 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1632 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1432 1633
1433 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1634 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1434 1635
1435 $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);
1436 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1637 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1437 1638
1438 # XXX: Call after $INVR = ... because set_opencont sets the items 1639 # XXX: Call after $INVR = ... because set_opencont sets the items
1439 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1640 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1440 1641
1441 $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;
1442} 1683}
1443 1684
1444sub toggle_player_page { 1685sub toggle_player_page {
1445 my ($widget) = @_; 1686 my ($widget) = @_;
1446 1687
… …
1465 1706
1466 my $ntb = 1707 my $ntb =
1467 $PL_NOTEBOOK = 1708 $PL_NOTEBOOK =
1468 new CFPlus::UI::Notebook expand => 1; 1709 new CFPlus::UI::Notebook expand => 1;
1469 1710
1470 $ntb->add ( 1711 $ntb->add_tab (
1471 "Statistics (F2)" => $STATS_PAGE = stats_window, 1712 "Statistics (F2)" => $STATS_PAGE = stats_window,
1472 "Shows statistics, where all your Stats and Resistances are shown." 1713 "Shows statistics, where all your Stats and Resistances are shown."
1473 ); 1714 );
1474 $ntb->add ( 1715 $ntb->add_tab (
1475 "Skills (F3)" => $SKILL_PAGE = skill_window, 1716 "Skills (F3)" => $SKILL_PAGE = skill_window,
1476 "Shows all your Skills." 1717 "Shows all your Skills."
1477 ); 1718 );
1478 1719
1479 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);
1480 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1721 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1481 $ntb->add ( 1722 $ntb->add_tab (
1482 "Spellbook (F4)" => $spellsw, 1723 "Spellbook (F4)" => $spellsw,
1483 "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."
1484 ); 1725 );
1485 $ntb->add ( 1726 $ntb->add_tab (
1486 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1727 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1487 "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 :). "
1488 . "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."
1489 ); 1730 );
1490 $ntb->add (Pickup => autopickup_setup, 1731 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1491 "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.");
1492 1736
1493 $ntb->set_current_page ($INVENTORY_PAGE); 1737 $ntb->set_current_page ($INVENTORY_PAGE);
1494 1738
1495 $plwin->add ($ntb); 1739 $plwin->add ($ntb);
1496 $plwin 1740 $plwin
… …
1650 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1894 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1651 ); 1895 );
1652 $hb->add (new CFPlus::UI::Button 1896 $hb->add (new CFPlus::UI::Button
1653 text => "Quit anyway", 1897 text => "Quit anyway",
1654 expand => 1, 1898 expand => 1,
1655 on_activate => sub { exit }, 1899 on_activate => sub { Event::unloop_all },
1656 ); 1900 );
1657 } 1901 }
1658 1902
1659 $QUIT_DIALOG->show; 1903 $QUIT_DIALOG->show;
1660 $QUIT_DIALOG->grab_focus; 1904 $QUIT_DIALOG->grab_focus;
… …
1693 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1937 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1694 $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]);
1695 1939
1696 $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]);
1697 1941
1698 $table->add (0, 0, new CFPlus::UI::Button 1942 $table->add_at (0, 0, new CFPlus::UI::Button
1699 text => "Close", 1943 text => "Close",
1700 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>.",
1701 on_activate => $close, 1945 on_activate => $close,
1702 ); 1946 );
1703 1947
1704 $table->add (2, 0, new CFPlus::UI::Button 1948 $table->add_at (2, 0, new CFPlus::UI::Button
1705 text => "Next", 1949 text => "Next",
1706 tooltip => "Show the next <b>Tip of the day</b>.", 1950 tooltip => "Show the next <b>Tip of the day</b>.",
1707 on_activate => sub { 1951 on_activate => sub {
1708 $close->(); 1952 $close->();
1709 &show_tip_of_the_day; 1953 &show_tip_of_the_day;
… …
1718 CFPlus::SDL_Init 1962 CFPlus::SDL_Init
1719 and die "SDL::Init failed!\n"; 1963 and die "SDL::Init failed!\n";
1720} 1964}
1721 1965
1722sub video_init { 1966sub video_init {
1723 sdl_init;
1724
1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1967 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1726 1968
1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1969 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1728 1970
1729 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1971 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1730 $FULLSCREEN = $CFG->{fullscreen}; 1972 $FULLSCREEN = $CFG->{fullscreen};
1731 $FAST = $CFG->{fast}; 1973 $FAST = $CFG->{fast};
1732 1974
1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1975 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1976 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1735 1977
1736 $SDL_ACTIVE = 1; 1978 $SDL_ACTIVE = 1;
1737 $LAST_REFRESH = time - 0.01; 1979 $LAST_REFRESH = time - 0.01;
1738 1980
1739 CFPlus::OpenGL::init; 1981 CFPlus::OpenGL::init;
1982 CFPlus::Macro::init;
1740 1983
1741 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1984 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1742 1985
1743 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1986 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1744 1987
1745 ############################################################################# 1988 #############################################################################
1746 1989
1747 if ($DEBUG_STATUS) { 1990 if ($DEBUG_STATUS) {
1748 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1991 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1749 } else { 1992 } else {
1750 # 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 });
1751 2006
1752 $DEBUG_STATUS = new CFPlus::UI::Label 2007 $DEBUG_STATUS = new CFPlus::UI::Label
1753 padding => 0, 2008 padding => 0,
1754 z => 100, 2009 z => 100,
1755 force_x => "max", 2010 force_x => "max",
… …
1780 2035
1781 $MAPWIDGET = new CFPlus::MapWidget; 2036 $MAPWIDGET = new CFPlus::MapWidget;
1782 $MAPWIDGET->connect (activate_console => sub { 2037 $MAPWIDGET->connect (activate_console => sub {
1783 my ($mapwidget, $preset) = @_; 2038 my ($mapwidget, $preset) = @_;
1784 2039
1785 if ($CONSOLE) { 2040 $MESSAGE_WINDOW->activate_console ($preset)
1786 $CONSOLE->{input}->{auto_activated} = 1; 2041 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 }); 2042 });
1794 $MAPWIDGET->show; 2043 $MAPWIDGET->show;
1795 $MAPWIDGET->grab_focus; 2044 $MAPWIDGET->grab_focus;
1796 2045
1797 $LOGVIEW = new CFPlus::UI::TextScroller 2046 $COMPLETER = new CFPlus::MapWidget::Command::
1798 expand => 1, 2047 command => { },
1799 font => $FONT_FIXED, 2048 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 ; 2049 ;
1807 2050
1808 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2051 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1809 title => "Setup", 2052 title => "Setup",
1810 name => "setup_dialog", 2053 name => "setup_dialog",
… …
1815 force_h => $::HEIGHT * 0.6, 2058 force_h => $::HEIGHT * 0.6,
1816 has_close_button => 1, 2059 has_close_button => 1,
1817 ; 2060 ;
1818 2061
1819 $METASERVER = metaserver_dialog; 2062 $METASERVER = metaserver_dialog;
2063 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1820 2064
1821 $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,
1822 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2066 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1823 2067
1824 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2068 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1825 "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.");
1826 $SETUP_NOTEBOOK->add (Client => client_setup, 2070 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1827 "Configure various client-specific settings."); 2071 "Configure various client-specific settings.");
1828 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2072 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1829 "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.");
1830 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2074 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1831 "Configure the use of audio, sound effects and background music."); 2075 "Configure the use of audio, sound effects and background music.");
1832 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2076 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1833 "Lets you define, edit and delete key bindings." 2077 "Lets you define, edit and delete key bindings."
1834 . "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 "
1835 . "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 "
1836 . "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. "
1837 . "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 "
1838 . "binding editor closes"); 2082 . "binding editor closes");
1839 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2083 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1840 "Some debuggin' options. Do not ask."); 2084 "Some debuggin' options. Do not ask.");
1841 2085
1842 $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
1843 2087
1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2088 $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."); 2089 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1846 2090
1847 $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,
1848 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.");
1849 2093
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 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
1851 2095
1852 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2096 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1872 tooltip => "Terminates the program", 2116 tooltip => "Terminates the program",
1873 on_activate => sub { 2117 on_activate => sub {
1874 if ($CONN) { 2118 if ($CONN) {
1875 open_quit_dialog; 2119 open_quit_dialog;
1876 } else { 2120 } else {
1877 exit; 2121 Event::unloop_all;
1878 } 2122 }
1879 0 2123 0
1880 }, 2124 },
1881 ); 2125 );
1882 2126
1883 $BUTTONBAR->show; 2127 $BUTTONBAR->show;
1884 $SETUP_DIALOG->show; 2128 $SETUP_DIALOG->show;
2129 $MESSAGE_WINDOW->show;
1885 } 2130 }
1886 2131
1887 $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]);
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} 2133}
2008 2134
2009sub video_shutdown { 2135sub video_shutdown {
2010 CFPlus::OpenGL::shutdown; 2136 CFPlus::OpenGL::shutdown;
2011 2137
2012 undef $SDL_ACTIVE; 2138 undef $SDL_ACTIVE;
2013} 2139}
2014 2140
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; 2141my %animate_object;
2144my $animate_timer; 2142my $animate_timer;
2145 2143
2146my $fps = 9; 2144my $fps = 9;
2147 2145
2148my %demo;#d#
2149
2150sub force_refresh { 2146sub force_refresh {
2147 if ($ENV{CFPLUS_DEBUG} & 4) {
2151 $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;
2152 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2149 debug sprintf "%3.2f", $fps;
2150 }
2153 2151
2154 $CFPlus::UI::ROOT->draw; 2152 $CFPlus::UI::ROOT->draw;
2155 2153 CFPlus::SDL_GL_SwapBuffers;
2156 $WANT_REFRESH = 0;
2157 $CAN_REFRESH = 0;
2158 $LAST_REFRESH = $NOW; 2154 $LAST_REFRESH = $NOW;
2159 2155 $WANT_REFRESH->stop;
2160 CFPlus::SDL_GL_SwapBuffers;
2161} 2156}
2162 2157
2158$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2159
2163my $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 {
2164 $NOW = time; 2161 $NOW = time;
2165 2162
2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2163 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2167 for CFPlus::SDL_PollEvent; 2164 for CFPlus::poll_events;
2168 2165
2169 if (%animate_object) { 2166 if (%animate_object) {
2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2167 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2171 $WANT_REFRESH++; 2168 $WANT_REFRESH->start;
2172 }
2173
2174 if ($WANT_REFRESH) {
2175 force_refresh;
2176 } else {
2177 $CAN_REFRESH = 1;
2178 } 2169 }
2179}); 2170});
2180 2171
2181sub animation_start { 2172sub animation_start {
2182 my ($widget) = @_; 2173 my ($widget) = @_;
… …
2186sub animation_stop { 2177sub animation_stop {
2187 my ($widget) = @_; 2178 my ($widget) = @_;
2188 delete $animate_object{$widget}; 2179 delete $animate_object{$widget};
2189} 2180}
2190 2181
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 = ( 2182%SDL_CB = (
2201 CFPlus::SDL_QUIT => sub { 2183 CFPlus::SDL_QUIT => sub {
2202 exit; 2184 Event::unloop_all;
2203 }, 2185 },
2204 CFPlus::SDL_VIDEORESIZE => sub { 2186 CFPlus::SDL_VIDEORESIZE => sub {
2205 }, 2187 },
2206 CFPlus::SDL_VIDEOEXPOSE => sub { 2188 CFPlus::SDL_VIDEOEXPOSE => sub {
2207 CFPlus::UI::full_refresh; 2189 CFPlus::UI::full_refresh;
2208 }, 2190 },
2209 CFPlus::SDL_ACTIVEEVENT => sub { 2191 CFPlus::SDL_ACTIVEEVENT => sub {
2210# not useful, as APPACTIVE include sonly iconified state, not unmapped 2192# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# 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#
2212# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2195# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2213# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2196# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2214# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2197# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2215 }, 2198 },
2216 CFPlus::SDL_KEYDOWN => sub { 2199 CFPlus::SDL_KEYDOWN => sub {
… …
2245 CFPlus::DB::Server::run; 2228 CFPlus::DB::Server::run;
2246 2229
2247 CFPlus::UI::set_layout ($::CFG->{layout}); 2230 CFPlus::UI::set_layout ($::CFG->{layout});
2248 2231
2249 my %DEF_CFG = ( 2232 my %DEF_CFG = (
2250 sdl_mode => 0, 2233 sdl_mode => 0,
2251 width => 640,
2252 height => 480,
2253 fullscreen => 0, 2234 fullscreen => 0,
2254 fast => 0, 2235 fast => 0,
2236 force_opengl11 => undef,
2237 texture_compression => 1,
2255 map_scale => 1, 2238 map_scale => 1,
2256 fow_enable => 1, 2239 fow_enable => 1,
2257 fow_intensity => 0.45, 2240 fow_intensity => 0,
2258 fow_smooth => 0,
2259 map_smoothing => 1, 2241 map_smoothing => 1,
2260 gui_fontsize => 1, 2242 gui_fontsize => 1,
2261 log_fontsize => 0.7, 2243 log_fontsize => 0.7,
2262 gauge_fontsize => 1, 2244 gauge_fontsize => 1,
2263 gauge_size => 0.35, 2245 gauge_size => 0.35,
2264 stat_fontsize => 0.7, 2246 stat_fontsize => 0.7,
2265 mapsize => 100, 2247 mapsize => 100,
2266 say_command => 'chat',
2267 audio_enable => 1, 2248 audio_enable => 1,
2249 effects_enable => 1,
2250 effects_volume => 1,
2268 bgm_enable => 1, 2251 bgm_enable => 1,
2269 bgm_volume => 0.25, 2252 bgm_volume => 0.5,
2270 face_prefetch => 0,
2271 output_sync => 1, 2253 output_sync => 1,
2272 output_count => 1, 2254 output_count => 1,
2273 output_rate => "", 2255 output_rate => "",
2274 pickup => 0, 2256 pickup => 0,
2275 inv_sort => "mtime", 2257 inv_sort => "mtime",
2276 default => "profile", # default profile 2258 default => "profile", # default profile
2277 show_tips => 1, 2259 show_tips => 1,
2278 logview_max_par => 1000, 2260 logview_max_par => 1000,
2279 ); 2261 );
2280 2262
2281 while (my ($k, $v) = each %DEF_CFG) { 2263 while (my ($k, $v) = each %DEF_CFG) {
2282 $CFG->{$k} = $v unless exists $CFG->{$k}; 2264 $CFG->{$k} = $v unless exists $CFG->{$k};
2283 } 2265 }
… …
2297 } 2279 }
2298 } 2280 }
2299 2281
2300 sdl_init; 2282 sdl_init;
2301 2283
2302 @SDL_MODES = reverse 2284 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2303 grep $_->[0] >= 640 && $_->[1] >= 480, 2285 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2304 CFPlus::SDL_ListModes;
2305
2306 @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;
2307 2289
2308 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2290 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2309 2291
2310 { 2292 {
2311 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2293 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2340# } 2322# }
2341# my $t2 = Time::HiRes::time; 2323# my $t2 = Time::HiRes::time;
2342# warn $t2-$t1; 2324# warn $t2-$t1;
2343# } 2325# }
2344 2326
2345 $startup_done->();
2346
2347 video_init; 2327 video_init;
2348 audio_init; 2328 audio_init;
2349} 2329}
2350 2330
2351show_tip_of_the_day if $CFG->{show_tips}; 2331show_tip_of_the_day if $CFG->{show_tips};
2352 2332
2333Event->idle (cb => sub {
2334 $_[0]->w->cancel;
2335 $startup_done->();
2336});
2337
2353Event::loop; 2338Event::loop;
2339
2340#video_shutdown;
2341#audio_shutdown;
2354#CFPlus::SDL_Quit; 2342CFPlus::SDL_Quit;
2355#CFPlus::_exit 0;
2356
2357END {
2358 CFPlus::SDL_Quit;
2359 CFPlus::DB::Server::stop; 2343CFPlus::DB::Server::stop;
2360}
2361 2344
2362=head1 NAME 2345=head1 NAME
2363 2346
2364cfplus - A Crossfire+ and Crossfire game client 2347cfplus - A Crossfire TRT and Crossfire game client
2365 2348
2366=head1 SYNOPSIS 2349=head1 SYNOPSIS
2367 2350
2368Just run it - no commandline arguments are supported. 2351Just run it - no commandline arguments are supported.
2369 2352
2370=head1 USAGE 2353=head1 USAGE
2371 2354
2372cfplus 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
2373fullscreen and interactively. 2356be used in fullscreen mode and interactively.
2374 2357
2375=head1 DEBUGGING 2358=head1 DEBUGGING
2376 2359
2377 2360
2378CFPLUS_DEBUG - environment variable 2361CFPLUS_DEBUG - environment variable

Diff Legend

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