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.140 by elmex, Sat Dec 16 16:01:09 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}
180 437
438# FIXME: a very ugly hack to wait for stat update look below! #d#
439our $QUERY_TIMER; #d#
440
181# server query dialog 441# server query dialog
182sub server_query { 442sub server_query {
183 my ($conn, $flags, $prompt) = @_; 443 my ($conn, $flags, $prompt) = @_;
444
445 # FIXME: a very ugly hack to wait for stat update #d#
446 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
447 unless ($QUERY_TIMER) {
448 $QUERY_TIMER =
449 Event->timer (
450 after => 1,
451 cb => sub {
452 server_query ($conn, $flags, $prompt, 1);
453 $QUERY_TIMER = undef
454 }
455 );
456 return;
457 }
458 }
184 459
185 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 460 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
186 x => "center", 461 x => "center",
187 y => "center", 462 y => "center",
188 title => "Server Query", 463 title => "Server Query",
189 child => my $vbox = new CFPlus::UI::VBox, 464 child => my $vbox = new CFPlus::UI::VBox,
190 ; 465 ;
191 466
192 my @dialog = my $label = new CFPlus::UI::Label 467 my @dialog = my $label = new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 468 max_w => $::WIDTH * 0.8,
194 ellipsise => 0, 469 ellipsise => 0,
195 text => $prompt; 470 text => $prompt;
196 471
197 if ($flags & CS_QUERY_YESNO) { 472 if ($flags & CS_QUERY_YESNO) {
198 push @dialog, my $hbox = new CFPlus::UI::HBox; 473 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
215 ); 490 );
216 491
217 $dialog->grab_focus; 492 $dialog->grab_focus;
218 493
219 } elsif ($flags & CS_QUERY_SINGLECHAR) { 494 } elsif ($flags & CS_QUERY_SINGLECHAR) {
220 $dialog->{tooltip} = "#charcreation_focus";
221
222 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) {
223 $MESSAGE_WINDOW->show; 496 $dialog->{tooltip} = "#charcreation_focus";
224 497
225 unshift @dialog, new CFPlus::UI::Label 498 unshift @dialog, new CFPlus::UI::Label
226 max_w => $::WIDTH * 0.4, 499 max_w => $::WIDTH * 0.8,
227 ellipsise => 0, 500 ellipsise => 0,
228 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
229 502
230 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
231 504
232 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
233 text => "Next Race", 506 text => "Next Race",
234 on_activate => sub { 507 on_activate => sub {
235 $conn->send ("reply n"); 508 $conn->send ("reply n");
236 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
237 0 510 0
238 }, 511 },
239 ); 512 );
240 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
241 text => "Accept", 514 text => "Accept",
242 on_activate => sub { 515 on_activate => sub {
243 $conn->send ("reply d"); 516 $conn->send ("reply d");
244 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
245 0 518 0
246 }, 519 },
247 ); 520 );
248 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
249 unshift @dialog, new CFPlus::UI::Label 545 unshift @dialog, new CFPlus::UI::Label
250 max_w => $::WIDTH * 0.4, 546 max_w => $::WIDTH * 0.4,
251 ellipsise => 0, 547 ellipsise => 0,
252 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 548 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
253 ; 549 ;
… …
257 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
258 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
259 return; 555 return;
260 } 556 }
261 557
262 $STATS_PAGE->show;
263 $MESSAGE_WINDOW->hide;
264
265 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
266 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
267 ellipsise => 0, 560 ellipsise => 0,
268 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
269 562
270 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
271 564
272 # left: re-roll 565 # left: re-roll
273 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
274 text => "Roll Again", 567 text => "Roll Again",
275 on_activate => sub { 568 on_activate => sub {
276 $conn->send ("reply y"); 569 $conn->send ("reply y");
277 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
278 0 571 0
… …
292 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
293 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
294 ], 587 ],
295 ), 1 .. 2; 588 ), 1 .. 2;
296 589
297 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
298 text => "Swap Stats", 591 text => "Swap Stats",
299 on_activate => sub { 592 on_activate => sub {
300 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
301 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
302 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
303 0 596 0
304 }, 597 },
305 ); 598 );
306 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
307 600
308 # right: accept 601 # right: accept
309 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
310 text => "Accept", 603 text => "Accept",
311 on_activate => sub { 604 on_activate => sub {
312 $conn->send ("reply n"); 605 $conn->send ("reply n");
313 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
314 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
… …
395 maph => $mapsize, 688 maph => $mapsize,
396 689
397 client => "cfplus $CFPlus::VERSION $] $^O", 690 client => "cfplus $CFPlus::VERSION $] $^O",
398 691
399 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
400 logview => $LOGVIEW,
401 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
402 map => $MAP, 694 map => $MAP,
403 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
404 query => \&server_query, 696 query => \&server_query,
405 697
406 sound_play => sub { 698 setup_req => {
407 my ($x, $y, $soundnum, $type) = @_; 699 smoothing => $CFG->{map_smoothing}*1,
408
409 $SDL_MIXER
410 or return;
411
412 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
413 or return;
414
415 $chunk->play;
416 }, 700 },
417 }; 701 };
418 702
419 if ($CONN) { 703 if ($CONN) {
420 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
… …
430 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
434 $SPELL_LIST->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
435 722
436 return unless $CONN; 723 return unless $CONN;
437 724
438 status "connection closed"; 725 status "connection closed";
439 726
… …
447sub graphics_setup { 734sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 735 my $vbox = new CFPlus::UI::VBox;
449 736
450 $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]);
451 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
452 $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");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 752
753 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
455 $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],
456 $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);
457 759
458 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
459 my ($self, $value) = @_; 761 my ($self, $value) = @_;
460 762
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
463 }); 765 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465 767
466 my $row = 1;
467
468 $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");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
472 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
473 ); 773 );
474 774
475 $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");
476 $table->add (1, $row++, new CFPlus::UI::CheckBox 776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
477 state => $CFG->{fast}, 777 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 778 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 779 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 780 );
481 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
482 $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");
483 $table->add (1, $row++, new CFPlus::UI::Slider 800 $table->add_at (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 801 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 802 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 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 }
487 ); 804 );
488 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
489 $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");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 817 state => $CFG->{fow_enable},
492 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.",
493 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 819 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
494 ); 820 );
495 821
496 $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");
497 $table->add (1, $row++, new CFPlus::UI::Slider 823 $table->add_at (1, $row++, new CFPlus::UI::Slider
498 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 824 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
499 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.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 826 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
501 ); 827 );
502 828
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fow_smooth},
506 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
507 on_changed => sub {
508 my ($self, $value) = @_;
509 $CFG->{fow_smooth} = $value;
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0
512 }
513 );
514
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 );
521
522 $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");
523 $table->add (1, $row++, new CFPlus::UI::Slider 830 $table->add_at (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 831 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
525 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.",
526 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 833 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
527 ); 834 );
528 835
529 $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");
530 $table->add (1, $row++, new CFPlus::UI::Slider 837 $table->add_at (1, $row++, new CFPlus::UI::Slider
531 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 838 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
532 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.",
533 on_changed => sub { 840 on_changed => sub {
534 $CFG->{gauge_fontsize} = $_[1]; 841 $CFG->{gauge_fontsize} = $_[1];
535 &set_gauge_window_fontsize; 842 &set_gauge_window_fontsize;
536 0 843 0
537 } 844 }
538 ); 845 );
539 846
540 $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");
541 $table->add (1, $row++, new CFPlus::UI::Slider 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 849 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 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.",
544 on_changed => sub { 851 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 852 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 853 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0 854 0
548 } 855 }
549 ); 856 );
550 857
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0
558 }
559 );
560
561 $vbox 858 $vbox
562} 859}
563 860
564sub audio_setup { 861sub audio_setup {
565 my $vbox = new CFPlus::UI::VBox; 862 my $vbox = new CFPlus::UI::VBox;
566 863
567 $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]);
568 865
569 my $row = 0; 866 my $row = 0;
570 867
571 $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");
572 $table->add (1, $row++, new CFPlus::UI::CheckBox 869 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{audio_enable}, 870 state => $CFG->{audio_enable},
574 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.",
575 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 872 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
576 ); 873 );
577# $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");
578# $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 {
579# $CFG->{effects_volume} = $_[1]; 876# $CFG->{effects_volume} = $_[1];
580# }); 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
581 $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");
582 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
583 $hbox->add (new CFPlus::UI::CheckBox 897 $table->add_at (1, $row, new CFPlus::UI::CheckBox
584 expand => 1, state => $CFG->{bgm_enable}, 898 expand => 1, state => $CFG->{bgm_enable},
585 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.",
586 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 }
587 ); 905 );
588 $hbox->add (new CFPlus::UI::Slider 906 $table->add_at (2, $row++, new CFPlus::UI::Slider
589 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 907 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
590 tooltip => "The volume of the background music. Changes are instant.", 908 tooltip => "The volume of the background music. Changes are instant.",
591 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 }
592 ); 910 );
593 911
594 $table->add (1, $row++, new CFPlus::UI::Button 912 $table->add_at (1, $row++, new CFPlus::UI::Button
595 expand => 1, align => 0, text => "Apply", 913 c_colspan => 2, expand => 1, align => 0, text => "Apply",
596 tooltip => "Apply the audio settings", 914 tooltip => "Apply the audio settings",
597 on_activate => sub { 915 on_activate => sub {
598 audio_shutdown (); 916 audio_shutdown ();
599 audio_init (); 917 audio_init ();
600 0 918 0
… …
658} 976}
659 977
660sub debug_setup { 978sub debug_setup {
661 my $table = new CFPlus::UI::Table; 979 my $table = new CFPlus::UI::Table;
662 980
663 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 981 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
664 $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 });
665 $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");
666 $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 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 985 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $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 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 987 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $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 });
671 $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() } );
672 990
673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
674
675 for my $x (0..2) {
676 for my $y (0 .. 2) {
677 $table->add ($x + 3, $y,
678 new CFPlus::UI::Entry
679 text => $default_smooth[$x * 3 + $y],
680 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
681 );
682 }
683 }
684
685 $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 });
686 1025
687 $table 1026 $table
688} 1027}
689 1028
690sub stats_window { 1029sub stats_window {
… …
738 [2, 4, st_spd => "Spd", 10.54], 1077 [2, 4, st_spd => "Spd", 10.54],
739 [2, 5, st_wspd => "WSp", 10.54], 1078 [2, 5, st_wspd => "WSp", 10.54],
740 ) { 1079 ) {
741 my ($col, $row, $id, $label, $template) = @$_; 1080 my ($col, $row, $id, $label, $template) = @$_;
742 1081
743 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1082 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
744 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1083 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
745 align => +1, template => $template, tooltip => "#stat_$label"); 1084 align => +1, template => $template, tooltip => "#stat_$label");
746 $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
747 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,
748 align => -1, text => $label, tooltip => "#stat_$label"); 1087 align => -1, text => $label, tooltip => "#stat_$label");
749 } 1088 }
750 1089
751 $vb->add (new CFPlus::UI::FancyFrame 1090 $vb->add (new CFPlus::UI::FancyFrame
… …
792 cold => ["Cold", 1131 cold => ["Cold",
793 "<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, ...)"],
794 ghit => ["Ghost hit", 1133 ghit => ["Ghost hit",
795 "<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)"],
796 ); 1135 );
1136
797 for (qw/slow holyw conf fire depl magic 1137 for (qw/slow holyw conf fire depl magic
798 drain acid pois para deat phys 1138 drain acid pois para deat phys
799 blind fear tund elec cold ghit/) 1139 blind fear tund elec cold ghit/)
800 { 1140 {
801 $tbl2->add ($col, $row, 1141 $tbl2->add_at ($col, $row,
802 $STATWIDS->{"res_$_"} = 1142 $STATWIDS->{"res_$_"} =
803 new CFPlus::UI::Label 1143 new CFPlus::UI::Label
804 font => $FONT_FIXED, 1144 font => $FONT_FIXED,
805 template => "-100%", 1145 template => "-100%",
806 align => +1, 1146 align => +1,
807 valign => 0, 1147 valign => 0,
808 can_events => 1, 1148 can_events => 1,
809 can_hover => 1, 1149 can_hover => 1,
810 tooltip => $resist_names{$_}->[1], 1150 tooltip => $resist_names{$_}->[1],
811 ); 1151 );
812 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1152 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
813 font => $FONT_FIXED, 1153 font => $FONT_FIXED,
814 can_hover => 1, 1154 can_hover => 1,
815 can_events => 1, 1155 can_events => 1,
816 path => "ui/resist/resist_$_.png", 1156 path => "ui/resist/resist_$_.png",
817 tooltip => $resist_names{$_}->[1], 1157 tooltip => $resist_names{$_}->[1],
818 ); 1158 );
819 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1159 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
820 text => $resist_names{$_}->[0], 1160 text => $resist_names{$_}->[0],
821 font => $FONT_FIXED, 1161 font => $FONT_FIXED,
822 can_hover => 1, 1162 can_hover => 1,
823 can_events => 1, 1163 can_events => 1,
824 tooltip => $resist_names{$_}->[1], 1164 tooltip => $resist_names{$_}->[1],
… …
857 return if $METASERVER_ATIME > time; 1197 return if $METASERVER_ATIME > time;
858 $METASERVER_ATIME = time + 60; 1198 $METASERVER_ATIME = time + 60;
859 1199
860 my $table = $METASERVER->{table}; 1200 my $table = $METASERVER->{table};
861 $table->clear; 1201 $table->clear;
862 $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...");
863 1203
864 my $ok = 0; 1204 my $ok = 0;
865 1205
866 CFPlus::background { 1206 CFPlus::background {
867 my $ua = CFPlus::lwp_useragent; 1207 my $ua = CFPlus::lwp_useragent;
… …
878 "The time this server has been running without being restarted.", 1218 "The time this server has been running without being restarted.",
879 "The server software version - a '+' indicates a Crossfire+ server.", 1219 "The server software version - a '+' indicates a Crossfire+ server.",
880 "Short information about this server provided by its admins.", 1220 "Short information about this server provided by its admins.",
881 ); 1221 );
882 my @col = qw(#Users Host Uptime Version Description); 1222 my @col = qw(#Users Host Uptime Version Description);
883 $table->add ($_, 0, new CFPlus::UI::Label 1223 $table->add_at ($_, 0, new CFPlus::UI::Label
884 can_hover => 1, can_events => 1, 1224 can_hover => 1, can_events => 1,
885 align => 0, fg => [1, 1, 0], 1225 align => 0, fg => [1, 1, 0],
886 text => $col[$_], tooltip => $tip[$_]) 1226 text => $col[$_], tooltip => $tip[$_])
887 for 0 .. $#col; 1227 for 0 .. $#col;
888 1228
889 my @align = qw(1 0 1 1 -1); 1229 my @align = qw(1 0 1 1 -1);
890 1230
891 my $y = 0; 1231 my $y = 0;
892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} } 1232 for my $m (@{ $msg->{servers} }) {
898 ) {
899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 1233 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 1234 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
901 1235
902 for ($desc) { 1236 for ($desc) {
903 s/<br>/\n/gi; 1237 s/<br>/\n/gi;
904 s/<li>/\n· /gi; 1238 s/<li>/\n· /gi;
905 s/<.*?>//sgi; 1239 s/<.*?>//sgi;
… …
916 1250
917 $m = [$users, $host, $uptime, $version, $desc]; 1251 $m = [$users, $host, $uptime, $version, $desc];
918 1252
919 $y++; 1253 $y++;
920 1254
921 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1255 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
922 (new CFPlus::UI::Button 1256 (new CFPlus::UI::Button
923 text => "Use", 1257 text => "Use",
924 tooltip => "Put this server into the <b>Host:Port</b> field", 1258 tooltip => "Put this server into the <b>Host:Port</b> field",
925 on_activate => sub { 1259 on_activate => sub {
926 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1260 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
929 }, 1263 },
930 ), 1264 ),
931 (new CFPlus::UI::Empty expand => 1), 1265 (new CFPlus::UI::Empty expand => 1),
932 ]); 1266 ]);
933 1267
934 $table->add ($_, $y, new CFPlus::UI::Label 1268 $table->add_at ($_, $y, new CFPlus::UI::Label
935 max_w => $::WIDTH * 0.4, 1269 max_w => $::WIDTH * 0.4,
936 ellipsise => 0, 1270 ellipsise => 0,
937 align => $align[$_], 1271 align => $align[$_],
938 text => $m->[$_], 1272 text => $m->[$_],
939 tooltip => $tip[$_], 1273 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1274 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
941 can_hover => 1, 1275 can_hover => 1,
942 can_events => 1, 1276 can_events => 1,
943 fontsize => 0.8) 1277 fontsize => 0.8)
944 for 0 .. $#$m; 1278 for 0 .. $#$m;
945 } 1279 }
… …
980 1314
981 $vbox->add (new CFPlus::UI::FancyFrame 1315 $vbox->add (new CFPlus::UI::FancyFrame
982 label => "Connection Settings", 1316 label => "Connection Settings",
983 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]),
984 ); 1318 );
985 $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");
986 1320
987 { 1321 {
988 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1322 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
989 1323
990 $vbox->add ( 1324 $vbox->add (
991 $HOST_ENTRY = new CFPlus::UI::Entry 1325 $HOST_ENTRY = new CFPlus::UI::Entry
992 expand => 1, 1326 expand => 1,
993 text => $CFG->{profile}{default}{host}, 1327 text => $CFG->{profile}{default}{host},
994 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",
995 on_changed => sub { 1329 on_changed => sub {
996 my ($self, $value) = @_; 1330 my ($self, $value) = @_;
997 $CFG->{profile}{default}{host} = $value; 1331 $CFG->{profile}{default}{host} = $value;
998 0 1332 1
999 } 1333 }
1000 ); 1334 );
1001 1335
1002 $vbox->add (new CFPlus::UI::Button 1336 $vbox->add (new CFPlus::UI::Button
1003 expand => 1, 1337 expand => 1,
1004 text => "Server List", 1338 text => "Server List",
1005 other => $METASERVER, 1339 other => $METASERVER,
1006 tooltip => "Show a list of available crossfire servers", 1340 tooltip => "Show a list of available crossfire servers",
1007 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1341 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1008 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1342 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1009 ); 1343 );
1010 } 1344 }
1011 1345
1012 $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");
1013 $table->add (1, 4, new CFPlus::UI::Entry 1347 $table->add_at (1, 4, new CFPlus::UI::Entry
1014 text => $CFG->{profile}{default}{user}, 1348 text => $CFG->{profile}{default}{user},
1015 tooltip => "The name of your character on the server", 1349 tooltip => "The name of your character on the server",
1016 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1350 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1017 ); 1351 );
1018 1352
1019 $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");
1020 $table->add (1, 5, new CFPlus::UI::Entry 1354 $table->add_at (1, 5, new CFPlus::UI::Entry
1021 text => $CFG->{profile}{default}{password}, 1355 text => $CFG->{profile}{default}{password},
1022 hidden => 1, 1356 hidden => 1,
1023 tooltip => "The password for your character", 1357 tooltip => "The password for your character",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1358 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1025 ); 1359 );
1026 1360
1027 $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");
1028 $table->add (1, 7, new CFPlus::UI::Slider 1362 $table->add_at (1, 7, new CFPlus::UI::Slider
1029 force_w => 100, 1363 force_w => 100,
1030 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1364 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1031 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. "
1032 . "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, "
1033 . "but you also increase bandwidth requirements and latency. " 1367 . "but you also increase bandwidth requirements and latency. "
1034 . "This option is only used once at log-in.", 1368 . "This option is only used once at log-in.",
1035 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 },
1036 ); 1370 );
1037 1371
1038 $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");
1039 $table->add (1, 8, new CFPlus::UI::CheckBox 1373 $table->add_at (1, 8, new CFPlus::UI::Entry
1040 state => $CFG->{face_prefetch}, 1374 text => $CFG->{output_rate},
1041 tooltip => "<b>Background Image Prefetch</b>\n\n" 1375 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1042 . "If enabled, the client automatically pre-fetches images from the server. " 1376 . "when sending data. When 0 or unset, the server "
1043 . "This might increase or create lag, but increases the chances " 1377 . "default will be used, which is usually around 100kb/s. Most servers will "
1044 . "of faces being ready for display when you encounter them. " 1378 . "dynamically find an optimal rate, so adjust this only when necessary.",
1045 . "It also uses up server bandwidth on every connect, "
1046 . "so only set it if you really need to prefetch images. "
1047 . "This option can be set and unset any time.",
1048 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1379 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1049 ); 1380 );
1050 1381
1051 $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");
1052 $table->add (1, 9, new CFPlus::UI::Entry 1383 $table->add_at (1, 9, new CFPlus::UI::Entry
1053 text => $CFG->{output_count}, 1384 text => $CFG->{output_count},
1054 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.",
1055 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1386 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1056 ); 1387 );
1057 1388
1058 $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");
1059 $table->add (1, 10, new CFPlus::UI::Entry 1390 $table->add_at (1, 10, new CFPlus::UI::Entry
1060 text => $CFG->{output_sync}, 1391 text => $CFG->{output_sync},
1061 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.",
1062 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1393 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1063 ); 1394 );
1064 1395
1065 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1396 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1066 expand => 1, 1397 expand => 1,
1067 align => 0, 1398 align => 0,
1068 text => "Login", 1399 text => "Login",
1069 on_activate => sub { 1400 on_activate => sub {
1070 $CONN ? stop_game 1401 $CONN ? stop_game
1071 : start_game; 1402 : start_game;
1072 0 1403 1
1073 }, 1404 },
1074 ); 1405 );
1075 1406
1076 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1407 $vbox->add (new CFPlus::UI::FancyFrame
1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1408 label => "Server Info",
1078 text => $CFG->{say_command}, 1409 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1079 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. "
1080 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1081 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1082 on_changed => sub {
1083 my ($self, $value) = @_;
1084 $CFG->{say_command} = $value;
1085 0
1086 }
1087 ); 1410 );
1088 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
1089 $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");
1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1421 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips}, 1422 state => $CFG->{show_tips},
1092 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?",
1093 on_changed => sub { 1424 on_changed => sub {
1094 my ($self, $value) = @_; 1425 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value; 1426 $CFG->{show_tips} = $value;
1096 0 1427 0
1097 } 1428 }
1098 ); 1429 );
1099 1430
1100 $vbox->add (new CFPlus::UI::FancyFrame 1431 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1101 label => "Server Info", 1432 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1102 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1433 text => $CFG->{logview_max_par},
1103 ); 1434 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1104 1435 . "sends more messages than this number, older messages get removed to save memory and "
1105 $vbox 1436 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1106}
1107
1108sub message_window {
1109 my $window = new CFPlus::UI::Toplevel
1110 name => "message_window",
1111 title => "Messages",
1112 border_bg => [1, 1, 1, 1],
1113 x => "max",
1114 y => 0,
1115 force_w => $::WIDTH * 0.4,
1116 force_h => $::HEIGHT * 0.5,
1117 child => (my $vbox = new CFPlus::UI::VBox),
1118 has_close_button => 1;
1119
1120 $vbox->add ($LOGVIEW);
1121
1122 $vbox->add (my $input = new CFPlus::UI::Entry
1123 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1124 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1125 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1126 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1127 on_focus_in => sub { 1437 on_changed => sub {
1128 my ($input, $prev_focus) = @_; 1438 my ($self, $value) = @_;
1129 1439 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1130 delete $input->{refocus_map};
1131
1132 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1133 $input->{refocus_map} = 1;
1134 }
1135 delete $input->{auto_activated};
1136
1137 0 1440 0
1138 }, 1441 },
1139 on_activate => sub {
1140 my ($input, $text) = @_;
1141 $input->set_text ('');
1142
1143 if ($text =~ /^\/(.*)/) {
1144 $::CONN->user_send ($1);
1145 } else {
1146 my $say_cmd = $::CFG->{say_command} || 'say';
1147 $::CONN->user_send ("$say_cmd $text");
1148 }
1149 if ($input->{refocus_map}) {
1150 delete $input->{refocus_map};
1151 $MAPWIDGET->focus_in
1152 }
1153
1154 0
1155 },
1156 on_escape => sub {
1157 $MAPWIDGET->grab_focus;
1158
1159 0
1160 },
1161 );
1162
1163 $CONSOLE = {
1164 window => $window,
1165 input => $input,
1166 }; 1442 );
1167 1443
1168 $window 1444 $table
1169} 1445}
1170 1446
1171sub autopickup_setup { 1447sub autopickup_setup {
1448 my $r = new CFPlus::UI::ScrolledWindow (
1449 expand => 1,
1450 scroll_y => 1
1451 );
1172 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 );
1173 1456
1174 for ( 1457 for (
1175 ["General", 0, 0, 1458 ["General", 0, 0,
1176 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1459 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1177 ["Inhibit autopickup" => PICKUP_INHIBIT], 1460 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1212 ], 1495 ],
1213 ["Weight/Value ratio", 2, 17] 1496 ["Weight/Value ratio", 2, 17]
1214 ) 1497 )
1215 { 1498 {
1216 my ($title, $x, $y, @bits) = @$_; 1499 my ($title, $x, $y, @bits) = @$_;
1217 $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]);
1218 1501
1219 for (@bits) { 1502 for (@bits) {
1220 ++$y; 1503 ++$y;
1221 1504
1222 my $mask = $_->[1]; 1505 my $mask = $_->[1];
1223 $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);
1224 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1507 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1225 state => $::CFG->{pickup} & $mask, 1508 state => $::CFG->{pickup} & $mask,
1226 on_changed => sub { 1509 on_changed => sub {
1227 my ($box, $value) = @_; 1510 my ($box, $value) = @_;
1228 1511
1229 if ($value) { 1512 if ($value) {
… …
1240 1523
1241 ${$_->[2]} = $checkbox if $_->[2]; 1524 ${$_->[2]} = $checkbox if $_->[2];
1242 } 1525 }
1243 } 1526 }
1244 1527
1245 $table->add (2, 18, new CFPlus::UI::ValSlider 1528 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1246 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1529 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1247 template => ">= 99", 1530 template => ">= 99",
1248 to_value => sub { ">= " . 5 * $_[0] }, 1531 to_value => sub { ">= " . 5 * $_[0] },
1249 on_changed => sub { 1532 on_changed => sub {
1250 my ($slider, $value) = @_; 1533 my ($slider, $value) = @_;
… …
1253 $::CFG->{pickup} |= int $value 1536 $::CFG->{pickup} |= int $value
1254 if $value; 1537 if $value;
1255 1; 1538 1;
1256 }); 1539 });
1257 1540
1258 $table->add (3, 18, new CFPlus::UI::Button 1541 $table->add_at (3, 18, new CFPlus::UI::Button
1259 text => "set", 1542 text => "set",
1260 on_activate => sub { 1543 on_activate => sub {
1261 $::CONN->send_command ("pickup $::CFG->{pickup}") 1544 $::CONN->send_command ("pickup $::CFG->{pickup}")
1262 if defined $::CONN; 1545 if defined $::CONN;
1263 0 1546 0
1264 }); 1547 });
1265 1548
1266 $table 1549 $r
1267} 1550}
1268 1551
1269my %SORT_ORDER = ( 1552my %SORT_ORDER = (
1270 type => undef, 1553 type => undef,
1271 mtime => sub { 1554 mtime => sub {
… …
1326 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1609 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1327 1610
1328 $hb 1611 $hb
1329} 1612}
1330 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
1331sub toggle_player_page { 1654sub toggle_player_page {
1332 my ($widget) = @_; 1655 my ($widget) = @_;
1333 1656
1334 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1657 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1335 $PL_WINDOW->hide; 1658 $PL_WINDOW->hide;
… …
1350 has_close_button => 1 1673 has_close_button => 1
1351 ; 1674 ;
1352 1675
1353 my $ntb = 1676 my $ntb =
1354 $PL_NOTEBOOK = 1677 $PL_NOTEBOOK =
1355 new CFPlus::UI::Notebook expand => 1, debug => 1; 1678 new CFPlus::UI::Notebook expand => 1;
1356 1679
1357 $ntb->add ( 1680 $ntb->add_tab (
1358 "Statistics (F2)" => $STATS_PAGE = stats_window, 1681 "Statistics (F2)" => $STATS_PAGE = stats_window,
1359 "Shows statistics, where all your Stats and Resistances are shown." 1682 "Shows statistics, where all your Stats and Resistances are shown."
1360 ); 1683 );
1361 $ntb->add ( 1684 $ntb->add_tab (
1362 "Skills (F3)" => $SKILL_PAGE = skill_window, 1685 "Skills (F3)" => $SKILL_PAGE = skill_window,
1363 "Shows all your Skills." 1686 "Shows all your Skills."
1364 ); 1687 );
1365 1688
1366 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);
1367 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1690 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1368 $ntb->add ( 1691 $ntb->add_tab (
1369 "Spellbook (F4)" => $spellsw, 1692 "Spellbook (F4)" => $spellsw,
1370 "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."
1371 ); 1694 );
1372 $ntb->add ( 1695 $ntb->add_tab (
1373 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1696 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1374 "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 :). "
1375 . "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."
1376 ); 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.");
1377 1705
1378 $ntb->set_current_page ($INVENTORY_PAGE); 1706 $ntb->set_current_page ($INVENTORY_PAGE);
1379 1707
1380 $plwin->add ($ntb); 1708 $plwin->add ($ntb);
1381 $plwin 1709 $plwin
… …
1547 1875
1548sub show_tip_of_the_day { 1876sub show_tip_of_the_day {
1549 # find all tips 1877 # find all tips
1550 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1878 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1551 1879
1552 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1880 CFPlus::DB::get state => "tip_of_the_day", sub {
1881 my ($todindex) = @_;
1553 $todindex = 0 if $todindex >= @tod; 1882 $todindex = 0 if $todindex >= @tod;
1554 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1883 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1555 1884
1556 # create dialog 1885 # create dialog
1557 my $dialog; 1886 my $dialog;
1558 1887
1559 my $close = sub { 1888 my $close = sub {
1560 $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;
1561 }; 1927 };
1562
1563 $dialog = new CFPlus::UI::Toplevel
1564 x => "center",
1565 y => "center",
1566 z => 3,
1567 name => 'tip_of_the_day',
1568 force_w => int $WIDTH * 4/9,
1569 force_h => int $WIDTH * 2/9,
1570 title => "Tip of the day #" . (1 + $todindex),
1571 child => my $vbox = new CFPlus::UI::VBox,
1572 has_close_button => 1,
1573 on_delete => $close,
1574 ;
1575
1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1579
1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1581
1582 $table->add (0, 0, new CFPlus::UI::Button
1583 text => "Close",
1584 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>.",
1585 on_activate => $close,
1586 );
1587
1588 $table->add (2, 0, new CFPlus::UI::Button
1589 text => "Next",
1590 tooltip => "Show the next <b>Tip of the day</b>.",
1591 on_activate => sub {
1592 $close->();
1593 &show_tip_of_the_day;
1594 },
1595 );
1596
1597 $dialog->show;
1598} 1928}
1599 1929
1600sub sdl_init { 1930sub sdl_init {
1601 CFPlus::SDL_Init 1931 CFPlus::SDL_Init
1602 and die "SDL::Init failed!\n"; 1932 and die "SDL::Init failed!\n";
1603} 1933}
1604 1934
1605sub video_init { 1935sub video_init {
1606 sdl_init;
1607
1608 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1936 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1609 1937
1610 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1938 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1611 1939
1612 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1940 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1613 $FULLSCREEN = $CFG->{fullscreen}; 1941 $FULLSCREEN = $CFG->{fullscreen};
1614 $FAST = $CFG->{fast}; 1942 $FAST = $CFG->{fast};
1615 1943
1616 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1944 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1617 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1945 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1618 1946
1619 $SDL_ACTIVE = 1; 1947 $SDL_ACTIVE = 1;
1620 $LAST_REFRESH = time - 0.01; 1948 $LAST_REFRESH = time - 0.01;
1621 1949
… …
1663 1991
1664 $MAPWIDGET = new CFPlus::MapWidget; 1992 $MAPWIDGET = new CFPlus::MapWidget;
1665 $MAPWIDGET->connect (activate_console => sub { 1993 $MAPWIDGET->connect (activate_console => sub {
1666 my ($mapwidget, $preset) = @_; 1994 my ($mapwidget, $preset) = @_;
1667 1995
1668 if ($CONSOLE) { 1996 $MESSAGE_WINDOW->activate_console ($preset)
1669 $CONSOLE->{input}->{auto_activated} = 1; 1997 if $MESSAGE_WINDOW;
1670 $CONSOLE->{input}->grab_focus;
1671
1672 if ($preset && $CONSOLE->{input}->get_text eq '') {
1673 $CONSOLE->{input}->set_text ($preset);
1674 }
1675 }
1676 }); 1998 });
1677 $MAPWIDGET->show; 1999 $MAPWIDGET->show;
1678 $MAPWIDGET->grab_focus; 2000 $MAPWIDGET->grab_focus;
1679
1680 $LOGVIEW = new CFPlus::UI::TextScroller
1681 expand => 1,
1682 font => $FONT_FIXED,
1683 fontsize => $::CFG->{log_fontsize},
1684 indent => -4,
1685 can_hover => 1,
1686 can_events => 1,
1687 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1688 ;
1689 2001
1690 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2002 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1691 title => "Setup", 2003 title => "Setup",
1692 name => "setup_dialog", 2004 name => "setup_dialog",
1693 x => 'center', 2005 x => 'center',
… …
1697 force_h => $::HEIGHT * 0.6, 2009 force_h => $::HEIGHT * 0.6,
1698 has_close_button => 1, 2010 has_close_button => 1,
1699 ; 2011 ;
1700 2012
1701 $METASERVER = metaserver_dialog; 2013 $METASERVER = metaserver_dialog;
2014 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1702 2015
1703 $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,
1704 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2017 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1705 2018
1706 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2019 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1707 "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.");
1708 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2021 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1709 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2022 "Configure various client-specific settings.");
1710 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2023 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1711 "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.");
1712 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2025 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1713 "Configure the use of audio, sound effects and background music."); 2026 "Configure the use of audio, sound effects and background music.");
1714 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2027 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1715 "Lets you define, edit and delete key bindings." 2028 "Lets you define, edit and delete key bindings."
1716 . "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 "
1717 . "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 "
1718 . "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. "
1719 . "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 "
1720 . "binding editor closes"); 2033 . "binding editor closes");
1721 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2034 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1722 "Some debuggin' options. Do not ask."); 2035 "Some debuggin' options. Do not ask.");
1723 2036
1724 $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
1725 2038
1726 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2039 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1727 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.");
1728 2041
1729 $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,
1730 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.");
1731 2044
1732 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
1733 2046
1734 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2047 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1767 } 2080 }
1768 2081
1769 $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]);
1770} 2083}
1771 2084
1772sub setup_build_button {
1773 my ($enabled) = @_;
1774 if ($enabled) {
1775 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1776 $BUILD_BUTTON ||= new CFPlus::UI::Button
1777 text => "Build",
1778 tooltip => "Opens the ingame builder",
1779 on_activate => sub {
1780 if ($CONN) {
1781 $CONN->send_ext_req (builder_player_items => sub {
1782 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1783 });
1784 }
1785 0
1786 };
1787 $BUTTONBAR->add ($BUILD_BUTTON);
1788 } else {
1789 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1790 }
1791}
1792
1793sub open_ingame_editor {
1794 my ($msg) = @_;
1795
1796 my $win = new CFPlus::UI::Toplevel
1797 x => 0,
1798 y => 'center',
1799 z => 4,
1800 name => 'builder_window',
1801 force_w => int $WIDTH * 1/4,
1802 force_h => int $HEIGHT * 3/4,
1803 title => "In game builder",
1804 has_close_button => 1;
1805
1806 my $r = new CFPlus::UI::ScrolledWindow (
1807 expand => 1,
1808 scroll_y => 1
1809 );
1810 $r->add (my $vb = new CFPlus::UI::VBox);
1811 $win->add ($r);
1812
1813
1814 $vb->add (
1815 new CFPlus::UI::Button
1816 text => "Disable build mode",
1817 on_activate => sub { $::IN_BUILD_MODE = undef }
1818 );
1819 $vb->add (
1820 new CFPlus::UI::Button
1821 text => "ERASE",
1822 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1823 );
1824
1825 for my $itemarchname (
1826 sort {
1827 $msg->{items}->{$a}->{build_arch_name}
1828 cmp $msg->{items}->{$b}->{build_arch_name}
1829 } keys %{$msg->{items}}
1830 ) {
1831 my $info = $msg->{items}->{$itemarchname};
1832 $vb->add (
1833 new CFPlus::UI::Button text => $info->{build_arch_name},
1834 on_activate => sub {
1835 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1836
1837 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1838 build_mode_query_arch_info ();
1839 }
1840 }
1841 );
1842 }
1843
1844 $win->show;
1845}
1846
1847sub build_mode_query_arch_info {
1848 my ($iteminfo) = $::IN_BUILD_MODE;
1849 my $itemarchname = $iteminfo->{item};
1850 my $info = $iteminfo->{info};
1851
1852 my $dialog = new CFPlus::UI::Toplevel
1853 x => "center",
1854 y => "center",
1855 z => 50,
1856 force_w => int $WIDTH * 1/2,
1857 title => "Enter information for placement of '$itemarchname'",
1858 has_close_button => 1;
1859
1860 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1861
1862 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1863 my $row = 0;
1864 if ($info->{has_name}) {
1865 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1866 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1867 }
1868 if ($info->{has_text}) {
1869 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1870 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1871 }
1872 if ($info->{has_connection}) {
1873 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1874 $table->add (1, $row++,
1875 new CFPlus::UI::Entry
1876 expand => 1,
1877 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1878 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1879 );
1880 }
1881
1882 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1883 $hb->add (new CFPlus::UI::Button
1884 text => "Close",
1885 expand => 1,
1886 on_activate => sub { $dialog->hide; 0 },
1887 );
1888 $dialog->show;
1889}
1890
1891sub video_shutdown { 2085sub video_shutdown {
1892 CFPlus::OpenGL::shutdown; 2086 CFPlus::OpenGL::shutdown;
1893 2087
1894 undef $SDL_ACTIVE; 2088 undef $SDL_ACTIVE;
1895} 2089}
1896 2090
1897my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1898my $bgmusic;#TODO#hack#d#
1899
1900sub audio_channel_finished {
1901 my ($channel) = @_;
1902
1903 #warn "channel $channel finished\n";#d#
1904}
1905
1906sub audio_music_finished {
1907 return unless $CFG->{bgm_enable};
1908
1909 # TODO: hack, do play loop and mood music
1910 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1911 $bgmusic->play (0);
1912
1913 push @bgmusic, shift @bgmusic;
1914}
1915
1916sub audio_init {
1917 if ($CFG->{audio_enable}) {
1918 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1919 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1920
1921 unless ($SDL_MIXER) {
1922 status "Unable to open sound device: there will be no sound";
1923 return;
1924 }
1925
1926 CFPlus::Mix_AllocateChannels 8;
1927 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1928
1929 audio_music_finished;
1930
1931 local $_;
1932 while (<$fh>) {
1933 next if /^\s*#/;
1934 next if /^\s*$/;
1935
1936 my ($file, $volume, $event) = split /\s+/, $_, 3;
1937
1938 push @SOUNDS, "$volume,$file";
1939
1940 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1941 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1942 $chunk->volume ($volume * 128 / 100);
1943 $chunk
1944 };
1945 }
1946 } else {
1947 status "unable to open sound config: $!";
1948 }
1949 }
1950}
1951
1952sub audio_shutdown {
1953 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1954 undef $SDL_MIXER;
1955 @SOUNDS = ();
1956 %AUDIO_CHUNKS = ();
1957}
1958
1959my %animate_object; 2091my %animate_object;
1960my $animate_timer; 2092my $animate_timer;
1961 2093
1962my $fps = 9; 2094my $fps = 9;
1963
1964my %demo;#d#
1965 2095
1966sub force_refresh { 2096sub force_refresh {
1967 $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;
1968 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1969 2099
1970 $CFPlus::UI::ROOT->draw; 2100 $CFPlus::UI::ROOT->draw;
1971 2101
1972 $WANT_REFRESH = 0; 2102 $WANT_REFRESH = 0;
1973 $CAN_REFRESH = 0; 2103 $CAN_REFRESH = 0;
1974 $LAST_REFRESH = $NOW; 2104 $LAST_REFRESH = $NOW;
1975 2105
1976 CFPlus::SDL_GL_SwapBuffers; 2106 CFPlus::SDL_GL_SwapBuffers;
1977} 2107}
1978 2108
1979my $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 {
1980 $NOW = time; 2110 $NOW = time;
1981 2111
1982 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1983 for CFPlus::SDL_PollEvent; 2113 for CFPlus::poll_events;
1984 2114
1985 if (%animate_object) { 2115 if (%animate_object) {
1986 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1987 $WANT_REFRESH++; 2117 ++$WANT_REFRESH;
1988 } 2118 }
1989 2119
1990 if ($WANT_REFRESH) { 2120 if ($WANT_REFRESH) {
1991 force_refresh; 2121 force_refresh;
1992 } else { 2122 } else {
… …
2002sub animation_stop { 2132sub animation_stop {
2003 my ($widget) = @_; 2133 my ($widget) = @_;
2004 delete $animate_object{$widget}; 2134 delete $animate_object{$widget};
2005} 2135}
2006 2136
2007# check once/second for faces that need to be prefetched
2008# this should, of course, only run on demand, but
2009# SDL forces worse things on us....
2010
2011Event->timer (after => 1, interval => 0.25, cb => sub {
2012 $CONN->face_prefetch
2013 if $CONN;
2014});
2015
2016%SDL_CB = ( 2137%SDL_CB = (
2017 CFPlus::SDL_QUIT => sub { 2138 CFPlus::SDL_QUIT => sub {
2018 Event::unloop -1; 2139 exit;
2019 }, 2140 },
2020 CFPlus::SDL_VIDEORESIZE => sub { 2141 CFPlus::SDL_VIDEORESIZE => sub {
2021 }, 2142 },
2022 CFPlus::SDL_VIDEOEXPOSE => sub { 2143 CFPlus::SDL_VIDEOEXPOSE => sub {
2023 CFPlus::UI::full_refresh; 2144 CFPlus::UI::full_refresh;
2024 }, 2145 },
2025 CFPlus::SDL_ACTIVEEVENT => sub { 2146 CFPlus::SDL_ACTIVEEVENT => sub {
2026# not useful, as APPACTIVE include sonly iconified state, not unmapped 2147# not useful, as APPACTIVE include sonly iconified state, not unmapped
2027# 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#
2028# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2150# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2029# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2151# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2030# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2152# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2031 }, 2153 },
2032 CFPlus::SDL_KEYDOWN => sub { 2154 CFPlus::SDL_KEYDOWN => sub {
… …
2056 2178
2057$SIG{INT} = $SIG{TERM} = sub { exit }; 2179$SIG{INT} = $SIG{TERM} = sub { exit };
2058 2180
2059{ 2181{
2060 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2182 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2183 CFPlus::DB::Server::run;
2184
2061 CFPlus::UI::set_layout ($::CFG->{layout}); 2185 CFPlus::UI::set_layout ($::CFG->{layout});
2062 2186
2063 my %DEF_CFG = ( 2187 my %DEF_CFG = (
2064 sdl_mode => 0, 2188 sdl_mode => 0,
2065 width => 640,
2066 height => 480,
2067 fullscreen => 0, 2189 fullscreen => 0,
2068 fast => 0, 2190 fast => 0,
2069 map_scale => 1, 2191 map_scale => 1,
2070 fow_enable => 1, 2192 fow_enable => 1,
2071 fow_intensity => 0.45, 2193 fow_intensity => 0,
2072 fow_smooth => 0, 2194 map_smoothing => 1,
2073 gui_fontsize => 1, 2195 gui_fontsize => 1,
2074 log_fontsize => 0.7, 2196 log_fontsize => 0.7,
2075 gauge_fontsize => 1, 2197 gauge_fontsize => 1,
2076 gauge_size => 0.35, 2198 gauge_size => 0.35,
2077 stat_fontsize => 0.7, 2199 stat_fontsize => 0.7,
2078 mapsize => 100, 2200 mapsize => 100,
2079 say_command => 'chat',
2080 audio_enable => 1, 2201 audio_enable => 1,
2202 effects_enable => 1,
2203 effects_volume => 1,
2081 bgm_enable => 1, 2204 bgm_enable => 1,
2082 bgm_volume => 0.25, 2205 bgm_volume => 0.5,
2083 face_prefetch => 0,
2084 output_sync => 1, 2206 output_sync => 1,
2085 output_count => 1, 2207 output_count => 1,
2208 output_rate => "",
2086 pickup => 0, 2209 pickup => 0,
2087 inv_sort => "mtime", 2210 inv_sort => "mtime",
2088 default => "profile", # default profile 2211 default => "profile", # default profile
2089 show_tips => 1, 2212 show_tips => 1,
2213 logview_max_par => 1000,
2090 ); 2214 );
2091 2215
2092 while (my ($k, $v) = each %DEF_CFG) { 2216 while (my ($k, $v) = each %DEF_CFG) {
2093 $CFG->{$k} = $v unless exists $CFG->{$k}; 2217 $CFG->{$k} = $v unless exists $CFG->{$k};
2094 } 2218 }
… …
2108 } 2232 }
2109 } 2233 }
2110 2234
2111 sdl_init; 2235 sdl_init;
2112 2236
2113 @SDL_MODES = reverse 2237 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2114 grep $_->[0] >= 640 && $_->[1] >= 480, 2238 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2115 CFPlus::SDL_ListModes;
2116
2117 @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;
2118 2242
2119 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2243 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2120 2244
2121 { 2245 {
2122 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2246 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2163 2287
2164Event::loop; 2288Event::loop;
2165#CFPlus::SDL_Quit; 2289#CFPlus::SDL_Quit;
2166#CFPlus::_exit 0; 2290#CFPlus::_exit 0;
2167 2291
2292END {
2293 video_shutdown;
2294 audio_shutdown;
2168END { CFPlus::SDL_Quit } 2295 CFPlus::SDL_Quit;
2296 CFPlus::DB::Server::stop;
2297}
2169 2298
2170=head1 NAME 2299=head1 NAME
2171 2300
2172cfplus - A Crossfire+ and Crossfire game client 2301cfplus - A Crossfire TRT and Crossfire game client
2173 2302
2174=head1 SYNOPSIS 2303=head1 SYNOPSIS
2175 2304
2176Just run it - no commandline arguments are supported. 2305Just run it - no commandline arguments are supported.
2177 2306
2178=head1 USAGE 2307=head1 USAGE
2179 2308
2180cfplus 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
2181fullscreen and interactively. 2310be used in fullscreen mode and interactively.
2182 2311
2183=head1 DEBUGGING 2312=head1 DEBUGGING
2184 2313
2185 2314
2186CFPLUS_DEBUG - environment variable 2315CFPLUS_DEBUG - environment variable

Diff Legend

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