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

Diff Legend

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