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.173 by root, Tue Jul 17 17:39:08 2007 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

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

Diff Legend

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