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.207 by root, Thu Aug 9 11:02:08 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 $channel->set_position_r ($dx, $dy, 20);
232 $chunk->play ($channel);
233 }
234 } else {
235 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{jingle}) {
241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 }
245 } else {
246 # fetch from database
247 CFPlus::DB::get res_data => $meta->{name}, sub {
248 my $rwops = new CFPlus::RW $_[0];
249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
251 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
252 $AUDIO_CHUNK{$face} = $chunk;
253
254 audio_sound_push ($face);
255 };
256 }
257 }
258}
259
260sub audio_sound_play {
261 my ($face, $dx, $dy, $vol) = @_;
262
263 $SDL_MIXER
264 or return;
265 $CFG->{effects_enable}
266 or return;
267
268 my $queue = $AUDIO_PLAY{$face} ||= [];
269 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
270 audio_sound_push $face
271 unless @$queue > 1;
272}
273
274sub audio_music_set_meta {
275 my ($meta) = @_;
276
277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
290 CFPlus::MixMusic::volume $base * $volume * 128;
291}
292
293sub audio_music_start {
294 my $meta = $MUSIC_PLAYING_META;
295
296 CFPlus::DB::get res_data => $meta->{name}, sub {
297 return unless $SDL_MIXER;
298
299 # music might have changed...
300 $meta eq $MUSIC_PLAYING_META
301 or return &audio_music_start ();
302
303 audio_music_update_volume;
304
305 $MUSIC_PLAYING_DATA = \$_[0];
306
307 my $rwops = $meta->{path}
308 ? new_from_file CFPlus::RW $meta->{path}
309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
310
311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
313
314 my $NOW = time;
315
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
319 $MUSIC_START = time - $pos;
320 } else {
321 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time;
323 }
324
325 delete $meta->{stop_time};
326 delete $meta->{stop_pos};
327 }
328}
329
330sub audio_music_push {
331 return unless $SDL_MIXER;
332
333 my $fade_out;
334
335 if (@MUSIC_JINGLE) {
336 @MUSIC_HAVE = $MUSIC_JINGLE[0];
337 $fade_out = 333;
338 } else {
339 return unless $CFG->{bgm_enable};
340
341 my @have =
342 grep $_,
343 map $CONN->{music_meta}{$_},
344 @$MUSIC_WANT;
345
346 @MUSIC_HAVE = @have
347 if @have;
348
349 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
351 $fade_out = 1000;
352 }
353
354 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356
357 my $NOW = time;
358
359 if ($MUSIC_PLAYING_META) {
360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
361 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
362 CFPlus::MixMusic::fade_out $fade_out;
363 } else {
364 # sort by stop time, oldest first
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366
367 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0];
373
374 audio_music_start;
375 }
376}
377
378sub audio_music_set_ambient {
379 my ($songs) = @_;
380
381 $MUSIC_WANT = $songs;
382 audio_music_push;
383}
384
385sub audio_music_finished {
386 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
391
392 undef $MUSIC_PLAYER;
393 undef $MUSIC_PLAYING_META;
394 undef $MUSIC_PLAYING_DATA;
395
396 audio_music_push;
397}
398
399sub audio_init {
400 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
403
404 unless ($SDL_MIXER) {
405 status "Unable to open sound device: there will be no sound";
406 return;
407 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else {
413 undef $SDL_MIXER;
414 }
415}
416
417sub audio_shutdown {
418 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META;
420 undef $MUSIC_PLAYING_DATA;
421
422 $MUSIC_WANT = [];
423 @MUSIC_JINGLE = ();
424 %AUDIO_PLAY = ();
425 %AUDIO_CHUNK = ();
426
427 CFPlus::Mix_CloseAudio if $SDL_MIXER;
428 undef $SDL_MIXER;
429}
430
431#############################################################################
175 432
176sub destroy_query_dialog { 433sub destroy_query_dialog {
177 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
178 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
179} 436}
… …
206 title => "Server Query", 463 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 464 child => my $vbox = new CFPlus::UI::VBox,
208 ; 465 ;
209 466
210 my @dialog = my $label = new CFPlus::UI::Label 467 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 468 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 469 ellipsise => 0,
213 text => $prompt; 470 text => $prompt;
214 471
215 if ($flags & CS_QUERY_YESNO) { 472 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 473 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 490 );
234 491
235 $dialog->grab_focus; 492 $dialog->grab_focus;
236 493
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 494 } 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) { 495 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241 $MESSAGE_WINDOW->show; 496 $dialog->{tooltip} = "#charcreation_focus";
242 497
243 unshift @dialog, new CFPlus::UI::Label 498 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 499 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 500 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
247 502
248 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
249 504
250 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
251 text => "Next Race", 506 text => "Next Race",
252 on_activate => sub { 507 on_activate => sub {
253 $conn->send ("reply n"); 508 $conn->send ("reply n");
254 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
255 0 510 0
256 }, 511 },
257 ); 512 );
258 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
259 text => "Accept", 514 text => "Accept",
260 on_activate => sub { 515 on_activate => sub {
261 $conn->send ("reply d"); 516 $conn->send ("reply d");
262 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
263 0 518 0
264 }, 519 },
265 ); 520 );
266 521
522 if ($conn->{chargen_race_description}) {
523 unshift @dialog, new CFPlus::UI::Label
524 max_w => $::WIDTH * 0.8,
525 ellipsise => 0,
526 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
527 ;
528 }
529
530 unshift @dialog, new CFPlus::UI::Face
531 face => $conn->{player}{face},
532 bg => [.2, .2, .2, 1],
533 min_w => 64,
534 min_h => 64,
535 ;
536
537 if ($conn->{chargen_race_title}) {
538 unshift @dialog, new CFPlus::UI::Label
539 allign => 1,
540 ellipsise => 0,
541 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
542 ;
543 }
544
267 unshift @dialog, new CFPlus::UI::Label 545 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 546 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 547 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 548 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
271 ; 549 ;
… …
275 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
276 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
277 return; 555 return;
278 } 556 }
279 557
280 $STATS_PAGE->show;
281 $MESSAGE_WINDOW->hide;
282
283 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
284 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
285 ellipsise => 0, 560 ellipsise => 0,
286 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
287 562
288 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
289 564
290 # left: re-roll 565 # left: re-roll
291 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
292 text => "Roll Again", 567 text => "Roll Again",
293 on_activate => sub { 568 on_activate => sub {
294 $conn->send ("reply y"); 569 $conn->send ("reply y");
295 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
296 0 571 0
… …
310 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
311 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
312 ], 587 ],
313 ), 1 .. 2; 588 ), 1 .. 2;
314 589
315 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
316 text => "Swap Stats", 591 text => "Swap Stats",
317 on_activate => sub { 592 on_activate => sub {
318 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
319 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
320 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
321 0 596 0
322 }, 597 },
323 ); 598 );
324 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
325 600
326 # right: accept 601 # right: accept
327 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
328 text => "Accept", 603 text => "Accept",
329 on_activate => sub { 604 on_activate => sub {
330 $conn->send ("reply n"); 605 $conn->send ("reply n");
331 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
332 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
… …
413 maph => $mapsize, 688 maph => $mapsize,
414 689
415 client => "cfplus $CFPlus::VERSION $] $^O", 690 client => "cfplus $CFPlus::VERSION $] $^O",
416 691
417 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
418 logview => $LOGVIEW,
419 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
420 map => $MAP, 694 map => $MAP,
421 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
422 query => \&server_query, 696 query => \&server_query,
423 697
424 sound_play => sub { 698 setup_req => {
425 my ($x, $y, $soundnum, $type) = @_; 699 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 }, 700 },
435 }; 701 };
436 702
437 if ($CONN) { 703 if ($CONN) {
438 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
… …
448 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
453 722
454 return unless $CONN; 723 return unless $CONN;
455 724
456 status "connection closed"; 725 status "connection closed";
457 726
… …
465sub graphics_setup { 734sub graphics_setup {
466 my $vbox = new CFPlus::UI::VBox; 735 my $vbox = new CFPlus::UI::VBox;
467 736
468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 737 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
469 738
739 my $row = 0;
740
741 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
742 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
743 can_events => 1,
744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
745
746 my $vidmode_tooltip =
747 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
748 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
749
470 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 750 $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); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
472 752
753 $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]); 754 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"); 755 tooltip => $vidmode_tooltip);
756 $hbox->add (my $mode_label = new CFPlus::UI::Label
757 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
758 can_events => 1, tooltip => $vidmode_tooltip);
475 759
476 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
477 my ($self, $value) = @_; 761 my ($self, $value) = @_;
478 762
479 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
480 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
481 }); 765 });
482 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
483 767
484 my $row = 1;
485
486 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 768 $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 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
488 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
489 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
490 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
491 ); 773 );
492 774
493 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 775 $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 776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
495 state => $CFG->{fast}, 777 state => $CFG->{fast},
496 tooltip => "Lower the visual quality considerably to speed up rendering.", 778 tooltip => "Lower the visual quality considerably to speed up rendering.",
497 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 779 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
498 ); 780 );
499 781
782 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
783 $table->add_at (1, $row++, new CFPlus::UI::Slider
784 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
785 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
786 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
787 );
788
789 $table->add_at (1, $row++, new CFPlus::UI::Button
790 expand => 1, align => 0, text => "Apply",
791 tooltip => "Apply the video settings above.",
792 on_activate => sub {
793 video_shutdown ();
794 video_init ();
795 0
796 }
797 );
798
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 799 $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 800 $table->add_at (1, $row++, new CFPlus::UI::Slider
502 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 801 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
503 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 802 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
504 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 803 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
505 ); 804 );
506 805
806 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
807 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
808 state => $CFG->{map_smoothing},
809 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
810 . "This increases load on the graphics subsystem and works only with 2.x servers. "
811 . "Changes take effect at next connection only.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
813 );
814
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 815 $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 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
509 state => $CFG->{fow_enable}, 817 state => $CFG->{fow_enable},
510 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 818 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 } 819 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
512 ); 820 );
513 821
514 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 822 $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 823 $table->add_at (1, $row++, new CFPlus::UI::Slider
516 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 824 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.", 825 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 } 826 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
519 ); 827 );
520 828
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"); 829 $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 830 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 831 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.", 832 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 }, 833 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
545 ); 834 );
546 835
547 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 836 $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 837 $table->add_at (1, $row++, new CFPlus::UI::Slider
549 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 838 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.", 839 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
551 on_changed => sub { 840 on_changed => sub {
552 $CFG->{gauge_fontsize} = $_[1]; 841 $CFG->{gauge_fontsize} = $_[1];
553 &set_gauge_window_fontsize; 842 &set_gauge_window_fontsize;
554 0 843 0
555 } 844 }
556 ); 845 );
557 846
558 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 847 $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 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
560 range => [$CFG->{gauge_size}, 0.2, 0.8], 849 range => [$CFG->{gauge_size}, 0.2, 0.8],
561 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 850 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
562 on_changed => sub { 851 on_changed => sub {
563 $CFG->{gauge_size} = $_[1]; 852 $CFG->{gauge_size} = $_[1];
564 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 853 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
565 0 854 0
566 } 855 }
567 ); 856 );
568 857
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 858 $vbox
580} 859}
581 860
582sub audio_setup { 861sub audio_setup {
583 my $vbox = new CFPlus::UI::VBox; 862 my $vbox = new CFPlus::UI::VBox;
584 863
585 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 864 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
586 865
587 my $row = 0; 866 my $row = 0;
588 867
589 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 868 $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 869 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{audio_enable}, 870 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.", 871 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 } 872 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
594 ); 873 );
595# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 874# $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 { 875# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
597# $CFG->{effects_volume} = $_[1]; 876# $CFG->{effects_volume} = $_[1];
598# }); 877# });
878
879 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
880 $table->add_at (1, $row, new CFPlus::UI::CheckBox
881 expand => 1, state => $CFG->{effects_enable},
882 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
883 on_changed => sub {
884 $CFG->{effects_enable} = $_[1];
885 $CONN->update_fx_want if $CONN;
886 0
887 }
888 );
889 $table->add_at (2, $row++, new CFPlus::UI::Slider
890 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
891 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
892 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
893 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
894 );
895
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 896 $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 897 $table->add_at (1, $row, new CFPlus::UI::CheckBox
602 expand => 1, state => $CFG->{bgm_enable}, 898 expand => 1, state => $CFG->{bgm_enable},
603 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 899 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 } 900 on_changed => sub {
901 $CFG->{bgm_enable} = $_[1];
902 $CONN->update_fx_want if $CONN;
903 0
904 }
605 ); 905 );
606 $hbox->add (new CFPlus::UI::Slider 906 $table->add_at (2, $row++, new CFPlus::UI::Slider
607 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 907 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
608 tooltip => "The volume of the background music. Changes are instant.", 908 tooltip => "The volume of the background music. Changes are instant.",
609 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 909 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
610 ); 910 );
611 911
612 $table->add (1, $row++, new CFPlus::UI::Button 912 $table->add_at (1, $row++, new CFPlus::UI::Button
613 expand => 1, align => 0, text => "Apply", 913 c_colspan => 2, expand => 1, align => 0, text => "Apply",
614 tooltip => "Apply the audio settings", 914 tooltip => "Apply the audio settings",
615 on_activate => sub { 915 on_activate => sub {
616 audio_shutdown (); 916 audio_shutdown ();
617 audio_init (); 917 audio_init ();
618 0 918 0
… …
676} 976}
677 977
678sub debug_setup { 978sub debug_setup {
679 my $table = new CFPlus::UI::Table; 979 my $table = new CFPlus::UI::Table;
680 980
681 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 981 $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 }); 982 $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"); 983 $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 }); 984 $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"); 985 $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 }); 986 $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"); 987 $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 }); 988 $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" } ); 989 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690 990
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# 991 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
992
993 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
994 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
995 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
996 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
997 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
998 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
999
1000 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1001
1002 $c->add_items ({
1003 type => "line_loop",
1004 color => [0, 1, 0],
1005 width => 9,
1006 coord_mode => "abs",
1007 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1008 });
1009
1010 $c->add_items ({
1011 type => "lines",
1012 color => [1, 1, 0],
1013 width => 2,
1014 coord_mode => "rel",
1015 coord => [[0,0], [1,1], [1,0], [0,1]],
1016 });
1017
1018 $c->add_items ({
1019 type => "polygon",
1020 color => [0, 0.43, 0],
1021 width => 2,
1022 coord_mode => "rel",
1023 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1024 });
704 1025
705 $table 1026 $table
706} 1027}
707 1028
708sub stats_window { 1029sub stats_window {
… …
756 [2, 4, st_spd => "Spd", 10.54], 1077 [2, 4, st_spd => "Spd", 10.54],
757 [2, 5, st_wspd => "WSp", 10.54], 1078 [2, 5, st_wspd => "WSp", 10.54],
758 ) { 1079 ) {
759 my ($col, $row, $id, $label, $template) = @$_; 1080 my ($col, $row, $id, $label, $template) = @$_;
760 1081
761 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1082 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
762 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1083 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
763 align => +1, template => $template, tooltip => "#stat_$label"); 1084 align => +1, template => $template, tooltip => "#stat_$label");
764 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1085 $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, 1086 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
766 align => -1, text => $label, tooltip => "#stat_$label"); 1087 align => -1, text => $label, tooltip => "#stat_$label");
767 } 1088 }
768 1089
769 $vb->add (new CFPlus::UI::FancyFrame 1090 $vb->add (new CFPlus::UI::FancyFrame
… …
810 cold => ["Cold", 1131 cold => ["Cold",
811 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1132 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
812 ghit => ["Ghost hit", 1133 ghit => ["Ghost hit",
813 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1134 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
814 ); 1135 );
1136
815 for (qw/slow holyw conf fire depl magic 1137 for (qw/slow holyw conf fire depl magic
816 drain acid pois para deat phys 1138 drain acid pois para deat phys
817 blind fear tund elec cold ghit/) 1139 blind fear tund elec cold ghit/)
818 { 1140 {
819 $tbl2->add ($col, $row, 1141 $tbl2->add_at ($col, $row,
820 $STATWIDS->{"res_$_"} = 1142 $STATWIDS->{"res_$_"} =
821 new CFPlus::UI::Label 1143 new CFPlus::UI::Label
822 font => $FONT_FIXED, 1144 font => $FONT_FIXED,
823 template => "-100%", 1145 template => "-100%",
824 align => +1, 1146 align => +1,
825 valign => 0, 1147 valign => 0,
826 can_events => 1, 1148 can_events => 1,
827 can_hover => 1, 1149 can_hover => 1,
828 tooltip => $resist_names{$_}->[1], 1150 tooltip => $resist_names{$_}->[1],
829 ); 1151 );
830 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1152 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
831 font => $FONT_FIXED, 1153 font => $FONT_FIXED,
832 can_hover => 1, 1154 can_hover => 1,
833 can_events => 1, 1155 can_events => 1,
834 path => "ui/resist/resist_$_.png", 1156 path => "ui/resist/resist_$_.png",
835 tooltip => $resist_names{$_}->[1], 1157 tooltip => $resist_names{$_}->[1],
836 ); 1158 );
837 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1159 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
838 text => $resist_names{$_}->[0], 1160 text => $resist_names{$_}->[0],
839 font => $FONT_FIXED, 1161 font => $FONT_FIXED,
840 can_hover => 1, 1162 can_hover => 1,
841 can_events => 1, 1163 can_events => 1,
842 tooltip => $resist_names{$_}->[1], 1164 tooltip => $resist_names{$_}->[1],
… …
875 return if $METASERVER_ATIME > time; 1197 return if $METASERVER_ATIME > time;
876 $METASERVER_ATIME = time + 60; 1198 $METASERVER_ATIME = time + 60;
877 1199
878 my $table = $METASERVER->{table}; 1200 my $table = $METASERVER->{table};
879 $table->clear; 1201 $table->clear;
880 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1202 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
881 1203
882 my $ok = 0; 1204 my $ok = 0;
883 1205
884 CFPlus::background { 1206 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent; 1207 my $ua = CFPlus::lwp_useragent;
… …
896 "The time this server has been running without being restarted.", 1218 "The time this server has been running without being restarted.",
897 "The server software version - a '+' indicates a Crossfire+ server.", 1219 "The server software version - a '+' indicates a Crossfire+ server.",
898 "Short information about this server provided by its admins.", 1220 "Short information about this server provided by its admins.",
899 ); 1221 );
900 my @col = qw(#Users Host Uptime Version Description); 1222 my @col = qw(#Users Host Uptime Version Description);
901 $table->add ($_, 0, new CFPlus::UI::Label 1223 $table->add_at ($_, 0, new CFPlus::UI::Label
902 can_hover => 1, can_events => 1, 1224 can_hover => 1, can_events => 1,
903 align => 0, fg => [1, 1, 0], 1225 align => 0, fg => [1, 1, 0],
904 text => $col[$_], tooltip => $tip[$_]) 1226 text => $col[$_], tooltip => $tip[$_])
905 for 0 .. $#col; 1227 for 0 .. $#col;
906 1228
907 my @align = qw(1 0 1 1 -1); 1229 my @align = qw(1 0 1 1 -1);
908 1230
909 my $y = 0; 1231 my $y = 0;
910 for my $m (
911 sort {
912 $b->{version} <=> $a->{version}
913 or $b->{users} <=> $a->{users}
914 }
915 @{ $msg->{servers} } 1232 for my $m (@{ $msg->{servers} }) {
916 ) {
917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 1233 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
918 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 1234 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
919 1235
920 for ($desc) { 1236 for ($desc) {
921 s/<br>/\n/gi; 1237 s/<br>/\n/gi;
922 s/<li>/\n· /gi; 1238 s/<li>/\n· /gi;
923 s/<.*?>//sgi; 1239 s/<.*?>//sgi;
… …
934 1250
935 $m = [$users, $host, $uptime, $version, $desc]; 1251 $m = [$users, $host, $uptime, $version, $desc];
936 1252
937 $y++; 1253 $y++;
938 1254
939 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1255 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
940 (new CFPlus::UI::Button 1256 (new CFPlus::UI::Button
941 text => "Use", 1257 text => "Use",
942 tooltip => "Put this server into the <b>Host:Port</b> field", 1258 tooltip => "Put this server into the <b>Host:Port</b> field",
943 on_activate => sub { 1259 on_activate => sub {
944 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1260 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
947 }, 1263 },
948 ), 1264 ),
949 (new CFPlus::UI::Empty expand => 1), 1265 (new CFPlus::UI::Empty expand => 1),
950 ]); 1266 ]);
951 1267
952 $table->add ($_, $y, new CFPlus::UI::Label 1268 $table->add_at ($_, $y, new CFPlus::UI::Label
953 max_w => $::WIDTH * 0.4, 1269 max_w => $::WIDTH * 0.4,
954 ellipsise => 0, 1270 ellipsise => 0,
955 align => $align[$_], 1271 align => $align[$_],
956 text => $m->[$_], 1272 text => $m->[$_],
957 tooltip => $tip[$_], 1273 tooltip => $tip[$_],
958 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1274 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
959 can_hover => 1, 1275 can_hover => 1,
960 can_events => 1, 1276 can_events => 1,
961 fontsize => 0.8) 1277 fontsize => 0.8)
962 for 0 .. $#$m; 1278 for 0 .. $#$m;
963 } 1279 }
… …
998 1314
999 $vbox->add (new CFPlus::UI::FancyFrame 1315 $vbox->add (new CFPlus::UI::FancyFrame
1000 label => "Connection Settings", 1316 label => "Connection Settings",
1001 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1317 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1002 ); 1318 );
1003 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1319 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1004 1320
1005 { 1321 {
1006 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1322 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1007 1323
1008 $vbox->add ( 1324 $vbox->add (
1009 $HOST_ENTRY = new CFPlus::UI::Entry 1325 $HOST_ENTRY = new CFPlus::UI::Entry
1010 expand => 1, 1326 expand => 1,
1011 text => $CFG->{profile}{default}{host}, 1327 text => $CFG->{profile}{default}{host},
1012 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1328 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1013 on_changed => sub { 1329 on_changed => sub {
1014 my ($self, $value) = @_; 1330 my ($self, $value) = @_;
1015 $CFG->{profile}{default}{host} = $value; 1331 $CFG->{profile}{default}{host} = $value;
1016 0 1332 1
1017 } 1333 }
1018 ); 1334 );
1019 1335
1020 $vbox->add (new CFPlus::UI::Button 1336 $vbox->add (new CFPlus::UI::Button
1021 expand => 1, 1337 expand => 1,
1022 text => "Server List", 1338 text => "Server List",
1023 other => $METASERVER, 1339 other => $METASERVER,
1024 tooltip => "Show a list of available crossfire servers", 1340 tooltip => "Show a list of available crossfire servers",
1025 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1341 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1026 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1342 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1027 ); 1343 );
1028 } 1344 }
1029 1345
1030 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1346 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1031 $table->add (1, 4, new CFPlus::UI::Entry 1347 $table->add_at (1, 4, new CFPlus::UI::Entry
1032 text => $CFG->{profile}{default}{user}, 1348 text => $CFG->{profile}{default}{user},
1033 tooltip => "The name of your character on the server", 1349 tooltip => "The name of your character on the server",
1034 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1350 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1035 ); 1351 );
1036 1352
1037 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1353 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1038 $table->add (1, 5, new CFPlus::UI::Entry 1354 $table->add_at (1, 5, new CFPlus::UI::Entry
1039 text => $CFG->{profile}{default}{password}, 1355 text => $CFG->{profile}{default}{password},
1040 hidden => 1, 1356 hidden => 1,
1041 tooltip => "The password for your character", 1357 tooltip => "The password for your character",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1358 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1043 ); 1359 );
1044 1360
1045 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1361 $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 1362 $table->add_at (1, 7, new CFPlus::UI::Slider
1047 force_w => 100, 1363 force_w => 100,
1048 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1364 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1049 tooltip => "This is the size of the portion of the map update the server sends you. " 1365 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, " 1366 . "If you set this to a high value you will be able to see further, "
1051 . "but you also increase bandwidth requirements and latency. " 1367 . "but you also increase bandwidth requirements and latency. "
1052 . "This option is only used once at log-in.", 1368 . "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 }, 1369 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1054 ); 1370 );
1055 1371
1056 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1372 $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 1373 $table->add_at (1, 8, new CFPlus::UI::Entry
1058 state => $CFG->{face_prefetch}, 1374 text => $CFG->{output_rate},
1059 tooltip => "<b>Background Image Prefetch</b>\n\n" 1375 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. " 1376 . "when sending data. When 0 or unset, the server "
1061 . "This might increase or create lag, but increases the chances " 1377 . "default will be used, which is usually around 100kb/s. Most servers will "
1062 . "of faces being ready for display when you encounter them. " 1378 . "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 }, 1379 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1067 ); 1380 );
1068 1381
1069 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1382 $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 1383 $table->add_at (1, 9, new CFPlus::UI::Entry
1071 text => $CFG->{output_count}, 1384 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.", 1385 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 }, 1386 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1074 ); 1387 );
1075 1388
1076 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1389 $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 1390 $table->add_at (1, 10, new CFPlus::UI::Entry
1078 text => $CFG->{output_sync}, 1391 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.", 1392 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 }, 1393 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1081 ); 1394 );
1082 1395
1083 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1396 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1084 expand => 1, 1397 expand => 1,
1085 align => 0, 1398 align => 0,
1086 text => "Login", 1399 text => "Login",
1087 on_activate => sub { 1400 on_activate => sub {
1088 $CONN ? stop_game 1401 $CONN ? stop_game
1089 : start_game; 1402 : start_game;
1090 0 1403 1
1091 }, 1404 },
1092 ); 1405 );
1093 1406
1094 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1407 $vbox->add (new CFPlus::UI::FancyFrame
1095 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1408 label => "Server Info",
1096 text => $CFG->{say_command}, 1409 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 ); 1410 );
1106 1411
1412 $vbox
1413}
1414
1415sub client_setup {
1416 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1417
1418 my $row = 0;
1419
1107 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1420 $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 1421 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1109 state => $CFG->{show_tips}, 1422 state => $CFG->{show_tips},
1110 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1423 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1111 on_changed => sub { 1424 on_changed => sub {
1112 my ($self, $value) = @_; 1425 my ($self, $value) = @_;
1113 $CFG->{show_tips} = $value; 1426 $CFG->{show_tips} = $value;
1114 0 1427 0
1115 } 1428 }
1116 ); 1429 );
1117 1430
1118 $vbox->add (new CFPlus::UI::FancyFrame 1431 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1119 label => "Server Info", 1432 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1120 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1433 text => $CFG->{logview_max_par},
1121 ); 1434 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1122 1435 . "sends more messages than this number, older messages get removed to save memory and "
1123 $vbox 1436 . "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 { 1437 on_changed => sub {
1146 my ($input, $prev_focus) = @_; 1438 my ($self, $value) = @_;
1147 1439 $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 1440 0
1156 }, 1441 },
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 }; 1442 );
1185 1443
1186 $window 1444 $table
1187} 1445}
1188 1446
1189sub autopickup_setup { 1447sub autopickup_setup {
1448 my $r = new CFPlus::UI::ScrolledWindow (
1449 expand => 1,
1450 scroll_y => 1
1451 );
1190 my $table = new CFPlus::UI::Table; 1452 $r->add (my $table = new CFPlus::UI::Table
1453 row_expand => [0],
1454 col_expand => [0, 1, 0, 1],
1455 );
1191 1456
1192 for ( 1457 for (
1193 ["General", 0, 0, 1458 ["General", 0, 0,
1194 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1459 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1195 ["Inhibit autopickup" => PICKUP_INHIBIT], 1460 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1230 ], 1495 ],
1231 ["Weight/Value ratio", 2, 17] 1496 ["Weight/Value ratio", 2, 17]
1232 ) 1497 )
1233 { 1498 {
1234 my ($title, $x, $y, @bits) = @$_; 1499 my ($title, $x, $y, @bits) = @$_;
1235 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1500 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1236 1501
1237 for (@bits) { 1502 for (@bits) {
1238 ++$y; 1503 ++$y;
1239 1504
1240 my $mask = $_->[1]; 1505 my $mask = $_->[1];
1241 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1506 $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 1507 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1243 state => $::CFG->{pickup} & $mask, 1508 state => $::CFG->{pickup} & $mask,
1244 on_changed => sub { 1509 on_changed => sub {
1245 my ($box, $value) = @_; 1510 my ($box, $value) = @_;
1246 1511
1247 if ($value) { 1512 if ($value) {
… …
1258 1523
1259 ${$_->[2]} = $checkbox if $_->[2]; 1524 ${$_->[2]} = $checkbox if $_->[2];
1260 } 1525 }
1261 } 1526 }
1262 1527
1263 $table->add (2, 18, new CFPlus::UI::ValSlider 1528 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1529 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99", 1530 template => ">= 99",
1266 to_value => sub { ">= " . 5 * $_[0] }, 1531 to_value => sub { ">= " . 5 * $_[0] },
1267 on_changed => sub { 1532 on_changed => sub {
1268 my ($slider, $value) = @_; 1533 my ($slider, $value) = @_;
… …
1271 $::CFG->{pickup} |= int $value 1536 $::CFG->{pickup} |= int $value
1272 if $value; 1537 if $value;
1273 1; 1538 1;
1274 }); 1539 });
1275 1540
1276 $table->add (3, 18, new CFPlus::UI::Button 1541 $table->add_at (3, 18, new CFPlus::UI::Button
1277 text => "set", 1542 text => "set",
1278 on_activate => sub { 1543 on_activate => sub {
1279 $::CONN->send_command ("pickup $::CFG->{pickup}") 1544 $::CONN->send_command ("pickup $::CFG->{pickup}")
1280 if defined $::CONN; 1545 if defined $::CONN;
1281 0 1546 0
1282 }); 1547 });
1283 1548
1284 $table 1549 $r
1285} 1550}
1286 1551
1287my %SORT_ORDER = ( 1552my %SORT_ORDER = (
1288 type => undef, 1553 type => undef,
1289 mtime => sub { 1554 mtime => sub {
… …
1344 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1609 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1345 1610
1346 $hb 1611 $hb
1347} 1612}
1348 1613
1614sub media_window {
1615 my $vb = new CFPlus::UI::VBox;
1616
1617 $vb->add (new CFPlus::UI::FancyFrame
1618 label => "Currently playing music",
1619 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1620 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1621 );
1622
1623 $vb->add (new CFPlus::UI::FancyFrame
1624 label => "Other media used in this session",
1625 expand => 1,
1626 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1627 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1628 );
1629
1630 $vb
1631}
1632
1633sub add_license {
1634 my ($meta) = @_;
1635
1636 $meta = $meta->{meta}
1637 or return;
1638
1639 $meta->{license} || $meta->{author} || $meta->{source}
1640 or return;
1641
1642 $LICENSE_WIDGET->add_paragraph ({
1643 fg => [1, 1, 1, 1],
1644 markup => "<small>"
1645 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1646 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1647 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1648 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1649 . "</small>",
1650 });
1651 $LICENSE_WIDGET->scroll_to_bottom;
1652}
1653
1349sub toggle_player_page { 1654sub toggle_player_page {
1350 my ($widget) = @_; 1655 my ($widget) = @_;
1351 1656
1352 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1657 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1353 $PL_WINDOW->hide; 1658 $PL_WINDOW->hide;
… …
1368 has_close_button => 1 1673 has_close_button => 1
1369 ; 1674 ;
1370 1675
1371 my $ntb = 1676 my $ntb =
1372 $PL_NOTEBOOK = 1677 $PL_NOTEBOOK =
1373 new CFPlus::UI::Notebook expand => 1, debug => 1; 1678 new CFPlus::UI::Notebook expand => 1;
1374 1679
1375 $ntb->add ( 1680 $ntb->add_tab (
1376 "Statistics (F2)" => $STATS_PAGE = stats_window, 1681 "Statistics (F2)" => $STATS_PAGE = stats_window,
1377 "Shows statistics, where all your Stats and Resistances are shown." 1682 "Shows statistics, where all your Stats and Resistances are shown."
1378 ); 1683 );
1379 $ntb->add ( 1684 $ntb->add_tab (
1380 "Skills (F3)" => $SKILL_PAGE = skill_window, 1685 "Skills (F3)" => $SKILL_PAGE = skill_window,
1381 "Shows all your Skills." 1686 "Shows all your Skills."
1382 ); 1687 );
1383 1688
1384 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1689 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1385 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1690 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1386 $ntb->add ( 1691 $ntb->add_tab (
1387 "Spellbook (F4)" => $spellsw, 1692 "Spellbook (F4)" => $spellsw,
1388 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1693 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1389 ); 1694 );
1390 $ntb->add ( 1695 $ntb->add_tab (
1391 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1696 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1392 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1697 "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." 1698 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1394 ); 1699 );
1700 $ntb->add_tab (Pickup => autopickup_setup,
1701 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1702
1703 $ntb->add_tab (Media => media_window,
1704 "License, Author and Source info for media sent by the server.");
1395 1705
1396 $ntb->set_current_page ($INVENTORY_PAGE); 1706 $ntb->set_current_page ($INVENTORY_PAGE);
1397 1707
1398 $plwin->add ($ntb); 1708 $plwin->add ($ntb);
1399 $plwin 1709 $plwin
… …
1565 1875
1566sub show_tip_of_the_day { 1876sub show_tip_of_the_day {
1567 # find all tips 1877 # find all tips
1568 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1878 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1569 1879
1570 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1880 CFPlus::DB::get state => "tip_of_the_day", sub {
1881 my ($todindex) = @_;
1571 $todindex = 0 if $todindex >= @tod; 1882 $todindex = 0 if $todindex >= @tod;
1572 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1883 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1573 1884
1574 # create dialog 1885 # create dialog
1575 my $dialog; 1886 my $dialog;
1576 1887
1577 my $close = sub { 1888 my $close = sub {
1578 $dialog->destroy; 1889 $dialog->destroy;
1890 };
1891
1892 $dialog = new CFPlus::UI::Toplevel
1893 x => "center",
1894 y => "center",
1895 z => 3,
1896 name => 'tip_of_the_day',
1897 force_w => int $WIDTH * 4/9,
1898 force_h => int $WIDTH * 2/9,
1899 title => "Tip of the day #" . (1 + $todindex),
1900 child => my $vbox = new CFPlus::UI::VBox,
1901 has_close_button => 1,
1902 on_delete => $close,
1903 ;
1904
1905 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1906 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1907 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1908
1909 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1910
1911 $table->add_at (0, 0, new CFPlus::UI::Button
1912 text => "Close",
1913 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>.",
1914 on_activate => $close,
1915 );
1916
1917 $table->add_at (2, 0, new CFPlus::UI::Button
1918 text => "Next",
1919 tooltip => "Show the next <b>Tip of the day</b>.",
1920 on_activate => sub {
1921 $close->();
1922 &show_tip_of_the_day;
1923 },
1924 );
1925
1926 $dialog->show;
1579 }; 1927 };
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} 1928}
1617 1929
1618sub sdl_init { 1930sub sdl_init {
1619 CFPlus::SDL_Init 1931 CFPlus::SDL_Init
1620 and die "SDL::Init failed!\n"; 1932 and die "SDL::Init failed!\n";
1621} 1933}
1622 1934
1623sub video_init { 1935sub video_init {
1624 sdl_init;
1625
1626 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1936 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1627 1937
1628 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1938 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1629 1939
1630 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1940 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1631 $FULLSCREEN = $CFG->{fullscreen}; 1941 $FULLSCREEN = $CFG->{fullscreen};
1632 $FAST = $CFG->{fast}; 1942 $FAST = $CFG->{fast};
1633 1943
1634 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1944 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1635 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1945 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1636 1946
1637 $SDL_ACTIVE = 1; 1947 $SDL_ACTIVE = 1;
1638 $LAST_REFRESH = time - 0.01; 1948 $LAST_REFRESH = time - 0.01;
1639 1949
… …
1681 1991
1682 $MAPWIDGET = new CFPlus::MapWidget; 1992 $MAPWIDGET = new CFPlus::MapWidget;
1683 $MAPWIDGET->connect (activate_console => sub { 1993 $MAPWIDGET->connect (activate_console => sub {
1684 my ($mapwidget, $preset) = @_; 1994 my ($mapwidget, $preset) = @_;
1685 1995
1686 if ($CONSOLE) { 1996 $MESSAGE_WINDOW->activate_console ($preset)
1687 $CONSOLE->{input}->{auto_activated} = 1; 1997 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 }); 1998 });
1695 $MAPWIDGET->show; 1999 $MAPWIDGET->show;
1696 $MAPWIDGET->grab_focus; 2000 $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 2001
1708 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2002 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1709 title => "Setup", 2003 title => "Setup",
1710 name => "setup_dialog", 2004 name => "setup_dialog",
1711 x => 'center', 2005 x => 'center',
… …
1715 force_h => $::HEIGHT * 0.6, 2009 force_h => $::HEIGHT * 0.6,
1716 has_close_button => 1, 2010 has_close_button => 1,
1717 ; 2011 ;
1718 2012
1719 $METASERVER = metaserver_dialog; 2013 $METASERVER = metaserver_dialog;
2014 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1720 2015
1721 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2016 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1722 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2017 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1723 2018
1724 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2019 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1725 "Configure the server to play on, your username, password and other server-related options."); 2020 "Configure the server to play on, your username, password and other server-related options.");
1726 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2021 $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."); 2022 "Configure various client-specific settings.");
1728 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2023 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1729 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2024 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1730 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2025 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1731 "Configure the use of audio, sound effects and background music."); 2026 "Configure the use of audio, sound effects and background music.");
1732 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2027 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1733 "Lets you define, edit and delete key bindings." 2028 "Lets you define, edit and delete key bindings."
1734 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2029 . "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 " 2030 . "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. " 2031 . "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 " 2032 . "After pressing the combo the binding will be saved automatically and the "
1738 . "binding editor closes"); 2033 . "binding editor closes");
1739 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2034 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1740 "Some debuggin' options. Do not ask."); 2035 "Some debuggin' options. Do not ask.");
1741 2036
1742 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2037 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1743 2038
1744 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2039 $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."); 2040 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1746 2041
1747 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2042 $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."); 2043 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1749 2044
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 2045 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 2046
1752 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2047 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1785 } 2080 }
1786 2081
1787 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1788} 2083}
1789 2084
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 { 2085sub video_shutdown {
1910 CFPlus::OpenGL::shutdown; 2086 CFPlus::OpenGL::shutdown;
1911 2087
1912 undef $SDL_ACTIVE; 2088 undef $SDL_ACTIVE;
1913} 2089}
1914 2090
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; 2091my %animate_object;
1978my $animate_timer; 2092my $animate_timer;
1979 2093
1980my $fps = 9; 2094my $fps = 9;
1981
1982my %demo;#d#
1983 2095
1984sub force_refresh { 2096sub force_refresh {
1985 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1986 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1987 2099
1988 $CFPlus::UI::ROOT->draw; 2100 $CFPlus::UI::ROOT->draw;
1989 2101
1990 $WANT_REFRESH = 0; 2102 $WANT_REFRESH = 0;
1991 $CAN_REFRESH = 0; 2103 $CAN_REFRESH = 0;
1992 $LAST_REFRESH = $NOW; 2104 $LAST_REFRESH = $NOW;
1993 2105
1994 CFPlus::SDL_GL_SwapBuffers; 2106 CFPlus::SDL_GL_SwapBuffers;
1995} 2107}
1996 2108
1997my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1998 $NOW = time; 2110 $NOW = time;
1999 2111
2000 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2001 for CFPlus::SDL_PollEvent; 2113 for CFPlus::poll_events;
2002 2114
2003 if (%animate_object) { 2115 if (%animate_object) {
2004 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2005 $WANT_REFRESH++; 2117 ++$WANT_REFRESH;
2006 } 2118 }
2007 2119
2008 if ($WANT_REFRESH) { 2120 if ($WANT_REFRESH) {
2009 force_refresh; 2121 force_refresh;
2010 } else { 2122 } else {
… …
2020sub animation_stop { 2132sub animation_stop {
2021 my ($widget) = @_; 2133 my ($widget) = @_;
2022 delete $animate_object{$widget}; 2134 delete $animate_object{$widget};
2023} 2135}
2024 2136
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 = ( 2137%SDL_CB = (
2035 CFPlus::SDL_QUIT => sub { 2138 CFPlus::SDL_QUIT => sub {
2036 Event::unloop -1; 2139 exit;
2037 }, 2140 },
2038 CFPlus::SDL_VIDEORESIZE => sub { 2141 CFPlus::SDL_VIDEORESIZE => sub {
2039 }, 2142 },
2040 CFPlus::SDL_VIDEOEXPOSE => sub { 2143 CFPlus::SDL_VIDEOEXPOSE => sub {
2041 CFPlus::UI::full_refresh; 2144 CFPlus::UI::full_refresh;
2042 }, 2145 },
2043 CFPlus::SDL_ACTIVEEVENT => sub { 2146 CFPlus::SDL_ACTIVEEVENT => sub {
2044# not useful, as APPACTIVE include sonly iconified state, not unmapped 2147# not useful, as APPACTIVE include sonly iconified state, not unmapped
2045# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2148# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2149# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2046# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2150# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2047# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2151# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2048# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2152# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2049 }, 2153 },
2050 CFPlus::SDL_KEYDOWN => sub { 2154 CFPlus::SDL_KEYDOWN => sub {
… …
2074 2178
2075$SIG{INT} = $SIG{TERM} = sub { exit }; 2179$SIG{INT} = $SIG{TERM} = sub { exit };
2076 2180
2077{ 2181{
2078 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2182 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2183 CFPlus::DB::Server::run;
2184
2079 CFPlus::UI::set_layout ($::CFG->{layout}); 2185 CFPlus::UI::set_layout ($::CFG->{layout});
2080 2186
2081 my %DEF_CFG = ( 2187 my %DEF_CFG = (
2082 sdl_mode => 0, 2188 sdl_mode => 0,
2083 width => 640,
2084 height => 480,
2085 fullscreen => 0, 2189 fullscreen => 0,
2086 fast => 0, 2190 fast => 0,
2087 map_scale => 1, 2191 map_scale => 1,
2088 fow_enable => 1, 2192 fow_enable => 1,
2089 fow_intensity => 0.45, 2193 fow_intensity => 0,
2090 fow_smooth => 0, 2194 map_smoothing => 1,
2091 gui_fontsize => 1, 2195 gui_fontsize => 1,
2092 log_fontsize => 0.7, 2196 log_fontsize => 0.7,
2093 gauge_fontsize => 1, 2197 gauge_fontsize => 1,
2094 gauge_size => 0.35, 2198 gauge_size => 0.35,
2095 stat_fontsize => 0.7, 2199 stat_fontsize => 0.7,
2096 mapsize => 100, 2200 mapsize => 100,
2097 say_command => 'chat',
2098 audio_enable => 1, 2201 audio_enable => 1,
2202 effects_enable => 1,
2203 effects_volume => 1,
2099 bgm_enable => 1, 2204 bgm_enable => 1,
2100 bgm_volume => 0.25, 2205 bgm_volume => 0.5,
2101 face_prefetch => 0,
2102 output_sync => 1, 2206 output_sync => 1,
2103 output_count => 1, 2207 output_count => 1,
2208 output_rate => "",
2104 pickup => 0, 2209 pickup => 0,
2105 inv_sort => "mtime", 2210 inv_sort => "mtime",
2106 default => "profile", # default profile 2211 default => "profile", # default profile
2107 show_tips => 1, 2212 show_tips => 1,
2213 logview_max_par => 1000,
2108 ); 2214 );
2109 2215
2110 while (my ($k, $v) = each %DEF_CFG) { 2216 while (my ($k, $v) = each %DEF_CFG) {
2111 $CFG->{$k} = $v unless exists $CFG->{$k}; 2217 $CFG->{$k} = $v unless exists $CFG->{$k};
2112 } 2218 }
… …
2126 } 2232 }
2127 } 2233 }
2128 2234
2129 sdl_init; 2235 sdl_init;
2130 2236
2131 @SDL_MODES = reverse 2237 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2132 grep $_->[0] >= 640 && $_->[1] >= 480, 2238 @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)"; 2239 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2240
2241 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2136 2242
2137 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2243 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2138 2244
2139 { 2245 {
2140 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2246 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2181 2287
2182Event::loop; 2288Event::loop;
2183#CFPlus::SDL_Quit; 2289#CFPlus::SDL_Quit;
2184#CFPlus::_exit 0; 2290#CFPlus::_exit 0;
2185 2291
2292END {
2293 video_shutdown;
2294 audio_shutdown;
2186END { CFPlus::SDL_Quit } 2295 CFPlus::SDL_Quit;
2296 CFPlus::DB::Server::stop;
2297}
2187 2298
2188=head1 NAME 2299=head1 NAME
2189 2300
2190cfplus - A Crossfire+ and Crossfire game client 2301cfplus - A Crossfire TRT and Crossfire game client
2191 2302
2192=head1 SYNOPSIS 2303=head1 SYNOPSIS
2193 2304
2194Just run it - no commandline arguments are supported. 2305Just run it - no commandline arguments are supported.
2195 2306
2196=head1 USAGE 2307=head1 USAGE
2197 2308
2198cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2309cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2199fullscreen and interactively. 2310be used in fullscreen mode and interactively.
2200 2311
2201=head1 DEBUGGING 2312=head1 DEBUGGING
2202 2313
2203 2314
2204CFPLUS_DEBUG - environment variable 2315CFPLUS_DEBUG - environment variable

Diff Legend

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