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

Diff Legend

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