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.144 by root, Fri Mar 16 03:14:50 2007 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
50 if %PAR::LibCache; 72 if %PAR::LibCache;
51 73
52use Time::HiRes 'time'; 74use Time::HiRes 'time';
53use Event; 75use Event;
76use List::Util qw(max min);
54 77
55use Crossfire; 78use Crossfire;
56use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
57 80
58use Compress::LZF; 81use Compress::LZF;
59 82
60use CFPlus; 83use CFPlus;
61use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
62use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
63use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
64use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
66use CFPlus::Pod; 92use CFPlus::Pod;
67use CFPlus::MapWidget; 93use CFPlus::MapWidget;
68use CFPlus::Macro; 94use CFPlus::Macro;
69 95
70$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
102 128
103our $MAP; 129our $MAP;
104our $MAPMAP; 130our $MAPMAP;
105our $MAPWIDGET; 131our $MAPWIDGET;
106our $BUTTONBAR; 132our $BUTTONBAR;
107our $LOGVIEW;
108our $CONSOLE;
109our $METASERVER; 133our $METASERVER;
110our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
111our $QUIT_DIALOG; 135our $QUIT_DIALOG;
112our $HOST_ENTRY; 136our $HOST_ENTRY;
113our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
120our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
121 145
122our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
123our $PL_WINDOW; 147our $PL_WINDOW;
124 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
125our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
126our $STATS_PAGE; 153our $STATS_PAGE;
127our $SKILL_PAGE; 154our $SKILL_PAGE;
128our $SPELL_PAGE; 155our $SPELL_PAGE;
129our $SPELL_LIST; 156our $SPELL_LIST;
… …
135our $STATWIDS; 162our $STATWIDS;
136 163
137our $SDL_ACTIVE; 164our $SDL_ACTIVE;
138our %SDL_CB; 165our %SDL_CB;
139 166
140our $SDL_MIXER;
141our @SOUNDS; # event => file mapping
142our %AUDIO_CHUNKS; # audio files
143
144our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
145our $STATUSBOX; 168our $STATUSBOX;
146our $DEBUG_STATUS; 169our $DEBUG_STATUS;
147 170
148our $INV; 171our $INV;
149our $INVR; 172our $INVR;
150our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
151 174
152our $PICKUP_CFG; 175our $PICKUP_CFG;
153 176
154our $IN_BUILD_MODE; 177#############################################################################
155our $BUILD_BUTTON;
156 178
157sub status { 179sub status {
158 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
159} 181}
160 182
… …
162 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
163} 185}
164 186
165sub message { 187sub message {
166 my ($para) = @_; 188 my ($para) = @_;
167 189 $MESSAGE_WINDOW->message ($para);
168 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
169
170 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
171
172 $LOGVIEW->add_paragraph ($para);
173 $LOGVIEW->scroll_to_bottom;
174} 190}
191
192#############################################################################
193#TODO: maybe move into own audio module...
194
195our $SDL_MIXER;
196
197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
198our $MUSIC_WANT; # arryref of ambient music we want to play
199our @MUSIC_HAVE; # ambient music we have on disk
200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
202our $MUSIC_PLAYING_DATA;
203our $MUSIC_PLAYING_META;
204our $MUSIC_PLAYER;
205our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
206
207our %AUDIO_CHUNK; # audio "files"
208our %AUDIO_PLAY; # which audio faces should be played
209
210sub audio_channel_finished {
211 my ($channel) = @_;
212
213# warn "channel $channel finished\n";#d#
214}
215
216sub audio_sound_push($) {
217 my ($face) = @_;
218
219 $CFG->{effects_enable}
220 or return;
221
222 $AUDIO_PLAY{$face}
223 or return;
224
225 if (my $chunk = $AUDIO_CHUNK{$face}) {
226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_;
228
229 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $dx = $dx / 10 * 255;
232 $channel->set_panning (255 - $dx, 255 + $dx);
233
234# my $angle = $dx ? : $dx < 0 ?
235# my $distance = -$vol;
236# $channel->set_position ($angle, $distance);
237
238 $chunk->play ($channel);
239 }
240 } else {
241 # sound_meta not set means data is in flight either way
242 my $meta = $CONN->{sound_meta}{$face}
243 or return;
244
245 # if its a jingle, play it as ambient music
246 if ($meta->{meta}{jingle}) {
247 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
248 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
249 &audio_music_push ($face);
250 }
251 } else {
252 # fetch from database
253 CFPlus::DB::get res_data => $meta->{name}, sub {
254 my $rwops = new CFPlus::RW $_[0];
255 my $chunk = new CFPlus::MixChunk $rwops
256 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
257 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
258 $AUDIO_CHUNK{$face} = $chunk;
259
260 audio_sound_push ($face);
261 };
262 }
263 }
264}
265
266sub audio_sound_play {
267 my ($face, $dx, $dy, $vol) = @_;
268
269 $SDL_MIXER
270 or return;
271 $CFG->{effects_enable}
272 or return;
273
274 my $queue = $AUDIO_PLAY{$face} ||= [];
275 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
276 audio_sound_push $face
277 unless @$queue > 1;
278}
279
280sub audio_music_set_meta {
281 my ($meta) = @_;
282
283 $MUSIC_PLAYING_META = $meta;
284 $MUSIC_PLAYING_WIDGET->set_markup (
285 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
286 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
287 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
288 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
289 );
290}
291
292sub audio_music_update_volume {
293 return unless $MUSIC_PLAYING_META;
294 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
295 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
296 CFPlus::MixMusic::volume $base * $volume * 128;
297}
298
299sub audio_music_start {
300 my $meta = $MUSIC_PLAYING_META;
301
302 CFPlus::DB::get res_data => $meta->{name}, sub {
303 return unless $SDL_MIXER;
304
305 # music might have changed...
306 $meta eq $MUSIC_PLAYING_META
307 or return &audio_music_start ();
308
309 audio_music_update_volume;
310
311 $MUSIC_PLAYING_DATA = \$_[0];
312
313 my $rwops = $meta->{path}
314 ? new_from_file CFPlus::RW $meta->{path}
315 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
316
317 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
318 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
319
320 my $NOW = time;
321
322 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
323 my $pos = $MUSIC_PLAYING_META->{stop_pos};
324 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
325 $MUSIC_START = time - $pos;
326 } else {
327 $MUSIC_PLAYER->play (0);
328 $MUSIC_START = time;
329 }
330
331 delete $meta->{stop_time};
332 delete $meta->{stop_pos};
333 }
334}
335
336sub audio_music_push {
337 return unless $SDL_MIXER;
338
339 my $fade_out;
340
341 if (@MUSIC_JINGLE) {
342 @MUSIC_HAVE = $MUSIC_JINGLE[0];
343 $fade_out = 333;
344 } else {
345 return unless $CFG->{bgm_enable};
346
347 my @have =
348 grep $_,
349 map $CONN->{music_meta}{$_},
350 @$MUSIC_WANT;
351
352 @MUSIC_HAVE = @have
353 if @have;
354
355 # default MUSIC_HAVE == MUSIC_DEFAULT
356 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
357 $fade_out = 1000;
358 }
359
360 # if the currently playing song is acceptable, let it continue
361 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
362
363 my $NOW = time;
364
365 if ($MUSIC_PLAYING_META) {
366 $MUSIC_PLAYING_META->{stop_time} = $NOW;
367 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
368 CFPlus::MixMusic::fade_out $fade_out;
369 } else {
370 # sort by stop time, oldest first
371 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
372
373 # if the most recently-played piece played very recently,
374 # resume it, else choose the oldest piece for rotation.
375 audio_music_set_meta
376 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
377 ? $MUSIC_HAVE[-1]
378 : $MUSIC_HAVE[0];
379
380 audio_music_start;
381 }
382}
383
384sub audio_music_set_ambient {
385 my ($songs) = @_;
386
387 $MUSIC_WANT = $songs;
388 audio_music_push;
389}
390
391sub audio_music_finished {
392 # we compress multiple jingles of the same type
393 shift @MUSIC_JINGLE
394 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
395
396 $MUSIC_PLAYING_WIDGET->clear;
397
398 undef $MUSIC_PLAYER;
399 undef $MUSIC_PLAYING_META;
400 undef $MUSIC_PLAYING_DATA;
401
402 audio_music_push;
403}
404
405sub audio_init {
406 if ($CFG->{audio_enable}) {
407 $ENV{MIX_EFFECTSMAXSPEED} = 1;
408 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
409
410 unless ($SDL_MIXER) {
411 status "Unable to open sound device: there will be no sound";
412 return;
413 }
414
415 CFPlus::Mix_AllocateChannels 16;
416
417 audio_music_finished;
418 } else {
419 undef $SDL_MIXER;
420 }
421}
422
423sub audio_shutdown {
424 undef $MUSIC_PLAYER;
425 undef $MUSIC_PLAYING_META;
426 undef $MUSIC_PLAYING_DATA;
427
428 $MUSIC_WANT = [];
429 @MUSIC_JINGLE = ();
430 %AUDIO_PLAY = ();
431 %AUDIO_CHUNK = ();
432
433 CFPlus::Mix_CloseAudio if $SDL_MIXER;
434 undef $SDL_MIXER;
435}
436
437#############################################################################
175 438
176sub destroy_query_dialog { 439sub destroy_query_dialog {
177 (delete $_[0]{query_dialog})->destroy 440 (delete $_[0]{query_dialog})->destroy
178 if $_[0]{query_dialog}; 441 if $_[0]{query_dialog};
179} 442}
… …
206 title => "Server Query", 469 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 470 child => my $vbox = new CFPlus::UI::VBox,
208 ; 471 ;
209 472
210 my @dialog = my $label = new CFPlus::UI::Label 473 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 474 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 475 ellipsise => 0,
213 text => $prompt; 476 text => $prompt;
214 477
215 if ($flags & CS_QUERY_YESNO) { 478 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 479 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 496 );
234 497
235 $dialog->grab_focus; 498 $dialog->grab_focus;
236 499
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 500 } elsif ($flags & CS_QUERY_SINGLECHAR) {
238 $dialog->{tooltip} = "#charcreation_focus";
239
240 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 501 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241 $MESSAGE_WINDOW->show; 502 $dialog->{tooltip} = "#charcreation_focus";
242 503
243 unshift @dialog, new CFPlus::UI::Label 504 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 505 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 506 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 507 markup => "\nOr use your keyboard and the text entry below:\n";
247 508
248 unshift @dialog, my $table = new CFPlus::UI::Table; 509 unshift @dialog, my $table = new CFPlus::UI::Table;
249 510
250 $table->add (0, 0, new CFPlus::UI::Button 511 $table->add_at (0, 0, new CFPlus::UI::Button
251 text => "Next Race", 512 text => "Next Race",
252 on_activate => sub { 513 on_activate => sub {
253 $conn->send ("reply n"); 514 $conn->send ("reply n");
254 destroy_query_dialog $conn; 515 destroy_query_dialog $conn;
255 0 516 0
256 }, 517 },
257 ); 518 );
258 $table->add (2, 0, new CFPlus::UI::Button 519 $table->add_at (2, 0, new CFPlus::UI::Button
259 text => "Accept", 520 text => "Accept",
260 on_activate => sub { 521 on_activate => sub {
261 $conn->send ("reply d"); 522 $conn->send ("reply d");
262 destroy_query_dialog $conn; 523 destroy_query_dialog $conn;
263 0 524 0
264 }, 525 },
265 ); 526 );
266 527
528 if ($conn->{chargen_race_description}) {
529 unshift @dialog, new CFPlus::UI::Label
530 max_w => $::WIDTH * 0.8,
531 ellipsise => 0,
532 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
533 ;
534 }
535
536 unshift @dialog, new CFPlus::UI::Face
537 face => $conn->{player}{face},
538 bg => [.2, .2, .2, 1],
539 min_w => 64,
540 min_h => 64,
541 ;
542
543 if ($conn->{chargen_race_title}) {
544 unshift @dialog, new CFPlus::UI::Label
545 allign => 1,
546 ellipsise => 0,
547 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
548 ;
549 }
550
267 unshift @dialog, new CFPlus::UI::Label 551 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 552 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 553 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 554 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
271 ; 555 ;
… …
275 $conn->send ("reply $stat"); 559 $conn->send ("reply $stat");
276 destroy_query_dialog $conn; 560 destroy_query_dialog $conn;
277 return; 561 return;
278 } 562 }
279 563
280 $STATS_PAGE->show;
281 $MESSAGE_WINDOW->hide;
282
283 unshift @dialog, new CFPlus::UI::Label 564 unshift @dialog, new CFPlus::UI::Label
284 max_w => $::WIDTH * 0.4, 565 max_w => $::WIDTH * 0.4,
285 ellipsise => 0, 566 ellipsise => 0,
286 markup => "\nOr use your keyboard and the text entry below:\n"; 567 markup => "\nOr use your keyboard and the text entry below:\n";
287 568
288 unshift @dialog, my $table = new CFPlus::UI::Table; 569 unshift @dialog, my $table = new CFPlus::UI::Table;
289 570
290 # left: re-roll 571 # left: re-roll
291 $table->add (0, 0, new CFPlus::UI::Button 572 $table->add_at (0, 0, new CFPlus::UI::Button
292 text => "Roll Again", 573 text => "Roll Again",
293 on_activate => sub { 574 on_activate => sub {
294 $conn->send ("reply y"); 575 $conn->send ("reply y");
295 destroy_query_dialog $conn; 576 destroy_query_dialog $conn;
296 0 577 0
… …
310 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 591 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
311 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 592 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
312 ], 593 ],
313 ), 1 .. 2; 594 ), 1 .. 2;
314 595
315 $table->add (2, 0, new CFPlus::UI::Button 596 $table->add_at (2, 0, new CFPlus::UI::Button
316 text => "Swap Stats", 597 text => "Swap Stats",
317 on_activate => sub { 598 on_activate => sub {
318 $conn->{stat_change_with} = $sw2->{value}; 599 $conn->{stat_change_with} = $sw2->{value};
319 $conn->send ("reply $sw1->{value}"); 600 $conn->send ("reply $sw1->{value}");
320 destroy_query_dialog $conn; 601 destroy_query_dialog $conn;
321 0 602 0
322 }, 603 },
323 ); 604 );
324 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 605 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
325 606
326 # right: accept 607 # right: accept
327 $table->add (4, 0, new CFPlus::UI::Button 608 $table->add_at (4, 0, new CFPlus::UI::Button
328 text => "Accept", 609 text => "Accept",
329 on_activate => sub { 610 on_activate => sub {
330 $conn->send ("reply n"); 611 $conn->send ("reply n");
331 $STATS_PAGE->hide; 612 $STATS_PAGE->hide;
332 destroy_query_dialog $conn; 613 destroy_query_dialog $conn;
… …
413 maph => $mapsize, 694 maph => $mapsize,
414 695
415 client => "cfplus $CFPlus::VERSION $] $^O", 696 client => "cfplus $CFPlus::VERSION $] $^O",
416 697
417 map_widget => $MAPWIDGET, 698 map_widget => $MAPWIDGET,
418 logview => $LOGVIEW,
419 statusbox => $STATUSBOX, 699 statusbox => $STATUSBOX,
420 map => $MAP, 700 map => $MAP,
421 mapmap => $MAPMAP, 701 mapmap => $MAPMAP,
422 query => \&server_query, 702 query => \&server_query,
423 703
424 sound_play => sub { 704 setup_req => {
425 my ($x, $y, $soundnum, $type) = @_; 705 smoothing => $CFG->{map_smoothing}*1,
426
427 $SDL_MIXER
428 or return;
429
430 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
431 or return;
432
433 $chunk->play;
434 }, 706 },
435 }; 707 };
436 708
437 if ($CONN) { 709 if ($CONN) {
438 CFPlus::lowdelay fileno $CONN->{fh}; 710 CFPlus::lowdelay fileno $CONN->{fh};
… …
448 $LOGIN_BUTTON->set_text ("Login"); 720 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 721 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 722 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 723 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 724 $SPELL_LIST->clear_spells;
725 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
726
727 &audio_music_set_ambient ([]);
453 728
454 return unless $CONN; 729 return unless $CONN;
455 730
456 status "connection closed"; 731 status "connection closed";
457 732
… …
467 742
468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 743 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
469 744
470 my $row = 0; 745 my $row = 0;
471 746
472 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
473 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 748 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
474 can_events => 1, 749 can_events => 1,
475 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 750 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
476 751
752 my $vidmode_tooltip =
753 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
754 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
755
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 756 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
478 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 757 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
479 758
759 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
480 $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]); 760 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
481 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 761 tooltip => $vidmode_tooltip);
762 $hbox->add (my $mode_label = new CFPlus::UI::Label
763 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
764 can_events => 1, tooltip => $vidmode_tooltip);
482 765
483 $mode_slider->connect (changed => sub { 766 $mode_slider->connect (changed => sub {
484 my ($self, $value) = @_; 767 my ($self, $value) = @_;
485 768
486 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 769 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
487 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 770 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
488 }); 771 });
489 $mode_slider->emit (changed => $mode_slider->{range}[0]); 772 $mode_slider->emit (changed => $mode_slider->{range}[0]);
490 773
491 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
492 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 775 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
493 state => $CFG->{fullscreen}, 776 state => $CFG->{fullscreen},
494 tooltip => "Bring the client into fullscreen mode.", 777 tooltip => "Bring the client into fullscreen mode.",
495 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
496 ); 779 );
497 780
498 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 781 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
499 $table->add (1, $row++, new CFPlus::UI::CheckBox 782 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
500 state => $CFG->{fast}, 783 state => $CFG->{fast},
501 tooltip => "Lower the visual quality considerably to speed up rendering.", 784 tooltip => "Lower the visual quality considerably to speed up rendering.",
502 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 785 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
503 ); 786 );
504 787
788 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
789 $table->add_at (1, $row++, new CFPlus::UI::Slider
790 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
791 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
792 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
793 );
794
795 $table->add_at (1, $row++, new CFPlus::UI::Button
796 expand => 1, align => 0, text => "Apply",
797 tooltip => "Apply the video settings above.",
798 on_activate => sub {
799 video_shutdown ();
800 video_init ();
801 0
802 }
803 );
804
505 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
506 $table->add (1, $row++, new CFPlus::UI::Slider 806 $table->add_at (1, $row++, new CFPlus::UI::Slider
507 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 807 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
508 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 808 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
509 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 809 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
510 ); 810 );
511 811
812 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
813 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
814 state => $CFG->{map_smoothing},
815 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
816 . "This increases load on the graphics subsystem and works only with 2.x servers. "
817 . "Changes take effect at next connection only.",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
819 );
820
512 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
513 $table->add (1, $row++, new CFPlus::UI::CheckBox 822 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
514 state => $CFG->{fow_enable}, 823 state => $CFG->{fow_enable},
515 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 824 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
516 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
517 ); 826 );
518 827
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
520 $table->add (1, $row++, new CFPlus::UI::Slider 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
521 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 830 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
522 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 831 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
523 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 832 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
524 ); 833 );
525 834
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
527 $table->add (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{fow_smooth},
529 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
530 on_changed => sub {
531 my ($self, $value) = @_;
532 $CFG->{fow_smooth} = $value;
533 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
534 0
535 }
536 );
537
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
539 $table->add (1, $row++, new CFPlus::UI::Slider
540 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
541 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
542 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
543 );
544
545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 835 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
546 $table->add (1, $row++, new CFPlus::UI::Slider 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
547 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 837 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
548 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 838 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
549 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 839 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
550 ); 840 );
551 841
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 842 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider 843 $table->add_at (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 844 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 845 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
556 on_changed => sub { 846 on_changed => sub {
557 $CFG->{gauge_fontsize} = $_[1]; 847 $CFG->{gauge_fontsize} = $_[1];
558 &set_gauge_window_fontsize; 848 &set_gauge_window_fontsize;
559 0 849 0
560 } 850 }
561 ); 851 );
562 852
563 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 853 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
564 $table->add (1, $row++, new CFPlus::UI::Slider 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
565 range => [$CFG->{gauge_size}, 0.2, 0.8], 855 range => [$CFG->{gauge_size}, 0.2, 0.8],
566 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 856 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
567 on_changed => sub { 857 on_changed => sub {
568 $CFG->{gauge_size} = $_[1]; 858 $CFG->{gauge_size} = $_[1];
569 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 859 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
570 0 860 0
571 } 861 }
572 ); 862 );
573 863
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
584 $vbox 864 $vbox
585} 865}
586 866
587sub audio_setup { 867sub audio_setup {
588 my $vbox = new CFPlus::UI::VBox; 868 my $vbox = new CFPlus::UI::VBox;
589 869
590 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 870 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
591 871
592 my $row = 0; 872 my $row = 0;
593 873
594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 874 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
595 $table->add (1, $row++, new CFPlus::UI::CheckBox 875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
596 state => $CFG->{audio_enable}, 876 state => $CFG->{audio_enable},
597 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.", 877 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.",
598 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 878 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
599 ); 879 );
600# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 880# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
601# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 881# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
602# $CFG->{effects_volume} = $_[1]; 882# $CFG->{effects_volume} = $_[1];
603# }); 883# });
884
885 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
886 $table->add_at (1, $row, new CFPlus::UI::CheckBox
887 expand => 1, state => $CFG->{effects_enable},
888 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
889 on_changed => sub {
890 $CFG->{effects_enable} = $_[1];
891 $CONN->update_fx_want if $CONN;
892 0
893 }
894 );
895 $table->add_at (2, $row++, new CFPlus::UI::Slider
896 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
897 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
898 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
899 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
900 );
901
604 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
605 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
606 $hbox->add (new CFPlus::UI::CheckBox 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
607 expand => 1, state => $CFG->{bgm_enable}, 904 expand => 1, state => $CFG->{bgm_enable},
608 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 905 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
609 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 906 on_changed => sub {
907 $CFG->{bgm_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
610 ); 911 );
611 $hbox->add (new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
612 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
613 tooltip => "The volume of the background music. Changes are instant.", 914 tooltip => "The volume of the background music. Changes are instant.",
614 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 915 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
615 ); 916 );
616 917
617 $table->add (1, $row++, new CFPlus::UI::Button 918 $table->add_at (1, $row++, new CFPlus::UI::Button
618 expand => 1, align => 0, text => "Apply", 919 c_colspan => 2, expand => 1, align => 0, text => "Apply",
619 tooltip => "Apply the audio settings", 920 tooltip => "Apply the audio settings",
620 on_activate => sub { 921 on_activate => sub {
621 audio_shutdown (); 922 audio_shutdown ();
622 audio_init (); 923 audio_init ();
623 0 924 0
… …
681} 982}
682 983
683sub debug_setup { 984sub debug_setup {
684 my $table = new CFPlus::UI::Table; 985 my $table = new CFPlus::UI::Table;
685 986
686 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 987 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
687 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 988 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
688 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 989 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
689 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 990 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
690 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 991 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
691 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 992 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
692 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 993 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
693 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 994 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
694 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 995 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
695 996
696 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
697
698 for my $x (0..2) {
699 for my $y (0 .. 2) {
700 $table->add ($x + 3, $y,
701 new CFPlus::UI::Entry
702 text => $default_smooth[$x * 3 + $y],
703 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
704 );
705 }
706 }
707
708 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 997 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
998
999 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1000 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1001 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1002 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1003 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1004 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1005
1006 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1007
1008 $c->add_items ({
1009 type => "line_loop",
1010 color => [0, 1, 0],
1011 width => 9,
1012 coord_mode => "abs",
1013 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1014 });
1015
1016 $c->add_items ({
1017 type => "lines",
1018 color => [1, 1, 0],
1019 width => 2,
1020 coord_mode => "rel",
1021 coord => [[0,0], [1,1], [1,0], [0,1]],
1022 });
1023
1024 $c->add_items ({
1025 type => "polygon",
1026 color => [0, 0.43, 0],
1027 width => 2,
1028 coord_mode => "rel",
1029 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1030 });
709 1031
710 $table 1032 $table
711} 1033}
712 1034
713sub stats_window { 1035sub stats_window {
… …
761 [2, 4, st_spd => "Spd", 10.54], 1083 [2, 4, st_spd => "Spd", 10.54],
762 [2, 5, st_wspd => "WSp", 10.54], 1084 [2, 5, st_wspd => "WSp", 10.54],
763 ) { 1085 ) {
764 my ($col, $row, $id, $label, $template) = @$_; 1086 my ($col, $row, $id, $label, $template) = @$_;
765 1087
766 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1088 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
767 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1089 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
768 align => +1, template => $template, tooltip => "#stat_$label"); 1090 align => +1, template => $template, tooltip => "#stat_$label");
769 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1091 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
770 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1092 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
771 align => -1, text => $label, tooltip => "#stat_$label"); 1093 align => -1, text => $label, tooltip => "#stat_$label");
772 } 1094 }
773 1095
774 $vb->add (new CFPlus::UI::FancyFrame 1096 $vb->add (new CFPlus::UI::FancyFrame
… …
815 cold => ["Cold", 1137 cold => ["Cold",
816 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1138 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
817 ghit => ["Ghost hit", 1139 ghit => ["Ghost hit",
818 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1140 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
819 ); 1141 );
1142
820 for (qw/slow holyw conf fire depl magic 1143 for (qw/slow holyw conf fire depl magic
821 drain acid pois para deat phys 1144 drain acid pois para deat phys
822 blind fear tund elec cold ghit/) 1145 blind fear tund elec cold ghit/)
823 { 1146 {
824 $tbl2->add ($col, $row, 1147 $tbl2->add_at ($col, $row,
825 $STATWIDS->{"res_$_"} = 1148 $STATWIDS->{"res_$_"} =
826 new CFPlus::UI::Label 1149 new CFPlus::UI::Label
827 font => $FONT_FIXED, 1150 font => $FONT_FIXED,
828 template => "-100%", 1151 template => "-100%",
829 align => +1, 1152 align => +1,
830 valign => 0, 1153 valign => 0,
831 can_events => 1, 1154 can_events => 1,
832 can_hover => 1, 1155 can_hover => 1,
833 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
834 ); 1157 );
835 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1158 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
836 font => $FONT_FIXED, 1159 font => $FONT_FIXED,
837 can_hover => 1, 1160 can_hover => 1,
838 can_events => 1, 1161 can_events => 1,
839 path => "ui/resist/resist_$_.png", 1162 path => "ui/resist/resist_$_.png",
840 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
841 ); 1164 );
842 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1165 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
843 text => $resist_names{$_}->[0], 1166 text => $resist_names{$_}->[0],
844 font => $FONT_FIXED, 1167 font => $FONT_FIXED,
845 can_hover => 1, 1168 can_hover => 1,
846 can_events => 1, 1169 can_events => 1,
847 tooltip => $resist_names{$_}->[1], 1170 tooltip => $resist_names{$_}->[1],
… …
880 return if $METASERVER_ATIME > time; 1203 return if $METASERVER_ATIME > time;
881 $METASERVER_ATIME = time + 60; 1204 $METASERVER_ATIME = time + 60;
882 1205
883 my $table = $METASERVER->{table}; 1206 my $table = $METASERVER->{table};
884 $table->clear; 1207 $table->clear;
885 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1208 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
886 1209
887 my $ok = 0; 1210 my $ok = 0;
888 1211
889 CFPlus::background { 1212 CFPlus::background {
890 my $ua = CFPlus::lwp_useragent; 1213 my $ua = CFPlus::lwp_useragent;
… …
901 "The time this server has been running without being restarted.", 1224 "The time this server has been running without being restarted.",
902 "The server software version - a '+' indicates a Crossfire+ server.", 1225 "The server software version - a '+' indicates a Crossfire+ server.",
903 "Short information about this server provided by its admins.", 1226 "Short information about this server provided by its admins.",
904 ); 1227 );
905 my @col = qw(#Users Host Uptime Version Description); 1228 my @col = qw(#Users Host Uptime Version Description);
906 $table->add ($_, 0, new CFPlus::UI::Label 1229 $table->add_at ($_, 0, new CFPlus::UI::Label
907 can_hover => 1, can_events => 1, 1230 can_hover => 1, can_events => 1,
908 align => 0, fg => [1, 1, 0], 1231 align => 0, fg => [1, 1, 0],
909 text => $col[$_], tooltip => $tip[$_]) 1232 text => $col[$_], tooltip => $tip[$_])
910 for 0 .. $#col; 1233 for 0 .. $#col;
911 1234
… …
933 1256
934 $m = [$users, $host, $uptime, $version, $desc]; 1257 $m = [$users, $host, $uptime, $version, $desc];
935 1258
936 $y++; 1259 $y++;
937 1260
938 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1261 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
939 (new CFPlus::UI::Button 1262 (new CFPlus::UI::Button
940 text => "Use", 1263 text => "Use",
941 tooltip => "Put this server into the <b>Host:Port</b> field", 1264 tooltip => "Put this server into the <b>Host:Port</b> field",
942 on_activate => sub { 1265 on_activate => sub {
943 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1266 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
946 }, 1269 },
947 ), 1270 ),
948 (new CFPlus::UI::Empty expand => 1), 1271 (new CFPlus::UI::Empty expand => 1),
949 ]); 1272 ]);
950 1273
951 $table->add ($_, $y, new CFPlus::UI::Label 1274 $table->add_at ($_, $y, new CFPlus::UI::Label
952 max_w => $::WIDTH * 0.4, 1275 max_w => $::WIDTH * 0.4,
953 ellipsise => 0, 1276 ellipsise => 0,
954 align => $align[$_], 1277 align => $align[$_],
955 text => $m->[$_], 1278 text => $m->[$_],
956 tooltip => $tip[$_], 1279 tooltip => $tip[$_],
… …
997 1320
998 $vbox->add (new CFPlus::UI::FancyFrame 1321 $vbox->add (new CFPlus::UI::FancyFrame
999 label => "Connection Settings", 1322 label => "Connection Settings",
1000 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1323 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1001 ); 1324 );
1002 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1325 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1003 1326
1004 { 1327 {
1005 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1328 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1006 1329
1007 $vbox->add ( 1330 $vbox->add (
1008 $HOST_ENTRY = new CFPlus::UI::Entry 1331 $HOST_ENTRY = new CFPlus::UI::Entry
1009 expand => 1, 1332 expand => 1,
1010 text => $CFG->{profile}{default}{host}, 1333 text => $CFG->{profile}{default}{host},
1011 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1334 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1012 on_changed => sub { 1335 on_changed => sub {
1013 my ($self, $value) = @_; 1336 my ($self, $value) = @_;
1014 $CFG->{profile}{default}{host} = $value; 1337 $CFG->{profile}{default}{host} = $value;
1015 0 1338 1
1016 } 1339 }
1017 ); 1340 );
1018 1341
1019 $vbox->add (new CFPlus::UI::Button 1342 $vbox->add (new CFPlus::UI::Button
1020 expand => 1, 1343 expand => 1,
1021 text => "Server List", 1344 text => "Server List",
1022 other => $METASERVER, 1345 other => $METASERVER,
1023 tooltip => "Show a list of available crossfire servers", 1346 tooltip => "Show a list of available crossfire servers",
1024 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1347 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1025 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1348 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1026 ); 1349 );
1027 } 1350 }
1028 1351
1029 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1352 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1030 $table->add (1, 4, new CFPlus::UI::Entry 1353 $table->add_at (1, 4, new CFPlus::UI::Entry
1031 text => $CFG->{profile}{default}{user}, 1354 text => $CFG->{profile}{default}{user},
1032 tooltip => "The name of your character on the server", 1355 tooltip => "The name of your character on the server",
1033 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1356 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1034 ); 1357 );
1035 1358
1036 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1359 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1037 $table->add (1, 5, new CFPlus::UI::Entry 1360 $table->add_at (1, 5, new CFPlus::UI::Entry
1038 text => $CFG->{profile}{default}{password}, 1361 text => $CFG->{profile}{default}{password},
1039 hidden => 1, 1362 hidden => 1,
1040 tooltip => "The password for your character", 1363 tooltip => "The password for your character",
1041 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1042 ); 1365 );
1043 1366
1044 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1367 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1045 $table->add (1, 7, new CFPlus::UI::Slider 1368 $table->add_at (1, 7, new CFPlus::UI::Slider
1046 force_w => 100, 1369 force_w => 100,
1047 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1370 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1048 tooltip => "This is the size of the portion of the map update the server sends you. " 1371 tooltip => "This is the size of the portion of the map update the server sends you. "
1049 . "If you set this to a high value you will be able to see further, " 1372 . "If you set this to a high value you will be able to see further, "
1050 . "but you also increase bandwidth requirements and latency. " 1373 . "but you also increase bandwidth requirements and latency. "
1051 . "This option is only used once at log-in.", 1374 . "This option is only used once at log-in.",
1052 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1375 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1053 ); 1376 );
1054 1377
1055 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1056 $table->add (1, 8, new CFPlus::UI::CheckBox
1057 state => $CFG->{face_prefetch},
1058 tooltip => "<b>Background Image Prefetch</b>\n\n"
1059 . "If enabled, the client automatically pre-fetches images from the server. "
1060 . "This might increase or create lag, but increases the chances "
1061 . "of faces being ready for display when you encounter them. "
1062 . "It also uses up server bandwidth on every connect, "
1063 . "so only set it if you really need to prefetch images. "
1064 . "This option can be set and unset any time.",
1065 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1066 );
1067
1068 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1378 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1069 $table->add (1, 9, new CFPlus::UI::Entry 1379 $table->add_at (1, 8, new CFPlus::UI::Entry
1070 text => $CFG->{output_rate}, 1380 text => $CFG->{output_rate},
1071 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1381 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1072 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1382 . "when sending data. When 0 or unset, the server "
1073 . "default will be used, which is usually around 100kb/s.", 1383 . "default will be used, which is usually around 100kb/s. Most servers will "
1384 . "dynamically find an optimal rate, so adjust this only when necessary.",
1074 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1075 ); 1386 );
1076 1387
1077 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1388 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1078 $table->add (1, 10, new CFPlus::UI::Entry 1389 $table->add_at (1, 9, new CFPlus::UI::Entry
1079 text => $CFG->{output_count}, 1390 text => $CFG->{output_count},
1080 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1391 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1081 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1082 ); 1393 );
1083 1394
1084 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1395 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1085 $table->add (1, 11, new CFPlus::UI::Entry 1396 $table->add_at (1, 10, new CFPlus::UI::Entry
1086 text => $CFG->{output_sync}, 1397 text => $CFG->{output_sync},
1087 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1398 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1088 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1089 ); 1400 );
1090 1401
1091 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1092 expand => 1, 1403 expand => 1,
1093 align => 0, 1404 align => 0,
1094 text => "Login", 1405 text => "Login",
1095 on_activate => sub { 1406 on_activate => sub {
1096 $CONN ? stop_game 1407 $CONN ? stop_game
1097 : start_game; 1408 : start_game;
1098 0 1409 1
1099 }, 1410 },
1100 ); 1411 );
1101 1412
1102 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1413 $vbox->add (new CFPlus::UI::FancyFrame
1103 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry 1414 label => "Server Info",
1104 text => $CFG->{say_command}, 1415 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1105 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. "
1106 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1107 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1108 on_changed => sub {
1109 my ($self, $value) = @_;
1110 $CFG->{say_command} = $value;
1111 0
1112 }
1113 ); 1416 );
1114 1417
1418 $vbox
1419}
1420
1421sub client_setup {
1422 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1423
1424 my $row = 0;
1425
1115 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1426 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1116 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox 1427 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1117 state => $CFG->{show_tips}, 1428 state => $CFG->{show_tips},
1118 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1429 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1119 on_changed => sub { 1430 on_changed => sub {
1120 my ($self, $value) = @_; 1431 my ($self, $value) = @_;
1121 $CFG->{show_tips} = $value; 1432 $CFG->{show_tips} = $value;
1122 0 1433 0
1123 } 1434 }
1124 ); 1435 );
1125 1436
1126 $vbox->add (new CFPlus::UI::FancyFrame 1437 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1127 label => "Server Info", 1438 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1128 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1439 text => $CFG->{logview_max_par},
1129 ); 1440 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1130 1441 . "sends more messages than this number, older messages get removed to save memory and "
1131 $vbox 1442 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1132}
1133
1134sub message_window {
1135 my $window = new CFPlus::UI::Toplevel
1136 name => "message_window",
1137 title => "Messages",
1138 border_bg => [1, 1, 1, 1],
1139 x => "max",
1140 y => 0,
1141 force_w => $::WIDTH * 0.4,
1142 force_h => $::HEIGHT * 0.5,
1143 child => (my $vbox = new CFPlus::UI::VBox),
1144 has_close_button => 1;
1145
1146 $vbox->add ($LOGVIEW);
1147
1148 $vbox->add (my $input = new CFPlus::UI::Entry
1149 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1150 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1151 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1152 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1153 on_focus_in => sub { 1443 on_changed => sub {
1154 my ($input, $prev_focus) = @_; 1444 my ($self, $value) = @_;
1155 1445 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1156 delete $input->{refocus_map};
1157
1158 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1159 $input->{refocus_map} = 1;
1160 }
1161 delete $input->{auto_activated};
1162
1163 0 1446 0
1164 }, 1447 },
1165 on_activate => sub {
1166 my ($input, $text) = @_;
1167 $input->set_text ('');
1168
1169 if ($text =~ /^\/(.*)/) {
1170 $::CONN->user_send ($1);
1171 } else {
1172 my $say_cmd = $::CFG->{say_command} || 'say';
1173 $::CONN->user_send ("$say_cmd $text");
1174 }
1175 if ($input->{refocus_map}) {
1176 delete $input->{refocus_map};
1177 $MAPWIDGET->focus_in
1178 }
1179
1180 0
1181 },
1182 on_escape => sub {
1183 $MAPWIDGET->grab_focus;
1184
1185 0
1186 },
1187 );
1188
1189 $CONSOLE = {
1190 window => $window,
1191 input => $input,
1192 }; 1448 );
1193 1449
1194 $window 1450 $table
1195} 1451}
1196 1452
1197sub autopickup_setup { 1453sub autopickup_setup {
1454 my $r = new CFPlus::UI::ScrolledWindow (
1455 expand => 1,
1456 scroll_y => 1
1457 );
1198 my $table = new CFPlus::UI::Table; 1458 $r->add (my $table = new CFPlus::UI::Table
1459 row_expand => [0],
1460 col_expand => [0, 1, 0, 1],
1461 );
1199 1462
1200 for ( 1463 for (
1201 ["General", 0, 0, 1464 ["General", 0, 0,
1202 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1465 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1203 ["Inhibit autopickup" => PICKUP_INHIBIT], 1466 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1238 ], 1501 ],
1239 ["Weight/Value ratio", 2, 17] 1502 ["Weight/Value ratio", 2, 17]
1240 ) 1503 )
1241 { 1504 {
1242 my ($title, $x, $y, @bits) = @$_; 1505 my ($title, $x, $y, @bits) = @$_;
1243 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1506 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1244 1507
1245 for (@bits) { 1508 for (@bits) {
1246 ++$y; 1509 ++$y;
1247 1510
1248 my $mask = $_->[1]; 1511 my $mask = $_->[1];
1249 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1512 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1250 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1513 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1251 state => $::CFG->{pickup} & $mask, 1514 state => $::CFG->{pickup} & $mask,
1252 on_changed => sub { 1515 on_changed => sub {
1253 my ($box, $value) = @_; 1516 my ($box, $value) = @_;
1254 1517
1255 if ($value) { 1518 if ($value) {
… …
1266 1529
1267 ${$_->[2]} = $checkbox if $_->[2]; 1530 ${$_->[2]} = $checkbox if $_->[2];
1268 } 1531 }
1269 } 1532 }
1270 1533
1271 $table->add (2, 18, new CFPlus::UI::ValSlider 1534 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1272 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1535 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1273 template => ">= 99", 1536 template => ">= 99",
1274 to_value => sub { ">= " . 5 * $_[0] }, 1537 to_value => sub { ">= " . 5 * $_[0] },
1275 on_changed => sub { 1538 on_changed => sub {
1276 my ($slider, $value) = @_; 1539 my ($slider, $value) = @_;
… …
1279 $::CFG->{pickup} |= int $value 1542 $::CFG->{pickup} |= int $value
1280 if $value; 1543 if $value;
1281 1; 1544 1;
1282 }); 1545 });
1283 1546
1284 $table->add (3, 18, new CFPlus::UI::Button 1547 $table->add_at (3, 18, new CFPlus::UI::Button
1285 text => "set", 1548 text => "set",
1286 on_activate => sub { 1549 on_activate => sub {
1287 $::CONN->send_command ("pickup $::CFG->{pickup}") 1550 $::CONN->send_command ("pickup $::CFG->{pickup}")
1288 if defined $::CONN; 1551 if defined $::CONN;
1289 0 1552 0
1290 }); 1553 });
1291 1554
1292 $table 1555 $r
1293} 1556}
1294 1557
1295my %SORT_ORDER = ( 1558my %SORT_ORDER = (
1296 type => undef, 1559 type => undef,
1297 mtime => sub { 1560 mtime => sub {
… …
1352 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1615 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1353 1616
1354 $hb 1617 $hb
1355} 1618}
1356 1619
1620sub media_window {
1621 my $vb = new CFPlus::UI::VBox;
1622
1623 $vb->add (new CFPlus::UI::FancyFrame
1624 label => "Currently playing music",
1625 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1626 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1627 );
1628
1629 $vb->add (new CFPlus::UI::FancyFrame
1630 label => "Other media used in this session",
1631 expand => 1,
1632 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1633 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1634 );
1635
1636 $vb
1637}
1638
1639sub add_license {
1640 my ($meta) = @_;
1641
1642 $meta = $meta->{meta}
1643 or return;
1644
1645 $meta->{license} || $meta->{author} || $meta->{source}
1646 or return;
1647
1648 $LICENSE_WIDGET->add_paragraph ({
1649 fg => [1, 1, 1, 1],
1650 markup => "<small>"
1651 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1652 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1653 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1654 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1655 . "</small>",
1656 });
1657 $LICENSE_WIDGET->scroll_to_bottom;
1658}
1659
1357sub toggle_player_page { 1660sub toggle_player_page {
1358 my ($widget) = @_; 1661 my ($widget) = @_;
1359 1662
1360 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1663 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1361 $PL_WINDOW->hide; 1664 $PL_WINDOW->hide;
… …
1376 has_close_button => 1 1679 has_close_button => 1
1377 ; 1680 ;
1378 1681
1379 my $ntb = 1682 my $ntb =
1380 $PL_NOTEBOOK = 1683 $PL_NOTEBOOK =
1381 new CFPlus::UI::Notebook expand => 1, debug => 1; 1684 new CFPlus::UI::Notebook expand => 1;
1382 1685
1383 $ntb->add ( 1686 $ntb->add_tab (
1384 "Statistics (F2)" => $STATS_PAGE = stats_window, 1687 "Statistics (F2)" => $STATS_PAGE = stats_window,
1385 "Shows statistics, where all your Stats and Resistances are shown." 1688 "Shows statistics, where all your Stats and Resistances are shown."
1386 ); 1689 );
1387 $ntb->add ( 1690 $ntb->add_tab (
1388 "Skills (F3)" => $SKILL_PAGE = skill_window, 1691 "Skills (F3)" => $SKILL_PAGE = skill_window,
1389 "Shows all your Skills." 1692 "Shows all your Skills."
1390 ); 1693 );
1391 1694
1392 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1695 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1393 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1696 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1394 $ntb->add ( 1697 $ntb->add_tab (
1395 "Spellbook (F4)" => $spellsw, 1698 "Spellbook (F4)" => $spellsw,
1396 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1699 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1397 ); 1700 );
1398 $ntb->add ( 1701 $ntb->add_tab (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1703 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1401 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1704 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402 ); 1705 );
1706 $ntb->add_tab (Pickup => autopickup_setup,
1707 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1708
1709 $ntb->add_tab (Media => media_window,
1710 "License, Author and Source info for media sent by the server.");
1403 1711
1404 $ntb->set_current_page ($INVENTORY_PAGE); 1712 $ntb->set_current_page ($INVENTORY_PAGE);
1405 1713
1406 $plwin->add ($ntb); 1714 $plwin->add ($ntb);
1407 $plwin 1715 $plwin
… …
1573 1881
1574sub show_tip_of_the_day { 1882sub show_tip_of_the_day {
1575 # find all tips 1883 # find all tips
1576 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1884 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1577 1885
1578 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1886 CFPlus::DB::get state => "tip_of_the_day", sub {
1887 my ($todindex) = @_;
1579 $todindex = 0 if $todindex >= @tod; 1888 $todindex = 0 if $todindex >= @tod;
1580 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1889 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1581 1890
1582 # create dialog 1891 # create dialog
1583 my $dialog; 1892 my $dialog;
1584 1893
1585 my $close = sub { 1894 my $close = sub {
1586 $dialog->destroy; 1895 $dialog->destroy;
1896 };
1897
1898 $dialog = new CFPlus::UI::Toplevel
1899 x => "center",
1900 y => "center",
1901 z => 3,
1902 name => 'tip_of_the_day',
1903 force_w => int $WIDTH * 4/9,
1904 force_h => int $WIDTH * 2/9,
1905 title => "Tip of the day #" . (1 + $todindex),
1906 child => my $vbox = new CFPlus::UI::VBox,
1907 has_close_button => 1,
1908 on_delete => $close,
1909 ;
1910
1911 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1912 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1913 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1914
1915 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1916
1917 $table->add_at (0, 0, new CFPlus::UI::Button
1918 text => "Close",
1919 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>.",
1920 on_activate => $close,
1921 );
1922
1923 $table->add_at (2, 0, new CFPlus::UI::Button
1924 text => "Next",
1925 tooltip => "Show the next <b>Tip of the day</b>.",
1926 on_activate => sub {
1927 $close->();
1928 &show_tip_of_the_day;
1929 },
1930 );
1931
1932 $dialog->show;
1587 }; 1933 };
1588
1589 $dialog = new CFPlus::UI::Toplevel
1590 x => "center",
1591 y => "center",
1592 z => 3,
1593 name => 'tip_of_the_day',
1594 force_w => int $WIDTH * 4/9,
1595 force_h => int $WIDTH * 2/9,
1596 title => "Tip of the day #" . (1 + $todindex),
1597 child => my $vbox = new CFPlus::UI::VBox,
1598 has_close_button => 1,
1599 on_delete => $close,
1600 ;
1601
1602 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1603 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1604 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1605
1606 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1607
1608 $table->add (0, 0, new CFPlus::UI::Button
1609 text => "Close",
1610 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>.",
1611 on_activate => $close,
1612 );
1613
1614 $table->add (2, 0, new CFPlus::UI::Button
1615 text => "Next",
1616 tooltip => "Show the next <b>Tip of the day</b>.",
1617 on_activate => sub {
1618 $close->();
1619 &show_tip_of_the_day;
1620 },
1621 );
1622
1623 $dialog->show;
1624} 1934}
1625 1935
1626sub sdl_init { 1936sub sdl_init {
1627 CFPlus::SDL_Init 1937 CFPlus::SDL_Init
1628 and die "SDL::Init failed!\n"; 1938 and die "SDL::Init failed!\n";
1629} 1939}
1630 1940
1631sub video_init { 1941sub video_init {
1632 sdl_init;
1633
1634 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1635 1943
1636 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1944 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1637 1945
1638 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1946 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1639 $FULLSCREEN = $CFG->{fullscreen}; 1947 $FULLSCREEN = $CFG->{fullscreen};
1640 $FAST = $CFG->{fast}; 1948 $FAST = $CFG->{fast};
1641 1949
1642 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1950 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1643 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1951 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1644 1952
1645 $SDL_ACTIVE = 1; 1953 $SDL_ACTIVE = 1;
1646 $LAST_REFRESH = time - 0.01; 1954 $LAST_REFRESH = time - 0.01;
1647 1955
… …
1689 1997
1690 $MAPWIDGET = new CFPlus::MapWidget; 1998 $MAPWIDGET = new CFPlus::MapWidget;
1691 $MAPWIDGET->connect (activate_console => sub { 1999 $MAPWIDGET->connect (activate_console => sub {
1692 my ($mapwidget, $preset) = @_; 2000 my ($mapwidget, $preset) = @_;
1693 2001
1694 if ($CONSOLE) { 2002 $MESSAGE_WINDOW->activate_console ($preset)
1695 $CONSOLE->{input}->{auto_activated} = 1; 2003 if $MESSAGE_WINDOW;
1696 $CONSOLE->{input}->grab_focus;
1697
1698 if ($preset && $CONSOLE->{input}->get_text eq '') {
1699 $CONSOLE->{input}->set_text ($preset);
1700 }
1701 }
1702 }); 2004 });
1703 $MAPWIDGET->show; 2005 $MAPWIDGET->show;
1704 $MAPWIDGET->grab_focus; 2006 $MAPWIDGET->grab_focus;
1705
1706 $LOGVIEW = new CFPlus::UI::TextScroller
1707 expand => 1,
1708 font => $FONT_FIXED,
1709 fontsize => $::CFG->{log_fontsize},
1710 indent => -4,
1711 can_hover => 1,
1712 can_events => 1,
1713 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1714 ;
1715 2007
1716 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2008 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1717 title => "Setup", 2009 title => "Setup",
1718 name => "setup_dialog", 2010 name => "setup_dialog",
1719 x => 'center', 2011 x => 'center',
… …
1723 force_h => $::HEIGHT * 0.6, 2015 force_h => $::HEIGHT * 0.6,
1724 has_close_button => 1, 2016 has_close_button => 1,
1725 ; 2017 ;
1726 2018
1727 $METASERVER = metaserver_dialog; 2019 $METASERVER = metaserver_dialog;
2020 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1728 2021
1729 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2022 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1730 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2023 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1731 2024
1732 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2025 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1733 "Configure the server to play on, your username, password and other server-related options."); 2026 "Configure the server to play on, your username, password and other server-related options.");
1734 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2027 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1735 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2028 "Configure various client-specific settings.");
1736 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2029 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1737 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2030 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1738 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2031 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1739 "Configure the use of audio, sound effects and background music."); 2032 "Configure the use of audio, sound effects and background music.");
1740 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2033 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1741 "Lets you define, edit and delete key bindings." 2034 "Lets you define, edit and delete key bindings."
1742 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2035 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1743 . "with nothing set and the recording started. After doing the actions you " 2036 . "with nothing set and the recording started. After doing the actions you "
1744 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2037 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1745 . "After pressing the combo the binding will be saved automatically and the " 2038 . "After pressing the combo the binding will be saved automatically and the "
1746 . "binding editor closes"); 2039 . "binding editor closes");
1747 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2040 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1748 "Some debuggin' options. Do not ask."); 2041 "Some debuggin' options. Do not ask.");
1749 2042
1750 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2043 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1751 2044
1752 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2045 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1753 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2046 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1754 2047
1755 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2048 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1756 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2049 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1757 2050
1758 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 2051 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
1759 2052
1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2053 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1793 } 2086 }
1794 2087
1795 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2088 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1796} 2089}
1797 2090
1798sub setup_build_button {
1799 my ($enabled) = @_;
1800 if ($enabled) {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 $BUILD_BUTTON ||= new CFPlus::UI::Button
1803 text => "Build",
1804 tooltip => "Opens the ingame builder",
1805 on_activate => sub {
1806 if ($CONN) {
1807 $CONN->send_ext_req (builder_player_items => sub {
1808 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1809 });
1810 }
1811 0
1812 };
1813 $BUTTONBAR->add ($BUILD_BUTTON);
1814 } else {
1815 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1816 }
1817}
1818
1819sub open_ingame_editor {
1820 my ($msg) = @_;
1821
1822 my $win = new CFPlus::UI::Toplevel
1823 x => 0,
1824 y => 'center',
1825 z => 4,
1826 name => 'builder_window',
1827 force_w => int $WIDTH * 1/4,
1828 force_h => int $HEIGHT * 3/4,
1829 title => "In game builder",
1830 has_close_button => 1;
1831
1832 my $r = new CFPlus::UI::ScrolledWindow (
1833 expand => 1,
1834 scroll_y => 1
1835 );
1836 $r->add (my $vb = new CFPlus::UI::VBox);
1837 $win->add ($r);
1838
1839
1840 $vb->add (
1841 new CFPlus::UI::Button
1842 text => "Disable build mode",
1843 on_activate => sub { $::IN_BUILD_MODE = undef }
1844 );
1845 $vb->add (
1846 new CFPlus::UI::Button
1847 text => "ERASE",
1848 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1849 );
1850
1851 for my $itemarchname (
1852 sort {
1853 $msg->{items}->{$a}->{build_arch_name}
1854 cmp $msg->{items}->{$b}->{build_arch_name}
1855 } keys %{$msg->{items}}
1856 ) {
1857 my $info = $msg->{items}->{$itemarchname};
1858 $vb->add (
1859 new CFPlus::UI::Button text => $info->{build_arch_name},
1860 on_activate => sub {
1861 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1862
1863 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1864 build_mode_query_arch_info ();
1865 }
1866 }
1867 );
1868 }
1869
1870 $win->show;
1871}
1872
1873sub build_mode_query_arch_info {
1874 my ($iteminfo) = $::IN_BUILD_MODE;
1875 my $itemarchname = $iteminfo->{item};
1876 my $info = $iteminfo->{info};
1877
1878 my $dialog = new CFPlus::UI::Toplevel
1879 x => "center",
1880 y => "center",
1881 z => 50,
1882 force_w => int $WIDTH * 1/2,
1883 title => "Enter information for placement of '$itemarchname'",
1884 has_close_button => 1;
1885
1886 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1887
1888 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1889 my $row = 0;
1890 if ($info->{has_name}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1892 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1893 }
1894 if ($info->{has_text}) {
1895 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1896 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1897 }
1898 if ($info->{has_connection}) {
1899 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1900 $table->add (1, $row++,
1901 new CFPlus::UI::Entry
1902 expand => 1,
1903 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1904 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1905 );
1906 }
1907
1908 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1909 $hb->add (new CFPlus::UI::Button
1910 text => "Close",
1911 expand => 1,
1912 on_activate => sub { $dialog->hide; 0 },
1913 );
1914 $dialog->show;
1915}
1916
1917sub video_shutdown { 2091sub video_shutdown {
1918 CFPlus::OpenGL::shutdown; 2092 CFPlus::OpenGL::shutdown;
1919 2093
1920 undef $SDL_ACTIVE; 2094 undef $SDL_ACTIVE;
1921} 2095}
1922 2096
1923my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1924my $bgmusic;#TODO#hack#d#
1925
1926sub audio_channel_finished {
1927 my ($channel) = @_;
1928
1929 #warn "channel $channel finished\n";#d#
1930}
1931
1932sub audio_music_finished {
1933 return unless $CFG->{bgm_enable};
1934
1935 # TODO: hack, do play loop and mood music
1936 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1937 $bgmusic->play (0);
1938
1939 push @bgmusic, shift @bgmusic;
1940}
1941
1942sub audio_init {
1943 if ($CFG->{audio_enable}) {
1944 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1945 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1946
1947 unless ($SDL_MIXER) {
1948 status "Unable to open sound device: there will be no sound";
1949 return;
1950 }
1951
1952 CFPlus::Mix_AllocateChannels 8;
1953 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1954
1955 audio_music_finished;
1956
1957 local $_;
1958 while (<$fh>) {
1959 next if /^\s*#/;
1960 next if /^\s*$/;
1961
1962 my ($file, $volume, $event) = split /\s+/, $_, 3;
1963
1964 push @SOUNDS, "$volume,$file";
1965
1966 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1967 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1968 $chunk->volume ($volume * 128 / 100);
1969 $chunk
1970 };
1971 }
1972 } else {
1973 status "unable to open sound config: $!";
1974 }
1975 }
1976}
1977
1978sub audio_shutdown {
1979 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1980 undef $SDL_MIXER;
1981 @SOUNDS = ();
1982 %AUDIO_CHUNKS = ();
1983}
1984
1985my %animate_object; 2097my %animate_object;
1986my $animate_timer; 2098my $animate_timer;
1987 2099
1988my $fps = 9; 2100my $fps = 9;
1989
1990my %demo;#d#
1991 2101
1992sub force_refresh { 2102sub force_refresh {
1993 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2103 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1994 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1995 2105
1996 $CFPlus::UI::ROOT->draw; 2106 $CFPlus::UI::ROOT->draw;
1997 2107
1998 $WANT_REFRESH = 0; 2108 $WANT_REFRESH = 0;
1999 $CAN_REFRESH = 0; 2109 $CAN_REFRESH = 0;
2000 $LAST_REFRESH = $NOW; 2110 $LAST_REFRESH = $NOW;
2001 2111
2002 CFPlus::SDL_GL_SwapBuffers; 2112 CFPlus::SDL_GL_SwapBuffers;
2003} 2113}
2004 2114
2005my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2115my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2006 $NOW = time; 2116 $NOW = time;
2007 2117
2008 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2118 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2009 for CFPlus::SDL_PollEvent; 2119 for CFPlus::poll_events;
2010 2120
2011 if (%animate_object) { 2121 if (%animate_object) {
2012 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2122 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2013 $WANT_REFRESH++; 2123 ++$WANT_REFRESH;
2014 } 2124 }
2015 2125
2016 if ($WANT_REFRESH) { 2126 if ($WANT_REFRESH) {
2017 force_refresh; 2127 force_refresh;
2018 } else { 2128 } else {
… …
2028sub animation_stop { 2138sub animation_stop {
2029 my ($widget) = @_; 2139 my ($widget) = @_;
2030 delete $animate_object{$widget}; 2140 delete $animate_object{$widget};
2031} 2141}
2032 2142
2033# check once/second for faces that need to be prefetched
2034# this should, of course, only run on demand, but
2035# SDL forces worse things on us....
2036
2037Event->timer (after => 1, interval => 0.25, cb => sub {
2038 $CONN->face_prefetch
2039 if $CONN;
2040});
2041
2042%SDL_CB = ( 2143%SDL_CB = (
2043 CFPlus::SDL_QUIT => sub { 2144 CFPlus::SDL_QUIT => sub {
2044 Event::unloop -1; 2145 exit;
2045 }, 2146 },
2046 CFPlus::SDL_VIDEORESIZE => sub { 2147 CFPlus::SDL_VIDEORESIZE => sub {
2047 }, 2148 },
2048 CFPlus::SDL_VIDEOEXPOSE => sub { 2149 CFPlus::SDL_VIDEOEXPOSE => sub {
2049 CFPlus::UI::full_refresh; 2150 CFPlus::UI::full_refresh;
2050 }, 2151 },
2051 CFPlus::SDL_ACTIVEEVENT => sub { 2152 CFPlus::SDL_ACTIVEEVENT => sub {
2052# not useful, as APPACTIVE include sonly iconified state, not unmapped 2153# not useful, as APPACTIVE include sonly iconified state, not unmapped
2053# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2154# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2155# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2054# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2156# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2055# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2157# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2056# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2158# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2057 }, 2159 },
2058 CFPlus::SDL_KEYDOWN => sub { 2160 CFPlus::SDL_KEYDOWN => sub {
… …
2082 2184
2083$SIG{INT} = $SIG{TERM} = sub { exit }; 2185$SIG{INT} = $SIG{TERM} = sub { exit };
2084 2186
2085{ 2187{
2086 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2188 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2189 CFPlus::DB::Server::run;
2190
2087 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2088 2192
2089 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2090 sdl_mode => 0, 2194 sdl_mode => 0,
2091 width => 640,
2092 height => 480,
2093 fullscreen => 0, 2195 fullscreen => 0,
2094 fast => 0, 2196 fast => 0,
2095 map_scale => 1, 2197 map_scale => 1,
2096 fow_enable => 1, 2198 fow_enable => 1,
2097 fow_intensity => 0.45, 2199 fow_intensity => 0,
2098 fow_smooth => 0, 2200 map_smoothing => 1,
2099 gui_fontsize => 1, 2201 gui_fontsize => 1,
2100 log_fontsize => 0.7, 2202 log_fontsize => 0.7,
2101 gauge_fontsize => 1, 2203 gauge_fontsize => 1,
2102 gauge_size => 0.35, 2204 gauge_size => 0.35,
2103 stat_fontsize => 0.7, 2205 stat_fontsize => 0.7,
2104 mapsize => 100, 2206 mapsize => 100,
2105 say_command => 'chat',
2106 audio_enable => 1, 2207 audio_enable => 1,
2208 effects_enable => 1,
2209 effects_volume => 1,
2107 bgm_enable => 1, 2210 bgm_enable => 1,
2108 bgm_volume => 0.25, 2211 bgm_volume => 0.5,
2109 face_prefetch => 0,
2110 output_sync => 1, 2212 output_sync => 1,
2111 output_count => 1, 2213 output_count => 1,
2112 output_rate => "", 2214 output_rate => "",
2113 pickup => 0, 2215 pickup => 0,
2114 inv_sort => "mtime", 2216 inv_sort => "mtime",
2115 default => "profile", # default profile 2217 default => "profile", # default profile
2116 show_tips => 1, 2218 show_tips => 1,
2219 logview_max_par => 1000,
2117 ); 2220 );
2118 2221
2119 while (my ($k, $v) = each %DEF_CFG) { 2222 while (my ($k, $v) = each %DEF_CFG) {
2120 $CFG->{$k} = $v unless exists $CFG->{$k}; 2223 $CFG->{$k} = $v unless exists $CFG->{$k};
2121 } 2224 }
… …
2135 } 2238 }
2136 } 2239 }
2137 2240
2138 sdl_init; 2241 sdl_init;
2139 2242
2140 @SDL_MODES = reverse 2243 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2141 grep $_->[0] >= 640 && $_->[1] >= 480, 2244 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2142 CFPlus::SDL_ListModes;
2143
2144 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2245 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2246
2247 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2145 2248
2146 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2249 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2147 2250
2148 { 2251 {
2149 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2252 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2190 2293
2191Event::loop; 2294Event::loop;
2192#CFPlus::SDL_Quit; 2295#CFPlus::SDL_Quit;
2193#CFPlus::_exit 0; 2296#CFPlus::_exit 0;
2194 2297
2298END {
2299 video_shutdown;
2300 audio_shutdown;
2195END { CFPlus::SDL_Quit } 2301 CFPlus::SDL_Quit;
2302 CFPlus::DB::Server::stop;
2303}
2196 2304
2197=head1 NAME 2305=head1 NAME
2198 2306
2199cfplus - A Crossfire+ and Crossfire game client 2307cfplus - A Crossfire TRT and Crossfire game client
2200 2308
2201=head1 SYNOPSIS 2309=head1 SYNOPSIS
2202 2310
2203Just run it - no commandline arguments are supported. 2311Just run it - no commandline arguments are supported.
2204 2312
2205=head1 USAGE 2313=head1 USAGE
2206 2314
2207cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2315cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2208fullscreen and interactively. 2316be used in fullscreen mode and interactively.
2209 2317
2210=head1 DEBUGGING 2318=head1 DEBUGGING
2211 2319
2212 2320
2213CFPLUS_DEBUG - environment variable 2321CFPLUS_DEBUG - environment variable

Diff Legend

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