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.152 by root, Tue Apr 24 01:13:15 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 { };
4
5# do splash-screen thingy on win32
6BEGIN { 5BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 } 9 }
… …
29# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
30BEGIN { 29BEGIN {
31 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
32 @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
33 32
33 my $root = $ENV{PAR_TEMP};
34
34 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 36 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 38 $zip->extractMember ($_, "$root/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 39 unless -e "$root/$1";
39 } 40 }
40 } 41 }
41 42
42 # TODO: pango-rc file, anybody? 43 if ($^O eq "MSWin32") {
44 # pango is relocatable on win32
45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
49 # unix, need to patch pango rc file
50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
52 local $/;
53 my $rc = <$fh>;
54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
43 55
44 unshift @INC, $ENV{PAR_TEMP}; 56 mkdir "$root/pango-modules";
57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
58 or die "$root/pango-modules/pango.modules: $!";
59 print $fh $rc;
60
61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
63 or die "$ENV{PANGO_RC_FILE}: $!";
64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
65 }
66
67 unshift @INC, $root;
45 } 68 }
46} 69}
47 70
48# 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
49unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 73 if %PAR::LibCache;
51 74
52use Time::HiRes 'time'; 75use Time::HiRes 'time';
53use Event; 76use Event;
77use List::Util qw(max min);
54 78
55use Crossfire; 79use Crossfire;
56use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
57 81
58use Compress::LZF; 82use Compress::LZF;
… …
60use CFPlus; 84use CFPlus;
61use CFPlus::OpenGL (); 85use CFPlus::OpenGL ();
62use CFPlus::Protocol; 86use CFPlus::Protocol;
63use CFPlus::DB; 87use CFPlus::DB;
64use CFPlus::UI; 88use CFPlus::UI;
89use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
67use CFPlus::Pod; 95use CFPlus::Pod;
68use CFPlus::MapWidget; 96use CFPlus::MapWidget;
69use CFPlus::Macro; 97use CFPlus::Macro;
70 98
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
88our $CONN; 116our $CONN;
89our $PROFILE; # current profile 117our $PROFILE; # current profile
90our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
91 119
92our $WANT_REFRESH; 120our $WANT_REFRESH;
93our $CAN_REFRESH;
94 121
95our @SDL_MODES; 122our @SDL_MODES;
96our $WIDTH; 123our $WIDTH;
97our $HEIGHT; 124our $HEIGHT;
98our $FULLSCREEN; 125our $FULLSCREEN;
… …
102our $FONT_FIXED; 129our $FONT_FIXED;
103 130
104our $MAP; 131our $MAP;
105our $MAPMAP; 132our $MAPMAP;
106our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
107our $BUTTONBAR; 135our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 136our $METASERVER;
111our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 138our $QUIT_DIALOG;
113our $HOST_ENTRY; 139our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 140our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 147our $SETUP_KEYBOARD;
122 148
123our $PL_NOTEBOOK; 149our $PL_NOTEBOOK;
124our $PL_WINDOW; 150our $PL_WINDOW;
125 151
152our $MUSIC_PLAYING_WIDGET;
153our $LICENSE_WIDGET;
154
155our $PICKUP_PAGE;
126our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
127our $STATS_PAGE; 157our $STATS_PAGE;
128our $SKILL_PAGE; 158our $SKILL_PAGE;
129our $SPELL_PAGE; 159our $SPELL_PAGE;
130our $SPELL_LIST; 160our $SPELL_LIST;
… …
136our $STATWIDS; 166our $STATWIDS;
137 167
138our $SDL_ACTIVE; 168our $SDL_ACTIVE;
139our %SDL_CB; 169our %SDL_CB;
140 170
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 172our $STATUSBOX;
147our $DEBUG_STATUS; 173our $DEBUG_STATUS;
148 174
149our $INV; 175our $INV;
150our $INVR; 176our $INVR;
151our $INV_RIGHT_HB; 177our $INVR_HB;
152 178
153our $PICKUP_CFG; 179#############################################################################
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157 180
158sub status { 181sub status {
159 $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]);
160} 183}
161 184
162sub debug { 185sub debug {
163 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
164} 187}
165 188
166sub 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($) {
167 my ($para) = @_; 218 my ($face) = @_;
168 219
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 220 $CFG->{effects_enable}
221 or return;
170 222
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}"; 223 $AUDIO_PLAY{$face}
224 or return;
172 225
173 $LOGVIEW->add_paragraph ($para); 226 if (my $chunk = $AUDIO_CHUNK{$face}) {
174 $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 }
175} 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#############################################################################
176 443
177sub destroy_query_dialog { 444sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 445 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 446 if $_[0]{query_dialog};
180} 447}
… …
244 ellipsise => 0, 511 ellipsise => 0,
245 markup => "\nOr use your keyboard and the text entry below:\n"; 512 markup => "\nOr use your keyboard and the text entry below:\n";
246 513
247 unshift @dialog, my $table = new CFPlus::UI::Table; 514 unshift @dialog, my $table = new CFPlus::UI::Table;
248 515
249 $table->add (0, 0, new CFPlus::UI::Button 516 $table->add_at (0, 0, new CFPlus::UI::Button
250 text => "Next Race", 517 text => "Next Race",
251 on_activate => sub { 518 on_activate => sub {
252 $conn->send ("reply n"); 519 $conn->send ("reply n");
253 destroy_query_dialog $conn; 520 destroy_query_dialog $conn;
254 0 521 0
255 }, 522 },
256 ); 523 );
257 $table->add (2, 0, new CFPlus::UI::Button 524 $table->add_at (2, 0, new CFPlus::UI::Button
258 text => "Accept", 525 text => "Accept",
259 on_activate => sub { 526 on_activate => sub {
260 $conn->send ("reply d"); 527 $conn->send ("reply d");
261 destroy_query_dialog $conn; 528 destroy_query_dialog $conn;
262 0 529 0
… …
269 ellipsise => 0, 536 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 537 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ; 538 ;
272 } 539 }
273 540
274 if ($conn->{chargen_race_title}) {
275 unshift @dialog, new CFPlus::UI::Face 541 unshift @dialog, new CFPlus::UI::Face
276 face => $conn->{player}{face}, 542 face => $conn->{player}{face},
277 bg => [.2, .2, .2, 1], 543 bg => [.2, .2, .2, 1],
278 min_w => 64, 544 min_w => 64,
279 min_h => 64, 545 min_h => 64,
280 ;
281 } 546 ;
282 547
283 if ($conn->{chargen_race_title}) { 548 if ($conn->{chargen_race_title}) {
284 unshift @dialog, new CFPlus::UI::Label 549 unshift @dialog, new CFPlus::UI::Label
285 allign => 1, 550 allign => 1,
286 ellipsise => 0, 551 ellipsise => 0,
… …
299 $conn->send ("reply $stat"); 564 $conn->send ("reply $stat");
300 destroy_query_dialog $conn; 565 destroy_query_dialog $conn;
301 return; 566 return;
302 } 567 }
303 568
304 $STATS_PAGE->show;
305 $MESSAGE_WINDOW->hide;
306
307 unshift @dialog, new CFPlus::UI::Label 569 unshift @dialog, new CFPlus::UI::Label
308 max_w => $::WIDTH * 0.4, 570 max_w => $::WIDTH * 0.4,
309 ellipsise => 0, 571 ellipsise => 0,
310 markup => "\nOr use your keyboard and the text entry below:\n"; 572 markup => "\nOr use your keyboard and the text entry below:\n";
311 573
312 unshift @dialog, my $table = new CFPlus::UI::Table; 574 unshift @dialog, my $table = new CFPlus::UI::Table;
313 575
314 # left: re-roll 576 # left: re-roll
315 $table->add (0, 0, new CFPlus::UI::Button 577 $table->add_at (0, 0, new CFPlus::UI::Button
316 text => "Roll Again", 578 text => "Roll Again",
317 on_activate => sub { 579 on_activate => sub {
318 $conn->send ("reply y"); 580 $conn->send ("reply y");
319 destroy_query_dialog $conn; 581 destroy_query_dialog $conn;
320 0 582 0
… …
334 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 596 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
335 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 597 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
336 ], 598 ],
337 ), 1 .. 2; 599 ), 1 .. 2;
338 600
339 $table->add (2, 0, new CFPlus::UI::Button 601 $table->add_at (2, 0, new CFPlus::UI::Button
340 text => "Swap Stats", 602 text => "Swap Stats",
341 on_activate => sub { 603 on_activate => sub {
342 $conn->{stat_change_with} = $sw2->{value}; 604 $conn->{stat_change_with} = $sw2->{value};
343 $conn->send ("reply $sw1->{value}"); 605 $conn->send ("reply $sw1->{value}");
344 destroy_query_dialog $conn; 606 destroy_query_dialog $conn;
345 0 607 0
346 }, 608 },
347 ); 609 );
348 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 610 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
349 611
350 # right: accept 612 # right: accept
351 $table->add (4, 0, new CFPlus::UI::Button 613 $table->add_at (4, 0, new CFPlus::UI::Button
352 text => "Accept", 614 text => "Accept",
353 on_activate => sub { 615 on_activate => sub {
354 $conn->send ("reply n"); 616 $conn->send ("reply n");
355 $STATS_PAGE->hide; 617 $STATS_PAGE->hide;
356 destroy_query_dialog $conn; 618 destroy_query_dialog $conn;
… …
437 maph => $mapsize, 699 maph => $mapsize,
438 700
439 client => "cfplus $CFPlus::VERSION $] $^O", 701 client => "cfplus $CFPlus::VERSION $] $^O",
440 702
441 map_widget => $MAPWIDGET, 703 map_widget => $MAPWIDGET,
442 logview => $LOGVIEW,
443 statusbox => $STATUSBOX, 704 statusbox => $STATUSBOX,
444 map => $MAP, 705 map => $MAP,
445 mapmap => $MAPMAP, 706 mapmap => $MAPMAP,
446 query => \&server_query, 707 query => \&server_query,
447 708
448 setup_req => { 709 setup_req => {
449 smoothing => $CFG->{map_smoothing}*1, 710 smoothing => $CFG->{map_smoothing}*1,
450 },
451
452 sound_play => sub {
453 my ($x, $y, $soundnum, $type) = @_;
454
455 $SDL_MIXER
456 or return;
457
458 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
459 or return;
460
461 $chunk->play;
462 }, 711 },
463 }; 712 };
464 713
465 if ($CONN) { 714 if ($CONN) {
466 CFPlus::lowdelay fileno $CONN->{fh}; 715 CFPlus::lowdelay fileno $CONN->{fh};
… …
476 $LOGIN_BUTTON->set_text ("Login"); 725 $LOGIN_BUTTON->set_text ("Login");
477 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 726 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
478 $SETUP_DIALOG->show; 727 $SETUP_DIALOG->show;
479 $PL_WINDOW->hide; 728 $PL_WINDOW->hide;
480 $SPELL_LIST->clear_spells; 729 $SPELL_LIST->clear_spells;
730 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
731
732 &audio_music_set_ambient ([]);
481 733
482 return unless $CONN; 734 return unless $CONN;
483 735
484 status "connection closed"; 736 status "connection closed";
485 737
… …
495 747
496 $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]);
497 749
498 my $row = 0; 750 my $row = 0;
499 751
500 $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");
501 $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,
502 can_events => 1, 754 can_events => 1,
503 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 755 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
504 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
505 $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");
506 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 762 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
507 763
764 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
508 $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],
509 $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);
510 770
511 $mode_slider->connect (changed => sub { 771 $mode_slider->connect (changed => sub {
512 my ($self, $value) = @_; 772 my ($self, $value) = @_;
513 773
514 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 774 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
515 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 775 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
516 }); 776 });
517 $mode_slider->emit (changed => $mode_slider->{range}[0]); 777 $mode_slider->emit (changed => $mode_slider->{range}[0]);
518 778
519 $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");
520 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 780 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
521 state => $CFG->{fullscreen}, 781 state => $CFG->{fullscreen},
522 tooltip => "Bring the client into fullscreen mode.", 782 tooltip => "Bring the client into fullscreen mode.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 783 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
524 ); 784 );
525 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
526 $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");
527 $table->add (1, $row++, new CFPlus::UI::CheckBox 809 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fast}, 810 state => $CFG->{fast},
529 tooltip => "Lower the visual quality considerably to speed up rendering.", 811 tooltip => "Lower the visual quality considerably to speed up rendering.",
530 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
531 ); 813 );
532 814
533 $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");
534 $table->add (1, $row++, new CFPlus::UI::Slider 816 $table->add_at (1, $row++, new CFPlus::UI::Slider
535 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 817 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
536 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.",
537 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 819 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538 ); 820 );
539 821
540 $table->add (1, $row++, new CFPlus::UI::Button 822 $table->add_at (1, $row++, new CFPlus::UI::Button
541 expand => 1, align => 0, text => "Apply", 823 expand => 1, align => 0, text => "Apply",
542 tooltip => "Apply the video settings above.", 824 tooltip => "Apply the video settings above.",
543 on_activate => sub { 825 on_activate => sub {
544 video_shutdown (); 826 video_shutdown ();
545 video_init (); 827 video_init ();
546 0 828 0
547 } 829 }
548 ); 830 );
549 831
550 $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");
551 $table->add (1, $row++, new CFPlus::UI::Slider 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 834 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
553 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 835 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
554 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 }
555 ); 837 );
556 838
557 $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");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox 840 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{map_smoothing}, 841 state => $CFG->{map_smoothing},
560 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. "
561 . "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. "
562 . "Changes take effect at next connection only.", 844 . "Changes take effect at next login only.",
563 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 845 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
564 ); 846 );
565 847
566 $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");
567 $table->add (1, $row++, new CFPlus::UI::CheckBox 849 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
568 state => $CFG->{fow_enable}, 850 state => $CFG->{fow_enable},
569 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.",
570 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 852 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
571 ); 853 );
572 854
573 $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");
574 $table->add (1, $row++, new CFPlus::UI::Slider 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
575 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 857 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
576 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.",
577 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
578 ); 860 );
579 861
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{fow_smooth},
583 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
584 on_changed => sub {
585 my ($self, $value) = @_;
586 $CFG->{fow_smooth} = $value;
587 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
588 0
589 }
590 );
591
592 $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");
593 $table->add (1, $row++, new CFPlus::UI::Slider 863 $table->add_at (1, $row++, new CFPlus::UI::Slider
594 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 864 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
595 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.",
596 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 867 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
597 ); 868 );
598 869
599 $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");
600 $table->add (1, $row++, new CFPlus::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
601 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 872 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
602 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.",
603 on_changed => sub { 874 on_changed => sub {
604 $CFG->{gauge_fontsize} = $_[1]; 875 $CFG->{gauge_fontsize} = $_[1];
605 &set_gauge_window_fontsize; 876 &set_gauge_window_fontsize;
606 0 877 0
607 } 878 }
608 ); 879 );
609 880
610 $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");
611 $table->add (1, $row++, new CFPlus::UI::Slider 882 $table->add_at (1, $row++, new CFPlus::UI::Slider
612 range => [$CFG->{gauge_size}, 0.2, 0.8], 883 range => [$CFG->{gauge_size}, 0.2, 0.8],
613 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.",
614 on_changed => sub { 885 on_changed => sub {
615 $CFG->{gauge_size} = $_[1]; 886 $CFG->{gauge_size} = $_[1];
616 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 887 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
622} 893}
623 894
624sub audio_setup { 895sub audio_setup {
625 my $vbox = new CFPlus::UI::VBox; 896 my $vbox = new CFPlus::UI::VBox;
626 897
627 $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]);
628 899
629 my $row = 0; 900 my $row = 0;
630 901
631 $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");
632 $table->add (1, $row++, new CFPlus::UI::CheckBox 903 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
633 state => $CFG->{audio_enable}, 904 state => $CFG->{audio_enable},
634 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.",
635 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 906 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
636 ); 907 );
637# $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");
638# $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 {
639# $CFG->{effects_volume} = $_[1]; 910# $CFG->{effects_volume} = $_[1];
640# }); 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
641 $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");
642 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
643 $hbox->add (new CFPlus::UI::CheckBox 931 $table->add_at (1, $row, new CFPlus::UI::CheckBox
644 expand => 1, state => $CFG->{bgm_enable}, 932 expand => 1, state => $CFG->{bgm_enable},
645 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.",
646 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 }
647 ); 940 );
648 $hbox->add (new CFPlus::UI::Slider 941 $table->add_at (2, $row++, new CFPlus::UI::Slider
649 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 942 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
650 tooltip => "The volume of the background music. Changes are instant.", 943 tooltip => "The volume of the background music. Changes are instant.",
651 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 }
652 ); 945 );
653 946
654 $table->add (1, $row++, new CFPlus::UI::Button 947 $table->add_at (1, $row++, new CFPlus::UI::Button
655 expand => 1, align => 0, text => "Apply", 948 c_colspan => 2, expand => 1, align => 0, text => "Apply",
656 tooltip => "Apply the audio settings", 949 tooltip => "Apply the audio settings",
657 on_activate => sub { 950 on_activate => sub {
658 audio_shutdown (); 951 audio_shutdown ();
659 audio_init (); 952 audio_init ();
660 0 953 0
… …
702 $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");
703 $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");
704 $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");
705 $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");
706 999
707 $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);
708 $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");
709 1004
710 $GAUGES = { 1005 $GAUGES = {
1006 exp => $exp, prg => $prg, sklprg => $sklprg,
711 exp => $exp, win => $win, range => $rng, 1007 win => $win, range => $rng,
712 food => $fg, mana => $mg, hp => $hg, grace => $gg 1008 hp => $hg, mana => $mg, grace => $gg, food => $fg,
713 }; 1009 };
714 1010
715 &set_gauge_window_fontsize; 1011 &set_gauge_window_fontsize;
716 1012
717 $win 1013 $win
718} 1014}
719 1015
720sub debug_setup { 1016sub debug_setup {
721 my $table = new CFPlus::UI::Table; 1017 my $table = new CFPlus::UI::Table;
722 1018
723 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1019 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
724 $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 });
725 $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");
726 $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 });
727 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1023 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
728 $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 });
729 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1025 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
730 $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 });
731 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 1027 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
732 1028
733 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
734
735 for my $x (0..2) {
736 for my $y (0 .. 2) {
737 $table->add ($x + 3, $y,
738 new CFPlus::UI::Entry
739 text => $default_smooth[$x * 3 + $y],
740 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
741 );
742 }
743 }
744
745 $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 });
746 1063
747 $table 1064 $table
748} 1065}
749 1066
750sub stats_window { 1067sub stats_window {
… …
798 [2, 4, st_spd => "Spd", 10.54], 1115 [2, 4, st_spd => "Spd", 10.54],
799 [2, 5, st_wspd => "WSp", 10.54], 1116 [2, 5, st_wspd => "WSp", 10.54],
800 ) { 1117 ) {
801 my ($col, $row, $id, $label, $template) = @$_; 1118 my ($col, $row, $id, $label, $template) = @$_;
802 1119
803 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1120 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
804 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1121 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
805 align => +1, template => $template, tooltip => "#stat_$label"); 1122 align => +1, template => $template, tooltip => "#stat_$label");
806 $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
807 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,
808 align => -1, text => $label, tooltip => "#stat_$label"); 1125 align => -1, text => $label, tooltip => "#stat_$label");
809 } 1126 }
810 1127
811 $vb->add (new CFPlus::UI::FancyFrame 1128 $vb->add (new CFPlus::UI::FancyFrame
… …
852 cold => ["Cold", 1169 cold => ["Cold",
853 "<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, ...)"],
854 ghit => ["Ghost hit", 1171 ghit => ["Ghost hit",
855 "<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)"],
856 ); 1173 );
1174
857 for (qw/slow holyw conf fire depl magic 1175 for (qw/slow holyw conf fire depl magic
858 drain acid pois para deat phys 1176 drain acid pois para deat phys
859 blind fear tund elec cold ghit/) 1177 blind fear tund elec cold ghit/)
860 { 1178 {
861 $tbl2->add ($col, $row, 1179 $tbl2->add_at ($col, $row,
862 $STATWIDS->{"res_$_"} = 1180 $STATWIDS->{"res_$_"} =
863 new CFPlus::UI::Label 1181 new CFPlus::UI::Label
864 font => $FONT_FIXED, 1182 font => $FONT_FIXED,
865 template => "-100%", 1183 template => "-100%",
866 align => +1, 1184 align => +1,
867 valign => 0, 1185 valign => 0,
868 can_events => 1, 1186 can_events => 1,
869 can_hover => 1, 1187 can_hover => 1,
870 tooltip => $resist_names{$_}->[1], 1188 tooltip => $resist_names{$_}->[1],
871 ); 1189 );
872 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1190 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
873 font => $FONT_FIXED, 1191 font => $FONT_FIXED,
874 can_hover => 1, 1192 can_hover => 1,
875 can_events => 1, 1193 can_events => 1,
876 path => "ui/resist/resist_$_.png", 1194 path => "ui/resist/resist_$_.png",
877 tooltip => $resist_names{$_}->[1], 1195 tooltip => $resist_names{$_}->[1],
878 ); 1196 );
879 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1197 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
880 text => $resist_names{$_}->[0], 1198 text => $resist_names{$_}->[0],
881 font => $FONT_FIXED, 1199 font => $FONT_FIXED,
882 can_hover => 1, 1200 can_hover => 1,
883 can_events => 1, 1201 can_events => 1,
884 tooltip => $resist_names{$_}->[1], 1202 tooltip => $resist_names{$_}->[1],
… …
896 $r 1214 $r
897} 1215}
898 1216
899sub skill_window { 1217sub skill_window {
900 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1218 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1219
901 $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
902 $sw 1222 $sw
903} 1223}
904 1224
905sub formsep($) { 1225sub formsep($) {
906 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1226 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
917 return if $METASERVER_ATIME > time; 1237 return if $METASERVER_ATIME > time;
918 $METASERVER_ATIME = time + 60; 1238 $METASERVER_ATIME = time + 60;
919 1239
920 my $table = $METASERVER->{table}; 1240 my $table = $METASERVER->{table};
921 $table->clear; 1241 $table->clear;
922 $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...");
923 1243
924 my $ok = 0; 1244 my $ok = 0;
925 1245
926 CFPlus::background { 1246 CFPlus::background {
927 my $ua = CFPlus::lwp_useragent; 1247 my $ua = CFPlus::lwp_useragent;
… …
938 "The time this server has been running without being restarted.", 1258 "The time this server has been running without being restarted.",
939 "The server software version - a '+' indicates a Crossfire+ server.", 1259 "The server software version - a '+' indicates a Crossfire+ server.",
940 "Short information about this server provided by its admins.", 1260 "Short information about this server provided by its admins.",
941 ); 1261 );
942 my @col = qw(#Users Host Uptime Version Description); 1262 my @col = qw(#Users Host Uptime Version Description);
943 $table->add ($_, 0, new CFPlus::UI::Label 1263 $table->add_at ($_, 0, new CFPlus::UI::Label
944 can_hover => 1, can_events => 1, 1264 can_hover => 1, can_events => 1,
945 align => 0, fg => [1, 1, 0], 1265 align => 0, fg => [1, 1, 0],
946 text => $col[$_], tooltip => $tip[$_]) 1266 text => $col[$_], tooltip => $tip[$_])
947 for 0 .. $#col; 1267 for 0 .. $#col;
948 1268
… …
970 1290
971 $m = [$users, $host, $uptime, $version, $desc]; 1291 $m = [$users, $host, $uptime, $version, $desc];
972 1292
973 $y++; 1293 $y++;
974 1294
975 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1295 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
976 (new CFPlus::UI::Button 1296 (new CFPlus::UI::Button
977 text => "Use", 1297 text => "Use",
978 tooltip => "Put this server into the <b>Host:Port</b> field", 1298 tooltip => "Put this server into the <b>Host:Port</b> field",
979 on_activate => sub { 1299 on_activate => sub {
980 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1300 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
983 }, 1303 },
984 ), 1304 ),
985 (new CFPlus::UI::Empty expand => 1), 1305 (new CFPlus::UI::Empty expand => 1),
986 ]); 1306 ]);
987 1307
988 $table->add ($_, $y, new CFPlus::UI::Label 1308 $table->add_at ($_, $y, new CFPlus::UI::Label
989 max_w => $::WIDTH * 0.4, 1309 max_w => $::WIDTH * 0.4,
990 ellipsise => 0, 1310 ellipsise => 0,
991 align => $align[$_], 1311 align => $align[$_],
992 text => $m->[$_], 1312 text => $m->[$_],
993 tooltip => $tip[$_], 1313 tooltip => $tip[$_],
… …
1034 1354
1035 $vbox->add (new CFPlus::UI::FancyFrame 1355 $vbox->add (new CFPlus::UI::FancyFrame
1036 label => "Connection Settings", 1356 label => "Connection Settings",
1037 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]),
1038 ); 1358 );
1039 $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");
1040 1360
1041 { 1361 {
1042 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1362 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1043 1363
1044 $vbox->add ( 1364 $vbox->add (
1045 $HOST_ENTRY = new CFPlus::UI::Entry 1365 $HOST_ENTRY = new CFPlus::UI::Entry
1046 expand => 1, 1366 expand => 1,
1047 text => $CFG->{profile}{default}{host}, 1367 text => $CFG->{profile}{default}{host},
1048 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",
1049 on_changed => sub { 1369 on_changed => sub {
1050 my ($self, $value) = @_; 1370 my ($self, $value) = @_;
1051 $CFG->{profile}{default}{host} = $value; 1371 $CFG->{profile}{default}{host} = $value;
1052 0 1372 1
1053 } 1373 }
1054 ); 1374 );
1055 1375
1056 $vbox->add (new CFPlus::UI::Button 1376 $vbox->add (new CFPlus::UI::Button
1057 expand => 1, 1377 expand => 1,
1058 text => "Server List", 1378 text => "Server List",
1059 other => $METASERVER, 1379 other => $METASERVER,
1060 tooltip => "Show a list of available crossfire servers", 1380 tooltip => "Show a list of available crossfire servers",
1061 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1381 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1062 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1382 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1063 ); 1383 );
1064 } 1384 }
1065 1385
1066 $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");
1067 $table->add (1, 4, new CFPlus::UI::Entry 1387 $table->add_at (1, 4, new CFPlus::UI::Entry
1068 text => $CFG->{profile}{default}{user}, 1388 text => $CFG->{profile}{default}{user},
1069 tooltip => "The name of your character on the server", 1389 tooltip => "The name of your character on the server",
1070 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1390 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1071 ); 1391 );
1072 1392
1073 $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");
1074 $table->add (1, 5, new CFPlus::UI::Entry 1394 $table->add_at (1, 5, new CFPlus::UI::Entry
1075 text => $CFG->{profile}{default}{password}, 1395 text => $CFG->{profile}{default}{password},
1076 hidden => 1, 1396 hidden => 1,
1077 tooltip => "The password for your character", 1397 tooltip => "The password for your character",
1078 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1398 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1079 ); 1399 );
1080 1400
1081 $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");
1082 $table->add (1, 7, new CFPlus::UI::Slider 1402 $table->add_at (1, 7, new CFPlus::UI::Slider
1083 force_w => 100, 1403 force_w => 100,
1084 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1404 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1085 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. "
1086 . "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, "
1087 . "but you also increase bandwidth requirements and latency. " 1407 . "but you also increase bandwidth requirements and latency. "
1088 . "This option is only used once at log-in.", 1408 . "This option is only used once at log-in.",
1089 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 },
1090 ); 1410 );
1091 1411
1092 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1093 $table->add (1, 8, new CFPlus::UI::CheckBox
1094 state => $CFG->{face_prefetch},
1095 tooltip => "<b>Background Image Prefetch</b>\n\n"
1096 . "If enabled, the client automatically pre-fetches images from the server. "
1097 . "This might increase or create lag, but increases the chances "
1098 . "of faces being ready for display when you encounter them. "
1099 . "It also uses up server bandwidth on every connect, "
1100 . "so only set it if you really need to prefetch images. "
1101 . "This option can be set and unset any time.",
1102 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1103 );
1104
1105 $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");
1106 $table->add (1, 9, new CFPlus::UI::Entry 1413 $table->add_at (1, 8, new CFPlus::UI::Entry
1107 text => $CFG->{output_rate}, 1414 text => $CFG->{output_rate},
1108 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 "
1109 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1416 . "when sending data. When 0 or unset, the server "
1110 . "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.",
1111 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1419 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1112 ); 1420 );
1113 1421
1114 $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");
1115 $table->add (1, 10, new CFPlus::UI::Entry 1423 $table->add_at (1, 9, new CFPlus::UI::Entry
1116 text => $CFG->{output_count}, 1424 text => $CFG->{output_count},
1117 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.",
1118 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1426 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1119 ); 1427 );
1120 1428
1121 $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");
1122 $table->add (1, 11, new CFPlus::UI::Entry 1430 $table->add_at (1, 10, new CFPlus::UI::Entry
1123 text => $CFG->{output_sync}, 1431 text => $CFG->{output_sync},
1124 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.",
1125 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1433 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1126 ); 1434 );
1127 1435
1128 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1436 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1129 expand => 1, 1437 expand => 1,
1130 align => 0, 1438 align => 0,
1131 text => "Login", 1439 text => "Login",
1132 on_activate => sub { 1440 on_activate => sub {
1133 $CONN ? stop_game 1441 $CONN ? stop_game
1134 : start_game; 1442 : start_game;
1135 0 1443 1
1136 }, 1444 },
1137 ); 1445 );
1138 1446
1139 $vbox->add (new CFPlus::UI::FancyFrame 1447 $vbox->add (new CFPlus::UI::FancyFrame
1140 label => "Server Info", 1448 label => "Server Info",
… …
1147sub client_setup { 1455sub client_setup {
1148 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];
1149 1457
1150 my $row = 0; 1458 my $row = 0;
1151 1459
1152 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1153 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1154 text => $CFG->{say_command},
1155 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. "
1156 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1157 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1158 on_changed => sub {
1159 my ($self, $value) = @_;
1160 $CFG->{say_command} = $value;
1161 0
1162 }
1163 );
1164
1165 $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");
1166 $table->add (1, $row++, new CFPlus::UI::CheckBox 1461 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1167 state => $CFG->{show_tips}, 1462 state => $CFG->{show_tips},
1168 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?",
1169 on_changed => sub { 1464 on_changed => sub {
1170 my ($self, $value) = @_; 1465 my ($self, $value) = @_;
1171 $CFG->{show_tips} = $value; 1466 $CFG->{show_tips} = $value;
1172 0 1467 0
1173 } 1468 }
1174 ); 1469 );
1175 1470
1176 $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");
1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1472 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1178 text => $CFG->{logview_max_par}, 1473 text => $CFG->{logview_max_par},
1179 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 "
1180 . "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 "
1181 . "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.",
1182 on_changed => sub { 1477 on_changed => sub {
1183 my ($self, $value) = @_; 1478 my ($self, $value) = @_;
1184 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1479 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1185 0 1480 0
1186 }, 1481 },
1187 ); 1482 );
1188 1483
1189 $table 1484 $table
1190} 1485}
1191 1486
1192sub message_window {
1193 my $window = new CFPlus::UI::Toplevel
1194 name => "message_window",
1195 title => "Messages",
1196 border_bg => [1, 1, 1, 1],
1197 x => "max",
1198 y => 0,
1199 force_w => $::WIDTH * 0.4,
1200 force_h => $::HEIGHT * 0.5,
1201 child => (my $vbox = new CFPlus::UI::VBox),
1202 has_close_button => 1;
1203
1204 $vbox->add ($LOGVIEW);
1205
1206 $vbox->add (my $input = new CFPlus::UI::Entry
1207 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1208 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1209 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1210 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1211 on_focus_in => sub {
1212 my ($input, $prev_focus) = @_;
1213
1214 delete $input->{refocus_map};
1215
1216 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1217 $input->{refocus_map} = 1;
1218 }
1219 delete $input->{auto_activated};
1220
1221 0
1222 },
1223 on_activate => sub {
1224 my ($input, $text) = @_;
1225 $input->set_text ('');
1226
1227 if ($text =~ /^\/(.*)/) {
1228 $::CONN->user_send ($1);
1229 } else {
1230 my $say_cmd = $::CFG->{say_command} || 'say';
1231 $::CONN->user_send ("$say_cmd $text");
1232 }
1233 if ($input->{refocus_map}) {
1234 delete $input->{refocus_map};
1235 $MAPWIDGET->focus_in
1236 }
1237
1238 0
1239 },
1240 on_escape => sub {
1241 $MAPWIDGET->grab_focus;
1242
1243 0
1244 },
1245 );
1246
1247 $CONSOLE = {
1248 window => $window,
1249 input => $input,
1250 };
1251
1252 $window
1253}
1254
1255sub autopickup_setup { 1487sub autopickup_setup {
1488 my $r = new CFPlus::UI::ScrolledWindow (
1489 expand => 1,
1490 scroll_y => 1
1491 );
1256 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 );
1257 1496
1258 for ( 1497 for (
1259 ["General", 0, 0, 1498 ["General", 0, 0,
1260 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1499 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1261 ["Inhibit autopickup" => PICKUP_INHIBIT], 1500 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1296 ], 1535 ],
1297 ["Weight/Value ratio", 2, 17] 1536 ["Weight/Value ratio", 2, 17]
1298 ) 1537 )
1299 { 1538 {
1300 my ($title, $x, $y, @bits) = @$_; 1539 my ($title, $x, $y, @bits) = @$_;
1301 $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]);
1302 1541
1303 for (@bits) { 1542 for (@bits) {
1304 ++$y; 1543 ++$y;
1305 1544
1306 my $mask = $_->[1]; 1545 my $mask = $_->[1];
1307 $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);
1308 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1547 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1309 state => $::CFG->{pickup} & $mask, 1548 state => $::CFG->{pickup} & $mask,
1310 on_changed => sub { 1549 on_changed => sub {
1311 my ($box, $value) = @_; 1550 my ($box, $value) = @_;
1312 1551
1313 if ($value) { 1552 if ($value) {
… …
1324 1563
1325 ${$_->[2]} = $checkbox if $_->[2]; 1564 ${$_->[2]} = $checkbox if $_->[2];
1326 } 1565 }
1327 } 1566 }
1328 1567
1329 $table->add (2, 18, new CFPlus::UI::ValSlider 1568 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1330 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1569 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1331 template => ">= 99", 1570 template => ">= 99",
1332 to_value => sub { ">= " . 5 * $_[0] }, 1571 to_value => sub { ">= " . 5 * $_[0] },
1333 on_changed => sub { 1572 on_changed => sub {
1334 my ($slider, $value) = @_; 1573 my ($slider, $value) = @_;
… …
1337 $::CFG->{pickup} |= int $value 1576 $::CFG->{pickup} |= int $value
1338 if $value; 1577 if $value;
1339 1; 1578 1;
1340 }); 1579 });
1341 1580
1342 $table->add (3, 18, new CFPlus::UI::Button 1581 $table->add_at (3, 18, new CFPlus::UI::Button
1343 text => "set", 1582 text => "set",
1344 on_activate => sub { 1583 on_activate => sub {
1345 $::CONN->send_command ("pickup $::CFG->{pickup}") 1584 $::CONN->send_command ("pickup $::CFG->{pickup}")
1346 if defined $::CONN; 1585 if defined $::CONN;
1347 0 1586 0
1348 }); 1587 });
1349 1588
1350 $table 1589 $r
1351} 1590}
1352 1591
1353my %SORT_ORDER = ( 1592my %SORT_ORDER = (
1354 type => undef, 1593 type => undef,
1355 mtime => sub { 1594 mtime => sub {
… …
1399 $sw1->add ($INV = new CFPlus::UI::Inventory); 1638 $sw1->add ($INV = new CFPlus::UI::Inventory);
1400 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1639 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1401 1640
1402 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1641 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1403 1642
1404 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1643 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1405 1644
1406 $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);
1407 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1646 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1408 1647
1409 # XXX: Call after $INVR = ... because set_opencont sets the items 1648 # XXX: Call after $INVR = ... because set_opencont sets the items
1410 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1649 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1411 1650
1412 $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;
1413} 1692}
1414 1693
1415sub toggle_player_page { 1694sub toggle_player_page {
1416 my ($widget) = @_; 1695 my ($widget) = @_;
1417 1696
… …
1434 has_close_button => 1 1713 has_close_button => 1
1435 ; 1714 ;
1436 1715
1437 my $ntb = 1716 my $ntb =
1438 $PL_NOTEBOOK = 1717 $PL_NOTEBOOK =
1439 new CFPlus::UI::Notebook expand => 1, debug => 1; 1718 new CFPlus::UI::Notebook expand => 1;
1440 1719
1441 $ntb->add ( 1720 $ntb->add_tab (
1442 "Statistics (F2)" => $STATS_PAGE = stats_window, 1721 "Statistics (F2)" => $STATS_PAGE = stats_window,
1443 "Shows statistics, where all your Stats and Resistances are shown." 1722 "Shows statistics, where all your Stats and Resistances are shown."
1444 ); 1723 );
1445 $ntb->add ( 1724 $ntb->add_tab (
1446 "Skills (F3)" => $SKILL_PAGE = skill_window, 1725 "Skills (F3)" => $SKILL_PAGE = skill_window,
1447 "Shows all your Skills." 1726 "Shows all your Skills."
1448 ); 1727 );
1449 1728
1450 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);
1451 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1730 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1452 $ntb->add ( 1731 $ntb->add_tab (
1453 "Spellbook (F4)" => $spellsw, 1732 "Spellbook (F4)" => $spellsw,
1454 "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."
1455 ); 1734 );
1456 $ntb->add ( 1735 $ntb->add_tab (
1457 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1736 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1458 "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 :). "
1459 . "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."
1460 ); 1739 );
1740 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
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.");
1461 1745
1462 $ntb->set_current_page ($INVENTORY_PAGE); 1746 $ntb->set_current_page ($INVENTORY_PAGE);
1463 1747
1464 $plwin->add ($ntb); 1748 $plwin->add ($ntb);
1465 $plwin 1749 $plwin
… …
1619 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1903 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1620 ); 1904 );
1621 $hb->add (new CFPlus::UI::Button 1905 $hb->add (new CFPlus::UI::Button
1622 text => "Quit anyway", 1906 text => "Quit anyway",
1623 expand => 1, 1907 expand => 1,
1624 on_activate => sub { exit }, 1908 on_activate => sub { Event::unloop_all },
1625 ); 1909 );
1626 } 1910 }
1627 1911
1628 $QUIT_DIALOG->show; 1912 $QUIT_DIALOG->show;
1629 $QUIT_DIALOG->grab_focus; 1913 $QUIT_DIALOG->grab_focus;
… …
1662 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1946 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1663 $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]);
1664 1948
1665 $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]);
1666 1950
1667 $table->add (0, 0, new CFPlus::UI::Button 1951 $table->add_at (0, 0, new CFPlus::UI::Button
1668 text => "Close", 1952 text => "Close",
1669 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>.",
1670 on_activate => $close, 1954 on_activate => $close,
1671 ); 1955 );
1672 1956
1673 $table->add (2, 0, new CFPlus::UI::Button 1957 $table->add_at (2, 0, new CFPlus::UI::Button
1674 text => "Next", 1958 text => "Next",
1675 tooltip => "Show the next <b>Tip of the day</b>.", 1959 tooltip => "Show the next <b>Tip of the day</b>.",
1676 on_activate => sub { 1960 on_activate => sub {
1677 $close->(); 1961 $close->();
1678 &show_tip_of_the_day; 1962 &show_tip_of_the_day;
… …
1687 CFPlus::SDL_Init 1971 CFPlus::SDL_Init
1688 and die "SDL::Init failed!\n"; 1972 and die "SDL::Init failed!\n";
1689} 1973}
1690 1974
1691sub video_init { 1975sub video_init {
1692 sdl_init;
1693
1694 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1976 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1695 1977
1696 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1978 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1697 1979
1698 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1980 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1699 $FULLSCREEN = $CFG->{fullscreen}; 1981 $FULLSCREEN = $CFG->{fullscreen};
1700 $FAST = $CFG->{fast}; 1982 $FAST = $CFG->{fast};
1701 1983
1702 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1984 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1703 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1985 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1704 1986
1705 $SDL_ACTIVE = 1; 1987 $SDL_ACTIVE = 1;
1706 $LAST_REFRESH = time - 0.01; 1988 $LAST_REFRESH = time - 0.01;
1707 1989
1708 CFPlus::OpenGL::init; 1990 CFPlus::OpenGL::init;
1991 CFPlus::Macro::init;
1709 1992
1710 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1993 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1711 1994
1712 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1995 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1713 1996
1714 ############################################################################# 1997 #############################################################################
1715 1998
1716 if ($DEBUG_STATUS) { 1999 if ($DEBUG_STATUS) {
1717 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2000 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1718 } else { 2001 } else {
1719 # 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 });
1720 2015
1721 $DEBUG_STATUS = new CFPlus::UI::Label 2016 $DEBUG_STATUS = new CFPlus::UI::Label
1722 padding => 0, 2017 padding => 0,
1723 z => 100, 2018 z => 100,
1724 force_x => "max", 2019 force_x => "max",
… …
1749 2044
1750 $MAPWIDGET = new CFPlus::MapWidget; 2045 $MAPWIDGET = new CFPlus::MapWidget;
1751 $MAPWIDGET->connect (activate_console => sub { 2046 $MAPWIDGET->connect (activate_console => sub {
1752 my ($mapwidget, $preset) = @_; 2047 my ($mapwidget, $preset) = @_;
1753 2048
1754 if ($CONSOLE) { 2049 $MESSAGE_WINDOW->activate_console ($preset)
1755 $CONSOLE->{input}->{auto_activated} = 1; 2050 if $MESSAGE_WINDOW;
1756 $CONSOLE->{input}->grab_focus;
1757
1758 if ($preset && $CONSOLE->{input}->get_text eq '') {
1759 $CONSOLE->{input}->set_text ($preset);
1760 }
1761 }
1762 }); 2051 });
1763 $MAPWIDGET->show; 2052 $MAPWIDGET->show;
1764 $MAPWIDGET->grab_focus; 2053 $MAPWIDGET->grab_focus;
1765 2054
1766 $LOGVIEW = new CFPlus::UI::TextScroller 2055 $COMPLETER = new CFPlus::MapWidget::Command::
1767 expand => 1, 2056 command => { },
1768 font => $FONT_FIXED, 2057 tooltip => "#completer_help",
1769 fontsize => $::CFG->{log_fontsize},
1770 indent => -4,
1771 can_hover => 1,
1772 can_events => 1,
1773 max_par => $CFG->{logview_max_par},
1774 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1775 ; 2058 ;
1776 2059
1777 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2060 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1778 title => "Setup", 2061 title => "Setup",
1779 name => "setup_dialog", 2062 name => "setup_dialog",
… …
1784 force_h => $::HEIGHT * 0.6, 2067 force_h => $::HEIGHT * 0.6,
1785 has_close_button => 1, 2068 has_close_button => 1,
1786 ; 2069 ;
1787 2070
1788 $METASERVER = metaserver_dialog; 2071 $METASERVER = metaserver_dialog;
2072 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1789 2073
1790 $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,
1791 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2075 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 2076
1793 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2077 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1794 "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.");
1795 $SETUP_NOTEBOOK->add (Client => client_setup, 2079 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1796 "Configure various client-specific settings."); 2080 "Configure various client-specific settings.");
1797 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1798 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1799 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2081 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1800 "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.");
1801 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2083 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1802 "Configure the use of audio, sound effects and background music."); 2084 "Configure the use of audio, sound effects and background music.");
1803 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2085 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1804 "Lets you define, edit and delete key bindings." 2086 "Lets you define, edit and delete key bindings."
1805 . "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 "
1806 . "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 "
1807 . "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. "
1808 . "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 "
1809 . "binding editor closes"); 2091 . "binding editor closes");
1810 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2092 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1811 "Some debuggin' options. Do not ask."); 2093 "Some debuggin' options. Do not ask.");
1812 2094
1813 $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
1814 2096
1815 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2097 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1816 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.");
1817 2099
1818 $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,
1819 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.");
1820 2102
1821 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
1822 2104
1823 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2105 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1843 tooltip => "Terminates the program", 2125 tooltip => "Terminates the program",
1844 on_activate => sub { 2126 on_activate => sub {
1845 if ($CONN) { 2127 if ($CONN) {
1846 open_quit_dialog; 2128 open_quit_dialog;
1847 } else { 2129 } else {
1848 exit; 2130 Event::unloop_all;
1849 } 2131 }
1850 0 2132 0
1851 }, 2133 },
1852 ); 2134 );
1853 2135
1854 $BUTTONBAR->show; 2136 $BUTTONBAR->show;
1855 $SETUP_DIALOG->show; 2137 $SETUP_DIALOG->show;
2138 $MESSAGE_WINDOW->show;
1856 } 2139 }
1857 2140
1858 $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]);
1859}
1860
1861sub setup_build_button {
1862 my ($enabled) = @_;
1863 if ($enabled) {
1864 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1865 $BUILD_BUTTON ||= new CFPlus::UI::Button
1866 text => "Build",
1867 tooltip => "Opens the ingame builder",
1868 on_activate => sub {
1869 if ($CONN) {
1870 $CONN->send_ext_req (builder_player_items => sub {
1871 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1872 });
1873 }
1874 0
1875 };
1876 $BUTTONBAR->add ($BUILD_BUTTON);
1877 } else {
1878 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1879 }
1880}
1881
1882sub open_ingame_editor {
1883 my ($msg) = @_;
1884
1885 my $win = new CFPlus::UI::Toplevel
1886 x => 0,
1887 y => 'center',
1888 z => 4,
1889 name => 'builder_window',
1890 force_w => int $WIDTH * 1/4,
1891 force_h => int $HEIGHT * 3/4,
1892 title => "In game builder",
1893 has_close_button => 1;
1894
1895 my $r = new CFPlus::UI::ScrolledWindow (
1896 expand => 1,
1897 scroll_y => 1
1898 );
1899 $r->add (my $vb = new CFPlus::UI::VBox);
1900 $win->add ($r);
1901
1902
1903 $vb->add (
1904 new CFPlus::UI::Button
1905 text => "Disable build mode",
1906 on_activate => sub { $::IN_BUILD_MODE = undef }
1907 );
1908 $vb->add (
1909 new CFPlus::UI::Button
1910 text => "ERASE",
1911 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1912 );
1913
1914 for my $itemarchname (
1915 sort {
1916 $msg->{items}->{$a}->{build_arch_name}
1917 cmp $msg->{items}->{$b}->{build_arch_name}
1918 } keys %{$msg->{items}}
1919 ) {
1920 my $info = $msg->{items}->{$itemarchname};
1921 $vb->add (
1922 new CFPlus::UI::Button text => $info->{build_arch_name},
1923 on_activate => sub {
1924 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1925
1926 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1927 build_mode_query_arch_info ();
1928 }
1929 }
1930 );
1931 }
1932
1933 $win->show;
1934}
1935
1936sub build_mode_query_arch_info {
1937 my ($iteminfo) = $::IN_BUILD_MODE;
1938 my $itemarchname = $iteminfo->{item};
1939 my $info = $iteminfo->{info};
1940
1941 my $dialog = new CFPlus::UI::Toplevel
1942 x => "center",
1943 y => "center",
1944 z => 50,
1945 force_w => int $WIDTH * 1/2,
1946 title => "Enter information for placement of '$itemarchname'",
1947 has_close_button => 1;
1948
1949 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1950
1951 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1952 my $row = 0;
1953 if ($info->{has_name}) {
1954 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1955 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1956 }
1957 if ($info->{has_text}) {
1958 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1959 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1960 }
1961 if ($info->{has_connection}) {
1962 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1963 $table->add (1, $row++,
1964 new CFPlus::UI::Entry
1965 expand => 1,
1966 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1967 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1968 );
1969 }
1970
1971 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1972 $hb->add (new CFPlus::UI::Button
1973 text => "Close",
1974 expand => 1,
1975 on_activate => sub { $dialog->hide; 0 },
1976 );
1977 $dialog->show;
1978} 2142}
1979 2143
1980sub video_shutdown { 2144sub video_shutdown {
1981 CFPlus::OpenGL::shutdown; 2145 CFPlus::OpenGL::shutdown;
1982 2146
1983 undef $SDL_ACTIVE; 2147 undef $SDL_ACTIVE;
1984} 2148}
1985 2149
1986my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1987my $bgmusic;#TODO#hack#d#
1988
1989sub audio_channel_finished {
1990 my ($channel) = @_;
1991
1992 #warn "channel $channel finished\n";#d#
1993}
1994
1995sub audio_music_finished {
1996 return unless $CFG->{bgm_enable};
1997
1998 # TODO: hack, do play loop and mood music
1999 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2000 $bgmusic->play (0);
2001
2002 push @bgmusic, shift @bgmusic;
2003}
2004
2005sub audio_init {
2006 if ($CFG->{audio_enable}) {
2007 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2008 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2009
2010 unless ($SDL_MIXER) {
2011 status "Unable to open sound device: there will be no sound";
2012 return;
2013 }
2014
2015 CFPlus::Mix_AllocateChannels 8;
2016 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2017
2018 audio_music_finished;
2019
2020 local $_;
2021 while (<$fh>) {
2022 next if /^\s*#/;
2023 next if /^\s*$/;
2024
2025 my ($file, $volume, $event) = split /\s+/, $_, 3;
2026
2027 push @SOUNDS, "$volume,$file";
2028
2029 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2030 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2031 $chunk->volume ($volume * 128 / 100);
2032 $chunk
2033 };
2034 }
2035 } else {
2036 status "unable to open sound config: $!";
2037 }
2038 }
2039}
2040
2041sub audio_shutdown {
2042 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2043 undef $SDL_MIXER;
2044 @SOUNDS = ();
2045 %AUDIO_CHUNKS = ();
2046}
2047
2048my %animate_object; 2150my %animate_object;
2049my $animate_timer; 2151my $animate_timer;
2050 2152
2051my $fps = 9; 2153my $fps = 9;
2052 2154
2053my %demo;#d#
2054
2055sub force_refresh { 2155sub force_refresh {
2156 if ($ENV{CFPLUS_DEBUG} & 4) {
2056 $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;
2057 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2158 debug sprintf "%3.2f", $fps;
2159 }
2058 2160
2059 $CFPlus::UI::ROOT->draw; 2161 $CFPlus::UI::ROOT->draw;
2060 2162 CFPlus::SDL_GL_SwapBuffers;
2061 $WANT_REFRESH = 0;
2062 $CAN_REFRESH = 0;
2063 $LAST_REFRESH = $NOW; 2163 $LAST_REFRESH = $NOW;
2064 2164 $WANT_REFRESH->stop;
2065 CFPlus::SDL_GL_SwapBuffers;
2066} 2165}
2067 2166
2167$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2168
2068my $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 {
2069 $NOW = time; 2170 $NOW = time;
2070 2171
2071 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2172 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2072 for CFPlus::SDL_PollEvent; 2173 for CFPlus::poll_events;
2073 2174
2074 if (%animate_object) { 2175 if (%animate_object) {
2075 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2176 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2076 $WANT_REFRESH++; 2177 $WANT_REFRESH->start;
2077 }
2078
2079 if ($WANT_REFRESH) {
2080 force_refresh;
2081 } else {
2082 $CAN_REFRESH = 1;
2083 } 2178 }
2084}); 2179});
2085 2180
2086sub animation_start { 2181sub animation_start {
2087 my ($widget) = @_; 2182 my ($widget) = @_;
… …
2091sub animation_stop { 2186sub animation_stop {
2092 my ($widget) = @_; 2187 my ($widget) = @_;
2093 delete $animate_object{$widget}; 2188 delete $animate_object{$widget};
2094} 2189}
2095 2190
2096# check once/second for faces that need to be prefetched
2097# this should, of course, only run on demand, but
2098# SDL forces worse things on us....
2099
2100Event->timer (after => 1, interval => 0.25, cb => sub {
2101 $CONN->face_prefetch
2102 if $CONN;
2103});
2104
2105%SDL_CB = ( 2191%SDL_CB = (
2106 CFPlus::SDL_QUIT => sub { 2192 CFPlus::SDL_QUIT => sub {
2107 exit; 2193 Event::unloop_all;
2108 }, 2194 },
2109 CFPlus::SDL_VIDEORESIZE => sub { 2195 CFPlus::SDL_VIDEORESIZE => sub {
2110 }, 2196 },
2111 CFPlus::SDL_VIDEOEXPOSE => sub { 2197 CFPlus::SDL_VIDEOEXPOSE => sub {
2112 CFPlus::UI::full_refresh; 2198 CFPlus::UI::full_refresh;
2113 }, 2199 },
2114 CFPlus::SDL_ACTIVEEVENT => sub { 2200 CFPlus::SDL_ACTIVEEVENT => sub {
2115# not useful, as APPACTIVE include sonly iconified state, not unmapped 2201# not useful, as APPACTIVE include sonly iconified state, not unmapped
2116# 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#
2117# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2204# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2118# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2205# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2119# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2206# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2120 }, 2207 },
2121 CFPlus::SDL_KEYDOWN => sub { 2208 CFPlus::SDL_KEYDOWN => sub {
… …
2150 CFPlus::DB::Server::run; 2237 CFPlus::DB::Server::run;
2151 2238
2152 CFPlus::UI::set_layout ($::CFG->{layout}); 2239 CFPlus::UI::set_layout ($::CFG->{layout});
2153 2240
2154 my %DEF_CFG = ( 2241 my %DEF_CFG = (
2155 sdl_mode => 0, 2242 sdl_mode => 0,
2156 width => 640,
2157 height => 480,
2158 fullscreen => 0, 2243 fullscreen => 0,
2159 fast => 0, 2244 fast => 0,
2245 force_opengl11 => undef,
2246 texture_compression => 1,
2160 map_scale => 1, 2247 map_scale => 1,
2161 fow_enable => 1, 2248 fow_enable => 1,
2162 fow_intensity => 0.45, 2249 fow_intensity => 0,
2163 fow_smooth => 0,
2164 map_smoothing => 1, 2250 map_smoothing => 1,
2165 gui_fontsize => 1, 2251 gui_fontsize => 1,
2166 log_fontsize => 0.7, 2252 log_fontsize => 0.7,
2167 gauge_fontsize => 1, 2253 gauge_fontsize => 1,
2168 gauge_size => 0.35, 2254 gauge_size => 0.35,
2169 stat_fontsize => 0.7, 2255 stat_fontsize => 0.7,
2170 mapsize => 100, 2256 mapsize => 100,
2171 say_command => 'chat',
2172 audio_enable => 1, 2257 audio_enable => 1,
2258 effects_enable => 1,
2259 effects_volume => 1,
2173 bgm_enable => 1, 2260 bgm_enable => 1,
2174 bgm_volume => 0.25, 2261 bgm_volume => 0.5,
2175 face_prefetch => 0,
2176 output_sync => 1, 2262 output_sync => 1,
2177 output_count => 1, 2263 output_count => 1,
2178 output_rate => "", 2264 output_rate => "",
2179 pickup => 0, 2265 pickup => 0,
2180 inv_sort => "mtime", 2266 inv_sort => "mtime",
2181 default => "profile", # default profile 2267 default => "profile", # default profile
2182 show_tips => 1, 2268 show_tips => 1,
2183 logview_max_par => 1000, 2269 logview_max_par => 1000,
2184 ); 2270 );
2185 2271
2186 while (my ($k, $v) = each %DEF_CFG) { 2272 while (my ($k, $v) = each %DEF_CFG) {
2187 $CFG->{$k} = $v unless exists $CFG->{$k}; 2273 $CFG->{$k} = $v unless exists $CFG->{$k};
2188 } 2274 }
… …
2202 } 2288 }
2203 } 2289 }
2204 2290
2205 sdl_init; 2291 sdl_init;
2206 2292
2207 @SDL_MODES = reverse 2293 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2208 grep $_->[0] >= 640 && $_->[1] >= 480, 2294 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2209 CFPlus::SDL_ListModes;
2210
2211 @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;
2212 2298
2213 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2299 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2214 2300
2215 { 2301 {
2216 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2302 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2245# } 2331# }
2246# my $t2 = Time::HiRes::time; 2332# my $t2 = Time::HiRes::time;
2247# warn $t2-$t1; 2333# warn $t2-$t1;
2248# } 2334# }
2249 2335
2250 $startup_done->();
2251
2252 video_init; 2336 video_init;
2253 audio_init; 2337 audio_init;
2254} 2338}
2255 2339
2256show_tip_of_the_day if $CFG->{show_tips}; 2340show_tip_of_the_day if $CFG->{show_tips};
2257 2341
2342Event->idle (cb => sub {
2343 $_[0]->w->cancel;
2344 $startup_done->();
2345});
2346
2258Event::loop; 2347Event::loop;
2348
2349#video_shutdown;
2350#audio_shutdown;
2259#CFPlus::SDL_Quit; 2351CFPlus::SDL_Quit;
2260#CFPlus::_exit 0;
2261
2262END {
2263 CFPlus::SDL_Quit;
2264 CFPlus::DB::Server::stop; 2352CFPlus::DB::Server::stop;
2265}
2266 2353
2267=head1 NAME 2354=head1 NAME
2268 2355
2269cfplus - A Crossfire+ and Crossfire game client 2356cfplus - A Crossfire TRT and Crossfire game client
2270 2357
2271=head1 SYNOPSIS 2358=head1 SYNOPSIS
2272 2359
2273Just run it - no commandline arguments are supported. 2360Just run it - no commandline arguments are supported.
2274 2361
2275=head1 USAGE 2362=head1 USAGE
2276 2363
2277cfplus 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
2278fullscreen and interactively. 2365be used in fullscreen mode and interactively.
2279 2366
2280=head1 DEBUGGING 2367=head1 DEBUGGING
2281 2368
2282 2369
2283CFPLUS_DEBUG - environment variable 2370CFPLUS_DEBUG - environment variable

Diff Legend

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