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.141 by elmex, Sat Dec 16 17:33:26 2006 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
… …
465sub graphics_setup { 740sub graphics_setup {
466 my $vbox = new CFPlus::UI::VBox; 741 my $vbox = new CFPlus::UI::VBox;
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
745 my $row = 0;
746
747 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
748 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
749 can_events => 1,
750 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
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
470 $table->add (0, 0, 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");
471 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 757 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
472 758
759 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
473 $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],
474 $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);
475 765
476 $mode_slider->connect (changed => sub { 766 $mode_slider->connect (changed => sub {
477 my ($self, $value) = @_; 767 my ($self, $value) = @_;
478 768
479 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 769 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
480 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 770 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
481 }); 771 });
482 $mode_slider->emit (changed => $mode_slider->{range}[0]); 772 $mode_slider->emit (changed => $mode_slider->{range}[0]);
483 773
484 my $row = 1;
485
486 $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");
487 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 775 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
488 state => $CFG->{fullscreen}, 776 state => $CFG->{fullscreen},
489 tooltip => "Bring the client into fullscreen mode.", 777 tooltip => "Bring the client into fullscreen mode.",
490 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
491 ); 779 );
492 780
493 $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");
494 $table->add (1, $row++, new CFPlus::UI::CheckBox 782 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
495 state => $CFG->{fast}, 783 state => $CFG->{fast},
496 tooltip => "Lower the visual quality considerably to speed up rendering.", 784 tooltip => "Lower the visual quality considerably to speed up rendering.",
497 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 785 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
498 ); 786 );
499 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
500 $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");
501 $table->add (1, $row++, new CFPlus::UI::Slider 806 $table->add_at (1, $row++, new CFPlus::UI::Slider
502 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 807 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
503 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 808 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
504 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 }
505 ); 810 );
506 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
507 $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");
508 $table->add (1, $row++, new CFPlus::UI::CheckBox 822 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
509 state => $CFG->{fow_enable}, 823 state => $CFG->{fow_enable},
510 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.",
511 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
512 ); 826 );
513 827
514 $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");
515 $table->add (1, $row++, new CFPlus::UI::Slider 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
516 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 830 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
517 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.",
518 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 832 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
519 ); 833 );
520 834
521 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
522 $table->add (1, $row++, new CFPlus::UI::CheckBox
523 state => $CFG->{fow_smooth},
524 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
525 on_changed => sub {
526 my ($self, $value) = @_;
527 $CFG->{fow_smooth} = $value;
528 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
529 0
530 }
531 );
532
533 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
534 $table->add (1, $row++, new CFPlus::UI::Slider
535 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.",
537 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538 );
539
540 $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");
541 $table->add (1, $row++, new CFPlus::UI::Slider 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 837 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
543 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.",
544 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 839 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
545 ); 840 );
546 841
547 $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");
548 $table->add (1, $row++, new CFPlus::UI::Slider 843 $table->add_at (1, $row++, new CFPlus::UI::Slider
549 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 844 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
550 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.",
551 on_changed => sub { 846 on_changed => sub {
552 $CFG->{gauge_fontsize} = $_[1]; 847 $CFG->{gauge_fontsize} = $_[1];
553 &set_gauge_window_fontsize; 848 &set_gauge_window_fontsize;
554 0 849 0
555 } 850 }
556 ); 851 );
557 852
558 $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");
559 $table->add (1, $row++, new CFPlus::UI::Slider 854 $table->add_at (1, $row++, new CFPlus::UI::Slider
560 range => [$CFG->{gauge_size}, 0.2, 0.8], 855 range => [$CFG->{gauge_size}, 0.2, 0.8],
561 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.",
562 on_changed => sub { 857 on_changed => sub {
563 $CFG->{gauge_size} = $_[1]; 858 $CFG->{gauge_size} = $_[1];
564 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 859 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
565 0 860 0
566 } 861 }
567 ); 862 );
568 863
569 $table->add (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings",
572 on_activate => sub {
573 video_shutdown ();
574 video_init ();
575 0
576 }
577 );
578
579 $vbox 864 $vbox
580} 865}
581 866
582sub audio_setup { 867sub audio_setup {
583 my $vbox = new CFPlus::UI::VBox; 868 my $vbox = new CFPlus::UI::VBox;
584 869
585 $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]);
586 871
587 my $row = 0; 872 my $row = 0;
588 873
589 $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");
590 $table->add (1, $row++, new CFPlus::UI::CheckBox 875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{audio_enable}, 876 state => $CFG->{audio_enable},
592 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.",
593 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 878 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
594 ); 879 );
595# $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");
596# $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 {
597# $CFG->{effects_volume} = $_[1]; 882# $CFG->{effects_volume} = $_[1];
598# }); 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
599 $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");
600 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
601 $hbox->add (new CFPlus::UI::CheckBox 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
602 expand => 1, state => $CFG->{bgm_enable}, 904 expand => 1, state => $CFG->{bgm_enable},
603 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.",
604 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 }
605 ); 911 );
606 $hbox->add (new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
607 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
608 tooltip => "The volume of the background music. Changes are instant.", 914 tooltip => "The volume of the background music. Changes are instant.",
609 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 }
610 ); 916 );
611 917
612 $table->add (1, $row++, new CFPlus::UI::Button 918 $table->add_at (1, $row++, new CFPlus::UI::Button
613 expand => 1, align => 0, text => "Apply", 919 c_colspan => 2, expand => 1, align => 0, text => "Apply",
614 tooltip => "Apply the audio settings", 920 tooltip => "Apply the audio settings",
615 on_activate => sub { 921 on_activate => sub {
616 audio_shutdown (); 922 audio_shutdown ();
617 audio_init (); 923 audio_init ();
618 0 924 0
… …
676} 982}
677 983
678sub debug_setup { 984sub debug_setup {
679 my $table = new CFPlus::UI::Table; 985 my $table = new CFPlus::UI::Table;
680 986
681 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 987 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
682 $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 });
683 $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");
684 $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 });
685 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 991 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
686 $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 });
687 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 993 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
688 $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 });
689 $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() } );
690 996
691 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
692
693 for my $x (0..2) {
694 for my $y (0 .. 2) {
695 $table->add ($x + 3, $y,
696 new CFPlus::UI::Entry
697 text => $default_smooth[$x * 3 + $y],
698 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
699 );
700 }
701 }
702
703 $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 });
704 1031
705 $table 1032 $table
706} 1033}
707 1034
708sub stats_window { 1035sub stats_window {
… …
756 [2, 4, st_spd => "Spd", 10.54], 1083 [2, 4, st_spd => "Spd", 10.54],
757 [2, 5, st_wspd => "WSp", 10.54], 1084 [2, 5, st_wspd => "WSp", 10.54],
758 ) { 1085 ) {
759 my ($col, $row, $id, $label, $template) = @$_; 1086 my ($col, $row, $id, $label, $template) = @$_;
760 1087
761 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1088 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
762 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1089 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
763 align => +1, template => $template, tooltip => "#stat_$label"); 1090 align => +1, template => $template, tooltip => "#stat_$label");
764 $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
765 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,
766 align => -1, text => $label, tooltip => "#stat_$label"); 1093 align => -1, text => $label, tooltip => "#stat_$label");
767 } 1094 }
768 1095
769 $vb->add (new CFPlus::UI::FancyFrame 1096 $vb->add (new CFPlus::UI::FancyFrame
… …
810 cold => ["Cold", 1137 cold => ["Cold",
811 "<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, ...)"],
812 ghit => ["Ghost hit", 1139 ghit => ["Ghost hit",
813 "<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)"],
814 ); 1141 );
1142
815 for (qw/slow holyw conf fire depl magic 1143 for (qw/slow holyw conf fire depl magic
816 drain acid pois para deat phys 1144 drain acid pois para deat phys
817 blind fear tund elec cold ghit/) 1145 blind fear tund elec cold ghit/)
818 { 1146 {
819 $tbl2->add ($col, $row, 1147 $tbl2->add_at ($col, $row,
820 $STATWIDS->{"res_$_"} = 1148 $STATWIDS->{"res_$_"} =
821 new CFPlus::UI::Label 1149 new CFPlus::UI::Label
822 font => $FONT_FIXED, 1150 font => $FONT_FIXED,
823 template => "-100%", 1151 template => "-100%",
824 align => +1, 1152 align => +1,
825 valign => 0, 1153 valign => 0,
826 can_events => 1, 1154 can_events => 1,
827 can_hover => 1, 1155 can_hover => 1,
828 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
829 ); 1157 );
830 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1158 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
831 font => $FONT_FIXED, 1159 font => $FONT_FIXED,
832 can_hover => 1, 1160 can_hover => 1,
833 can_events => 1, 1161 can_events => 1,
834 path => "ui/resist/resist_$_.png", 1162 path => "ui/resist/resist_$_.png",
835 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
836 ); 1164 );
837 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1165 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
838 text => $resist_names{$_}->[0], 1166 text => $resist_names{$_}->[0],
839 font => $FONT_FIXED, 1167 font => $FONT_FIXED,
840 can_hover => 1, 1168 can_hover => 1,
841 can_events => 1, 1169 can_events => 1,
842 tooltip => $resist_names{$_}->[1], 1170 tooltip => $resist_names{$_}->[1],
… …
875 return if $METASERVER_ATIME > time; 1203 return if $METASERVER_ATIME > time;
876 $METASERVER_ATIME = time + 60; 1204 $METASERVER_ATIME = time + 60;
877 1205
878 my $table = $METASERVER->{table}; 1206 my $table = $METASERVER->{table};
879 $table->clear; 1207 $table->clear;
880 $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...");
881 1209
882 my $ok = 0; 1210 my $ok = 0;
883 1211
884 CFPlus::background { 1212 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent; 1213 my $ua = CFPlus::lwp_useragent;
… …
896 "The time this server has been running without being restarted.", 1224 "The time this server has been running without being restarted.",
897 "The server software version - a '+' indicates a Crossfire+ server.", 1225 "The server software version - a '+' indicates a Crossfire+ server.",
898 "Short information about this server provided by its admins.", 1226 "Short information about this server provided by its admins.",
899 ); 1227 );
900 my @col = qw(#Users Host Uptime Version Description); 1228 my @col = qw(#Users Host Uptime Version Description);
901 $table->add ($_, 0, new CFPlus::UI::Label 1229 $table->add_at ($_, 0, new CFPlus::UI::Label
902 can_hover => 1, can_events => 1, 1230 can_hover => 1, can_events => 1,
903 align => 0, fg => [1, 1, 0], 1231 align => 0, fg => [1, 1, 0],
904 text => $col[$_], tooltip => $tip[$_]) 1232 text => $col[$_], tooltip => $tip[$_])
905 for 0 .. $#col; 1233 for 0 .. $#col;
906 1234
907 my @align = qw(1 0 1 1 -1); 1235 my @align = qw(1 0 1 1 -1);
908 1236
909 my $y = 0; 1237 my $y = 0;
910 for my $m (
911 sort {
912 $b->{version} <=> $a->{version}
913 or $b->{users} <=> $a->{users}
914 }
915 @{ $msg->{servers} } 1238 for my $m (@{ $msg->{servers} }) {
916 ) {
917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 1239 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
918 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 1240 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
919 1241
920 for ($desc) { 1242 for ($desc) {
921 s/<br>/\n/gi; 1243 s/<br>/\n/gi;
922 s/<li>/\n· /gi; 1244 s/<li>/\n· /gi;
923 s/<.*?>//sgi; 1245 s/<.*?>//sgi;
… …
934 1256
935 $m = [$users, $host, $uptime, $version, $desc]; 1257 $m = [$users, $host, $uptime, $version, $desc];
936 1258
937 $y++; 1259 $y++;
938 1260
939 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1261 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
940 (new CFPlus::UI::Button 1262 (new CFPlus::UI::Button
941 text => "Use", 1263 text => "Use",
942 tooltip => "Put this server into the <b>Host:Port</b> field", 1264 tooltip => "Put this server into the <b>Host:Port</b> field",
943 on_activate => sub { 1265 on_activate => sub {
944 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1266 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
947 }, 1269 },
948 ), 1270 ),
949 (new CFPlus::UI::Empty expand => 1), 1271 (new CFPlus::UI::Empty expand => 1),
950 ]); 1272 ]);
951 1273
952 $table->add ($_, $y, new CFPlus::UI::Label 1274 $table->add_at ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4, 1275 max_w => $::WIDTH * 0.4,
954 ellipsise => 0, 1276 ellipsise => 0,
955 align => $align[$_], 1277 align => $align[$_],
956 text => $m->[$_], 1278 text => $m->[$_],
957 tooltip => $tip[$_], 1279 tooltip => $tip[$_],
958 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1280 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
959 can_hover => 1, 1281 can_hover => 1,
960 can_events => 1, 1282 can_events => 1,
961 fontsize => 0.8) 1283 fontsize => 0.8)
962 for 0 .. $#$m; 1284 for 0 .. $#$m;
963 } 1285 }
… …
998 1320
999 $vbox->add (new CFPlus::UI::FancyFrame 1321 $vbox->add (new CFPlus::UI::FancyFrame
1000 label => "Connection Settings", 1322 label => "Connection Settings",
1001 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]),
1002 ); 1324 );
1003 $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");
1004 1326
1005 { 1327 {
1006 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1328 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1007 1329
1008 $vbox->add ( 1330 $vbox->add (
1009 $HOST_ENTRY = new CFPlus::UI::Entry 1331 $HOST_ENTRY = new CFPlus::UI::Entry
1010 expand => 1, 1332 expand => 1,
1011 text => $CFG->{profile}{default}{host}, 1333 text => $CFG->{profile}{default}{host},
1012 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",
1013 on_changed => sub { 1335 on_changed => sub {
1014 my ($self, $value) = @_; 1336 my ($self, $value) = @_;
1015 $CFG->{profile}{default}{host} = $value; 1337 $CFG->{profile}{default}{host} = $value;
1016 0 1338 1
1017 } 1339 }
1018 ); 1340 );
1019 1341
1020 $vbox->add (new CFPlus::UI::Button 1342 $vbox->add (new CFPlus::UI::Button
1021 expand => 1, 1343 expand => 1,
1022 text => "Server List", 1344 text => "Server List",
1023 other => $METASERVER, 1345 other => $METASERVER,
1024 tooltip => "Show a list of available crossfire servers", 1346 tooltip => "Show a list of available crossfire servers",
1025 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1347 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1026 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1348 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1027 ); 1349 );
1028 } 1350 }
1029 1351
1030 $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");
1031 $table->add (1, 4, new CFPlus::UI::Entry 1353 $table->add_at (1, 4, new CFPlus::UI::Entry
1032 text => $CFG->{profile}{default}{user}, 1354 text => $CFG->{profile}{default}{user},
1033 tooltip => "The name of your character on the server", 1355 tooltip => "The name of your character on the server",
1034 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1356 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1035 ); 1357 );
1036 1358
1037 $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");
1038 $table->add (1, 5, new CFPlus::UI::Entry 1360 $table->add_at (1, 5, new CFPlus::UI::Entry
1039 text => $CFG->{profile}{default}{password}, 1361 text => $CFG->{profile}{default}{password},
1040 hidden => 1, 1362 hidden => 1,
1041 tooltip => "The password for your character", 1363 tooltip => "The password for your character",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1043 ); 1365 );
1044 1366
1045 $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");
1046 $table->add (1, 7, new CFPlus::UI::Slider 1368 $table->add_at (1, 7, new CFPlus::UI::Slider
1047 force_w => 100, 1369 force_w => 100,
1048 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1370 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1049 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. "
1050 . "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, "
1051 . "but you also increase bandwidth requirements and latency. " 1373 . "but you also increase bandwidth requirements and latency. "
1052 . "This option is only used once at log-in.", 1374 . "This option is only used once at log-in.",
1053 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 },
1054 ); 1376 );
1055 1377
1056 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1378 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1057 $table->add (1, 8, new CFPlus::UI::CheckBox 1379 $table->add_at (1, 8, new CFPlus::UI::Entry
1058 state => $CFG->{face_prefetch}, 1380 text => $CFG->{output_rate},
1059 tooltip => "<b>Background Image Prefetch</b>\n\n" 1381 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1060 . "If enabled, the client automatically pre-fetches images from the server. " 1382 . "when sending data. When 0 or unset, the server "
1061 . "This might increase or create lag, but increases the chances " 1383 . "default will be used, which is usually around 100kb/s. Most servers will "
1062 . "of faces being ready for display when you encounter them. " 1384 . "dynamically find an optimal rate, so adjust this only when necessary.",
1063 . "It also uses up server bandwidth on every connect, "
1064 . "so only set it if you really need to prefetch images. "
1065 . "This option can be set and unset any time.",
1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1067 ); 1386 );
1068 1387
1069 $table->add (0, 9, 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");
1070 $table->add (1, 9, new CFPlus::UI::Entry 1389 $table->add_at (1, 9, new CFPlus::UI::Entry
1071 text => $CFG->{output_count}, 1390 text => $CFG->{output_count},
1072 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.",
1073 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1074 ); 1393 );
1075 1394
1076 $table->add (0, 10, 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");
1077 $table->add (1, 10, new CFPlus::UI::Entry 1396 $table->add_at (1, 10, new CFPlus::UI::Entry
1078 text => $CFG->{output_sync}, 1397 text => $CFG->{output_sync},
1079 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.",
1080 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1081 ); 1400 );
1082 1401
1083 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1084 expand => 1, 1403 expand => 1,
1085 align => 0, 1404 align => 0,
1086 text => "Login", 1405 text => "Login",
1087 on_activate => sub { 1406 on_activate => sub {
1088 $CONN ? stop_game 1407 $CONN ? stop_game
1089 : start_game; 1408 : start_game;
1090 0 1409 1
1091 }, 1410 },
1092 ); 1411 );
1093 1412
1094 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1413 $vbox->add (new CFPlus::UI::FancyFrame
1095 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1414 label => "Server Info",
1096 text => $CFG->{say_command}, 1415 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1097 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. "
1098 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1099 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1100 on_changed => sub {
1101 my ($self, $value) = @_;
1102 $CFG->{say_command} = $value;
1103 0
1104 }
1105 ); 1416 );
1106 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
1107 $table->add (0, 13, 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");
1108 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1427 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1109 state => $CFG->{show_tips}, 1428 state => $CFG->{show_tips},
1110 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?",
1111 on_changed => sub { 1430 on_changed => sub {
1112 my ($self, $value) = @_; 1431 my ($self, $value) = @_;
1113 $CFG->{show_tips} = $value; 1432 $CFG->{show_tips} = $value;
1114 0 1433 0
1115 } 1434 }
1116 ); 1435 );
1117 1436
1118 $vbox->add (new CFPlus::UI::FancyFrame 1437 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1119 label => "Server Info", 1438 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1120 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1439 text => $CFG->{logview_max_par},
1121 ); 1440 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1122 1441 . "sends more messages than this number, older messages get removed to save memory and "
1123 $vbox 1442 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1124}
1125
1126sub message_window {
1127 my $window = new CFPlus::UI::Toplevel
1128 name => "message_window",
1129 title => "Messages",
1130 border_bg => [1, 1, 1, 1],
1131 x => "max",
1132 y => 0,
1133 force_w => $::WIDTH * 0.4,
1134 force_h => $::HEIGHT * 0.5,
1135 child => (my $vbox = new CFPlus::UI::VBox),
1136 has_close_button => 1;
1137
1138 $vbox->add ($LOGVIEW);
1139
1140 $vbox->add (my $input = new CFPlus::UI::Entry
1141 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1142 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1143 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1144 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1145 on_focus_in => sub { 1443 on_changed => sub {
1146 my ($input, $prev_focus) = @_; 1444 my ($self, $value) = @_;
1147 1445 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1148 delete $input->{refocus_map};
1149
1150 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1151 $input->{refocus_map} = 1;
1152 }
1153 delete $input->{auto_activated};
1154
1155 0 1446 0
1156 }, 1447 },
1157 on_activate => sub {
1158 my ($input, $text) = @_;
1159 $input->set_text ('');
1160
1161 if ($text =~ /^\/(.*)/) {
1162 $::CONN->user_send ($1);
1163 } else {
1164 my $say_cmd = $::CFG->{say_command} || 'say';
1165 $::CONN->user_send ("$say_cmd $text");
1166 }
1167 if ($input->{refocus_map}) {
1168 delete $input->{refocus_map};
1169 $MAPWIDGET->focus_in
1170 }
1171
1172 0
1173 },
1174 on_escape => sub {
1175 $MAPWIDGET->grab_focus;
1176
1177 0
1178 },
1179 );
1180
1181 $CONSOLE = {
1182 window => $window,
1183 input => $input,
1184 }; 1448 );
1185 1449
1186 $window 1450 $table
1187} 1451}
1188 1452
1189sub autopickup_setup { 1453sub autopickup_setup {
1454 my $r = new CFPlus::UI::ScrolledWindow (
1455 expand => 1,
1456 scroll_y => 1
1457 );
1190 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 );
1191 1462
1192 for ( 1463 for (
1193 ["General", 0, 0, 1464 ["General", 0, 0,
1194 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1465 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1195 ["Inhibit autopickup" => PICKUP_INHIBIT], 1466 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1230 ], 1501 ],
1231 ["Weight/Value ratio", 2, 17] 1502 ["Weight/Value ratio", 2, 17]
1232 ) 1503 )
1233 { 1504 {
1234 my ($title, $x, $y, @bits) = @$_; 1505 my ($title, $x, $y, @bits) = @$_;
1235 $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]);
1236 1507
1237 for (@bits) { 1508 for (@bits) {
1238 ++$y; 1509 ++$y;
1239 1510
1240 my $mask = $_->[1]; 1511 my $mask = $_->[1];
1241 $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);
1242 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1513 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1243 state => $::CFG->{pickup} & $mask, 1514 state => $::CFG->{pickup} & $mask,
1244 on_changed => sub { 1515 on_changed => sub {
1245 my ($box, $value) = @_; 1516 my ($box, $value) = @_;
1246 1517
1247 if ($value) { 1518 if ($value) {
… …
1258 1529
1259 ${$_->[2]} = $checkbox if $_->[2]; 1530 ${$_->[2]} = $checkbox if $_->[2];
1260 } 1531 }
1261 } 1532 }
1262 1533
1263 $table->add (2, 18, new CFPlus::UI::ValSlider 1534 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1535 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99", 1536 template => ">= 99",
1266 to_value => sub { ">= " . 5 * $_[0] }, 1537 to_value => sub { ">= " . 5 * $_[0] },
1267 on_changed => sub { 1538 on_changed => sub {
1268 my ($slider, $value) = @_; 1539 my ($slider, $value) = @_;
… …
1271 $::CFG->{pickup} |= int $value 1542 $::CFG->{pickup} |= int $value
1272 if $value; 1543 if $value;
1273 1; 1544 1;
1274 }); 1545 });
1275 1546
1276 $table->add (3, 18, new CFPlus::UI::Button 1547 $table->add_at (3, 18, new CFPlus::UI::Button
1277 text => "set", 1548 text => "set",
1278 on_activate => sub { 1549 on_activate => sub {
1279 $::CONN->send_command ("pickup $::CFG->{pickup}") 1550 $::CONN->send_command ("pickup $::CFG->{pickup}")
1280 if defined $::CONN; 1551 if defined $::CONN;
1281 0 1552 0
1282 }); 1553 });
1283 1554
1284 $table 1555 $r
1285} 1556}
1286 1557
1287my %SORT_ORDER = ( 1558my %SORT_ORDER = (
1288 type => undef, 1559 type => undef,
1289 mtime => sub { 1560 mtime => sub {
… …
1344 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1615 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1345 1616
1346 $hb 1617 $hb
1347} 1618}
1348 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
1349sub toggle_player_page { 1660sub toggle_player_page {
1350 my ($widget) = @_; 1661 my ($widget) = @_;
1351 1662
1352 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1663 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1353 $PL_WINDOW->hide; 1664 $PL_WINDOW->hide;
… …
1368 has_close_button => 1 1679 has_close_button => 1
1369 ; 1680 ;
1370 1681
1371 my $ntb = 1682 my $ntb =
1372 $PL_NOTEBOOK = 1683 $PL_NOTEBOOK =
1373 new CFPlus::UI::Notebook expand => 1, debug => 1; 1684 new CFPlus::UI::Notebook expand => 1;
1374 1685
1375 $ntb->add ( 1686 $ntb->add_tab (
1376 "Statistics (F2)" => $STATS_PAGE = stats_window, 1687 "Statistics (F2)" => $STATS_PAGE = stats_window,
1377 "Shows statistics, where all your Stats and Resistances are shown." 1688 "Shows statistics, where all your Stats and Resistances are shown."
1378 ); 1689 );
1379 $ntb->add ( 1690 $ntb->add_tab (
1380 "Skills (F3)" => $SKILL_PAGE = skill_window, 1691 "Skills (F3)" => $SKILL_PAGE = skill_window,
1381 "Shows all your Skills." 1692 "Shows all your Skills."
1382 ); 1693 );
1383 1694
1384 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);
1385 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1696 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1386 $ntb->add ( 1697 $ntb->add_tab (
1387 "Spellbook (F4)" => $spellsw, 1698 "Spellbook (F4)" => $spellsw,
1388 "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."
1389 ); 1700 );
1390 $ntb->add ( 1701 $ntb->add_tab (
1391 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1392 "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 :). "
1393 . "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."
1394 ); 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.");
1395 1711
1396 $ntb->set_current_page ($INVENTORY_PAGE); 1712 $ntb->set_current_page ($INVENTORY_PAGE);
1397 1713
1398 $plwin->add ($ntb); 1714 $plwin->add ($ntb);
1399 $plwin 1715 $plwin
… …
1565 1881
1566sub show_tip_of_the_day { 1882sub show_tip_of_the_day {
1567 # find all tips 1883 # find all tips
1568 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1884 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1569 1885
1570 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1886 CFPlus::DB::get state => "tip_of_the_day", sub {
1887 my ($todindex) = @_;
1571 $todindex = 0 if $todindex >= @tod; 1888 $todindex = 0 if $todindex >= @tod;
1572 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1889 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1573 1890
1574 # create dialog 1891 # create dialog
1575 my $dialog; 1892 my $dialog;
1576 1893
1577 my $close = sub { 1894 my $close = sub {
1578 $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;
1579 }; 1933 };
1580
1581 $dialog = new CFPlus::UI::Toplevel
1582 x => "center",
1583 y => "center",
1584 z => 3,
1585 name => 'tip_of_the_day',
1586 force_w => int $WIDTH * 4/9,
1587 force_h => int $WIDTH * 2/9,
1588 title => "Tip of the day #" . (1 + $todindex),
1589 child => my $vbox = new CFPlus::UI::VBox,
1590 has_close_button => 1,
1591 on_delete => $close,
1592 ;
1593
1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1595 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1596 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1597
1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1599
1600 $table->add (0, 0, new CFPlus::UI::Button
1601 text => "Close",
1602 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>.",
1603 on_activate => $close,
1604 );
1605
1606 $table->add (2, 0, new CFPlus::UI::Button
1607 text => "Next",
1608 tooltip => "Show the next <b>Tip of the day</b>.",
1609 on_activate => sub {
1610 $close->();
1611 &show_tip_of_the_day;
1612 },
1613 );
1614
1615 $dialog->show;
1616} 1934}
1617 1935
1618sub sdl_init { 1936sub sdl_init {
1619 CFPlus::SDL_Init 1937 CFPlus::SDL_Init
1620 and die "SDL::Init failed!\n"; 1938 and die "SDL::Init failed!\n";
1621} 1939}
1622 1940
1623sub video_init { 1941sub video_init {
1624 sdl_init;
1625
1626 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1627 1943
1628 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1944 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1629 1945
1630 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1946 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1631 $FULLSCREEN = $CFG->{fullscreen}; 1947 $FULLSCREEN = $CFG->{fullscreen};
1632 $FAST = $CFG->{fast}; 1948 $FAST = $CFG->{fast};
1633 1949
1634 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1950 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1635 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1951 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1636 1952
1637 $SDL_ACTIVE = 1; 1953 $SDL_ACTIVE = 1;
1638 $LAST_REFRESH = time - 0.01; 1954 $LAST_REFRESH = time - 0.01;
1639 1955
… …
1681 1997
1682 $MAPWIDGET = new CFPlus::MapWidget; 1998 $MAPWIDGET = new CFPlus::MapWidget;
1683 $MAPWIDGET->connect (activate_console => sub { 1999 $MAPWIDGET->connect (activate_console => sub {
1684 my ($mapwidget, $preset) = @_; 2000 my ($mapwidget, $preset) = @_;
1685 2001
1686 if ($CONSOLE) { 2002 $MESSAGE_WINDOW->activate_console ($preset)
1687 $CONSOLE->{input}->{auto_activated} = 1; 2003 if $MESSAGE_WINDOW;
1688 $CONSOLE->{input}->grab_focus;
1689
1690 if ($preset && $CONSOLE->{input}->get_text eq '') {
1691 $CONSOLE->{input}->set_text ($preset);
1692 }
1693 }
1694 }); 2004 });
1695 $MAPWIDGET->show; 2005 $MAPWIDGET->show;
1696 $MAPWIDGET->grab_focus; 2006 $MAPWIDGET->grab_focus;
1697
1698 $LOGVIEW = new CFPlus::UI::TextScroller
1699 expand => 1,
1700 font => $FONT_FIXED,
1701 fontsize => $::CFG->{log_fontsize},
1702 indent => -4,
1703 can_hover => 1,
1704 can_events => 1,
1705 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1706 ;
1707 2007
1708 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2008 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1709 title => "Setup", 2009 title => "Setup",
1710 name => "setup_dialog", 2010 name => "setup_dialog",
1711 x => 'center', 2011 x => 'center',
… …
1715 force_h => $::HEIGHT * 0.6, 2015 force_h => $::HEIGHT * 0.6,
1716 has_close_button => 1, 2016 has_close_button => 1,
1717 ; 2017 ;
1718 2018
1719 $METASERVER = metaserver_dialog; 2019 $METASERVER = metaserver_dialog;
2020 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1720 2021
1721 $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,
1722 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2023 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1723 2024
1724 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2025 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1725 "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.");
1726 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2027 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1727 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2028 "Configure various client-specific settings.");
1728 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2029 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1729 "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.");
1730 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2031 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1731 "Configure the use of audio, sound effects and background music."); 2032 "Configure the use of audio, sound effects and background music.");
1732 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2033 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1733 "Lets you define, edit and delete key bindings." 2034 "Lets you define, edit and delete key bindings."
1734 . "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 "
1735 . "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 "
1736 . "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. "
1737 . "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 "
1738 . "binding editor closes"); 2039 . "binding editor closes");
1739 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2040 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1740 "Some debuggin' options. Do not ask."); 2041 "Some debuggin' options. Do not ask.");
1741 2042
1742 $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
1743 2044
1744 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2045 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1745 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.");
1746 2047
1747 $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,
1748 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.");
1749 2050
1750 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
1751 2052
1752 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2053 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1785 } 2086 }
1786 2087
1787 $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]);
1788} 2089}
1789 2090
1790sub setup_build_button {
1791 my ($enabled) = @_;
1792 if ($enabled) {
1793 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1794 $BUILD_BUTTON ||= new CFPlus::UI::Button
1795 text => "Build",
1796 tooltip => "Opens the ingame builder",
1797 on_activate => sub {
1798 if ($CONN) {
1799 $CONN->send_ext_req (builder_player_items => sub {
1800 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1801 });
1802 }
1803 0
1804 };
1805 $BUTTONBAR->add ($BUILD_BUTTON);
1806 } else {
1807 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1808 }
1809}
1810
1811sub open_ingame_editor {
1812 my ($msg) = @_;
1813
1814 my $win = new CFPlus::UI::Toplevel
1815 x => 0,
1816 y => 'center',
1817 z => 4,
1818 name => 'builder_window',
1819 force_w => int $WIDTH * 1/4,
1820 force_h => int $HEIGHT * 3/4,
1821 title => "In game builder",
1822 has_close_button => 1;
1823
1824 my $r = new CFPlus::UI::ScrolledWindow (
1825 expand => 1,
1826 scroll_y => 1
1827 );
1828 $r->add (my $vb = new CFPlus::UI::VBox);
1829 $win->add ($r);
1830
1831
1832 $vb->add (
1833 new CFPlus::UI::Button
1834 text => "Disable build mode",
1835 on_activate => sub { $::IN_BUILD_MODE = undef }
1836 );
1837 $vb->add (
1838 new CFPlus::UI::Button
1839 text => "ERASE",
1840 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1841 );
1842
1843 for my $itemarchname (
1844 sort {
1845 $msg->{items}->{$a}->{build_arch_name}
1846 cmp $msg->{items}->{$b}->{build_arch_name}
1847 } keys %{$msg->{items}}
1848 ) {
1849 my $info = $msg->{items}->{$itemarchname};
1850 $vb->add (
1851 new CFPlus::UI::Button text => $info->{build_arch_name},
1852 on_activate => sub {
1853 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1854
1855 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1856 build_mode_query_arch_info ();
1857 }
1858 }
1859 );
1860 }
1861
1862 $win->show;
1863}
1864
1865sub build_mode_query_arch_info {
1866 my ($iteminfo) = $::IN_BUILD_MODE;
1867 my $itemarchname = $iteminfo->{item};
1868 my $info = $iteminfo->{info};
1869
1870 my $dialog = new CFPlus::UI::Toplevel
1871 x => "center",
1872 y => "center",
1873 z => 50,
1874 force_w => int $WIDTH * 1/2,
1875 title => "Enter information for placement of '$itemarchname'",
1876 has_close_button => 1;
1877
1878 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1879
1880 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1881 my $row = 0;
1882 if ($info->{has_name}) {
1883 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1884 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1885 }
1886 if ($info->{has_text}) {
1887 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1888 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1889 }
1890 if ($info->{has_connection}) {
1891 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1892 $table->add (1, $row++,
1893 new CFPlus::UI::Entry
1894 expand => 1,
1895 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1896 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1897 );
1898 }
1899
1900 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1901 $hb->add (new CFPlus::UI::Button
1902 text => "Close",
1903 expand => 1,
1904 on_activate => sub { $dialog->hide; 0 },
1905 );
1906 $dialog->show;
1907}
1908
1909sub video_shutdown { 2091sub video_shutdown {
1910 CFPlus::OpenGL::shutdown; 2092 CFPlus::OpenGL::shutdown;
1911 2093
1912 undef $SDL_ACTIVE; 2094 undef $SDL_ACTIVE;
1913} 2095}
1914 2096
1915my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1916my $bgmusic;#TODO#hack#d#
1917
1918sub audio_channel_finished {
1919 my ($channel) = @_;
1920
1921 #warn "channel $channel finished\n";#d#
1922}
1923
1924sub audio_music_finished {
1925 return unless $CFG->{bgm_enable};
1926
1927 # TODO: hack, do play loop and mood music
1928 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1929 $bgmusic->play (0);
1930
1931 push @bgmusic, shift @bgmusic;
1932}
1933
1934sub audio_init {
1935 if ($CFG->{audio_enable}) {
1936 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1937 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1938
1939 unless ($SDL_MIXER) {
1940 status "Unable to open sound device: there will be no sound";
1941 return;
1942 }
1943
1944 CFPlus::Mix_AllocateChannels 8;
1945 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1946
1947 audio_music_finished;
1948
1949 local $_;
1950 while (<$fh>) {
1951 next if /^\s*#/;
1952 next if /^\s*$/;
1953
1954 my ($file, $volume, $event) = split /\s+/, $_, 3;
1955
1956 push @SOUNDS, "$volume,$file";
1957
1958 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1959 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1960 $chunk->volume ($volume * 128 / 100);
1961 $chunk
1962 };
1963 }
1964 } else {
1965 status "unable to open sound config: $!";
1966 }
1967 }
1968}
1969
1970sub audio_shutdown {
1971 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1972 undef $SDL_MIXER;
1973 @SOUNDS = ();
1974 %AUDIO_CHUNKS = ();
1975}
1976
1977my %animate_object; 2097my %animate_object;
1978my $animate_timer; 2098my $animate_timer;
1979 2099
1980my $fps = 9; 2100my $fps = 9;
1981
1982my %demo;#d#
1983 2101
1984sub force_refresh { 2102sub force_refresh {
1985 $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;
1986 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1987 2105
1988 $CFPlus::UI::ROOT->draw; 2106 $CFPlus::UI::ROOT->draw;
1989 2107
1990 $WANT_REFRESH = 0; 2108 $WANT_REFRESH = 0;
1991 $CAN_REFRESH = 0; 2109 $CAN_REFRESH = 0;
1992 $LAST_REFRESH = $NOW; 2110 $LAST_REFRESH = $NOW;
1993 2111
1994 CFPlus::SDL_GL_SwapBuffers; 2112 CFPlus::SDL_GL_SwapBuffers;
1995} 2113}
1996 2114
1997my $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 {
1998 $NOW = time; 2116 $NOW = time;
1999 2117
2000 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2118 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2001 for CFPlus::SDL_PollEvent; 2119 for CFPlus::poll_events;
2002 2120
2003 if (%animate_object) { 2121 if (%animate_object) {
2004 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2122 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2005 $WANT_REFRESH++; 2123 ++$WANT_REFRESH;
2006 } 2124 }
2007 2125
2008 if ($WANT_REFRESH) { 2126 if ($WANT_REFRESH) {
2009 force_refresh; 2127 force_refresh;
2010 } else { 2128 } else {
… …
2020sub animation_stop { 2138sub animation_stop {
2021 my ($widget) = @_; 2139 my ($widget) = @_;
2022 delete $animate_object{$widget}; 2140 delete $animate_object{$widget};
2023} 2141}
2024 2142
2025# check once/second for faces that need to be prefetched
2026# this should, of course, only run on demand, but
2027# SDL forces worse things on us....
2028
2029Event->timer (after => 1, interval => 0.25, cb => sub {
2030 $CONN->face_prefetch
2031 if $CONN;
2032});
2033
2034%SDL_CB = ( 2143%SDL_CB = (
2035 CFPlus::SDL_QUIT => sub { 2144 CFPlus::SDL_QUIT => sub {
2036 Event::unloop -1; 2145 exit;
2037 }, 2146 },
2038 CFPlus::SDL_VIDEORESIZE => sub { 2147 CFPlus::SDL_VIDEORESIZE => sub {
2039 }, 2148 },
2040 CFPlus::SDL_VIDEOEXPOSE => sub { 2149 CFPlus::SDL_VIDEOEXPOSE => sub {
2041 CFPlus::UI::full_refresh; 2150 CFPlus::UI::full_refresh;
2042 }, 2151 },
2043 CFPlus::SDL_ACTIVEEVENT => sub { 2152 CFPlus::SDL_ACTIVEEVENT => sub {
2044# not useful, as APPACTIVE include sonly iconified state, not unmapped 2153# not useful, as APPACTIVE include sonly iconified state, not unmapped
2045# 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#
2046# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2156# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2047# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2157# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2048# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2158# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2049 }, 2159 },
2050 CFPlus::SDL_KEYDOWN => sub { 2160 CFPlus::SDL_KEYDOWN => sub {
… …
2074 2184
2075$SIG{INT} = $SIG{TERM} = sub { exit }; 2185$SIG{INT} = $SIG{TERM} = sub { exit };
2076 2186
2077{ 2187{
2078 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2188 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2189 CFPlus::DB::Server::run;
2190
2079 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2080 2192
2081 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2082 sdl_mode => 0, 2194 sdl_mode => 0,
2083 width => 640,
2084 height => 480,
2085 fullscreen => 0, 2195 fullscreen => 0,
2086 fast => 0, 2196 fast => 0,
2087 map_scale => 1, 2197 map_scale => 1,
2088 fow_enable => 1, 2198 fow_enable => 1,
2089 fow_intensity => 0.45, 2199 fow_intensity => 0,
2090 fow_smooth => 0, 2200 map_smoothing => 1,
2091 gui_fontsize => 1, 2201 gui_fontsize => 1,
2092 log_fontsize => 0.7, 2202 log_fontsize => 0.7,
2093 gauge_fontsize => 1, 2203 gauge_fontsize => 1,
2094 gauge_size => 0.35, 2204 gauge_size => 0.35,
2095 stat_fontsize => 0.7, 2205 stat_fontsize => 0.7,
2096 mapsize => 100, 2206 mapsize => 100,
2097 say_command => 'chat',
2098 audio_enable => 1, 2207 audio_enable => 1,
2208 effects_enable => 1,
2209 effects_volume => 1,
2099 bgm_enable => 1, 2210 bgm_enable => 1,
2100 bgm_volume => 0.25, 2211 bgm_volume => 0.5,
2101 face_prefetch => 0,
2102 output_sync => 1, 2212 output_sync => 1,
2103 output_count => 1, 2213 output_count => 1,
2214 output_rate => "",
2104 pickup => 0, 2215 pickup => 0,
2105 inv_sort => "mtime", 2216 inv_sort => "mtime",
2106 default => "profile", # default profile 2217 default => "profile", # default profile
2107 show_tips => 1, 2218 show_tips => 1,
2219 logview_max_par => 1000,
2108 ); 2220 );
2109 2221
2110 while (my ($k, $v) = each %DEF_CFG) { 2222 while (my ($k, $v) = each %DEF_CFG) {
2111 $CFG->{$k} = $v unless exists $CFG->{$k}; 2223 $CFG->{$k} = $v unless exists $CFG->{$k};
2112 } 2224 }
… …
2126 } 2238 }
2127 } 2239 }
2128 2240
2129 sdl_init; 2241 sdl_init;
2130 2242
2131 @SDL_MODES = reverse 2243 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2132 grep $_->[0] >= 640 && $_->[1] >= 480, 2244 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2133 CFPlus::SDL_ListModes;
2134
2135 @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;
2136 2248
2137 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2249 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2138 2250
2139 { 2251 {
2140 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2252 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2181 2293
2182Event::loop; 2294Event::loop;
2183#CFPlus::SDL_Quit; 2295#CFPlus::SDL_Quit;
2184#CFPlus::_exit 0; 2296#CFPlus::_exit 0;
2185 2297
2298END {
2299 video_shutdown;
2300 audio_shutdown;
2186END { CFPlus::SDL_Quit } 2301 CFPlus::SDL_Quit;
2302 CFPlus::DB::Server::stop;
2303}
2187 2304
2188=head1 NAME 2305=head1 NAME
2189 2306
2190cfplus - A Crossfire+ and Crossfire game client 2307cfplus - A Crossfire TRT and Crossfire game client
2191 2308
2192=head1 SYNOPSIS 2309=head1 SYNOPSIS
2193 2310
2194Just run it - no commandline arguments are supported. 2311Just run it - no commandline arguments are supported.
2195 2312
2196=head1 USAGE 2313=head1 USAGE
2197 2314
2198cfplus 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
2199fullscreen and interactively. 2316be used in fullscreen mode and interactively.
2200 2317
2201=head1 DEBUGGING 2318=head1 DEBUGGING
2202 2319
2203 2320
2204CFPLUS_DEBUG - environment variable 2321CFPLUS_DEBUG - environment variable

Diff Legend

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