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.159 by root, Thu Jul 5 06:49:10 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 @SOUNDS; # event => file mapping
165our %AUDIO_CHUNKS; # audio files
166
167our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
168our $STATUSBOX; 172our $STATUSBOX;
169our $DEBUG_STATUS; 173our $DEBUG_STATUS;
170 174
171our $INV; 175our $INV;
172our $INVR; 176our $INVR;
173our $INV_RIGHT_HB; 177our $INVR_HB;
174 178
175our $PICKUP_CFG; 179#############################################################################
176
177our $IN_BUILD_MODE;
178our $BUILD_BUTTON;
179 180
180sub status { 181sub status {
181 $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]);
182} 183}
183 184
184sub debug { 185sub debug {
185 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
186} 187}
187 188
188sub 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($) {
189 my ($para) = @_; 218 my ($face) = @_;
190 219
191 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 220 $CFG->{effects_enable}
221 or return;
192 222
193 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 223 $AUDIO_PLAY{$face}
224 or return;
194 225
195 $LOGVIEW->add_paragraph ($para); 226 if (my $chunk = $AUDIO_CHUNK{$face}) {
196 $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 }
197} 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#############################################################################
198 443
199sub destroy_query_dialog { 444sub destroy_query_dialog {
200 (delete $_[0]{query_dialog})->destroy 445 (delete $_[0]{query_dialog})->destroy
201 if $_[0]{query_dialog}; 446 if $_[0]{query_dialog};
202} 447}
… …
266 ellipsise => 0, 511 ellipsise => 0,
267 markup => "\nOr use your keyboard and the text entry below:\n"; 512 markup => "\nOr use your keyboard and the text entry below:\n";
268 513
269 unshift @dialog, my $table = new CFPlus::UI::Table; 514 unshift @dialog, my $table = new CFPlus::UI::Table;
270 515
271 $table->add (0, 0, new CFPlus::UI::Button 516 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Next Race", 517 text => "Next Race",
273 on_activate => sub { 518 on_activate => sub {
274 $conn->send ("reply n"); 519 $conn->send ("reply n");
275 destroy_query_dialog $conn; 520 destroy_query_dialog $conn;
276 0 521 0
277 }, 522 },
278 ); 523 );
279 $table->add (2, 0, new CFPlus::UI::Button 524 $table->add_at (2, 0, new CFPlus::UI::Button
280 text => "Accept", 525 text => "Accept",
281 on_activate => sub { 526 on_activate => sub {
282 $conn->send ("reply d"); 527 $conn->send ("reply d");
283 destroy_query_dialog $conn; 528 destroy_query_dialog $conn;
284 0 529 0
… …
319 $conn->send ("reply $stat"); 564 $conn->send ("reply $stat");
320 destroy_query_dialog $conn; 565 destroy_query_dialog $conn;
321 return; 566 return;
322 } 567 }
323 568
324 $STATS_PAGE->show;
325 $MESSAGE_WINDOW->hide;
326
327 unshift @dialog, new CFPlus::UI::Label 569 unshift @dialog, new CFPlus::UI::Label
328 max_w => $::WIDTH * 0.4, 570 max_w => $::WIDTH * 0.4,
329 ellipsise => 0, 571 ellipsise => 0,
330 markup => "\nOr use your keyboard and the text entry below:\n"; 572 markup => "\nOr use your keyboard and the text entry below:\n";
331 573
332 unshift @dialog, my $table = new CFPlus::UI::Table; 574 unshift @dialog, my $table = new CFPlus::UI::Table;
333 575
334 # left: re-roll 576 # left: re-roll
335 $table->add (0, 0, new CFPlus::UI::Button 577 $table->add_at (0, 0, new CFPlus::UI::Button
336 text => "Roll Again", 578 text => "Roll Again",
337 on_activate => sub { 579 on_activate => sub {
338 $conn->send ("reply y"); 580 $conn->send ("reply y");
339 destroy_query_dialog $conn; 581 destroy_query_dialog $conn;
340 0 582 0
… …
354 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 596 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
355 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 597 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
356 ], 598 ],
357 ), 1 .. 2; 599 ), 1 .. 2;
358 600
359 $table->add (2, 0, new CFPlus::UI::Button 601 $table->add_at (2, 0, new CFPlus::UI::Button
360 text => "Swap Stats", 602 text => "Swap Stats",
361 on_activate => sub { 603 on_activate => sub {
362 $conn->{stat_change_with} = $sw2->{value}; 604 $conn->{stat_change_with} = $sw2->{value};
363 $conn->send ("reply $sw1->{value}"); 605 $conn->send ("reply $sw1->{value}");
364 destroy_query_dialog $conn; 606 destroy_query_dialog $conn;
365 0 607 0
366 }, 608 },
367 ); 609 );
368 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 610 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
369 611
370 # right: accept 612 # right: accept
371 $table->add (4, 0, new CFPlus::UI::Button 613 $table->add_at (4, 0, new CFPlus::UI::Button
372 text => "Accept", 614 text => "Accept",
373 on_activate => sub { 615 on_activate => sub {
374 $conn->send ("reply n"); 616 $conn->send ("reply n");
375 $STATS_PAGE->hide; 617 $STATS_PAGE->hide;
376 destroy_query_dialog $conn; 618 destroy_query_dialog $conn;
… …
457 maph => $mapsize, 699 maph => $mapsize,
458 700
459 client => "cfplus $CFPlus::VERSION $] $^O", 701 client => "cfplus $CFPlus::VERSION $] $^O",
460 702
461 map_widget => $MAPWIDGET, 703 map_widget => $MAPWIDGET,
462 logview => $LOGVIEW,
463 statusbox => $STATUSBOX, 704 statusbox => $STATUSBOX,
464 map => $MAP, 705 map => $MAP,
465 mapmap => $MAPMAP, 706 mapmap => $MAPMAP,
466 query => \&server_query, 707 query => \&server_query,
467 708
468 setup_req => { 709 setup_req => {
469 smoothing => $CFG->{map_smoothing}*1, 710 smoothing => $CFG->{map_smoothing}*1,
470 },
471
472 sound_play => sub {
473 my ($x, $y, $soundnum, $type) = @_;
474
475 $SDL_MIXER
476 or return;
477
478 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
479 or return;
480
481 $chunk->play;
482 }, 711 },
483 }; 712 };
484 713
485 if ($CONN) { 714 if ($CONN) {
486 CFPlus::lowdelay fileno $CONN->{fh}; 715 CFPlus::lowdelay fileno $CONN->{fh};
… …
498 $SETUP_DIALOG->show; 727 $SETUP_DIALOG->show;
499 $PL_WINDOW->hide; 728 $PL_WINDOW->hide;
500 $SPELL_LIST->clear_spells; 729 $SPELL_LIST->clear_spells;
501 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 730 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
502 731
732 &audio_music_set_ambient ([]);
733
503 return unless $CONN; 734 return unless $CONN;
504 735
505 status "connection closed"; 736 status "connection closed";
506 737
507 destroy_query_dialog $CONN; 738 destroy_query_dialog $CONN;
… …
516 747
517 $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]);
518 749
519 my $row = 0; 750 my $row = 0;
520 751
521 $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");
522 $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,
523 can_events => 1, 754 can_events => 1,
524 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 755 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
525 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
526 $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");
527 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 762 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
528 763
764 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
529 $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],
530 $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);
531 770
532 $mode_slider->connect (changed => sub { 771 $mode_slider->connect (changed => sub {
533 my ($self, $value) = @_; 772 my ($self, $value) = @_;
534 773
535 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 774 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
536 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 775 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
537 }); 776 });
538 $mode_slider->emit (changed => $mode_slider->{range}[0]); 777 $mode_slider->emit (changed => $mode_slider->{range}[0]);
539 778
540 $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");
541 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 780 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
542 state => $CFG->{fullscreen}, 781 state => $CFG->{fullscreen},
543 tooltip => "Bring the client into fullscreen mode.", 782 tooltip => "Bring the client into fullscreen mode.",
544 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 783 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
545 ); 784 );
546 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
547 $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");
548 $table->add (1, $row++, new CFPlus::UI::CheckBox 809 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
549 state => $CFG->{fast}, 810 state => $CFG->{fast},
550 tooltip => "Lower the visual quality considerably to speed up rendering.", 811 tooltip => "Lower the visual quality considerably to speed up rendering.",
551 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
552 ); 813 );
553 814
554 $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");
555 $table->add (1, $row++, new CFPlus::UI::Slider 816 $table->add_at (1, $row++, new CFPlus::UI::Slider
556 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 817 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
557 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.",
558 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 819 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
559 ); 820 );
560 821
561 $table->add (1, $row++, new CFPlus::UI::Button 822 $table->add_at (1, $row++, new CFPlus::UI::Button
562 expand => 1, align => 0, text => "Apply", 823 expand => 1, align => 0, text => "Apply",
563 tooltip => "Apply the video settings above.", 824 tooltip => "Apply the video settings above.",
564 on_activate => sub { 825 on_activate => sub {
565 video_shutdown (); 826 video_shutdown ();
566 video_init (); 827 video_init ();
567 0 828 0
568 } 829 }
569 ); 830 );
570 831
571 $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");
572 $table->add (1, $row++, new CFPlus::UI::Slider 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
573 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 834 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
574 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 835 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
575 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 }
576 ); 837 );
577 838
578 $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");
579 $table->add (1, $row++, new CFPlus::UI::CheckBox 840 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
580 state => $CFG->{map_smoothing}, 841 state => $CFG->{map_smoothing},
581 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. "
582 . "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. "
583 . "Changes take effect at next connection only.", 844 . "Changes take effect at next login only.",
584 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 845 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
585 ); 846 );
586 847
587 $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");
588 $table->add (1, $row++, new CFPlus::UI::CheckBox 849 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
589 state => $CFG->{fow_enable}, 850 state => $CFG->{fow_enable},
590 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.",
591 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 852 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
592 ); 853 );
593 854
594 $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");
595 $table->add (1, $row++, new CFPlus::UI::Slider 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
596 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 857 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
597 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.",
598 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
599 ); 860 );
600 861
601 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
602 $table->add (1, $row++, new CFPlus::UI::CheckBox
603 state => $CFG->{fow_smooth},
604 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
605 on_changed => sub {
606 my ($self, $value) = @_;
607 $CFG->{fow_smooth} = $value;
608 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
609 0
610 }
611 );
612
613 $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");
614 $table->add (1, $row++, new CFPlus::UI::Slider 863 $table->add_at (1, $row++, new CFPlus::UI::Slider
615 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 864 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
616 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.",
617 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 867 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
618 ); 868 );
619 869
620 $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");
621 $table->add (1, $row++, new CFPlus::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
622 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 872 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
623 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.",
624 on_changed => sub { 874 on_changed => sub {
625 $CFG->{gauge_fontsize} = $_[1]; 875 $CFG->{gauge_fontsize} = $_[1];
626 &set_gauge_window_fontsize; 876 &set_gauge_window_fontsize;
627 0 877 0
628 } 878 }
629 ); 879 );
630 880
631 $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");
632 $table->add (1, $row++, new CFPlus::UI::Slider 882 $table->add_at (1, $row++, new CFPlus::UI::Slider
633 range => [$CFG->{gauge_size}, 0.2, 0.8], 883 range => [$CFG->{gauge_size}, 0.2, 0.8],
634 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.",
635 on_changed => sub { 885 on_changed => sub {
636 $CFG->{gauge_size} = $_[1]; 886 $CFG->{gauge_size} = $_[1];
637 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 887 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
643} 893}
644 894
645sub audio_setup { 895sub audio_setup {
646 my $vbox = new CFPlus::UI::VBox; 896 my $vbox = new CFPlus::UI::VBox;
647 897
648 $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]);
649 899
650 my $row = 0; 900 my $row = 0;
651 901
652 $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");
653 $table->add (1, $row++, new CFPlus::UI::CheckBox 903 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
654 state => $CFG->{audio_enable}, 904 state => $CFG->{audio_enable},
655 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.",
656 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 906 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
657 ); 907 );
658# $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");
659# $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 {
660# $CFG->{effects_volume} = $_[1]; 910# $CFG->{effects_volume} = $_[1];
661# }); 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
662 $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");
663 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
664 $hbox->add (new CFPlus::UI::CheckBox 931 $table->add_at (1, $row, new CFPlus::UI::CheckBox
665 expand => 1, state => $CFG->{bgm_enable}, 932 expand => 1, state => $CFG->{bgm_enable},
666 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.",
667 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 }
668 ); 940 );
669 $hbox->add (new CFPlus::UI::Slider 941 $table->add_at (2, $row++, new CFPlus::UI::Slider
670 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 942 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
671 tooltip => "The volume of the background music. Changes are instant.", 943 tooltip => "The volume of the background music. Changes are instant.",
672 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 }
673 ); 945 );
674 946
675 $table->add (1, $row++, new CFPlus::UI::Button 947 $table->add_at (1, $row++, new CFPlus::UI::Button
676 expand => 1, align => 0, text => "Apply", 948 c_colspan => 2, expand => 1, align => 0, text => "Apply",
677 tooltip => "Apply the audio settings", 949 tooltip => "Apply the audio settings",
678 on_activate => sub { 950 on_activate => sub {
679 audio_shutdown (); 951 audio_shutdown ();
680 audio_init (); 952 audio_init ();
681 0 953 0
… …
723 $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");
724 $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");
725 $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");
726 $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");
727 999
728 $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);
729 $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");
730 1004
731 $GAUGES = { 1005 $GAUGES = {
1006 exp => $exp, prg => $prg, sklprg => $sklprg,
732 exp => $exp, win => $win, range => $rng, 1007 win => $win, range => $rng,
733 food => $fg, mana => $mg, hp => $hg, grace => $gg 1008 hp => $hg, mana => $mg, grace => $gg, food => $fg,
734 }; 1009 };
735 1010
736 &set_gauge_window_fontsize; 1011 &set_gauge_window_fontsize;
737 1012
738 $win 1013 $win
739} 1014}
740 1015
741sub debug_setup { 1016sub debug_setup {
742 my $table = new CFPlus::UI::Table; 1017 my $table = new CFPlus::UI::Table;
743 1018
744 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1019 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
745 $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 });
746 $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");
747 $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 });
748 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1023 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
749 $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 });
750 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1025 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
751 $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 });
752 $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() } );
753 1028
754 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
755
756 for my $x (0..2) {
757 for my $y (0 .. 2) {
758 $table->add ($x + 3, $y,
759 new CFPlus::UI::Entry
760 text => $default_smooth[$x * 3 + $y],
761 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
762 );
763 }
764 }
765
766 $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 });
767 1063
768 $table 1064 $table
769} 1065}
770 1066
771sub stats_window { 1067sub stats_window {
… …
819 [2, 4, st_spd => "Spd", 10.54], 1115 [2, 4, st_spd => "Spd", 10.54],
820 [2, 5, st_wspd => "WSp", 10.54], 1116 [2, 5, st_wspd => "WSp", 10.54],
821 ) { 1117 ) {
822 my ($col, $row, $id, $label, $template) = @$_; 1118 my ($col, $row, $id, $label, $template) = @$_;
823 1119
824 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1120 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
825 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1121 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
826 align => +1, template => $template, tooltip => "#stat_$label"); 1122 align => +1, template => $template, tooltip => "#stat_$label");
827 $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
828 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,
829 align => -1, text => $label, tooltip => "#stat_$label"); 1125 align => -1, text => $label, tooltip => "#stat_$label");
830 } 1126 }
831 1127
832 $vb->add (new CFPlus::UI::FancyFrame 1128 $vb->add (new CFPlus::UI::FancyFrame
… …
873 cold => ["Cold", 1169 cold => ["Cold",
874 "<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, ...)"],
875 ghit => ["Ghost hit", 1171 ghit => ["Ghost hit",
876 "<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)"],
877 ); 1173 );
1174
878 for (qw/slow holyw conf fire depl magic 1175 for (qw/slow holyw conf fire depl magic
879 drain acid pois para deat phys 1176 drain acid pois para deat phys
880 blind fear tund elec cold ghit/) 1177 blind fear tund elec cold ghit/)
881 { 1178 {
882 $tbl2->add ($col, $row, 1179 $tbl2->add_at ($col, $row,
883 $STATWIDS->{"res_$_"} = 1180 $STATWIDS->{"res_$_"} =
884 new CFPlus::UI::Label 1181 new CFPlus::UI::Label
885 font => $FONT_FIXED, 1182 font => $FONT_FIXED,
886 template => "-100%", 1183 template => "-100%",
887 align => +1, 1184 align => +1,
888 valign => 0, 1185 valign => 0,
889 can_events => 1, 1186 can_events => 1,
890 can_hover => 1, 1187 can_hover => 1,
891 tooltip => $resist_names{$_}->[1], 1188 tooltip => $resist_names{$_}->[1],
892 ); 1189 );
893 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1190 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
894 font => $FONT_FIXED, 1191 font => $FONT_FIXED,
895 can_hover => 1, 1192 can_hover => 1,
896 can_events => 1, 1193 can_events => 1,
897 path => "ui/resist/resist_$_.png", 1194 path => "ui/resist/resist_$_.png",
898 tooltip => $resist_names{$_}->[1], 1195 tooltip => $resist_names{$_}->[1],
899 ); 1196 );
900 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1197 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
901 text => $resist_names{$_}->[0], 1198 text => $resist_names{$_}->[0],
902 font => $FONT_FIXED, 1199 font => $FONT_FIXED,
903 can_hover => 1, 1200 can_hover => 1,
904 can_events => 1, 1201 can_events => 1,
905 tooltip => $resist_names{$_}->[1], 1202 tooltip => $resist_names{$_}->[1],
… …
917 $r 1214 $r
918} 1215}
919 1216
920sub skill_window { 1217sub skill_window {
921 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1218 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1219
922 $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
923 $sw 1222 $sw
924} 1223}
925 1224
926sub formsep($) { 1225sub formsep($) {
927 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1226 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
938 return if $METASERVER_ATIME > time; 1237 return if $METASERVER_ATIME > time;
939 $METASERVER_ATIME = time + 60; 1238 $METASERVER_ATIME = time + 60;
940 1239
941 my $table = $METASERVER->{table}; 1240 my $table = $METASERVER->{table};
942 $table->clear; 1241 $table->clear;
943 $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...");
944 1243
945 my $ok = 0; 1244 my $ok = 0;
946 1245
947 CFPlus::background { 1246 CFPlus::background {
948 my $ua = CFPlus::lwp_useragent; 1247 my $ua = CFPlus::lwp_useragent;
… …
959 "The time this server has been running without being restarted.", 1258 "The time this server has been running without being restarted.",
960 "The server software version - a '+' indicates a Crossfire+ server.", 1259 "The server software version - a '+' indicates a Crossfire+ server.",
961 "Short information about this server provided by its admins.", 1260 "Short information about this server provided by its admins.",
962 ); 1261 );
963 my @col = qw(#Users Host Uptime Version Description); 1262 my @col = qw(#Users Host Uptime Version Description);
964 $table->add ($_, 0, new CFPlus::UI::Label 1263 $table->add_at ($_, 0, new CFPlus::UI::Label
965 can_hover => 1, can_events => 1, 1264 can_hover => 1, can_events => 1,
966 align => 0, fg => [1, 1, 0], 1265 align => 0, fg => [1, 1, 0],
967 text => $col[$_], tooltip => $tip[$_]) 1266 text => $col[$_], tooltip => $tip[$_])
968 for 0 .. $#col; 1267 for 0 .. $#col;
969 1268
… …
991 1290
992 $m = [$users, $host, $uptime, $version, $desc]; 1291 $m = [$users, $host, $uptime, $version, $desc];
993 1292
994 $y++; 1293 $y++;
995 1294
996 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1295 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
997 (new CFPlus::UI::Button 1296 (new CFPlus::UI::Button
998 text => "Use", 1297 text => "Use",
999 tooltip => "Put this server into the <b>Host:Port</b> field", 1298 tooltip => "Put this server into the <b>Host:Port</b> field",
1000 on_activate => sub { 1299 on_activate => sub {
1001 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1300 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1004 }, 1303 },
1005 ), 1304 ),
1006 (new CFPlus::UI::Empty expand => 1), 1305 (new CFPlus::UI::Empty expand => 1),
1007 ]); 1306 ]);
1008 1307
1009 $table->add ($_, $y, new CFPlus::UI::Label 1308 $table->add_at ($_, $y, new CFPlus::UI::Label
1010 max_w => $::WIDTH * 0.4, 1309 max_w => $::WIDTH * 0.4,
1011 ellipsise => 0, 1310 ellipsise => 0,
1012 align => $align[$_], 1311 align => $align[$_],
1013 text => $m->[$_], 1312 text => $m->[$_],
1014 tooltip => $tip[$_], 1313 tooltip => $tip[$_],
… …
1055 1354
1056 $vbox->add (new CFPlus::UI::FancyFrame 1355 $vbox->add (new CFPlus::UI::FancyFrame
1057 label => "Connection Settings", 1356 label => "Connection Settings",
1058 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]),
1059 ); 1358 );
1060 $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");
1061 1360
1062 { 1361 {
1063 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1362 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1064 1363
1065 $vbox->add ( 1364 $vbox->add (
1066 $HOST_ENTRY = new CFPlus::UI::Entry 1365 $HOST_ENTRY = new CFPlus::UI::Entry
1067 expand => 1, 1366 expand => 1,
1068 text => $CFG->{profile}{default}{host}, 1367 text => $CFG->{profile}{default}{host},
1069 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",
1070 on_changed => sub { 1369 on_changed => sub {
1071 my ($self, $value) = @_; 1370 my ($self, $value) = @_;
1072 $CFG->{profile}{default}{host} = $value; 1371 $CFG->{profile}{default}{host} = $value;
1073 0 1372 1
1074 } 1373 }
1075 ); 1374 );
1076 1375
1077 $vbox->add (new CFPlus::UI::Button 1376 $vbox->add (new CFPlus::UI::Button
1078 expand => 1, 1377 expand => 1,
1079 text => "Server List", 1378 text => "Server List",
1080 other => $METASERVER, 1379 other => $METASERVER,
1081 tooltip => "Show a list of available crossfire servers", 1380 tooltip => "Show a list of available crossfire servers",
1082 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1381 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1083 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1382 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1084 ); 1383 );
1085 } 1384 }
1086 1385
1087 $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");
1088 $table->add (1, 4, new CFPlus::UI::Entry 1387 $table->add_at (1, 4, new CFPlus::UI::Entry
1089 text => $CFG->{profile}{default}{user}, 1388 text => $CFG->{profile}{default}{user},
1090 tooltip => "The name of your character on the server", 1389 tooltip => "The name of your character on the server",
1091 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1390 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1092 ); 1391 );
1093 1392
1094 $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");
1095 $table->add (1, 5, new CFPlus::UI::Entry 1394 $table->add_at (1, 5, new CFPlus::UI::Entry
1096 text => $CFG->{profile}{default}{password}, 1395 text => $CFG->{profile}{default}{password},
1097 hidden => 1, 1396 hidden => 1,
1098 tooltip => "The password for your character", 1397 tooltip => "The password for your character",
1099 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1398 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1100 ); 1399 );
1101 1400
1102 $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");
1103 $table->add (1, 7, new CFPlus::UI::Slider 1402 $table->add_at (1, 7, new CFPlus::UI::Slider
1104 force_w => 100, 1403 force_w => 100,
1105 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1404 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1106 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. "
1107 . "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, "
1108 . "but you also increase bandwidth requirements and latency. " 1407 . "but you also increase bandwidth requirements and latency. "
1109 . "This option is only used once at log-in.", 1408 . "This option is only used once at log-in.",
1110 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 },
1111 ); 1410 );
1112 1411
1113 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1114 $table->add (1, 8, new CFPlus::UI::CheckBox
1115 state => $CFG->{face_prefetch},
1116 tooltip => "<b>Background Image Prefetch</b>\n\n"
1117 . "If enabled, the client automatically pre-fetches images from the server. "
1118 . "This might increase or create lag, but increases the chances "
1119 . "of faces being ready for display when you encounter them. "
1120 . "It also uses up server bandwidth on every connect, "
1121 . "so only set it if you really need to prefetch images. "
1122 . "This option can be set and unset any time.",
1123 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1124 );
1125
1126 $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");
1127 $table->add (1, 9, new CFPlus::UI::Entry 1413 $table->add_at (1, 8, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate}, 1414 text => $CFG->{output_rate},
1129 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 "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1416 . "when sending data. When 0 or unset, the server "
1131 . "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.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1419 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1133 ); 1420 );
1134 1421
1135 $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");
1136 $table->add (1, 10, new CFPlus::UI::Entry 1423 $table->add_at (1, 9, new CFPlus::UI::Entry
1137 text => $CFG->{output_count}, 1424 text => $CFG->{output_count},
1138 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.",
1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1426 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1140 ); 1427 );
1141 1428
1142 $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");
1143 $table->add (1, 11, new CFPlus::UI::Entry 1430 $table->add_at (1, 10, new CFPlus::UI::Entry
1144 text => $CFG->{output_sync}, 1431 text => $CFG->{output_sync},
1145 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.",
1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1433 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1147 ); 1434 );
1148 1435
1149 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1436 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1150 expand => 1, 1437 expand => 1,
1151 align => 0, 1438 align => 0,
1152 text => "Login", 1439 text => "Login",
1153 on_activate => sub { 1440 on_activate => sub {
1154 $CONN ? stop_game 1441 $CONN ? stop_game
1155 : start_game; 1442 : start_game;
1156 0 1443 1
1157 }, 1444 },
1158 ); 1445 );
1159 1446
1160 $vbox->add (new CFPlus::UI::FancyFrame 1447 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info", 1448 label => "Server Info",
… …
1168sub client_setup { 1455sub client_setup {
1169 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];
1170 1457
1171 my $row = 0; 1458 my $row = 0;
1172 1459
1173 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1174 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1175 text => $CFG->{say_command},
1176 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. "
1177 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1178 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1179 on_changed => sub {
1180 my ($self, $value) = @_;
1181 $CFG->{say_command} = $value;
1182 0
1183 }
1184 );
1185
1186 $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");
1187 $table->add (1, $row++, new CFPlus::UI::CheckBox 1461 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1188 state => $CFG->{show_tips}, 1462 state => $CFG->{show_tips},
1189 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?",
1190 on_changed => sub { 1464 on_changed => sub {
1191 my ($self, $value) = @_; 1465 my ($self, $value) = @_;
1192 $CFG->{show_tips} = $value; 1466 $CFG->{show_tips} = $value;
1193 0 1467 0
1194 } 1468 }
1195 ); 1469 );
1196 1470
1197 $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");
1198 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1472 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199 text => $CFG->{logview_max_par}, 1473 text => $CFG->{logview_max_par},
1200 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 "
1201 . "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 "
1202 . "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.",
1203 on_changed => sub { 1477 on_changed => sub {
1204 my ($self, $value) = @_; 1478 my ($self, $value) = @_;
1205 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1479 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1206 0 1480 0
1207 }, 1481 },
1208 ); 1482 );
1209 1483
1210 $table 1484 $table
1211} 1485}
1212 1486
1213sub message_window {
1214 my $window = new CFPlus::UI::Toplevel
1215 name => "message_window",
1216 title => "Messages",
1217 border_bg => [1, 1, 1, 1],
1218 x => "max",
1219 y => 0,
1220 force_w => $::WIDTH * 0.4,
1221 force_h => $::HEIGHT * 0.5,
1222 child => (my $vbox = new CFPlus::UI::VBox),
1223 has_close_button => 1;
1224
1225 $vbox->add ($LOGVIEW);
1226
1227 $vbox->add (my $input = new CFPlus::UI::Entry
1228 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1229 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1230 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1231 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1232 on_focus_in => sub {
1233 my ($input, $prev_focus) = @_;
1234
1235 delete $input->{refocus_map};
1236
1237 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1238 $input->{refocus_map} = 1;
1239 }
1240 delete $input->{auto_activated};
1241
1242 0
1243 },
1244 on_activate => sub {
1245 my ($input, $text) = @_;
1246 $input->set_text ('');
1247
1248 if ($text =~ /^\/(.*)/) {
1249 $::CONN->user_send ($1);
1250 } else {
1251 my $say_cmd = $::CFG->{say_command} || 'say';
1252 $::CONN->user_send ("$say_cmd $text");
1253 }
1254 if ($input->{refocus_map}) {
1255 delete $input->{refocus_map};
1256 $MAPWIDGET->focus_in
1257 }
1258
1259 0
1260 },
1261 on_escape => sub {
1262 $MAPWIDGET->grab_focus;
1263
1264 0
1265 },
1266 );
1267
1268 $CONSOLE = {
1269 window => $window,
1270 input => $input,
1271 };
1272
1273 $window
1274}
1275
1276sub autopickup_setup { 1487sub autopickup_setup {
1488 my $r = new CFPlus::UI::ScrolledWindow (
1489 expand => 1,
1490 scroll_y => 1
1491 );
1277 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 );
1278 1496
1279 for ( 1497 for (
1280 ["General", 0, 0, 1498 ["General", 0, 0,
1281 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1499 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1282 ["Inhibit autopickup" => PICKUP_INHIBIT], 1500 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1317 ], 1535 ],
1318 ["Weight/Value ratio", 2, 17] 1536 ["Weight/Value ratio", 2, 17]
1319 ) 1537 )
1320 { 1538 {
1321 my ($title, $x, $y, @bits) = @$_; 1539 my ($title, $x, $y, @bits) = @$_;
1322 $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]);
1323 1541
1324 for (@bits) { 1542 for (@bits) {
1325 ++$y; 1543 ++$y;
1326 1544
1327 my $mask = $_->[1]; 1545 my $mask = $_->[1];
1328 $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);
1329 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1547 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1330 state => $::CFG->{pickup} & $mask, 1548 state => $::CFG->{pickup} & $mask,
1331 on_changed => sub { 1549 on_changed => sub {
1332 my ($box, $value) = @_; 1550 my ($box, $value) = @_;
1333 1551
1334 if ($value) { 1552 if ($value) {
… …
1345 1563
1346 ${$_->[2]} = $checkbox if $_->[2]; 1564 ${$_->[2]} = $checkbox if $_->[2];
1347 } 1565 }
1348 } 1566 }
1349 1567
1350 $table->add (2, 18, new CFPlus::UI::ValSlider 1568 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1351 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1569 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1352 template => ">= 99", 1570 template => ">= 99",
1353 to_value => sub { ">= " . 5 * $_[0] }, 1571 to_value => sub { ">= " . 5 * $_[0] },
1354 on_changed => sub { 1572 on_changed => sub {
1355 my ($slider, $value) = @_; 1573 my ($slider, $value) = @_;
… …
1358 $::CFG->{pickup} |= int $value 1576 $::CFG->{pickup} |= int $value
1359 if $value; 1577 if $value;
1360 1; 1578 1;
1361 }); 1579 });
1362 1580
1363 $table->add (3, 18, new CFPlus::UI::Button 1581 $table->add_at (3, 18, new CFPlus::UI::Button
1364 text => "set", 1582 text => "set",
1365 on_activate => sub { 1583 on_activate => sub {
1366 $::CONN->send_command ("pickup $::CFG->{pickup}") 1584 $::CONN->send_command ("pickup $::CFG->{pickup}")
1367 if defined $::CONN; 1585 if defined $::CONN;
1368 0 1586 0
1369 }); 1587 });
1370 1588
1371 $table 1589 $r
1372} 1590}
1373 1591
1374my %SORT_ORDER = ( 1592my %SORT_ORDER = (
1375 type => undef, 1593 type => undef,
1376 mtime => sub { 1594 mtime => sub {
… …
1420 $sw1->add ($INV = new CFPlus::UI::Inventory); 1638 $sw1->add ($INV = new CFPlus::UI::Inventory);
1421 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1639 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1422 1640
1423 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1641 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1424 1642
1425 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1643 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1426 1644
1427 $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);
1428 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1646 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1429 1647
1430 # XXX: Call after $INVR = ... because set_opencont sets the items 1648 # XXX: Call after $INVR = ... because set_opencont sets the items
1431 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1649 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1432 1650
1433 $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;
1434} 1692}
1435 1693
1436sub toggle_player_page { 1694sub toggle_player_page {
1437 my ($widget) = @_; 1695 my ($widget) = @_;
1438 1696
… …
1457 1715
1458 my $ntb = 1716 my $ntb =
1459 $PL_NOTEBOOK = 1717 $PL_NOTEBOOK =
1460 new CFPlus::UI::Notebook expand => 1; 1718 new CFPlus::UI::Notebook expand => 1;
1461 1719
1462 $ntb->add ( 1720 $ntb->add_tab (
1463 "Statistics (F2)" => $STATS_PAGE = stats_window, 1721 "Statistics (F2)" => $STATS_PAGE = stats_window,
1464 "Shows statistics, where all your Stats and Resistances are shown." 1722 "Shows statistics, where all your Stats and Resistances are shown."
1465 ); 1723 );
1466 $ntb->add ( 1724 $ntb->add_tab (
1467 "Skills (F3)" => $SKILL_PAGE = skill_window, 1725 "Skills (F3)" => $SKILL_PAGE = skill_window,
1468 "Shows all your Skills." 1726 "Shows all your Skills."
1469 ); 1727 );
1470 1728
1471 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);
1472 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1730 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1473 $ntb->add ( 1731 $ntb->add_tab (
1474 "Spellbook (F4)" => $spellsw, 1732 "Spellbook (F4)" => $spellsw,
1475 "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."
1476 ); 1734 );
1477 $ntb->add ( 1735 $ntb->add_tab (
1478 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1736 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1479 "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 :). "
1480 . "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."
1481 ); 1739 );
1482 $ntb->add (Pickup => autopickup_setup, 1740 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1483 "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.");
1484 1745
1485 $ntb->set_current_page ($INVENTORY_PAGE); 1746 $ntb->set_current_page ($INVENTORY_PAGE);
1486 1747
1487 $plwin->add ($ntb); 1748 $plwin->add ($ntb);
1488 $plwin 1749 $plwin
… …
1642 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1903 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1643 ); 1904 );
1644 $hb->add (new CFPlus::UI::Button 1905 $hb->add (new CFPlus::UI::Button
1645 text => "Quit anyway", 1906 text => "Quit anyway",
1646 expand => 1, 1907 expand => 1,
1647 on_activate => sub { exit }, 1908 on_activate => sub { Event::unloop_all },
1648 ); 1909 );
1649 } 1910 }
1650 1911
1651 $QUIT_DIALOG->show; 1912 $QUIT_DIALOG->show;
1652 $QUIT_DIALOG->grab_focus; 1913 $QUIT_DIALOG->grab_focus;
… …
1685 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1946 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1686 $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]);
1687 1948
1688 $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]);
1689 1950
1690 $table->add (0, 0, new CFPlus::UI::Button 1951 $table->add_at (0, 0, new CFPlus::UI::Button
1691 text => "Close", 1952 text => "Close",
1692 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>.",
1693 on_activate => $close, 1954 on_activate => $close,
1694 ); 1955 );
1695 1956
1696 $table->add (2, 0, new CFPlus::UI::Button 1957 $table->add_at (2, 0, new CFPlus::UI::Button
1697 text => "Next", 1958 text => "Next",
1698 tooltip => "Show the next <b>Tip of the day</b>.", 1959 tooltip => "Show the next <b>Tip of the day</b>.",
1699 on_activate => sub { 1960 on_activate => sub {
1700 $close->(); 1961 $close->();
1701 &show_tip_of_the_day; 1962 &show_tip_of_the_day;
… …
1710 CFPlus::SDL_Init 1971 CFPlus::SDL_Init
1711 and die "SDL::Init failed!\n"; 1972 and die "SDL::Init failed!\n";
1712} 1973}
1713 1974
1714sub video_init { 1975sub video_init {
1715 sdl_init;
1716
1717 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1976 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1718 1977
1719 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1978 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1720 1979
1721 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1980 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1722 $FULLSCREEN = $CFG->{fullscreen}; 1981 $FULLSCREEN = $CFG->{fullscreen};
1723 $FAST = $CFG->{fast}; 1982 $FAST = $CFG->{fast};
1724 1983
1725 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1984 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1726 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1985 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1727 1986
1728 $SDL_ACTIVE = 1; 1987 $SDL_ACTIVE = 1;
1729 $LAST_REFRESH = time - 0.01; 1988 $LAST_REFRESH = time - 0.01;
1730 1989
1731 CFPlus::OpenGL::init; 1990 CFPlus::OpenGL::init;
1991 CFPlus::Macro::init;
1732 1992
1733 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1993 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1734 1994
1735 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1995 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1736 1996
1737 ############################################################################# 1997 #############################################################################
1738 1998
1739 if ($DEBUG_STATUS) { 1999 if ($DEBUG_STATUS) {
1740 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2000 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1741 } else { 2001 } else {
1742 # 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 });
1743 2015
1744 $DEBUG_STATUS = new CFPlus::UI::Label 2016 $DEBUG_STATUS = new CFPlus::UI::Label
1745 padding => 0, 2017 padding => 0,
1746 z => 100, 2018 z => 100,
1747 force_x => "max", 2019 force_x => "max",
… …
1772 2044
1773 $MAPWIDGET = new CFPlus::MapWidget; 2045 $MAPWIDGET = new CFPlus::MapWidget;
1774 $MAPWIDGET->connect (activate_console => sub { 2046 $MAPWIDGET->connect (activate_console => sub {
1775 my ($mapwidget, $preset) = @_; 2047 my ($mapwidget, $preset) = @_;
1776 2048
1777 if ($CONSOLE) { 2049 $MESSAGE_WINDOW->activate_console ($preset)
1778 $CONSOLE->{input}->{auto_activated} = 1; 2050 if $MESSAGE_WINDOW;
1779 $CONSOLE->{input}->grab_focus;
1780
1781 if ($preset && $CONSOLE->{input}->get_text eq '') {
1782 $CONSOLE->{input}->set_text ($preset);
1783 }
1784 }
1785 }); 2051 });
1786 $MAPWIDGET->show; 2052 $MAPWIDGET->show;
1787 $MAPWIDGET->grab_focus; 2053 $MAPWIDGET->grab_focus;
1788 2054
1789 $LOGVIEW = new CFPlus::UI::TextScroller 2055 $COMPLETER = new CFPlus::MapWidget::Command::
1790 expand => 1, 2056 command => { },
1791 font => $FONT_FIXED, 2057 tooltip => "#completer_help",
1792 fontsize => $::CFG->{log_fontsize},
1793 indent => -4,
1794 can_hover => 1,
1795 can_events => 1,
1796 max_par => $CFG->{logview_max_par},
1797 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1798 ; 2058 ;
1799 2059
1800 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2060 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1801 title => "Setup", 2061 title => "Setup",
1802 name => "setup_dialog", 2062 name => "setup_dialog",
… …
1807 force_h => $::HEIGHT * 0.6, 2067 force_h => $::HEIGHT * 0.6,
1808 has_close_button => 1, 2068 has_close_button => 1,
1809 ; 2069 ;
1810 2070
1811 $METASERVER = metaserver_dialog; 2071 $METASERVER = metaserver_dialog;
2072 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1812 2073
1813 $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,
1814 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2075 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1815 2076
1816 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2077 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1817 "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.");
1818 $SETUP_NOTEBOOK->add (Client => client_setup, 2079 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1819 "Configure various client-specific settings."); 2080 "Configure various client-specific settings.");
1820 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2081 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1821 "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.");
1822 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2083 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1823 "Configure the use of audio, sound effects and background music."); 2084 "Configure the use of audio, sound effects and background music.");
1824 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2085 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1825 "Lets you define, edit and delete key bindings." 2086 "Lets you define, edit and delete key bindings."
1826 . "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 "
1827 . "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 "
1828 . "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. "
1829 . "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 "
1830 . "binding editor closes"); 2091 . "binding editor closes");
1831 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2092 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1832 "Some debuggin' options. Do not ask."); 2093 "Some debuggin' options. Do not ask.");
1833 2094
1834 $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
1835 2096
1836 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2097 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1837 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.");
1838 2099
1839 $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,
1840 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.");
1841 2102
1842 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
1843 2104
1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2105 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1864 tooltip => "Terminates the program", 2125 tooltip => "Terminates the program",
1865 on_activate => sub { 2126 on_activate => sub {
1866 if ($CONN) { 2127 if ($CONN) {
1867 open_quit_dialog; 2128 open_quit_dialog;
1868 } else { 2129 } else {
1869 exit; 2130 Event::unloop_all;
1870 } 2131 }
1871 0 2132 0
1872 }, 2133 },
1873 ); 2134 );
1874 2135
1875 $BUTTONBAR->show; 2136 $BUTTONBAR->show;
1876 $SETUP_DIALOG->show; 2137 $SETUP_DIALOG->show;
2138 $MESSAGE_WINDOW->show;
1877 } 2139 }
1878 2140
1879 $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]);
1880}
1881
1882sub setup_build_button {
1883 my ($enabled) = @_;
1884 if ($enabled) {
1885 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1886 $BUILD_BUTTON ||= new CFPlus::UI::Button
1887 text => "Build",
1888 tooltip => "Opens the ingame builder",
1889 on_activate => sub {
1890 if ($CONN) {
1891 $CONN->send_ext_req (builder_player_items => sub {
1892 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1893 });
1894 }
1895 0
1896 };
1897 $BUTTONBAR->add ($BUILD_BUTTON);
1898 } else {
1899 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1900 }
1901}
1902
1903sub open_ingame_editor {
1904 my ($msg) = @_;
1905
1906 my $win = new CFPlus::UI::Toplevel
1907 x => 0,
1908 y => 'center',
1909 z => 4,
1910 name => 'builder_window',
1911 force_w => int $WIDTH * 1/4,
1912 force_h => int $HEIGHT * 3/4,
1913 title => "In game builder",
1914 has_close_button => 1;
1915
1916 my $r = new CFPlus::UI::ScrolledWindow (
1917 expand => 1,
1918 scroll_y => 1
1919 );
1920 $r->add (my $vb = new CFPlus::UI::VBox);
1921 $win->add ($r);
1922
1923
1924 $vb->add (
1925 new CFPlus::UI::Button
1926 text => "Disable build mode",
1927 on_activate => sub { $::IN_BUILD_MODE = undef }
1928 );
1929 $vb->add (
1930 new CFPlus::UI::Button
1931 text => "ERASE",
1932 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1933 );
1934
1935 for my $itemarchname (
1936 sort {
1937 $msg->{items}->{$a}->{build_arch_name}
1938 cmp $msg->{items}->{$b}->{build_arch_name}
1939 } keys %{$msg->{items}}
1940 ) {
1941 my $info = $msg->{items}->{$itemarchname};
1942 $vb->add (
1943 new CFPlus::UI::Button text => $info->{build_arch_name},
1944 on_activate => sub {
1945 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1946
1947 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1948 build_mode_query_arch_info ();
1949 }
1950 }
1951 );
1952 }
1953
1954 $win->show;
1955}
1956
1957sub build_mode_query_arch_info {
1958 my ($iteminfo) = $::IN_BUILD_MODE;
1959 my $itemarchname = $iteminfo->{item};
1960 my $info = $iteminfo->{info};
1961
1962 my $dialog = new CFPlus::UI::Toplevel
1963 x => "center",
1964 y => "center",
1965 z => 50,
1966 force_w => int $WIDTH * 1/2,
1967 title => "Enter information for placement of '$itemarchname'",
1968 has_close_button => 1;
1969
1970 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1971
1972 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1973 my $row = 0;
1974 if ($info->{has_name}) {
1975 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1976 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1977 }
1978 if ($info->{has_text}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1981 }
1982 if ($info->{has_connection}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1984 $table->add (1, $row++,
1985 new CFPlus::UI::Entry
1986 expand => 1,
1987 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1988 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1989 );
1990 }
1991
1992 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1993 $hb->add (new CFPlus::UI::Button
1994 text => "Close",
1995 expand => 1,
1996 on_activate => sub { $dialog->hide; 0 },
1997 );
1998 $dialog->show;
1999} 2142}
2000 2143
2001sub video_shutdown { 2144sub video_shutdown {
2002 CFPlus::OpenGL::shutdown; 2145 CFPlus::OpenGL::shutdown;
2003 2146
2004 undef $SDL_ACTIVE; 2147 undef $SDL_ACTIVE;
2005} 2148}
2006 2149
2007my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2008my $bgmusic;#TODO#hack#d#
2009
2010sub audio_channel_finished {
2011 my ($channel) = @_;
2012
2013 #warn "channel $channel finished\n";#d#
2014}
2015
2016sub audio_music_finished {
2017 return unless $CFG->{bgm_enable};
2018
2019 # TODO: hack, do play loop and mood music
2020 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2021 $bgmusic->play (0);
2022
2023 push @bgmusic, shift @bgmusic;
2024}
2025
2026sub audio_init {
2027 if ($CFG->{audio_enable}) {
2028 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2029 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2030
2031 unless ($SDL_MIXER) {
2032 status "Unable to open sound device: there will be no sound";
2033 return;
2034 }
2035
2036 CFPlus::Mix_AllocateChannels 8;
2037 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2038
2039 audio_music_finished;
2040
2041 local $_;
2042 while (<$fh>) {
2043 next if /^\s*#/;
2044 next if /^\s*$/;
2045
2046 my ($file, $volume, $event) = split /\s+/, $_, 3;
2047
2048 push @SOUNDS, "$volume,$file";
2049
2050 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2051 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2052 $chunk->volume ($volume * 128 / 100);
2053 $chunk
2054 };
2055 }
2056 } else {
2057 status "unable to open sound config: $!";
2058 }
2059 }
2060}
2061
2062sub audio_shutdown {
2063 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2064 undef $SDL_MIXER;
2065 @SOUNDS = ();
2066 %AUDIO_CHUNKS = ();
2067}
2068
2069my %animate_object; 2150my %animate_object;
2070my $animate_timer; 2151my $animate_timer;
2071 2152
2072my $fps = 9; 2153my $fps = 9;
2073 2154
2074my %demo;#d#
2075
2076sub force_refresh { 2155sub force_refresh {
2156 if ($ENV{CFPLUS_DEBUG} & 4) {
2077 $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;
2078 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2158 debug sprintf "%3.2f", $fps;
2159 }
2079 2160
2080 $CFPlus::UI::ROOT->draw; 2161 $CFPlus::UI::ROOT->draw;
2081 2162 CFPlus::SDL_GL_SwapBuffers;
2082 $WANT_REFRESH = 0;
2083 $CAN_REFRESH = 0;
2084 $LAST_REFRESH = $NOW; 2163 $LAST_REFRESH = $NOW;
2085 2164 $WANT_REFRESH->stop;
2086 CFPlus::SDL_GL_SwapBuffers;
2087} 2165}
2088 2166
2167$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2168
2089my $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 {
2090 $NOW = time; 2170 $NOW = time;
2091 2171
2092 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2172 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2093 for CFPlus::SDL_PollEvent; 2173 for CFPlus::poll_events;
2094 2174
2095 if (%animate_object) { 2175 if (%animate_object) {
2096 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2176 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2097 $WANT_REFRESH++; 2177 $WANT_REFRESH->start;
2098 }
2099
2100 if ($WANT_REFRESH) {
2101 force_refresh;
2102 } else {
2103 $CAN_REFRESH = 1;
2104 } 2178 }
2105}); 2179});
2106 2180
2107sub animation_start { 2181sub animation_start {
2108 my ($widget) = @_; 2182 my ($widget) = @_;
… …
2112sub animation_stop { 2186sub animation_stop {
2113 my ($widget) = @_; 2187 my ($widget) = @_;
2114 delete $animate_object{$widget}; 2188 delete $animate_object{$widget};
2115} 2189}
2116 2190
2117# check once/second for faces that need to be prefetched
2118# this should, of course, only run on demand, but
2119# SDL forces worse things on us....
2120
2121Event->timer (after => 1, interval => 0.25, cb => sub {
2122 $CONN->face_prefetch
2123 if $CONN;
2124});
2125
2126%SDL_CB = ( 2191%SDL_CB = (
2127 CFPlus::SDL_QUIT => sub { 2192 CFPlus::SDL_QUIT => sub {
2128 exit; 2193 Event::unloop_all;
2129 }, 2194 },
2130 CFPlus::SDL_VIDEORESIZE => sub { 2195 CFPlus::SDL_VIDEORESIZE => sub {
2131 }, 2196 },
2132 CFPlus::SDL_VIDEOEXPOSE => sub { 2197 CFPlus::SDL_VIDEOEXPOSE => sub {
2133 CFPlus::UI::full_refresh; 2198 CFPlus::UI::full_refresh;
2134 }, 2199 },
2135 CFPlus::SDL_ACTIVEEVENT => sub { 2200 CFPlus::SDL_ACTIVEEVENT => sub {
2136# not useful, as APPACTIVE include sonly iconified state, not unmapped 2201# not useful, as APPACTIVE include sonly iconified state, not unmapped
2137# 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#
2138# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2204# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2139# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2205# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2140# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2206# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2141 }, 2207 },
2142 CFPlus::SDL_KEYDOWN => sub { 2208 CFPlus::SDL_KEYDOWN => sub {
… …
2171 CFPlus::DB::Server::run; 2237 CFPlus::DB::Server::run;
2172 2238
2173 CFPlus::UI::set_layout ($::CFG->{layout}); 2239 CFPlus::UI::set_layout ($::CFG->{layout});
2174 2240
2175 my %DEF_CFG = ( 2241 my %DEF_CFG = (
2176 sdl_mode => 0, 2242 sdl_mode => 0,
2177 width => 640,
2178 height => 480,
2179 fullscreen => 0, 2243 fullscreen => 0,
2180 fast => 0, 2244 fast => 0,
2245 force_opengl11 => undef,
2246 texture_compression => 1,
2181 map_scale => 1, 2247 map_scale => 1,
2182 fow_enable => 1, 2248 fow_enable => 1,
2183 fow_intensity => 0.45, 2249 fow_intensity => 0,
2184 fow_smooth => 0,
2185 map_smoothing => 1, 2250 map_smoothing => 1,
2186 gui_fontsize => 1, 2251 gui_fontsize => 1,
2187 log_fontsize => 0.7, 2252 log_fontsize => 0.7,
2188 gauge_fontsize => 1, 2253 gauge_fontsize => 1,
2189 gauge_size => 0.35, 2254 gauge_size => 0.35,
2190 stat_fontsize => 0.7, 2255 stat_fontsize => 0.7,
2191 mapsize => 100, 2256 mapsize => 100,
2192 say_command => 'chat',
2193 audio_enable => 1, 2257 audio_enable => 1,
2258 effects_enable => 1,
2259 effects_volume => 1,
2194 bgm_enable => 1, 2260 bgm_enable => 1,
2195 bgm_volume => 0.25, 2261 bgm_volume => 0.5,
2196 face_prefetch => 0,
2197 output_sync => 1, 2262 output_sync => 1,
2198 output_count => 1, 2263 output_count => 1,
2199 output_rate => "", 2264 output_rate => "",
2200 pickup => 0, 2265 pickup => 0,
2201 inv_sort => "mtime", 2266 inv_sort => "mtime",
2202 default => "profile", # default profile 2267 default => "profile", # default profile
2203 show_tips => 1, 2268 show_tips => 1,
2204 logview_max_par => 1000, 2269 logview_max_par => 1000,
2205 ); 2270 );
2206 2271
2207 while (my ($k, $v) = each %DEF_CFG) { 2272 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2273 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2274 }
… …
2223 } 2288 }
2224 } 2289 }
2225 2290
2226 sdl_init; 2291 sdl_init;
2227 2292
2228 @SDL_MODES = reverse 2293 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2229 grep $_->[0] >= 640 && $_->[1] >= 480, 2294 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2230 CFPlus::SDL_ListModes;
2231
2232 @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;
2233 2298
2234 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2299 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2235 2300
2236 { 2301 {
2237 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2302 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2266# } 2331# }
2267# my $t2 = Time::HiRes::time; 2332# my $t2 = Time::HiRes::time;
2268# warn $t2-$t1; 2333# warn $t2-$t1;
2269# } 2334# }
2270 2335
2271 $startup_done->();
2272
2273 video_init; 2336 video_init;
2274 audio_init; 2337 audio_init;
2275} 2338}
2276 2339
2277show_tip_of_the_day if $CFG->{show_tips}; 2340show_tip_of_the_day if $CFG->{show_tips};
2278 2341
2342Event->idle (cb => sub {
2343 $_[0]->w->cancel;
2344 $startup_done->();
2345});
2346
2279Event::loop; 2347Event::loop;
2348
2349#video_shutdown;
2350#audio_shutdown;
2280#CFPlus::SDL_Quit; 2351CFPlus::SDL_Quit;
2281#CFPlus::_exit 0;
2282
2283END {
2284 CFPlus::SDL_Quit;
2285 CFPlus::DB::Server::stop; 2352CFPlus::DB::Server::stop;
2286}
2287 2353
2288=head1 NAME 2354=head1 NAME
2289 2355
2290cfplus - A Crossfire+ and Crossfire game client 2356cfplus - A Crossfire TRT and Crossfire game client
2291 2357
2292=head1 SYNOPSIS 2358=head1 SYNOPSIS
2293 2359
2294Just run it - no commandline arguments are supported. 2360Just run it - no commandline arguments are supported.
2295 2361
2296=head1 USAGE 2362=head1 USAGE
2297 2363
2298cfplus 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
2299fullscreen and interactively. 2365be used in fullscreen mode and interactively.
2300 2366
2301=head1 DEBUGGING 2367=head1 DEBUGGING
2302 2368
2303 2369
2304CFPLUS_DEBUG - environment variable 2370CFPLUS_DEBUG - environment variable

Diff Legend

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