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.149 by root, Thu Apr 12 07:53:31 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 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;
… …
60use CFPlus; 83use CFPlus;
61use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
62use CFPlus::Protocol; 85use CFPlus::Protocol;
63use CFPlus::DB; 86use CFPlus::DB;
64use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
65use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
67use CFPlus::Pod; 92use CFPlus::Pod;
68use CFPlus::MapWidget; 93use CFPlus::MapWidget;
69use CFPlus::Macro; 94use CFPlus::Macro;
70 95
71$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
88our $CONN; 113our $CONN;
89our $PROFILE; # current profile 114our $PROFILE; # current profile
90our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
91 116
92our $WANT_REFRESH; 117our $WANT_REFRESH;
93our $CAN_REFRESH;
94 118
95our @SDL_MODES; 119our @SDL_MODES;
96our $WIDTH; 120our $WIDTH;
97our $HEIGHT; 121our $HEIGHT;
98our $FULLSCREEN; 122our $FULLSCREEN;
… …
103 127
104our $MAP; 128our $MAP;
105our $MAPMAP; 129our $MAPMAP;
106our $MAPWIDGET; 130our $MAPWIDGET;
107our $BUTTONBAR; 131our $BUTTONBAR;
108our $LOGVIEW;
109our $CONSOLE;
110our $METASERVER; 132our $METASERVER;
111our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
112our $QUIT_DIALOG; 134our $QUIT_DIALOG;
113our $HOST_ENTRY; 135our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
121our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
122 144
123our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
124our $PL_WINDOW; 146our $PL_WINDOW;
125 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
126our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
127our $STATS_PAGE; 152our $STATS_PAGE;
128our $SKILL_PAGE; 153our $SKILL_PAGE;
129our $SPELL_PAGE; 154our $SPELL_PAGE;
130our $SPELL_LIST; 155our $SPELL_LIST;
… …
136our $STATWIDS; 161our $STATWIDS;
137 162
138our $SDL_ACTIVE; 163our $SDL_ACTIVE;
139our %SDL_CB; 164our %SDL_CB;
140 165
141our $SDL_MIXER;
142our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files
144
145our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 167our $STATUSBOX;
147our $DEBUG_STATUS; 168our $DEBUG_STATUS;
148 169
149our $INV; 170our $INV;
150our $INVR; 171our $INVR;
151our $INV_RIGHT_HB; 172our $INVR_HB;
152 173
153our $PICKUP_CFG; 174#############################################################################
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157 175
158sub status { 176sub status {
159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160} 178}
161 179
… …
163 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
164} 182}
165 183
166sub message { 184sub message {
167 my ($para) = @_; 185 my ($para) = @_;
168 186 $MESSAGE_WINDOW->message ($para);
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
175} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{face}[$face]
234 or return;
235
236 $meta->{data}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{data}{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->{data}{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.6, $dx, $dy, $vol]; # do not play sound for outdated events
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->{data}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{data}{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 $_ && $_->{data},
343 map $CONN->{face}[$_],
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#############################################################################
176 432
177sub destroy_query_dialog { 433sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
180} 436}
… …
207 title => "Server Query", 463 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 464 child => my $vbox = new CFPlus::UI::VBox,
209 ; 465 ;
210 466
211 my @dialog = my $label = new CFPlus::UI::Label 467 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 468 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 469 ellipsise => 0,
214 text => $prompt; 470 text => $prompt;
215 471
216 if ($flags & CS_QUERY_YESNO) { 472 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 473 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 490 );
235 491
236 $dialog->grab_focus; 492 $dialog->grab_focus;
237 493
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 494 } elsif ($flags & CS_QUERY_SINGLECHAR) {
239 $dialog->{tooltip} = "#charcreation_focus";
240
241 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) {
242 $MESSAGE_WINDOW->show; 496 $dialog->{tooltip} = "#charcreation_focus";
243 497
244 unshift @dialog, new CFPlus::UI::Label 498 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 499 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 500 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
248 502
249 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
250 504
251 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
252 text => "Next Race", 506 text => "Next Race",
253 on_activate => sub { 507 on_activate => sub {
254 $conn->send ("reply n"); 508 $conn->send ("reply n");
255 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
256 0 510 0
257 }, 511 },
258 ); 512 );
259 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
260 text => "Accept", 514 text => "Accept",
261 on_activate => sub { 515 on_activate => sub {
262 $conn->send ("reply d"); 516 $conn->send ("reply d");
263 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
264 0 518 0
265 }, 519 },
266 ); 520 );
267 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
268 unshift @dialog, new CFPlus::UI::Label 545 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 546 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 547 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 548 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 549 ;
… …
276 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
278 return; 555 return;
279 } 556 }
280 557
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283
284 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 560 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
288 562
289 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
290 564
291 # left: re-roll 565 # left: re-roll
292 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
293 text => "Roll Again", 567 text => "Roll Again",
294 on_activate => sub { 568 on_activate => sub {
295 $conn->send ("reply y"); 569 $conn->send ("reply y");
296 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
297 0 571 0
… …
311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313 ], 587 ],
314 ), 1 .. 2; 588 ), 1 .. 2;
315 589
316 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
317 text => "Swap Stats", 591 text => "Swap Stats",
318 on_activate => sub { 592 on_activate => sub {
319 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
320 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
321 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
322 0 596 0
323 }, 597 },
324 ); 598 );
325 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326 600
327 # right: accept 601 # right: accept
328 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
329 text => "Accept", 603 text => "Accept",
330 on_activate => sub { 604 on_activate => sub {
331 $conn->send ("reply n"); 605 $conn->send ("reply n");
332 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
333 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
… …
414 maph => $mapsize, 688 maph => $mapsize,
415 689
416 client => "cfplus $CFPlus::VERSION $] $^O", 690 client => "cfplus $CFPlus::VERSION $] $^O",
417 691
418 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
419 logview => $LOGVIEW,
420 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
421 map => $MAP, 694 map => $MAP,
422 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
423 query => \&server_query, 696 query => \&server_query,
424 697
425 setup_req => { 698 setup_req => {
426 smoothing => $CFG->{map_smoothing}*1, 699 smoothing => $CFG->{map_smoothing}*1,
427 },
428
429 sound_play => sub {
430 my ($x, $y, $soundnum, $type) = @_;
431
432 $SDL_MIXER
433 or return;
434
435 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
436 or return;
437
438 $chunk->play;
439 }, 700 },
440 }; 701 };
441 702
442 if ($CONN) { 703 if ($CONN) {
443 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
… …
453 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
454 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
455 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
456 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
457 $SPELL_LIST->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
458 722
459 return unless $CONN; 723 return unless $CONN;
460 724
461 status "connection closed"; 725 status "connection closed";
462 726
… …
472 736
473 $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]);
474 738
475 my $row = 0; 739 my $row = 0;
476 740
477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 741 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
478 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 742 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
479 can_events => 1, 743 can_events => 1,
480 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481 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
482 $table->add (0, $row, 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");
483 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
484 752
753 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
485 $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],
486 $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);
487 759
488 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
489 my ($self, $value) = @_; 761 my ($self, $value) = @_;
490 762
491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
493 }); 765 });
494 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
495 767
496 $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");
497 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
498 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
499 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
501 ); 773 );
502 774
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
777 state => $CFG->{force_opengl11},
778 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
779 . "higher memory usage and slower performance. It will, however, help tremendously on "
780 . "cards that claim to support a feature but fall back to software rendering. "
781 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
782 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
783 . "experience extremely low framerates and your card should do better, try this option.</b>",
784 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
785 );
786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
788 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
789 state => $CFG->{texture_compression},
790 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
791 . "will save a lot of memory and increase performance. The compression algorithm "
792 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
793 . "forced OpenGL 1.1 mode.",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
795 );
796
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 797 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fast}, 799 state => $CFG->{fast},
506 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
507 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
508 ); 802 );
509 803
510 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
511 $table->add (1, $row++, new CFPlus::UI::Slider 805 $table->add_at (1, $row++, new CFPlus::UI::Slider
512 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 806 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
513 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 807 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
514 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 808 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515 ); 809 );
516 810
517 $table->add (1, $row++, new CFPlus::UI::Button 811 $table->add_at (1, $row++, new CFPlus::UI::Button
518 expand => 1, align => 0, text => "Apply", 812 expand => 1, align => 0, text => "Apply",
519 tooltip => "Apply the video settings above.", 813 tooltip => "Apply the video settings above.",
520 on_activate => sub { 814 on_activate => sub {
521 video_shutdown (); 815 video_shutdown ();
522 video_init (); 816 video_init ();
523 0 817 0
524 } 818 }
525 ); 819 );
526 820
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
528 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 823 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 824 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
531 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
532 ); 826 );
533 827
534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
535 $table->add (1, $row++, new CFPlus::UI::CheckBox 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
537 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 831 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
538 . "This increases load on the graphics subsystem and works only with 2.x servers. " 832 . "This increases load on the graphics subsystem and works only with TRT servers. "
539 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
540 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
541 ); 835 );
542 836
543 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 837 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
544 $table->add (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
545 state => $CFG->{fow_enable}, 839 state => $CFG->{fow_enable},
546 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 840 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
547 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 841 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
548 ); 842 );
549 843
550 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 844 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
551 $table->add (1, $row++, new CFPlus::UI::Slider 845 $table->add_at (1, $row++, new CFPlus::UI::Slider
552 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 846 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
553 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 847 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 848 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
555 ); 849 );
556 850
557 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
558 $table->add (1, $row++, new CFPlus::UI::CheckBox
559 state => $CFG->{fow_smooth},
560 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
561 on_changed => sub {
562 my ($self, $value) = @_;
563 $CFG->{fow_smooth} = $value;
564 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
565 0
566 }
567 );
568
569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 851 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
570 $table->add (1, $row++, new CFPlus::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
571 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
572 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 854 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
855 . "but you still need to press apply to correctly re-layout the widget.",
573 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 856 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
574 ); 857 );
575 858
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 859 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
577 $table->add (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
578 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 861 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
579 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 862 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
580 on_changed => sub { 863 on_changed => sub {
581 $CFG->{gauge_fontsize} = $_[1]; 864 $CFG->{gauge_fontsize} = $_[1];
582 &set_gauge_window_fontsize; 865 &set_gauge_window_fontsize;
583 0 866 0
584 } 867 }
585 ); 868 );
586 869
587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 870 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
588 $table->add (1, $row++, new CFPlus::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
589 range => [$CFG->{gauge_size}, 0.2, 0.8], 872 range => [$CFG->{gauge_size}, 0.2, 0.8],
590 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 873 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
591 on_changed => sub { 874 on_changed => sub {
592 $CFG->{gauge_size} = $_[1]; 875 $CFG->{gauge_size} = $_[1];
593 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 876 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
599} 882}
600 883
601sub audio_setup { 884sub audio_setup {
602 my $vbox = new CFPlus::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
603 886
604 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 887 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
605 888
606 my $row = 0; 889 my $row = 0;
607 890
608 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 891 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
609 $table->add (1, $row++, new CFPlus::UI::CheckBox 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
610 state => $CFG->{audio_enable}, 893 state => $CFG->{audio_enable},
611 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.", 894 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.",
612 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 895 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
613 ); 896 );
614# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 897# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
615# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 898# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
616# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
617# }); 900# });
901
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{effects_enable},
905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub {
907 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
911 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
917 );
918
618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 919 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
619 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
620 $hbox->add (new CFPlus::UI::CheckBox 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
621 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
622 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 922 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
623 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 923 on_changed => sub {
924 $CFG->{bgm_enable} = $_[1];
925 $CONN->update_fx_want if $CONN;
926 audio_music_push;
927 0
928 }
624 ); 929 );
625 $hbox->add (new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
626 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
627 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
628 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 933 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
629 ); 934 );
630 935
631 $table->add (1, $row++, new CFPlus::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
632 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
633 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
634 on_activate => sub { 939 on_activate => sub {
635 audio_shutdown (); 940 audio_shutdown ();
636 audio_init (); 941 audio_init ();
637 0 942 0
… …
695} 1000}
696 1001
697sub debug_setup { 1002sub debug_setup {
698 my $table = new CFPlus::UI::Table; 1003 my $table = new CFPlus::UI::Table;
699 1004
700 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1005 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
701 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1006 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
702 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1007 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
703 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1008 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
704 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1009 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
705 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1010 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
706 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1011 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
707 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1012 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
708 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 1013 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
709 1014
710 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
711
712 for my $x (0..2) {
713 for my $y (0 .. 2) {
714 $table->add ($x + 3, $y,
715 new CFPlus::UI::Entry
716 text => $default_smooth[$x * 3 + $y],
717 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
718 );
719 }
720 }
721
722 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1015 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1016
1017 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
1018 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
1019 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
1020 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
1021 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
1022 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
1023
1024 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1025
1026 $c->add_items ({
1027 type => "line_loop",
1028 color => [0, 1, 0],
1029 width => 9,
1030 coord_mode => "abs",
1031 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
1032 });
1033
1034 $c->add_items ({
1035 type => "lines",
1036 color => [1, 1, 0],
1037 width => 2,
1038 coord_mode => "rel",
1039 coord => [[0,0], [1,1], [1,0], [0,1]],
1040 });
1041
1042 $c->add_items ({
1043 type => "polygon",
1044 color => [0, 0.43, 0],
1045 width => 2,
1046 coord_mode => "rel",
1047 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1048 });
723 1049
724 $table 1050 $table
725} 1051}
726 1052
727sub stats_window { 1053sub stats_window {
… …
775 [2, 4, st_spd => "Spd", 10.54], 1101 [2, 4, st_spd => "Spd", 10.54],
776 [2, 5, st_wspd => "WSp", 10.54], 1102 [2, 5, st_wspd => "WSp", 10.54],
777 ) { 1103 ) {
778 my ($col, $row, $id, $label, $template) = @$_; 1104 my ($col, $row, $id, $label, $template) = @$_;
779 1105
780 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1106 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
781 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1107 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
782 align => +1, template => $template, tooltip => "#stat_$label"); 1108 align => +1, template => $template, tooltip => "#stat_$label");
783 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1109 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
784 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1110 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
785 align => -1, text => $label, tooltip => "#stat_$label"); 1111 align => -1, text => $label, tooltip => "#stat_$label");
786 } 1112 }
787 1113
788 $vb->add (new CFPlus::UI::FancyFrame 1114 $vb->add (new CFPlus::UI::FancyFrame
… …
829 cold => ["Cold", 1155 cold => ["Cold",
830 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1156 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
831 ghit => ["Ghost hit", 1157 ghit => ["Ghost hit",
832 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1158 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
833 ); 1159 );
1160
834 for (qw/slow holyw conf fire depl magic 1161 for (qw/slow holyw conf fire depl magic
835 drain acid pois para deat phys 1162 drain acid pois para deat phys
836 blind fear tund elec cold ghit/) 1163 blind fear tund elec cold ghit/)
837 { 1164 {
838 $tbl2->add ($col, $row, 1165 $tbl2->add_at ($col, $row,
839 $STATWIDS->{"res_$_"} = 1166 $STATWIDS->{"res_$_"} =
840 new CFPlus::UI::Label 1167 new CFPlus::UI::Label
841 font => $FONT_FIXED, 1168 font => $FONT_FIXED,
842 template => "-100%", 1169 template => "-100%",
843 align => +1, 1170 align => +1,
844 valign => 0, 1171 valign => 0,
845 can_events => 1, 1172 can_events => 1,
846 can_hover => 1, 1173 can_hover => 1,
847 tooltip => $resist_names{$_}->[1], 1174 tooltip => $resist_names{$_}->[1],
848 ); 1175 );
849 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1176 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
850 font => $FONT_FIXED, 1177 font => $FONT_FIXED,
851 can_hover => 1, 1178 can_hover => 1,
852 can_events => 1, 1179 can_events => 1,
853 path => "ui/resist/resist_$_.png", 1180 path => "ui/resist/resist_$_.png",
854 tooltip => $resist_names{$_}->[1], 1181 tooltip => $resist_names{$_}->[1],
855 ); 1182 );
856 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1183 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
857 text => $resist_names{$_}->[0], 1184 text => $resist_names{$_}->[0],
858 font => $FONT_FIXED, 1185 font => $FONT_FIXED,
859 can_hover => 1, 1186 can_hover => 1,
860 can_events => 1, 1187 can_events => 1,
861 tooltip => $resist_names{$_}->[1], 1188 tooltip => $resist_names{$_}->[1],
… …
894 return if $METASERVER_ATIME > time; 1221 return if $METASERVER_ATIME > time;
895 $METASERVER_ATIME = time + 60; 1222 $METASERVER_ATIME = time + 60;
896 1223
897 my $table = $METASERVER->{table}; 1224 my $table = $METASERVER->{table};
898 $table->clear; 1225 $table->clear;
899 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1226 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
900 1227
901 my $ok = 0; 1228 my $ok = 0;
902 1229
903 CFPlus::background { 1230 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent; 1231 my $ua = CFPlus::lwp_useragent;
… …
915 "The time this server has been running without being restarted.", 1242 "The time this server has been running without being restarted.",
916 "The server software version - a '+' indicates a Crossfire+ server.", 1243 "The server software version - a '+' indicates a Crossfire+ server.",
917 "Short information about this server provided by its admins.", 1244 "Short information about this server provided by its admins.",
918 ); 1245 );
919 my @col = qw(#Users Host Uptime Version Description); 1246 my @col = qw(#Users Host Uptime Version Description);
920 $table->add ($_, 0, new CFPlus::UI::Label 1247 $table->add_at ($_, 0, new CFPlus::UI::Label
921 can_hover => 1, can_events => 1, 1248 can_hover => 1, can_events => 1,
922 align => 0, fg => [1, 1, 0], 1249 align => 0, fg => [1, 1, 0],
923 text => $col[$_], tooltip => $tip[$_]) 1250 text => $col[$_], tooltip => $tip[$_])
924 for 0 .. $#col; 1251 for 0 .. $#col;
925 1252
… …
947 1274
948 $m = [$users, $host, $uptime, $version, $desc]; 1275 $m = [$users, $host, $uptime, $version, $desc];
949 1276
950 $y++; 1277 $y++;
951 1278
952 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1279 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
953 (new CFPlus::UI::Button 1280 (new CFPlus::UI::Button
954 text => "Use", 1281 text => "Use",
955 tooltip => "Put this server into the <b>Host:Port</b> field", 1282 tooltip => "Put this server into the <b>Host:Port</b> field",
956 on_activate => sub { 1283 on_activate => sub {
957 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1284 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
960 }, 1287 },
961 ), 1288 ),
962 (new CFPlus::UI::Empty expand => 1), 1289 (new CFPlus::UI::Empty expand => 1),
963 ]); 1290 ]);
964 1291
965 $table->add ($_, $y, new CFPlus::UI::Label 1292 $table->add_at ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4, 1293 max_w => $::WIDTH * 0.4,
967 ellipsise => 0, 1294 ellipsise => 0,
968 align => $align[$_], 1295 align => $align[$_],
969 text => $m->[$_], 1296 text => $m->[$_],
970 tooltip => $tip[$_], 1297 tooltip => $tip[$_],
… …
1011 1338
1012 $vbox->add (new CFPlus::UI::FancyFrame 1339 $vbox->add (new CFPlus::UI::FancyFrame
1013 label => "Connection Settings", 1340 label => "Connection Settings",
1014 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1341 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1015 ); 1342 );
1016 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1343 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1017 1344
1018 { 1345 {
1019 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1346 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1020 1347
1021 $vbox->add ( 1348 $vbox->add (
1022 $HOST_ENTRY = new CFPlus::UI::Entry 1349 $HOST_ENTRY = new CFPlus::UI::Entry
1023 expand => 1, 1350 expand => 1,
1024 text => $CFG->{profile}{default}{host}, 1351 text => $CFG->{profile}{default}{host},
1025 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1352 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1026 on_changed => sub { 1353 on_changed => sub {
1027 my ($self, $value) = @_; 1354 my ($self, $value) = @_;
1028 $CFG->{profile}{default}{host} = $value; 1355 $CFG->{profile}{default}{host} = $value;
1029 0 1356 1
1030 } 1357 }
1031 ); 1358 );
1032 1359
1033 $vbox->add (new CFPlus::UI::Button 1360 $vbox->add (new CFPlus::UI::Button
1034 expand => 1, 1361 expand => 1,
1035 text => "Server List", 1362 text => "Server List",
1036 other => $METASERVER, 1363 other => $METASERVER,
1037 tooltip => "Show a list of available crossfire servers", 1364 tooltip => "Show a list of available crossfire servers",
1038 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1365 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1039 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1366 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1040 ); 1367 );
1041 } 1368 }
1042 1369
1043 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1370 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1044 $table->add (1, 4, new CFPlus::UI::Entry 1371 $table->add_at (1, 4, new CFPlus::UI::Entry
1045 text => $CFG->{profile}{default}{user}, 1372 text => $CFG->{profile}{default}{user},
1046 tooltip => "The name of your character on the server", 1373 tooltip => "The name of your character on the server",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1374 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1048 ); 1375 );
1049 1376
1050 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1377 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1051 $table->add (1, 5, new CFPlus::UI::Entry 1378 $table->add_at (1, 5, new CFPlus::UI::Entry
1052 text => $CFG->{profile}{default}{password}, 1379 text => $CFG->{profile}{default}{password},
1053 hidden => 1, 1380 hidden => 1,
1054 tooltip => "The password for your character", 1381 tooltip => "The password for your character",
1055 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1382 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1056 ); 1383 );
1057 1384
1058 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1385 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1059 $table->add (1, 7, new CFPlus::UI::Slider 1386 $table->add_at (1, 7, new CFPlus::UI::Slider
1060 force_w => 100, 1387 force_w => 100,
1061 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1388 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1062 tooltip => "This is the size of the portion of the map update the server sends you. " 1389 tooltip => "This is the size of the portion of the map update the server sends you. "
1063 . "If you set this to a high value you will be able to see further, " 1390 . "If you set this to a high value you will be able to see further, "
1064 . "but you also increase bandwidth requirements and latency. " 1391 . "but you also increase bandwidth requirements and latency. "
1065 . "This option is only used once at log-in.", 1392 . "This option is only used once at log-in.",
1066 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1393 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1067 ); 1394 );
1068 1395
1069 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1070 $table->add (1, 8, new CFPlus::UI::CheckBox
1071 state => $CFG->{face_prefetch},
1072 tooltip => "<b>Background Image Prefetch</b>\n\n"
1073 . "If enabled, the client automatically pre-fetches images from the server. "
1074 . "This might increase or create lag, but increases the chances "
1075 . "of faces being ready for display when you encounter them. "
1076 . "It also uses up server bandwidth on every connect, "
1077 . "so only set it if you really need to prefetch images. "
1078 . "This option can be set and unset any time.",
1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1080 );
1081
1082 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1396 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1083 $table->add (1, 9, new CFPlus::UI::Entry 1397 $table->add_at (1, 8, new CFPlus::UI::Entry
1084 text => $CFG->{output_rate}, 1398 text => $CFG->{output_rate},
1085 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1399 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1086 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1400 . "when sending data. When 0 or unset, the server "
1087 . "default will be used, which is usually around 100kb/s.", 1401 . "default will be used, which is usually around 100kb/s. Most servers will "
1402 . "dynamically find an optimal rate, so adjust this only when necessary.",
1088 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1403 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1089 ); 1404 );
1090 1405
1091 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1406 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092 $table->add (1, 10, new CFPlus::UI::Entry 1407 $table->add_at (1, 9, new CFPlus::UI::Entry
1093 text => $CFG->{output_count}, 1408 text => $CFG->{output_count},
1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1409 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1410 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1096 ); 1411 );
1097 1412
1098 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1413 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099 $table->add (1, 11, new CFPlus::UI::Entry 1414 $table->add_at (1, 10, new CFPlus::UI::Entry
1100 text => $CFG->{output_sync}, 1415 text => $CFG->{output_sync},
1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1416 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1417 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1103 ); 1418 );
1104 1419
1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1420 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1106 expand => 1, 1421 expand => 1,
1107 align => 0, 1422 align => 0,
1108 text => "Login", 1423 text => "Login",
1109 on_activate => sub { 1424 on_activate => sub {
1110 $CONN ? stop_game 1425 $CONN ? stop_game
1111 : start_game; 1426 : start_game;
1112 0 1427 1
1113 }, 1428 },
1114 ); 1429 );
1115 1430
1116 $vbox->add (new CFPlus::UI::FancyFrame 1431 $vbox->add (new CFPlus::UI::FancyFrame
1117 label => "Server Info", 1432 label => "Server Info",
… …
1124sub client_setup { 1439sub client_setup {
1125 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1440 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126 1441
1127 my $row = 0; 1442 my $row = 0;
1128 1443
1129 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1130 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1131 text => $CFG->{say_command},
1132 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. "
1133 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1134 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1135 on_changed => sub {
1136 my ($self, $value) = @_;
1137 $CFG->{say_command} = $value;
1138 0
1139 }
1140 );
1141
1142 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1444 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1143 $table->add (1, $row++, new CFPlus::UI::CheckBox 1445 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1144 state => $CFG->{show_tips}, 1446 state => $CFG->{show_tips},
1145 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1447 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1146 on_changed => sub { 1448 on_changed => sub {
1147 my ($self, $value) = @_; 1449 my ($self, $value) = @_;
1148 $CFG->{show_tips} = $value; 1450 $CFG->{show_tips} = $value;
1149 0 1451 0
1150 } 1452 }
1151 ); 1453 );
1152 1454
1153 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1455 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1154 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1456 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1155 text => $CFG->{logview_max_par}, 1457 text => $CFG->{logview_max_par},
1156 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1458 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1157 . "sends more messages than this number, older messages get removed to save memory and " 1459 . "sends more messages than this number, older messages get removed to save memory and "
1158 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1460 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159 on_changed => sub { 1461 on_changed => sub {
1160 my ($self, $value) = @_; 1462 my ($self, $value) = @_;
1161 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1463 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1162 0 1464 0
1163 }, 1465 },
1164 ); 1466 );
1165 1467
1166 $table 1468 $table
1167} 1469}
1168 1470
1169sub message_window {
1170 my $window = new CFPlus::UI::Toplevel
1171 name => "message_window",
1172 title => "Messages",
1173 border_bg => [1, 1, 1, 1],
1174 x => "max",
1175 y => 0,
1176 force_w => $::WIDTH * 0.4,
1177 force_h => $::HEIGHT * 0.5,
1178 child => (my $vbox = new CFPlus::UI::VBox),
1179 has_close_button => 1;
1180
1181 $vbox->add ($LOGVIEW);
1182
1183 $vbox->add (my $input = new CFPlus::UI::Entry
1184 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1185 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1186 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1187 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1188 on_focus_in => sub {
1189 my ($input, $prev_focus) = @_;
1190
1191 delete $input->{refocus_map};
1192
1193 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1194 $input->{refocus_map} = 1;
1195 }
1196 delete $input->{auto_activated};
1197
1198 0
1199 },
1200 on_activate => sub {
1201 my ($input, $text) = @_;
1202 $input->set_text ('');
1203
1204 if ($text =~ /^\/(.*)/) {
1205 $::CONN->user_send ($1);
1206 } else {
1207 my $say_cmd = $::CFG->{say_command} || 'say';
1208 $::CONN->user_send ("$say_cmd $text");
1209 }
1210 if ($input->{refocus_map}) {
1211 delete $input->{refocus_map};
1212 $MAPWIDGET->focus_in
1213 }
1214
1215 0
1216 },
1217 on_escape => sub {
1218 $MAPWIDGET->grab_focus;
1219
1220 0
1221 },
1222 );
1223
1224 $CONSOLE = {
1225 window => $window,
1226 input => $input,
1227 };
1228
1229 $window
1230}
1231
1232sub autopickup_setup { 1471sub autopickup_setup {
1472 my $r = new CFPlus::UI::ScrolledWindow (
1473 expand => 1,
1474 scroll_y => 1
1475 );
1233 my $table = new CFPlus::UI::Table; 1476 $r->add (my $table = new CFPlus::UI::Table
1477 row_expand => [0],
1478 col_expand => [0, 1, 0, 1],
1479 );
1234 1480
1235 for ( 1481 for (
1236 ["General", 0, 0, 1482 ["General", 0, 0,
1237 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1483 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1238 ["Inhibit autopickup" => PICKUP_INHIBIT], 1484 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1273 ], 1519 ],
1274 ["Weight/Value ratio", 2, 17] 1520 ["Weight/Value ratio", 2, 17]
1275 ) 1521 )
1276 { 1522 {
1277 my ($title, $x, $y, @bits) = @$_; 1523 my ($title, $x, $y, @bits) = @$_;
1278 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1524 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1279 1525
1280 for (@bits) { 1526 for (@bits) {
1281 ++$y; 1527 ++$y;
1282 1528
1283 my $mask = $_->[1]; 1529 my $mask = $_->[1];
1284 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1530 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1285 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1531 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1286 state => $::CFG->{pickup} & $mask, 1532 state => $::CFG->{pickup} & $mask,
1287 on_changed => sub { 1533 on_changed => sub {
1288 my ($box, $value) = @_; 1534 my ($box, $value) = @_;
1289 1535
1290 if ($value) { 1536 if ($value) {
… …
1301 1547
1302 ${$_->[2]} = $checkbox if $_->[2]; 1548 ${$_->[2]} = $checkbox if $_->[2];
1303 } 1549 }
1304 } 1550 }
1305 1551
1306 $table->add (2, 18, new CFPlus::UI::ValSlider 1552 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1307 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1553 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308 template => ">= 99", 1554 template => ">= 99",
1309 to_value => sub { ">= " . 5 * $_[0] }, 1555 to_value => sub { ">= " . 5 * $_[0] },
1310 on_changed => sub { 1556 on_changed => sub {
1311 my ($slider, $value) = @_; 1557 my ($slider, $value) = @_;
… …
1314 $::CFG->{pickup} |= int $value 1560 $::CFG->{pickup} |= int $value
1315 if $value; 1561 if $value;
1316 1; 1562 1;
1317 }); 1563 });
1318 1564
1319 $table->add (3, 18, new CFPlus::UI::Button 1565 $table->add_at (3, 18, new CFPlus::UI::Button
1320 text => "set", 1566 text => "set",
1321 on_activate => sub { 1567 on_activate => sub {
1322 $::CONN->send_command ("pickup $::CFG->{pickup}") 1568 $::CONN->send_command ("pickup $::CFG->{pickup}")
1323 if defined $::CONN; 1569 if defined $::CONN;
1324 0 1570 0
1325 }); 1571 });
1326 1572
1327 $table 1573 $r
1328} 1574}
1329 1575
1330my %SORT_ORDER = ( 1576my %SORT_ORDER = (
1331 type => undef, 1577 type => undef,
1332 mtime => sub { 1578 mtime => sub {
… …
1376 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1377 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1378 1624
1379 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1380 1626
1381 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1382 1628
1383 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1629 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1384 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1385 1631
1386 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
1387 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1633 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1388 1634
1389 $hb 1635 $hb
1636}
1637
1638sub media_window {
1639 my $vb = new CFPlus::UI::VBox;
1640
1641 $vb->add (new CFPlus::UI::FancyFrame
1642 label => "Currently playing music",
1643 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1644 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1645 );
1646
1647 $vb->add (new CFPlus::UI::FancyFrame
1648 label => "Other media used in this session",
1649 expand => 1,
1650 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1651 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1652 );
1653
1654 $vb
1655}
1656
1657sub add_license {
1658 my ($meta) = @_;
1659
1660 $meta = $meta->{data}
1661 or return;
1662
1663 $meta->{license} || $meta->{author} || $meta->{source}
1664 or return;
1665
1666 $LICENSE_WIDGET->add_paragraph ({
1667 fg => [1, 1, 1, 1],
1668 markup => "<small>"
1669 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1670 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1671 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1672 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1673 . "</small>",
1674 });
1675 $LICENSE_WIDGET->scroll_to_bottom;
1390} 1676}
1391 1677
1392sub toggle_player_page { 1678sub toggle_player_page {
1393 my ($widget) = @_; 1679 my ($widget) = @_;
1394 1680
… …
1411 has_close_button => 1 1697 has_close_button => 1
1412 ; 1698 ;
1413 1699
1414 my $ntb = 1700 my $ntb =
1415 $PL_NOTEBOOK = 1701 $PL_NOTEBOOK =
1416 new CFPlus::UI::Notebook expand => 1, debug => 1; 1702 new CFPlus::UI::Notebook expand => 1;
1417 1703
1418 $ntb->add ( 1704 $ntb->add_tab (
1419 "Statistics (F2)" => $STATS_PAGE = stats_window, 1705 "Statistics (F2)" => $STATS_PAGE = stats_window,
1420 "Shows statistics, where all your Stats and Resistances are shown." 1706 "Shows statistics, where all your Stats and Resistances are shown."
1421 ); 1707 );
1422 $ntb->add ( 1708 $ntb->add_tab (
1423 "Skills (F3)" => $SKILL_PAGE = skill_window, 1709 "Skills (F3)" => $SKILL_PAGE = skill_window,
1424 "Shows all your Skills." 1710 "Shows all your Skills."
1425 ); 1711 );
1426 1712
1427 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1713 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1428 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1714 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1429 $ntb->add ( 1715 $ntb->add_tab (
1430 "Spellbook (F4)" => $spellsw, 1716 "Spellbook (F4)" => $spellsw,
1431 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1717 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1432 ); 1718 );
1433 $ntb->add ( 1719 $ntb->add_tab (
1434 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1435 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1721 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1436 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1722 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1437 ); 1723 );
1724 $ntb->add_tab (Pickup => autopickup_setup,
1725 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1726
1727 $ntb->add_tab (Media => media_window,
1728 "License, Author and Source info for media sent by the server.");
1438 1729
1439 $ntb->set_current_page ($INVENTORY_PAGE); 1730 $ntb->set_current_page ($INVENTORY_PAGE);
1440 1731
1441 $plwin->add ($ntb); 1732 $plwin->add ($ntb);
1442 $plwin 1733 $plwin
… …
1596 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1597 ); 1888 );
1598 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1599 text => "Quit anyway", 1890 text => "Quit anyway",
1600 expand => 1, 1891 expand => 1,
1601 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1602 ); 1893 );
1603 } 1894 }
1604 1895
1605 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1606 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
1639 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1930 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1640 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1931 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641 1932
1642 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1933 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643 1934
1644 $table->add (0, 0, new CFPlus::UI::Button 1935 $table->add_at (0, 0, new CFPlus::UI::Button
1645 text => "Close", 1936 text => "Close",
1646 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>.", 1937 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>.",
1647 on_activate => $close, 1938 on_activate => $close,
1648 ); 1939 );
1649 1940
1650 $table->add (2, 0, new CFPlus::UI::Button 1941 $table->add_at (2, 0, new CFPlus::UI::Button
1651 text => "Next", 1942 text => "Next",
1652 tooltip => "Show the next <b>Tip of the day</b>.", 1943 tooltip => "Show the next <b>Tip of the day</b>.",
1653 on_activate => sub { 1944 on_activate => sub {
1654 $close->(); 1945 $close->();
1655 &show_tip_of_the_day; 1946 &show_tip_of_the_day;
… …
1664 CFPlus::SDL_Init 1955 CFPlus::SDL_Init
1665 and die "SDL::Init failed!\n"; 1956 and die "SDL::Init failed!\n";
1666} 1957}
1667 1958
1668sub video_init { 1959sub video_init {
1669 sdl_init;
1670
1671 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1960 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1672 1961
1673 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1962 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1674 1963
1675 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1964 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1676 $FULLSCREEN = $CFG->{fullscreen}; 1965 $FULLSCREEN = $CFG->{fullscreen};
1677 $FAST = $CFG->{fast}; 1966 $FAST = $CFG->{fast};
1678 1967
1679 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1968 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1680 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1969 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1681 1970
1682 $SDL_ACTIVE = 1; 1971 $SDL_ACTIVE = 1;
1683 $LAST_REFRESH = time - 0.01; 1972 $LAST_REFRESH = time - 0.01;
1684 1973
… …
1726 2015
1727 $MAPWIDGET = new CFPlus::MapWidget; 2016 $MAPWIDGET = new CFPlus::MapWidget;
1728 $MAPWIDGET->connect (activate_console => sub { 2017 $MAPWIDGET->connect (activate_console => sub {
1729 my ($mapwidget, $preset) = @_; 2018 my ($mapwidget, $preset) = @_;
1730 2019
1731 if ($CONSOLE) { 2020 $MESSAGE_WINDOW->activate_console ($preset)
1732 $CONSOLE->{input}->{auto_activated} = 1; 2021 if $MESSAGE_WINDOW;
1733 $CONSOLE->{input}->grab_focus;
1734
1735 if ($preset && $CONSOLE->{input}->get_text eq '') {
1736 $CONSOLE->{input}->set_text ($preset);
1737 }
1738 }
1739 }); 2022 });
1740 $MAPWIDGET->show; 2023 $MAPWIDGET->show;
1741 $MAPWIDGET->grab_focus; 2024 $MAPWIDGET->grab_focus;
1742
1743 $LOGVIEW = new CFPlus::UI::TextScroller
1744 expand => 1,
1745 font => $FONT_FIXED,
1746 fontsize => $::CFG->{log_fontsize},
1747 indent => -4,
1748 can_hover => 1,
1749 can_events => 1,
1750 max_par => $CFG->{logview_max_par},
1751 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1752 ;
1753 2025
1754 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2026 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1755 title => "Setup", 2027 title => "Setup",
1756 name => "setup_dialog", 2028 name => "setup_dialog",
1757 x => 'center', 2029 x => 'center',
… …
1761 force_h => $::HEIGHT * 0.6, 2033 force_h => $::HEIGHT * 0.6,
1762 has_close_button => 1, 2034 has_close_button => 1,
1763 ; 2035 ;
1764 2036
1765 $METASERVER = metaserver_dialog; 2037 $METASERVER = metaserver_dialog;
2038 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1766 2039
1767 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2040 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1768 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2041 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1769 2042
1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2043 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1771 "Configure the server to play on, your username, password and other server-related options."); 2044 "Configure the server to play on, your username, password and other server-related options.");
1772 $SETUP_NOTEBOOK->add (Client => client_setup, 2045 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1773 "Configure various client-specific settings."); 2046 "Configure various client-specific settings.");
1774 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1775 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1776 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2047 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1777 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2048 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1778 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2049 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1779 "Configure the use of audio, sound effects and background music."); 2050 "Configure the use of audio, sound effects and background music.");
1780 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2051 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1781 "Lets you define, edit and delete key bindings." 2052 "Lets you define, edit and delete key bindings."
1782 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2053 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1783 . "with nothing set and the recording started. After doing the actions you " 2054 . "with nothing set and the recording started. After doing the actions you "
1784 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2055 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1785 . "After pressing the combo the binding will be saved automatically and the " 2056 . "After pressing the combo the binding will be saved automatically and the "
1786 . "binding editor closes"); 2057 . "binding editor closes");
1787 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2058 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1788 "Some debuggin' options. Do not ask."); 2059 "Some debuggin' options. Do not ask.");
1789 2060
1790 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2061 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1791 2062
1792 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2063 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1793 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2064 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1794 2065
1795 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2066 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1796 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2067 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1797 2068
1798 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 2069 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
1799 2070
1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2071 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1820 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
1821 on_activate => sub { 2092 on_activate => sub {
1822 if ($CONN) { 2093 if ($CONN) {
1823 open_quit_dialog; 2094 open_quit_dialog;
1824 } else { 2095 } else {
1825 exit; 2096 Event::unloop_all;
1826 } 2097 }
1827 0 2098 0
1828 }, 2099 },
1829 ); 2100 );
1830 2101
1831 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
1832 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
1833 } 2105 }
1834 2106
1835 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2107 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1836}
1837
1838sub setup_build_button {
1839 my ($enabled) = @_;
1840 if ($enabled) {
1841 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1842 $BUILD_BUTTON ||= new CFPlus::UI::Button
1843 text => "Build",
1844 tooltip => "Opens the ingame builder",
1845 on_activate => sub {
1846 if ($CONN) {
1847 $CONN->send_ext_req (builder_player_items => sub {
1848 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1849 });
1850 }
1851 0
1852 };
1853 $BUTTONBAR->add ($BUILD_BUTTON);
1854 } else {
1855 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1856 }
1857}
1858
1859sub open_ingame_editor {
1860 my ($msg) = @_;
1861
1862 my $win = new CFPlus::UI::Toplevel
1863 x => 0,
1864 y => 'center',
1865 z => 4,
1866 name => 'builder_window',
1867 force_w => int $WIDTH * 1/4,
1868 force_h => int $HEIGHT * 3/4,
1869 title => "In game builder",
1870 has_close_button => 1;
1871
1872 my $r = new CFPlus::UI::ScrolledWindow (
1873 expand => 1,
1874 scroll_y => 1
1875 );
1876 $r->add (my $vb = new CFPlus::UI::VBox);
1877 $win->add ($r);
1878
1879
1880 $vb->add (
1881 new CFPlus::UI::Button
1882 text => "Disable build mode",
1883 on_activate => sub { $::IN_BUILD_MODE = undef }
1884 );
1885 $vb->add (
1886 new CFPlus::UI::Button
1887 text => "ERASE",
1888 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1889 );
1890
1891 for my $itemarchname (
1892 sort {
1893 $msg->{items}->{$a}->{build_arch_name}
1894 cmp $msg->{items}->{$b}->{build_arch_name}
1895 } keys %{$msg->{items}}
1896 ) {
1897 my $info = $msg->{items}->{$itemarchname};
1898 $vb->add (
1899 new CFPlus::UI::Button text => $info->{build_arch_name},
1900 on_activate => sub {
1901 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1902
1903 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1904 build_mode_query_arch_info ();
1905 }
1906 }
1907 );
1908 }
1909
1910 $win->show;
1911}
1912
1913sub build_mode_query_arch_info {
1914 my ($iteminfo) = $::IN_BUILD_MODE;
1915 my $itemarchname = $iteminfo->{item};
1916 my $info = $iteminfo->{info};
1917
1918 my $dialog = new CFPlus::UI::Toplevel
1919 x => "center",
1920 y => "center",
1921 z => 50,
1922 force_w => int $WIDTH * 1/2,
1923 title => "Enter information for placement of '$itemarchname'",
1924 has_close_button => 1;
1925
1926 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927
1928 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929 my $row = 0;
1930 if ($info->{has_name}) {
1931 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1932 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933 }
1934 if ($info->{has_text}) {
1935 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1936 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937 }
1938 if ($info->{has_connection}) {
1939 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940 $table->add (1, $row++,
1941 new CFPlus::UI::Entry
1942 expand => 1,
1943 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1944 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1945 );
1946 }
1947
1948 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1949 $hb->add (new CFPlus::UI::Button
1950 text => "Close",
1951 expand => 1,
1952 on_activate => sub { $dialog->hide; 0 },
1953 );
1954 $dialog->show;
1955} 2108}
1956 2109
1957sub video_shutdown { 2110sub video_shutdown {
1958 CFPlus::OpenGL::shutdown; 2111 CFPlus::OpenGL::shutdown;
1959 2112
1960 undef $SDL_ACTIVE; 2113 undef $SDL_ACTIVE;
1961} 2114}
1962 2115
1963my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1964my $bgmusic;#TODO#hack#d#
1965
1966sub audio_channel_finished {
1967 my ($channel) = @_;
1968
1969 #warn "channel $channel finished\n";#d#
1970}
1971
1972sub audio_music_finished {
1973 return unless $CFG->{bgm_enable};
1974
1975 # TODO: hack, do play loop and mood music
1976 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1977 $bgmusic->play (0);
1978
1979 push @bgmusic, shift @bgmusic;
1980}
1981
1982sub audio_init {
1983 if ($CFG->{audio_enable}) {
1984 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1985 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1986
1987 unless ($SDL_MIXER) {
1988 status "Unable to open sound device: there will be no sound";
1989 return;
1990 }
1991
1992 CFPlus::Mix_AllocateChannels 8;
1993 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1994
1995 audio_music_finished;
1996
1997 local $_;
1998 while (<$fh>) {
1999 next if /^\s*#/;
2000 next if /^\s*$/;
2001
2002 my ($file, $volume, $event) = split /\s+/, $_, 3;
2003
2004 push @SOUNDS, "$volume,$file";
2005
2006 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2007 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2008 $chunk->volume ($volume * 128 / 100);
2009 $chunk
2010 };
2011 }
2012 } else {
2013 status "unable to open sound config: $!";
2014 }
2015 }
2016}
2017
2018sub audio_shutdown {
2019 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2020 undef $SDL_MIXER;
2021 @SOUNDS = ();
2022 %AUDIO_CHUNKS = ();
2023}
2024
2025my %animate_object; 2116my %animate_object;
2026my $animate_timer; 2117my $animate_timer;
2027 2118
2028my $fps = 9; 2119my $fps = 9;
2029 2120
2030my %demo;#d#
2031
2032sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
2033 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2123 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2034 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
2035 2126
2036 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
2037 2128 CFPlus::SDL_GL_SwapBuffers;
2038 $WANT_REFRESH = 0;
2039 $CAN_REFRESH = 0;
2040 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
2041 2130 $WANT_REFRESH->stop;
2042 CFPlus::SDL_GL_SwapBuffers;
2043} 2131}
2044 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
2045my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2135my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2046 $NOW = time; 2136 $NOW = time;
2047 2137
2048 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2049 for CFPlus::SDL_PollEvent; 2139 for CFPlus::poll_events;
2050 2140
2051 if (%animate_object) { 2141 if (%animate_object) {
2052 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2053 $WANT_REFRESH++; 2143 $WANT_REFRESH->start;
2054 }
2055
2056 if ($WANT_REFRESH) {
2057 force_refresh;
2058 } else {
2059 $CAN_REFRESH = 1;
2060 } 2144 }
2061}); 2145});
2062 2146
2063sub animation_start { 2147sub animation_start {
2064 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2068sub animation_stop { 2152sub animation_stop {
2069 my ($widget) = @_; 2153 my ($widget) = @_;
2070 delete $animate_object{$widget}; 2154 delete $animate_object{$widget};
2071} 2155}
2072 2156
2073# check once/second for faces that need to be prefetched
2074# this should, of course, only run on demand, but
2075# SDL forces worse things on us....
2076
2077Event->timer (after => 1, interval => 0.25, cb => sub {
2078 $CONN->face_prefetch
2079 if $CONN;
2080});
2081
2082%SDL_CB = ( 2157%SDL_CB = (
2083 CFPlus::SDL_QUIT => sub { 2158 CFPlus::SDL_QUIT => sub {
2084 Event::unloop -1; 2159 exit;
2085 }, 2160 },
2086 CFPlus::SDL_VIDEORESIZE => sub { 2161 CFPlus::SDL_VIDEORESIZE => sub {
2087 }, 2162 },
2088 CFPlus::SDL_VIDEOEXPOSE => sub { 2163 CFPlus::SDL_VIDEOEXPOSE => sub {
2089 CFPlus::UI::full_refresh; 2164 CFPlus::UI::full_refresh;
2090 }, 2165 },
2091 CFPlus::SDL_ACTIVEEVENT => sub { 2166 CFPlus::SDL_ACTIVEEVENT => sub {
2092# not useful, as APPACTIVE include sonly iconified state, not unmapped 2167# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2168# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2169# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2094# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2170# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2171# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2172# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2097 }, 2173 },
2098 CFPlus::SDL_KEYDOWN => sub { 2174 CFPlus::SDL_KEYDOWN => sub {
… …
2127 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2128 2204
2129 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2130 2206
2131 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2132 sdl_mode => 0, 2208 sdl_mode => 0,
2133 width => 640,
2134 height => 480,
2135 fullscreen => 0, 2209 fullscreen => 0,
2136 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2137 map_scale => 1, 2213 map_scale => 1,
2138 fow_enable => 1, 2214 fow_enable => 1,
2139 fow_intensity => 0.45, 2215 fow_intensity => 0,
2140 fow_smooth => 0,
2141 map_smoothing => 1, 2216 map_smoothing => 1,
2142 gui_fontsize => 1, 2217 gui_fontsize => 1,
2143 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2144 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2145 gauge_size => 0.35, 2220 gauge_size => 0.35,
2146 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2147 mapsize => 100, 2222 mapsize => 100,
2148 say_command => 'chat',
2149 audio_enable => 1, 2223 audio_enable => 1,
2224 effects_enable => 1,
2225 effects_volume => 1,
2150 bgm_enable => 1, 2226 bgm_enable => 1,
2151 bgm_volume => 0.25, 2227 bgm_volume => 0.5,
2152 face_prefetch => 0,
2153 output_sync => 1, 2228 output_sync => 1,
2154 output_count => 1, 2229 output_count => 1,
2155 output_rate => "", 2230 output_rate => "",
2156 pickup => 0, 2231 pickup => 0,
2157 inv_sort => "mtime", 2232 inv_sort => "mtime",
2158 default => "profile", # default profile 2233 default => "profile", # default profile
2159 show_tips => 1, 2234 show_tips => 1,
2160 logview_max_par => 1000, 2235 logview_max_par => 1000,
2161 ); 2236 );
2162 2237
2163 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2164 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2165 } 2240 }
… …
2179 } 2254 }
2180 } 2255 }
2181 2256
2182 sdl_init; 2257 sdl_init;
2183 2258
2184 @SDL_MODES = reverse 2259 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2185 grep $_->[0] >= 640 && $_->[1] >= 480, 2260 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2186 CFPlus::SDL_ListModes;
2187
2188 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2261 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2262
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2189 2264
2190 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2265 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2191 2266
2192 { 2267 {
2193 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2268 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2231} 2306}
2232 2307
2233show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2234 2309
2235Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2236#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2237#CFPlus::_exit 0; 2315CFPlus::DB::Server::stop;
2238
2239END { CFPlus::SDL_Quit }
2240 2316
2241=head1 NAME 2317=head1 NAME
2242 2318
2243cfplus - A Crossfire+ and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2244 2320
2245=head1 SYNOPSIS 2321=head1 SYNOPSIS
2246 2322
2247Just run it - no commandline arguments are supported. 2323Just run it - no commandline arguments are supported.
2248 2324
2249=head1 USAGE 2325=head1 USAGE
2250 2326
2251cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2327cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2252fullscreen and interactively. 2328be used in fullscreen mode and interactively.
2253 2329
2254=head1 DEBUGGING 2330=head1 DEBUGGING
2255 2331
2256 2332
2257CFPLUS_DEBUG - environment variable 2333CFPLUS_DEBUG - environment variable

Diff Legend

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