ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.168 by root, Sat Jul 14 12:05:53 2007 UTC vs.
Revision 1.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
757 my $vidmode_tooltip =
758 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
759 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
760
534 $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");
535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 762 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
536 763
764 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
537 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 765 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 766 tooltip => $vidmode_tooltip);
767 $hbox->add (my $mode_label = new CFPlus::UI::Label
768 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
769 can_events => 1, tooltip => $vidmode_tooltip);
539 770
540 $mode_slider->connect (changed => sub { 771 $mode_slider->connect (changed => sub {
541 my ($self, $value) = @_; 772 my ($self, $value) = @_;
542 773
543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 774 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 775 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
545 }); 776 });
546 $mode_slider->emit (changed => $mode_slider->{range}[0]); 777 $mode_slider->emit (changed => $mode_slider->{range}[0]);
547 778
548 $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");
549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 780 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
550 state => $CFG->{fullscreen}, 781 state => $CFG->{fullscreen},
551 tooltip => "Bring the client into fullscreen mode.", 782 tooltip => "Bring the client into fullscreen mode.",
552 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 783 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
553 ); 784 );
554 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
555 $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");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox 809 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{fast}, 810 state => $CFG->{fast},
558 tooltip => "Lower the visual quality considerably to speed up rendering.", 811 tooltip => "Lower the visual quality considerably to speed up rendering.",
559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
560 ); 813 );
561 814
562 $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");
563 $table->add (1, $row++, new CFPlus::UI::Slider 816 $table->add_at (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 817 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 818 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 819 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 ); 820 );
568 821
569 $table->add (1, $row++, new CFPlus::UI::Button 822 $table->add_at (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply", 823 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.", 824 tooltip => "Apply the video settings above.",
572 on_activate => sub { 825 on_activate => sub {
573 video_shutdown (); 826 video_shutdown ();
574 video_init (); 827 video_init ();
575 0 828 0
576 } 829 }
577 ); 830 );
578 831
579 $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");
580 $table->add (1, $row++, new CFPlus::UI::Slider 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 834 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 835 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
583 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 }
584 ); 837 );
585 838
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox 840 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing}, 841 state => $CFG->{map_smoothing},
589 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. "
590 . "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. "
591 . "Changes take effect at next connection only.", 844 . "Changes take effect at next login only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 845 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
593 ); 846 );
594 847
595 $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");
596 $table->add (1, $row++, new CFPlus::UI::CheckBox 849 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
597 state => $CFG->{fow_enable}, 850 state => $CFG->{fow_enable},
598 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.",
599 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 852 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
600 ); 853 );
601 854
602 $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");
603 $table->add (1, $row++, new CFPlus::UI::Slider 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
604 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 857 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
605 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 858 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
606 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
607 ); 860 );
608 861
609 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
610 $table->add (1, $row++, new CFPlus::UI::CheckBox
611 state => $CFG->{fow_smooth},
612 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
613 on_changed => sub {
614 my ($self, $value) = @_;
615 $CFG->{fow_smooth} = $value;
616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
617 0
618 }
619 );
620
621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 862 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
622 $table->add (1, $row++, new CFPlus::UI::Slider 863 $table->add_at (1, $row++, new CFPlus::UI::Slider
623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 864 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
624 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 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.",
625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 867 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
626 ); 868 );
627 869
628 $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");
629 $table->add (1, $row++, new CFPlus::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
630 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 872 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
631 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 873 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
632 on_changed => sub { 874 on_changed => sub {
633 $CFG->{gauge_fontsize} = $_[1]; 875 $CFG->{gauge_fontsize} = $_[1];
634 &set_gauge_window_fontsize; 876 &set_gauge_window_fontsize;
635 0 877 0
636 } 878 }
637 ); 879 );
638 880
639 $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");
640 $table->add (1, $row++, new CFPlus::UI::Slider 882 $table->add_at (1, $row++, new CFPlus::UI::Slider
641 range => [$CFG->{gauge_size}, 0.2, 0.8], 883 range => [$CFG->{gauge_size}, 0.2, 0.8],
642 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.",
643 on_changed => sub { 885 on_changed => sub {
644 $CFG->{gauge_size} = $_[1]; 886 $CFG->{gauge_size} = $_[1];
645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 887 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
651} 893}
652 894
653sub audio_setup { 895sub audio_setup {
654 my $vbox = new CFPlus::UI::VBox; 896 my $vbox = new CFPlus::UI::VBox;
655 897
656 $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]);
657 899
658 my $row = 0; 900 my $row = 0;
659 901
660 $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");
661 $table->add (1, $row++, new CFPlus::UI::CheckBox 903 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
662 state => $CFG->{audio_enable}, 904 state => $CFG->{audio_enable},
663 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
664 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 906 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
665 ); 907 );
666# $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");
667# $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 {
668# $CFG->{effects_volume} = $_[1]; 910# $CFG->{effects_volume} = $_[1];
669# }); 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
670 $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");
671 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
672 $hbox->add (new CFPlus::UI::CheckBox 931 $table->add_at (1, $row, new CFPlus::UI::CheckBox
673 expand => 1, state => $CFG->{bgm_enable}, 932 expand => 1, state => $CFG->{bgm_enable},
674 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.",
675 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 }
676 ); 940 );
677 $hbox->add (new CFPlus::UI::Slider 941 $table->add_at (2, $row++, new CFPlus::UI::Slider
678 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 942 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
679 tooltip => "The volume of the background music. Changes are instant.", 943 tooltip => "The volume of the background music. Changes are instant.",
680 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 }
681 ); 945 );
682 946
683 $table->add (1, $row++, new CFPlus::UI::Button 947 $table->add_at (1, $row++, new CFPlus::UI::Button
684 expand => 1, align => 0, text => "Apply", 948 c_colspan => 2, expand => 1, align => 0, text => "Apply",
685 tooltip => "Apply the audio settings", 949 tooltip => "Apply the audio settings",
686 on_activate => sub { 950 on_activate => sub {
687 audio_shutdown (); 951 audio_shutdown ();
688 audio_init (); 952 audio_init ();
689 0 953 0
… …
731 $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");
732 $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");
733 $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");
734 $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");
735 999
736 $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);
737 $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");
738 1004
739 $GAUGES = { 1005 $GAUGES = {
1006 exp => $exp, prg => $prg, sklprg => $sklprg,
740 exp => $exp, win => $win, range => $rng, 1007 win => $win, range => $rng,
741 food => $fg, mana => $mg, hp => $hg, grace => $gg 1008 hp => $hg, mana => $mg, grace => $gg, food => $fg,
742 }; 1009 };
743 1010
744 &set_gauge_window_fontsize; 1011 &set_gauge_window_fontsize;
745 1012
746 $win 1013 $win
747} 1014}
748 1015
749sub debug_setup { 1016sub debug_setup {
750 my $table = new CFPlus::UI::Table; 1017 my $table = new CFPlus::UI::Table;
751 1018
752 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1019 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
753 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1020 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
754 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1021 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
755 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1022 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1023 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
757 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1024 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1025 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1026 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1027 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
761 1028
762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
763
764 for my $x (0..2) {
765 for my $y (0 .. 2) {
766 $table->add ($x + 3, $y,
767 new CFPlus::UI::Entry
768 text => $default_smooth[$x * 3 + $y],
769 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
770 );
771 }
772 }
773
774 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 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 });
775 1063
776 $table 1064 $table
777} 1065}
778 1066
779sub stats_window { 1067sub stats_window {
… …
827 [2, 4, st_spd => "Spd", 10.54], 1115 [2, 4, st_spd => "Spd", 10.54],
828 [2, 5, st_wspd => "WSp", 10.54], 1116 [2, 5, st_wspd => "WSp", 10.54],
829 ) { 1117 ) {
830 my ($col, $row, $id, $label, $template) = @$_; 1118 my ($col, $row, $id, $label, $template) = @$_;
831 1119
832 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1120 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
833 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1121 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
834 align => +1, template => $template, tooltip => "#stat_$label"); 1122 align => +1, template => $template, tooltip => "#stat_$label");
835 $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
836 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,
837 align => -1, text => $label, tooltip => "#stat_$label"); 1125 align => -1, text => $label, tooltip => "#stat_$label");
838 } 1126 }
839 1127
840 $vb->add (new CFPlus::UI::FancyFrame 1128 $vb->add (new CFPlus::UI::FancyFrame
… …
881 cold => ["Cold", 1169 cold => ["Cold",
882 "<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, ...)"],
883 ghit => ["Ghost hit", 1171 ghit => ["Ghost hit",
884 "<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)"],
885 ); 1173 );
1174
886 for (qw/slow holyw conf fire depl magic 1175 for (qw/slow holyw conf fire depl magic
887 drain acid pois para deat phys 1176 drain acid pois para deat phys
888 blind fear tund elec cold ghit/) 1177 blind fear tund elec cold ghit/)
889 { 1178 {
890 $tbl2->add ($col, $row, 1179 $tbl2->add_at ($col, $row,
891 $STATWIDS->{"res_$_"} = 1180 $STATWIDS->{"res_$_"} =
892 new CFPlus::UI::Label 1181 new CFPlus::UI::Label
893 font => $FONT_FIXED, 1182 font => $FONT_FIXED,
894 template => "-100%", 1183 template => "-100%",
895 align => +1, 1184 align => +1,
896 valign => 0, 1185 valign => 0,
897 can_events => 1, 1186 can_events => 1,
898 can_hover => 1, 1187 can_hover => 1,
899 tooltip => $resist_names{$_}->[1], 1188 tooltip => $resist_names{$_}->[1],
900 ); 1189 );
901 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1190 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
902 font => $FONT_FIXED, 1191 font => $FONT_FIXED,
903 can_hover => 1, 1192 can_hover => 1,
904 can_events => 1, 1193 can_events => 1,
905 path => "ui/resist/resist_$_.png", 1194 path => "ui/resist/resist_$_.png",
906 tooltip => $resist_names{$_}->[1], 1195 tooltip => $resist_names{$_}->[1],
907 ); 1196 );
908 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1197 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
909 text => $resist_names{$_}->[0], 1198 text => $resist_names{$_}->[0],
910 font => $FONT_FIXED, 1199 font => $FONT_FIXED,
911 can_hover => 1, 1200 can_hover => 1,
912 can_events => 1, 1201 can_events => 1,
913 tooltip => $resist_names{$_}->[1], 1202 tooltip => $resist_names{$_}->[1],
… …
925 $r 1214 $r
926} 1215}
927 1216
928sub skill_window { 1217sub skill_window {
929 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1218 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1219
930 $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
931 $sw 1222 $sw
932} 1223}
933 1224
934sub formsep($) { 1225sub formsep($) {
935 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1226 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
946 return if $METASERVER_ATIME > time; 1237 return if $METASERVER_ATIME > time;
947 $METASERVER_ATIME = time + 60; 1238 $METASERVER_ATIME = time + 60;
948 1239
949 my $table = $METASERVER->{table}; 1240 my $table = $METASERVER->{table};
950 $table->clear; 1241 $table->clear;
951 $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...");
952 1243
953 my $ok = 0; 1244 my $ok = 0;
954 1245
955 CFPlus::background { 1246 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent; 1247 my $ua = CFPlus::lwp_useragent;
… …
967 "The time this server has been running without being restarted.", 1258 "The time this server has been running without being restarted.",
968 "The server software version - a '+' indicates a Crossfire+ server.", 1259 "The server software version - a '+' indicates a Crossfire+ server.",
969 "Short information about this server provided by its admins.", 1260 "Short information about this server provided by its admins.",
970 ); 1261 );
971 my @col = qw(#Users Host Uptime Version Description); 1262 my @col = qw(#Users Host Uptime Version Description);
972 $table->add ($_, 0, new CFPlus::UI::Label 1263 $table->add_at ($_, 0, new CFPlus::UI::Label
973 can_hover => 1, can_events => 1, 1264 can_hover => 1, can_events => 1,
974 align => 0, fg => [1, 1, 0], 1265 align => 0, fg => [1, 1, 0],
975 text => $col[$_], tooltip => $tip[$_]) 1266 text => $col[$_], tooltip => $tip[$_])
976 for 0 .. $#col; 1267 for 0 .. $#col;
977 1268
… …
999 1290
1000 $m = [$users, $host, $uptime, $version, $desc]; 1291 $m = [$users, $host, $uptime, $version, $desc];
1001 1292
1002 $y++; 1293 $y++;
1003 1294
1004 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1295 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1005 (new CFPlus::UI::Button 1296 (new CFPlus::UI::Button
1006 text => "Use", 1297 text => "Use",
1007 tooltip => "Put this server into the <b>Host:Port</b> field", 1298 tooltip => "Put this server into the <b>Host:Port</b> field",
1008 on_activate => sub { 1299 on_activate => sub {
1009 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1300 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1012 }, 1303 },
1013 ), 1304 ),
1014 (new CFPlus::UI::Empty expand => 1), 1305 (new CFPlus::UI::Empty expand => 1),
1015 ]); 1306 ]);
1016 1307
1017 $table->add ($_, $y, new CFPlus::UI::Label 1308 $table->add_at ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4, 1309 max_w => $::WIDTH * 0.4,
1019 ellipsise => 0, 1310 ellipsise => 0,
1020 align => $align[$_], 1311 align => $align[$_],
1021 text => $m->[$_], 1312 text => $m->[$_],
1022 tooltip => $tip[$_], 1313 tooltip => $tip[$_],
… …
1063 1354
1064 $vbox->add (new CFPlus::UI::FancyFrame 1355 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings", 1356 label => "Connection Settings",
1066 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]),
1067 ); 1358 );
1068 $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");
1069 1360
1070 { 1361 {
1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1362 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1072 1363
1073 $vbox->add ( 1364 $vbox->add (
1074 $HOST_ENTRY = new CFPlus::UI::Entry 1365 $HOST_ENTRY = new CFPlus::UI::Entry
1075 expand => 1, 1366 expand => 1,
1076 text => $CFG->{profile}{default}{host}, 1367 text => $CFG->{profile}{default}{host},
1077 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",
1078 on_changed => sub { 1369 on_changed => sub {
1079 my ($self, $value) = @_; 1370 my ($self, $value) = @_;
1080 $CFG->{profile}{default}{host} = $value; 1371 $CFG->{profile}{default}{host} = $value;
1081 0 1372 1
1082 } 1373 }
1083 ); 1374 );
1084 1375
1085 $vbox->add (new CFPlus::UI::Button 1376 $vbox->add (new CFPlus::UI::Button
1086 expand => 1, 1377 expand => 1,
1087 text => "Server List", 1378 text => "Server List",
1088 other => $METASERVER, 1379 other => $METASERVER,
1089 tooltip => "Show a list of available crossfire servers", 1380 tooltip => "Show a list of available crossfire servers",
1090 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1381 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1091 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1382 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1092 ); 1383 );
1093 } 1384 }
1094 1385
1095 $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");
1096 $table->add (1, 4, new CFPlus::UI::Entry 1387 $table->add_at (1, 4, new CFPlus::UI::Entry
1097 text => $CFG->{profile}{default}{user}, 1388 text => $CFG->{profile}{default}{user},
1098 tooltip => "The name of your character on the server", 1389 tooltip => "The name of your character on the server",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1390 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1100 ); 1391 );
1101 1392
1102 $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");
1103 $table->add (1, 5, new CFPlus::UI::Entry 1394 $table->add_at (1, 5, new CFPlus::UI::Entry
1104 text => $CFG->{profile}{default}{password}, 1395 text => $CFG->{profile}{default}{password},
1105 hidden => 1, 1396 hidden => 1,
1106 tooltip => "The password for your character", 1397 tooltip => "The password for your character",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1398 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1108 ); 1399 );
1109 1400
1110 $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");
1111 $table->add (1, 7, new CFPlus::UI::Slider 1402 $table->add_at (1, 7, new CFPlus::UI::Slider
1112 force_w => 100, 1403 force_w => 100,
1113 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1404 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1114 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. "
1115 . "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, "
1116 . "but you also increase bandwidth requirements and latency. " 1407 . "but you also increase bandwidth requirements and latency. "
1117 . "This option is only used once at log-in.", 1408 . "This option is only used once at log-in.",
1118 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1409 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1119 ); 1410 );
1120 1411
1121 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1122 $table->add (1, 8, new CFPlus::UI::CheckBox
1123 state => $CFG->{face_prefetch},
1124 tooltip => "<b>Background Image Prefetch</b>\n\n"
1125 . "If enabled, the client automatically pre-fetches images from the server. "
1126 . "This might increase or create lag, but increases the chances "
1127 . "of faces being ready for display when you encounter them. "
1128 . "It also uses up server bandwidth on every connect, "
1129 . "so only set it if you really need to prefetch images. "
1130 . "This option can be set and unset any time.",
1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1132 );
1133
1134 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1412 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1135 $table->add (1, 9, new CFPlus::UI::Entry 1413 $table->add_at (1, 8, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate}, 1414 text => $CFG->{output_rate},
1137 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 "
1138 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1416 . "when sending data. When 0 or unset, the server "
1139 . "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.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1419 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1141 ); 1420 );
1142 1421
1143 $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");
1144 $table->add (1, 10, new CFPlus::UI::Entry 1423 $table->add_at (1, 9, new CFPlus::UI::Entry
1145 text => $CFG->{output_count}, 1424 text => $CFG->{output_count},
1146 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1425 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1426 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1148 ); 1427 );
1149 1428
1150 $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");
1151 $table->add (1, 11, new CFPlus::UI::Entry 1430 $table->add_at (1, 10, new CFPlus::UI::Entry
1152 text => $CFG->{output_sync}, 1431 text => $CFG->{output_sync},
1153 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1432 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1433 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1155 ); 1434 );
1156 1435
1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1436 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1158 expand => 1, 1437 expand => 1,
1159 align => 0, 1438 align => 0,
1160 text => "Login", 1439 text => "Login",
1161 on_activate => sub { 1440 on_activate => sub {
1162 $CONN ? stop_game 1441 $CONN ? stop_game
1163 : start_game; 1442 : start_game;
1164 0 1443 1
1165 }, 1444 },
1166 ); 1445 );
1167 1446
1168 $vbox->add (new CFPlus::UI::FancyFrame 1447 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info", 1448 label => "Server Info",
… …
1176sub client_setup { 1455sub client_setup {
1177 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];
1178 1457
1179 my $row = 0; 1458 my $row = 0;
1180 1459
1181 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1183 text => $CFG->{say_command},
1184 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1185 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1186 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1187 on_changed => sub {
1188 my ($self, $value) = @_;
1189 $CFG->{say_command} = $value;
1190 0
1191 }
1192 );
1193
1194 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1460 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1195 $table->add (1, $row++, new CFPlus::UI::CheckBox 1461 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1196 state => $CFG->{show_tips}, 1462 state => $CFG->{show_tips},
1197 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?",
1198 on_changed => sub { 1464 on_changed => sub {
1199 my ($self, $value) = @_; 1465 my ($self, $value) = @_;
1200 $CFG->{show_tips} = $value; 1466 $CFG->{show_tips} = $value;
1201 0 1467 0
1202 } 1468 }
1203 ); 1469 );
1204 1470
1205 $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");
1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1472 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1207 text => $CFG->{logview_max_par}, 1473 text => $CFG->{logview_max_par},
1208 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 "
1209 . "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 "
1210 . "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.",
1211 on_changed => sub { 1477 on_changed => sub {
1212 my ($self, $value) = @_; 1478 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1479 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1214 0 1480 0
1215 }, 1481 },
1216 ); 1482 );
1217 1483
1218 $table 1484 $table
1219} 1485}
1220 1486
1221sub message_window {
1222 my $window = new CFPlus::UI::Toplevel
1223 name => "message_window",
1224 title => "Messages",
1225 border_bg => [1, 1, 1, 1],
1226 x => "max",
1227 y => 0,
1228 force_w => $::WIDTH * 0.4,
1229 force_h => $::HEIGHT * 0.5,
1230 child => (my $vbox = new CFPlus::UI::VBox),
1231 has_close_button => 1;
1232
1233 $vbox->add ($LOGVIEW);
1234
1235 $vbox->add (my $input = new CFPlus::UI::Entry
1236 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1237 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1238 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1239 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1240 on_focus_in => sub {
1241 my ($input, $prev_focus) = @_;
1242
1243 delete $input->{refocus_map};
1244
1245 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1246 $input->{refocus_map} = 1;
1247 }
1248 delete $input->{auto_activated};
1249
1250 0
1251 },
1252 on_activate => sub {
1253 my ($input, $text) = @_;
1254 $input->set_text ('');
1255
1256 if ($text =~ /^\/(.*)/) {
1257 $::CONN->user_send ($1);
1258 } else {
1259 my $say_cmd = $::CFG->{say_command} || 'say';
1260 $::CONN->user_send ("$say_cmd $text");
1261 }
1262 if ($input->{refocus_map}) {
1263 delete $input->{refocus_map};
1264 $MAPWIDGET->focus_in
1265 }
1266
1267 0
1268 },
1269 on_escape => sub {
1270 $MAPWIDGET->grab_focus;
1271
1272 0
1273 },
1274 );
1275
1276 $CONSOLE = {
1277 window => $window,
1278 input => $input,
1279 };
1280
1281 $window
1282}
1283
1284sub autopickup_setup { 1487sub autopickup_setup {
1488 my $r = new CFPlus::UI::ScrolledWindow (
1489 expand => 1,
1490 scroll_y => 1
1491 );
1285 my $table = new CFPlus::UI::Table; 1492 $r->add (my $table = new CFPlus::UI::Table
1493 row_expand => [0],
1494 col_expand => [0, 1, 0, 1],
1495 );
1286 1496
1287 for ( 1497 for (
1288 ["General", 0, 0, 1498 ["General", 0, 0,
1289 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1499 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1290 ["Inhibit autopickup" => PICKUP_INHIBIT], 1500 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1325 ], 1535 ],
1326 ["Weight/Value ratio", 2, 17] 1536 ["Weight/Value ratio", 2, 17]
1327 ) 1537 )
1328 { 1538 {
1329 my ($title, $x, $y, @bits) = @$_; 1539 my ($title, $x, $y, @bits) = @$_;
1330 $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]);
1331 1541
1332 for (@bits) { 1542 for (@bits) {
1333 ++$y; 1543 ++$y;
1334 1544
1335 my $mask = $_->[1]; 1545 my $mask = $_->[1];
1336 $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);
1337 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1547 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1338 state => $::CFG->{pickup} & $mask, 1548 state => $::CFG->{pickup} & $mask,
1339 on_changed => sub { 1549 on_changed => sub {
1340 my ($box, $value) = @_; 1550 my ($box, $value) = @_;
1341 1551
1342 if ($value) { 1552 if ($value) {
… …
1353 1563
1354 ${$_->[2]} = $checkbox if $_->[2]; 1564 ${$_->[2]} = $checkbox if $_->[2];
1355 } 1565 }
1356 } 1566 }
1357 1567
1358 $table->add (2, 18, new CFPlus::UI::ValSlider 1568 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1359 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1569 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1360 template => ">= 99", 1570 template => ">= 99",
1361 to_value => sub { ">= " . 5 * $_[0] }, 1571 to_value => sub { ">= " . 5 * $_[0] },
1362 on_changed => sub { 1572 on_changed => sub {
1363 my ($slider, $value) = @_; 1573 my ($slider, $value) = @_;
… …
1366 $::CFG->{pickup} |= int $value 1576 $::CFG->{pickup} |= int $value
1367 if $value; 1577 if $value;
1368 1; 1578 1;
1369 }); 1579 });
1370 1580
1371 $table->add (3, 18, new CFPlus::UI::Button 1581 $table->add_at (3, 18, new CFPlus::UI::Button
1372 text => "set", 1582 text => "set",
1373 on_activate => sub { 1583 on_activate => sub {
1374 $::CONN->send_command ("pickup $::CFG->{pickup}") 1584 $::CONN->send_command ("pickup $::CFG->{pickup}")
1375 if defined $::CONN; 1585 if defined $::CONN;
1376 0 1586 0
1377 }); 1587 });
1378 1588
1379 $table 1589 $r
1380} 1590}
1381 1591
1382my %SORT_ORDER = ( 1592my %SORT_ORDER = (
1383 type => undef, 1593 type => undef,
1384 mtime => sub { 1594 mtime => sub {
… …
1428 $sw1->add ($INV = new CFPlus::UI::Inventory); 1638 $sw1->add ($INV = new CFPlus::UI::Inventory);
1429 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1639 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1430 1640
1431 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1641 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1432 1642
1433 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1643 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1434 1644
1435 $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);
1436 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1646 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1437 1647
1438 # XXX: Call after $INVR = ... because set_opencont sets the items 1648 # XXX: Call after $INVR = ... because set_opencont sets the items
1439 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1649 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1440 1650
1441 $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;
1442} 1692}
1443 1693
1444sub toggle_player_page { 1694sub toggle_player_page {
1445 my ($widget) = @_; 1695 my ($widget) = @_;
1446 1696
… …
1465 1715
1466 my $ntb = 1716 my $ntb =
1467 $PL_NOTEBOOK = 1717 $PL_NOTEBOOK =
1468 new CFPlus::UI::Notebook expand => 1; 1718 new CFPlus::UI::Notebook expand => 1;
1469 1719
1470 $ntb->add ( 1720 $ntb->add_tab (
1471 "Statistics (F2)" => $STATS_PAGE = stats_window, 1721 "Statistics (F2)" => $STATS_PAGE = stats_window,
1472 "Shows statistics, where all your Stats and Resistances are shown." 1722 "Shows statistics, where all your Stats and Resistances are shown."
1473 ); 1723 );
1474 $ntb->add ( 1724 $ntb->add_tab (
1475 "Skills (F3)" => $SKILL_PAGE = skill_window, 1725 "Skills (F3)" => $SKILL_PAGE = skill_window,
1476 "Shows all your Skills." 1726 "Shows all your Skills."
1477 ); 1727 );
1478 1728
1479 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);
1480 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1730 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1481 $ntb->add ( 1731 $ntb->add_tab (
1482 "Spellbook (F4)" => $spellsw, 1732 "Spellbook (F4)" => $spellsw,
1483 "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."
1484 ); 1734 );
1485 $ntb->add ( 1735 $ntb->add_tab (
1486 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1736 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1487 "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 :). "
1488 . "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."
1489 ); 1739 );
1490 $ntb->add (Pickup => autopickup_setup, 1740 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1491 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 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.");
1492 1745
1493 $ntb->set_current_page ($INVENTORY_PAGE); 1746 $ntb->set_current_page ($INVENTORY_PAGE);
1494 1747
1495 $plwin->add ($ntb); 1748 $plwin->add ($ntb);
1496 $plwin 1749 $plwin
… …
1650 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1903 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1651 ); 1904 );
1652 $hb->add (new CFPlus::UI::Button 1905 $hb->add (new CFPlus::UI::Button
1653 text => "Quit anyway", 1906 text => "Quit anyway",
1654 expand => 1, 1907 expand => 1,
1655 on_activate => sub { exit }, 1908 on_activate => sub { Event::unloop_all },
1656 ); 1909 );
1657 } 1910 }
1658 1911
1659 $QUIT_DIALOG->show; 1912 $QUIT_DIALOG->show;
1660 $QUIT_DIALOG->grab_focus; 1913 $QUIT_DIALOG->grab_focus;
… …
1693 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1946 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1694 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1947 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1695 1948
1696 $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]);
1697 1950
1698 $table->add (0, 0, new CFPlus::UI::Button 1951 $table->add_at (0, 0, new CFPlus::UI::Button
1699 text => "Close", 1952 text => "Close",
1700 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 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>.",
1701 on_activate => $close, 1954 on_activate => $close,
1702 ); 1955 );
1703 1956
1704 $table->add (2, 0, new CFPlus::UI::Button 1957 $table->add_at (2, 0, new CFPlus::UI::Button
1705 text => "Next", 1958 text => "Next",
1706 tooltip => "Show the next <b>Tip of the day</b>.", 1959 tooltip => "Show the next <b>Tip of the day</b>.",
1707 on_activate => sub { 1960 on_activate => sub {
1708 $close->(); 1961 $close->();
1709 &show_tip_of_the_day; 1962 &show_tip_of_the_day;
… …
1718 CFPlus::SDL_Init 1971 CFPlus::SDL_Init
1719 and die "SDL::Init failed!\n"; 1972 and die "SDL::Init failed!\n";
1720} 1973}
1721 1974
1722sub video_init { 1975sub video_init {
1723 sdl_init;
1724
1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1976 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1726 1977
1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1978 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1728 1979
1729 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1980 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1730 $FULLSCREEN = $CFG->{fullscreen}; 1981 $FULLSCREEN = $CFG->{fullscreen};
1731 $FAST = $CFG->{fast}; 1982 $FAST = $CFG->{fast};
1732 1983
1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1984 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1985 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
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::SDL_PollEvent; 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;
2208 }, 2199 },
2209 CFPlus::SDL_ACTIVEEVENT => sub { 2200 CFPlus::SDL_ACTIVEEVENT => sub {
2210# not useful, as APPACTIVE include sonly iconified state, not unmapped 2201# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2202# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2203# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2212# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2204# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2213# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2205# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2214# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2206# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2215 }, 2207 },
2216 CFPlus::SDL_KEYDOWN => sub { 2208 CFPlus::SDL_KEYDOWN => sub {
… …
2245 CFPlus::DB::Server::run; 2237 CFPlus::DB::Server::run;
2246 2238
2247 CFPlus::UI::set_layout ($::CFG->{layout}); 2239 CFPlus::UI::set_layout ($::CFG->{layout});
2248 2240
2249 my %DEF_CFG = ( 2241 my %DEF_CFG = (
2250 sdl_mode => 0, 2242 sdl_mode => 0,
2251 width => 640,
2252 height => 480,
2253 fullscreen => 0, 2243 fullscreen => 0,
2254 fast => 0, 2244 fast => 0,
2245 force_opengl11 => undef,
2246 texture_compression => 1,
2255 map_scale => 1, 2247 map_scale => 1,
2256 fow_enable => 1, 2248 fow_enable => 1,
2257 fow_intensity => 0.45, 2249 fow_intensity => 0,
2258 fow_smooth => 0,
2259 map_smoothing => 1, 2250 map_smoothing => 1,
2260 gui_fontsize => 1, 2251 gui_fontsize => 1,
2261 log_fontsize => 0.7, 2252 log_fontsize => 0.7,
2262 gauge_fontsize => 1, 2253 gauge_fontsize => 1,
2263 gauge_size => 0.35, 2254 gauge_size => 0.35,
2264 stat_fontsize => 0.7, 2255 stat_fontsize => 0.7,
2265 mapsize => 100, 2256 mapsize => 100,
2266 say_command => 'chat',
2267 audio_enable => 1, 2257 audio_enable => 1,
2258 effects_enable => 1,
2259 effects_volume => 1,
2268 bgm_enable => 1, 2260 bgm_enable => 1,
2269 bgm_volume => 0.25, 2261 bgm_volume => 0.5,
2270 face_prefetch => 0,
2271 output_sync => 1, 2262 output_sync => 1,
2272 output_count => 1, 2263 output_count => 1,
2273 output_rate => "", 2264 output_rate => "",
2274 pickup => 0, 2265 pickup => 0,
2275 inv_sort => "mtime", 2266 inv_sort => "mtime",
2276 default => "profile", # default profile 2267 default => "profile", # default profile
2277 show_tips => 1, 2268 show_tips => 1,
2278 logview_max_par => 1000, 2269 logview_max_par => 1000,
2279 ); 2270 );
2280 2271
2281 while (my ($k, $v) = each %DEF_CFG) { 2272 while (my ($k, $v) = each %DEF_CFG) {
2282 $CFG->{$k} = $v unless exists $CFG->{$k}; 2273 $CFG->{$k} = $v unless exists $CFG->{$k};
2283 } 2274 }
… …
2297 } 2288 }
2298 } 2289 }
2299 2290
2300 sdl_init; 2291 sdl_init;
2301 2292
2302 @SDL_MODES = reverse 2293 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2303 grep $_->[0] >= 640 && $_->[1] >= 480, 2294 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2304 CFPlus::SDL_ListModes;
2305
2306 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 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;
2307 2298
2308 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2299 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2309 2300
2310 { 2301 {
2311 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2302 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2340# } 2331# }
2341# my $t2 = Time::HiRes::time; 2332# my $t2 = Time::HiRes::time;
2342# warn $t2-$t1; 2333# warn $t2-$t1;
2343# } 2334# }
2344 2335
2345 $startup_done->();
2346
2347 video_init; 2336 video_init;
2348 audio_init; 2337 audio_init;
2349} 2338}
2350 2339
2351show_tip_of_the_day if $CFG->{show_tips}; 2340show_tip_of_the_day if $CFG->{show_tips};
2352 2341
2342Event->idle (cb => sub {
2343 $_[0]->w->cancel;
2344 $startup_done->();
2345});
2346
2353Event::loop; 2347Event::loop;
2348
2349#video_shutdown;
2350#audio_shutdown;
2354#CFPlus::SDL_Quit; 2351CFPlus::SDL_Quit;
2355#CFPlus::_exit 0;
2356
2357END {
2358 CFPlus::SDL_Quit;
2359 CFPlus::DB::Server::stop; 2352CFPlus::DB::Server::stop;
2360}
2361 2353
2362=head1 NAME 2354=head1 NAME
2363 2355
2364cfplus - A Crossfire+ and Crossfire game client 2356cfplus - A Crossfire TRT and Crossfire game client
2365 2357
2366=head1 SYNOPSIS 2358=head1 SYNOPSIS
2367 2359
2368Just run it - no commandline arguments are supported. 2360Just run it - no commandline arguments are supported.
2369 2361
2370=head1 USAGE 2362=head1 USAGE
2371 2363
2372cfplus 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
2373fullscreen and interactively. 2365be used in fullscreen mode and interactively.
2374 2366
2375=head1 DEBUGGING 2367=head1 DEBUGGING
2376 2368
2377 2369
2378CFPLUS_DEBUG - environment variable 2370CFPLUS_DEBUG - environment variable

Diff Legend

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