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.125 by root, Thu Nov 16 19:42:46 2006 UTC vs.
Revision 1.210 by root, Sun Aug 12 01:49:09 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) {
22} 23}
23 24
24use strict; 25use strict;
25use utf8; 26use utf8;
26 27
28use Carp 'verbose';
29
27# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
28BEGIN { 31BEGIN {
29 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
30 @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
31 34
35 my $tmp = $ENV{PAR_TEMP};
36
32 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
33 for ($zip->memberNames) { 38 for ($zip->memberNames) {
34 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
36 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
37 } 42 }
38 } 43 }
39 44
40 # 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
41 54
42 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;
43 } 67 }
44} 68}
45 69
46# 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
47unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
48 if %PAR::LibCache; 72 if %PAR::LibCache;
49 73
50use Time::HiRes 'time'; 74use Time::HiRes 'time';
51use Event; 75use Event;
76use List::Util qw(max min);
52 77
53use Crossfire; 78use Crossfire;
54use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
55 80
56use Compress::LZF; 81use Compress::LZF;
57 82
58use CFPlus; 83use CFPlus;
59use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
60use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
61use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
62use CFPlus::Pod; 92use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
65 95
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 97$SIG{PIPE} = 'IGNORE';
68 98
69$Event::Eval = 0; 99$Event::Eval = 1;
70$Event::DIED = sub { 100$Event::DIED = sub {
71 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 102};
76 103
77my $MAX_FPS = 60; 104my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
79 106
86our $CONN; 113our $CONN;
87our $PROFILE; # current profile 114our $PROFILE; # current profile
88our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
89 116
90our $WANT_REFRESH; 117our $WANT_REFRESH;
91our $CAN_REFRESH;
92 118
93our @SDL_MODES; 119our @SDL_MODES;
94our $WIDTH; 120our $WIDTH;
95our $HEIGHT; 121our $HEIGHT;
96our $FULLSCREEN; 122our $FULLSCREEN;
101 127
102our $MAP; 128our $MAP;
103our $MAPMAP; 129our $MAPMAP;
104our $MAPWIDGET; 130our $MAPWIDGET;
105our $BUTTONBAR; 131our $BUTTONBAR;
106our $LOGVIEW;
107our $CONSOLE;
108our $METASERVER; 132our $METASERVER;
109our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
110our $QUIT_DIALOG; 134our $QUIT_DIALOG;
111our $HOST_ENTRY; 135our $HOST_ENTRY;
112our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
119our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
120 144
121our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
122our $PL_WINDOW; 146our $PL_WINDOW;
123 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
124our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
125our $STATS_PAGE; 152our $STATS_PAGE;
126our $SKILL_PAGE; 153our $SKILL_PAGE;
127our $SPELL_PAGE; 154our $SPELL_PAGE;
155our $SPELL_LIST;
128 156
129our $HELP_WINDOW; 157our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 158our $MESSAGE_WINDOW;
131our $FLOORBOX; 159our $FLOORBOX;
132our $GAUGES; 160our $GAUGES;
133our $STATWIDS; 161our $STATWIDS;
134 162
135our $SDL_ACTIVE; 163our $SDL_ACTIVE;
136our %SDL_CB; 164our %SDL_CB;
137 165
138our $SDL_MIXER;
139our @SOUNDS; # event => file mapping
140our %AUDIO_CHUNKS; # audio files
141
142our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
143our $STATUSBOX; 167our $STATUSBOX;
144our $DEBUG_STATUS; 168our $DEBUG_STATUS;
145 169
146our $INV; 170our $INV;
147our $INVR; 171our $INVR;
148our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
149 173
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 174our $PICKUP_CFG;
175
176#############################################################################
154 177
155sub status { 178sub status {
156 $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]);
157} 180}
158 181
160 $DEBUG_STATUS->set_text ($_[0]); 183 $DEBUG_STATUS->set_text ($_[0]);
161} 184}
162 185
163sub message { 186sub message {
164 my ($para) = @_; 187 my ($para) = @_;
165 188 $MESSAGE_WINDOW->message ($para);
166 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
167
168 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
169
170 $LOGVIEW->add_paragraph ($para);
171 $LOGVIEW->scroll_to_bottom;
172} 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#############################################################################
173 431
174sub destroy_query_dialog { 432sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 433 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 434 if $_[0]{query_dialog};
177} 435}
178 436
437# FIXME: a very ugly hack to wait for stat update look below! #d#
438our $QUERY_TIMER; #d#
439
179# server query dialog 440# server query dialog
180sub server_query { 441sub server_query {
181 my ($conn, $flags, $prompt) = @_; 442 my ($conn, $flags, $prompt) = @_;
443
444 # FIXME: a very ugly hack to wait for stat update #d#
445 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
446 unless ($QUERY_TIMER) {
447 $QUERY_TIMER =
448 Event->timer (
449 after => 1,
450 cb => sub {
451 server_query ($conn, $flags, $prompt, 1);
452 $QUERY_TIMER = undef
453 }
454 );
455 return;
456 }
457 }
182 458
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 459 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 460 x => "center",
185 y => "center", 461 y => "center",
186 title => "Server Query", 462 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 463 child => my $vbox = new CFPlus::UI::VBox,
188 ; 464 ;
189 465
190 my @dialog = my $label = new CFPlus::UI::Label 466 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 467 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 468 ellipsise => 0,
193 text => $prompt; 469 text => $prompt;
194 470
195 if ($flags & CS_QUERY_YESNO) { 471 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 472 push @dialog, my $hbox = new CFPlus::UI::HBox;
213 ); 489 );
214 490
215 $dialog->grab_focus; 491 $dialog->grab_focus;
216 492
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 493 } elsif ($flags & CS_QUERY_SINGLECHAR) {
218 $dialog->{tooltip} = "#charcreation_focus";
219
220 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) {
221 $MESSAGE_WINDOW->show; 495 $dialog->{tooltip} = "#charcreation_focus";
222 496
223 unshift @dialog, new CFPlus::UI::Label 497 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 498 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 499 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 500 markup => "\nOr use your keyboard and the text entry below:\n";
227 501
228 unshift @dialog, my $table = new CFPlus::UI::Table; 502 unshift @dialog, my $table = new CFPlus::UI::Table;
229 503
230 $table->add (0, 0, new CFPlus::UI::Button 504 $table->add_at (0, 0, new CFPlus::UI::Button
231 text => "Next Race", 505 text => "Next Race",
232 on_activate => sub { 506 on_activate => sub {
233 $conn->send ("reply n"); 507 $conn->send ("reply n");
234 destroy_query_dialog $conn; 508 destroy_query_dialog $conn;
235 0 509 0
236 }, 510 },
237 ); 511 );
238 $table->add (2, 0, new CFPlus::UI::Button 512 $table->add_at (2, 0, new CFPlus::UI::Button
239 text => "Accept", 513 text => "Accept",
240 on_activate => sub { 514 on_activate => sub {
241 $conn->send ("reply d"); 515 $conn->send ("reply d");
242 destroy_query_dialog $conn; 516 destroy_query_dialog $conn;
243 0 517 0
244 }, 518 },
245 ); 519 );
246 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
247 unshift @dialog, new CFPlus::UI::Label 544 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 545 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 546 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 547 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
251 ; 548 ;
255 $conn->send ("reply $stat"); 552 $conn->send ("reply $stat");
256 destroy_query_dialog $conn; 553 destroy_query_dialog $conn;
257 return; 554 return;
258 } 555 }
259 556
260 $STATS_PAGE->show;
261 $MESSAGE_WINDOW->hide;
262
263 unshift @dialog, new CFPlus::UI::Label 557 unshift @dialog, new CFPlus::UI::Label
264 max_w => $::WIDTH * 0.4, 558 max_w => $::WIDTH * 0.4,
265 ellipsise => 0, 559 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 560 markup => "\nOr use your keyboard and the text entry below:\n";
267 561
268 unshift @dialog, my $table = new CFPlus::UI::Table; 562 unshift @dialog, my $table = new CFPlus::UI::Table;
269 563
270 # left: re-roll 564 # left: re-roll
271 $table->add (0, 0, new CFPlus::UI::Button 565 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Roll Again", 566 text => "Roll Again",
273 on_activate => sub { 567 on_activate => sub {
274 $conn->send ("reply y"); 568 $conn->send ("reply y");
275 destroy_query_dialog $conn; 569 destroy_query_dialog $conn;
276 0 570 0
290 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 584 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
291 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 585 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
292 ], 586 ],
293 ), 1 .. 2; 587 ), 1 .. 2;
294 588
295 $table->add (2, 0, new CFPlus::UI::Button 589 $table->add_at (2, 0, new CFPlus::UI::Button
296 text => "Swap Stats", 590 text => "Swap Stats",
297 on_activate => sub { 591 on_activate => sub {
298 $conn->{stat_change_with} = $sw2->{value}; 592 $conn->{stat_change_with} = $sw2->{value};
299 $conn->send ("reply $sw1->{value}"); 593 $conn->send ("reply $sw1->{value}");
300 destroy_query_dialog $conn; 594 destroy_query_dialog $conn;
301 0 595 0
302 }, 596 },
303 ); 597 );
304 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 598 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
305 599
306 # right: accept 600 # right: accept
307 $table->add (4, 0, new CFPlus::UI::Button 601 $table->add_at (4, 0, new CFPlus::UI::Button
308 text => "Accept", 602 text => "Accept",
309 on_activate => sub { 603 on_activate => sub {
310 $conn->send ("reply n"); 604 $conn->send ("reply n");
311 $STATS_PAGE->hide; 605 $STATS_PAGE->hide;
312 destroy_query_dialog $conn; 606 destroy_query_dialog $conn;
375 status "logging in..."; 669 status "logging in...";
376 670
377 $LOGIN_BUTTON->set_text ("Logout"); 671 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 672 $SETUP_DIALOG->hide;
379 673
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 674 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 675
384 my ($host, $port) = split /:/, $PROFILE->{host}; 676 my ($host, $port) = split /:/, $PROFILE->{host};
385 677
386 $MAP = new CFPlus::Map; 678 $MAP = new CFPlus::Map;
395 maph => $mapsize, 687 maph => $mapsize,
396 688
397 client => "cfplus $CFPlus::VERSION $] $^O", 689 client => "cfplus $CFPlus::VERSION $] $^O",
398 690
399 map_widget => $MAPWIDGET, 691 map_widget => $MAPWIDGET,
400 logview => $LOGVIEW,
401 statusbox => $STATUSBOX, 692 statusbox => $STATUSBOX,
402 map => $MAP, 693 map => $MAP,
403 mapmap => $MAPMAP, 694 mapmap => $MAPMAP,
404 query => \&server_query, 695 query => \&server_query,
405 696
406 sound_play => sub { 697 setup_req => {
407 my ($x, $y, $soundnum, $type) = @_; 698 smoothing => $CFG->{map_smoothing}*1,
408
409 $SDL_MIXER
410 or return;
411
412 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
413 or return;
414
415 $chunk->play;
416 }, 699 },
417 }; 700 };
418 701
419 if ($CONN) { 702 if ($CONN) {
420 CFPlus::lowdelay fileno $CONN->{fh}; 703 CFPlus::lowdelay fileno $CONN->{fh};
429sub stop_game { 712sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 713 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 714 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 715 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 716 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 717 $SPELL_LIST->clear_spells;
718 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
719
720 &audio_music_set_ambient ([]);
435 721
436 return unless $CONN; 722 return unless $CONN;
437 723
438 status "connection closed"; 724 status "connection closed";
439 725
447sub graphics_setup { 733sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 734 my $vbox = new CFPlus::UI::VBox;
449 735
450 $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]);
451 737
738 my $row = 0;
739
740 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
741 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
742 can_events => 1,
743 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
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
452 $table->add (0, 0, 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");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 750 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 751
752 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
455 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 753 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 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);
457 758
458 $mode_slider->connect (changed => sub { 759 $mode_slider->connect (changed => sub {
459 my ($self, $value) = @_; 760 my ($self, $value) = @_;
460 761
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 762 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 763 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
463 }); 764 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 765 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465 766
466 my $row = 1;
467
468 $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");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 768 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
472 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
473 ); 772 );
474 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
475 $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");
476 $table->add (1, $row++, new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
477 state => $CFG->{fast}, 788 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 789 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 791 );
481 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
482 $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");
483 $table->add (1, $row++, new CFPlus::UI::Slider 811 $table->add_at (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 812 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 813 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 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 }
487 ); 815 );
488 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
489 $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");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 827 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 828 state => $CFG->{fow_enable},
492 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.",
493 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 830 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
494 ); 831 );
495 832
496 $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");
497 $table->add (1, $row++, new CFPlus::UI::Slider 834 $table->add_at (1, $row++, new CFPlus::UI::Slider
498 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 835 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
499 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 836 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 837 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
501 ); 838 );
502 839
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fow_smooth},
506 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
507 on_changed => sub {
508 my ($self, $value) = @_;
509 $CFG->{fow_smooth} = $value;
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0
512 }
513 );
514
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 );
521
522 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 840 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 841 $table->add_at (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 842 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
525 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 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.",
526 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 845 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
527 ); 846 );
528 847
529 $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");
530 $table->add (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
531 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 850 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
532 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 851 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
533 on_changed => sub { 852 on_changed => sub {
534 $CFG->{gauge_fontsize} = $_[1]; 853 $CFG->{gauge_fontsize} = $_[1];
535 &set_gauge_window_fontsize; 854 &set_gauge_window_fontsize;
536 0 855 0
537 } 856 }
538 ); 857 );
539 858
540 $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");
541 $table->add (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 861 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 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.",
544 on_changed => sub { 863 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 864 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 865 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0 866 0
548 } 867 }
549 ); 868 );
550 869
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0
558 }
559 );
560
561 $vbox 870 $vbox
562} 871}
563 872
564sub audio_setup { 873sub audio_setup {
565 my $vbox = new CFPlus::UI::VBox; 874 my $vbox = new CFPlus::UI::VBox;
566 875
567 $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]);
568 877
569 my $row = 0; 878 my $row = 0;
570 879
571 $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");
572 $table->add (1, $row++, new CFPlus::UI::CheckBox 881 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{audio_enable}, 882 state => $CFG->{audio_enable},
574 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
575 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 884 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
576 ); 885 );
577# $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");
578# $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 {
579# $CFG->{effects_volume} = $_[1]; 888# $CFG->{effects_volume} = $_[1];
580# }); 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
581 $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");
582 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
583 $hbox->add (new CFPlus::UI::CheckBox 909 $table->add_at (1, $row, new CFPlus::UI::CheckBox
584 expand => 1, state => $CFG->{bgm_enable}, 910 expand => 1, state => $CFG->{bgm_enable},
585 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.",
586 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 }
587 ); 917 );
588 $hbox->add (new CFPlus::UI::Slider 918 $table->add_at (2, $row++, new CFPlus::UI::Slider
589 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 919 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
590 tooltip => "The volume of the background music. Changes are instant.", 920 tooltip => "The volume of the background music. Changes are instant.",
591 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 }
592 ); 922 );
593 923
594 $table->add (1, $row++, new CFPlus::UI::Button 924 $table->add_at (1, $row++, new CFPlus::UI::Button
595 expand => 1, align => 0, text => "Apply", 925 c_colspan => 2, expand => 1, align => 0, text => "Apply",
596 tooltip => "Apply the audio settings", 926 tooltip => "Apply the audio settings",
597 on_activate => sub { 927 on_activate => sub {
598 audio_shutdown (); 928 audio_shutdown ();
599 audio_init (); 929 audio_init ();
600 0 930 0
658} 988}
659 989
660sub debug_setup { 990sub debug_setup {
661 my $table = new CFPlus::UI::Table; 991 my $table = new CFPlus::UI::Table;
662 992
663 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 993 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
664 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 994 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
665 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 995 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 996 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 997 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 998 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 999 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1000 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1001 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
671 1002
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 1003 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
673 1004
674 for my $x (0..2) { 1005 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
675 for my $y (0 .. 2) { 1006 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
676 $table->add ($x + 3, $y, 1007 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
677 new CFPlus::UI::Entry 1008 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
678 text => $default_smooth[$x * 3 + $y], 1009 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 1010 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
680 ); 1011
681 } 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]],
682 } 1020 });
683 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 });
684 1037
685 $table 1038 $table
686} 1039}
687 1040
688sub stats_window { 1041sub stats_window {
736 [2, 4, st_spd => "Spd", 10.54], 1089 [2, 4, st_spd => "Spd", 10.54],
737 [2, 5, st_wspd => "WSp", 10.54], 1090 [2, 5, st_wspd => "WSp", 10.54],
738 ) { 1091 ) {
739 my ($col, $row, $id, $label, $template) = @$_; 1092 my ($col, $row, $id, $label, $template) = @$_;
740 1093
741 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1094 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
742 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1095 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
743 align => +1, template => $template, tooltip => "#stat_$label"); 1096 align => +1, template => $template, tooltip => "#stat_$label");
744 $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
745 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,
746 align => -1, text => $label, tooltip => "#stat_$label"); 1099 align => -1, text => $label, tooltip => "#stat_$label");
747 } 1100 }
748 1101
749 $vb->add (new CFPlus::UI::FancyFrame 1102 $vb->add (new CFPlus::UI::FancyFrame
790 cold => ["Cold", 1143 cold => ["Cold",
791 "<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, ...)"],
792 ghit => ["Ghost hit", 1145 ghit => ["Ghost hit",
793 "<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)"],
794 ); 1147 );
1148
795 for (qw/slow holyw conf fire depl magic 1149 for (qw/slow holyw conf fire depl magic
796 drain acid pois para deat phys 1150 drain acid pois para deat phys
797 blind fear tund elec cold ghit/) 1151 blind fear tund elec cold ghit/)
798 { 1152 {
799 $tbl2->add ($col, $row, 1153 $tbl2->add_at ($col, $row,
800 $STATWIDS->{"res_$_"} = 1154 $STATWIDS->{"res_$_"} =
801 new CFPlus::UI::Label 1155 new CFPlus::UI::Label
802 font => $FONT_FIXED, 1156 font => $FONT_FIXED,
803 template => "-100%", 1157 template => "-100%",
804 align => +1, 1158 align => +1,
805 valign => 0, 1159 valign => 0,
806 can_events => 1, 1160 can_events => 1,
807 can_hover => 1, 1161 can_hover => 1,
808 tooltip => $resist_names{$_}->[1], 1162 tooltip => $resist_names{$_}->[1],
809 ); 1163 );
810 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1164 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
811 font => $FONT_FIXED, 1165 font => $FONT_FIXED,
812 can_hover => 1, 1166 can_hover => 1,
813 can_events => 1, 1167 can_events => 1,
814 path => "ui/resist/resist_$_.png", 1168 path => "ui/resist/resist_$_.png",
815 tooltip => $resist_names{$_}->[1], 1169 tooltip => $resist_names{$_}->[1],
816 ); 1170 );
817 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1171 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
818 text => $resist_names{$_}->[0], 1172 text => $resist_names{$_}->[0],
819 font => $FONT_FIXED, 1173 font => $FONT_FIXED,
820 can_hover => 1, 1174 can_hover => 1,
821 can_events => 1, 1175 can_events => 1,
822 tooltip => $resist_names{$_}->[1], 1176 tooltip => $resist_names{$_}->[1],
855 return if $METASERVER_ATIME > time; 1209 return if $METASERVER_ATIME > time;
856 $METASERVER_ATIME = time + 60; 1210 $METASERVER_ATIME = time + 60;
857 1211
858 my $table = $METASERVER->{table}; 1212 my $table = $METASERVER->{table};
859 $table->clear; 1213 $table->clear;
860 $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...");
861 1215
862 my $ok = 0; 1216 my $ok = 0;
863 1217
864 CFPlus::background { 1218 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent; 1219 my $ua = CFPlus::lwp_useragent;
876 "The time this server has been running without being restarted.", 1230 "The time this server has been running without being restarted.",
877 "The server software version - a '+' indicates a Crossfire+ server.", 1231 "The server software version - a '+' indicates a Crossfire+ server.",
878 "Short information about this server provided by its admins.", 1232 "Short information about this server provided by its admins.",
879 ); 1233 );
880 my @col = qw(#Users Host Uptime Version Description); 1234 my @col = qw(#Users Host Uptime Version Description);
881 $table->add ($_, 0, new CFPlus::UI::Label 1235 $table->add_at ($_, 0, new CFPlus::UI::Label
882 can_hover => 1, can_events => 1, 1236 can_hover => 1, can_events => 1,
883 align => 0, fg => [1, 1, 0], 1237 align => 0, fg => [1, 1, 0],
884 text => $col[$_], tooltip => $tip[$_]) 1238 text => $col[$_], tooltip => $tip[$_])
885 for 0 .. $#col; 1239 for 0 .. $#col;
886 1240
887 my @align = qw(1 0 1 1 -1); 1241 my @align = qw(1 0 1 1 -1);
888 1242
889 my $y = 0; 1243 my $y = 0;
890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} } 1244 for my $m (@{ $msg->{servers} }) {
896 ) {
897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 1245 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 1246 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
899 1247
900 for ($desc) { 1248 for ($desc) {
901 s/<br>/\n/gi; 1249 s/<br>/\n/gi;
902 s/<li>/\n· /gi; 1250 s/<li>/\n· /gi;
903 s/<.*?>//sgi; 1251 s/<.*?>//sgi;
914 1262
915 $m = [$users, $host, $uptime, $version, $desc]; 1263 $m = [$users, $host, $uptime, $version, $desc];
916 1264
917 $y++; 1265 $y++;
918 1266
919 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1267 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
920 (new CFPlus::UI::Button 1268 (new CFPlus::UI::Button
921 text => "Use", 1269 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field", 1270 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub { 1271 on_activate => sub {
924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1272 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
927 }, 1275 },
928 ), 1276 ),
929 (new CFPlus::UI::Empty expand => 1), 1277 (new CFPlus::UI::Empty expand => 1),
930 ]); 1278 ]);
931 1279
932 $table->add ($_, $y, new CFPlus::UI::Label 1280 $table->add_at ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4, 1281 max_w => $::WIDTH * 0.4,
934 ellipsise => 0, 1282 ellipsise => 0,
935 align => $align[$_], 1283 align => $align[$_],
936 text => $m->[$_], 1284 text => $m->[$_],
937 tooltip => $tip[$_], 1285 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1286 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
939 can_hover => 1, 1287 can_hover => 1,
940 can_events => 1, 1288 can_events => 1,
941 fontsize => 0.8) 1289 fontsize => 0.8)
942 for 0 .. $#$m; 1290 for 0 .. $#$m;
943 } 1291 }
978 1326
979 $vbox->add (new CFPlus::UI::FancyFrame 1327 $vbox->add (new CFPlus::UI::FancyFrame
980 label => "Connection Settings", 1328 label => "Connection Settings",
981 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]),
982 ); 1330 );
983 $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");
984 1332
985 { 1333 {
986 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1334 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
987 1335
988 $vbox->add ( 1336 $vbox->add (
989 $HOST_ENTRY = new CFPlus::UI::Entry 1337 $HOST_ENTRY = new CFPlus::UI::Entry
990 expand => 1, 1338 expand => 1,
991 text => $CFG->{profile}{default}{host}, 1339 text => $CFG->{profile}{default}{host},
992 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",
993 on_changed => sub { 1341 on_changed => sub {
994 my ($self, $value) = @_; 1342 my ($self, $value) = @_;
995 $CFG->{profile}{default}{host} = $value; 1343 $CFG->{profile}{default}{host} = $value;
996 0 1344 1
997 } 1345 }
998 ); 1346 );
999 1347
1000 $vbox->add (new CFPlus::UI::Button 1348 $vbox->add (new CFPlus::UI::Button
1001 expand => 1, 1349 expand => 1,
1002 text => "Server List", 1350 text => "Server List",
1003 other => $METASERVER, 1351 other => $METASERVER,
1004 tooltip => "Show a list of available crossfire servers", 1352 tooltip => "Show a list of available crossfire servers",
1005 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1353 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1006 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1354 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1007 ); 1355 );
1008 } 1356 }
1009 1357
1010 $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");
1011 $table->add (1, 4, new CFPlus::UI::Entry 1359 $table->add_at (1, 4, new CFPlus::UI::Entry
1012 text => $CFG->{profile}{default}{user}, 1360 text => $CFG->{profile}{default}{user},
1013 tooltip => "The name of your character on the server", 1361 tooltip => "The name of your character on the server",
1014 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1362 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1015 ); 1363 );
1016 1364
1017 $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");
1018 $table->add (1, 5, new CFPlus::UI::Entry 1366 $table->add_at (1, 5, new CFPlus::UI::Entry
1019 text => $CFG->{profile}{default}{password}, 1367 text => $CFG->{profile}{default}{password},
1020 hidden => 1, 1368 hidden => 1,
1021 tooltip => "The password for your character", 1369 tooltip => "The password for your character",
1022 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1370 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1023 ); 1371 );
1024 1372
1025 $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");
1026 $table->add (1, 7, new CFPlus::UI::Slider 1374 $table->add_at (1, 7, new CFPlus::UI::Slider
1027 force_w => 100, 1375 force_w => 100,
1028 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1376 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1029 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. "
1030 . "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, "
1031 . "but you also increase bandwidth requirements and latency. " 1379 . "but you also increase bandwidth requirements and latency. "
1032 . "This option is only used once at log-in.", 1380 . "This option is only used once at log-in.",
1033 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 },
1034 ); 1382 );
1035 1383
1036 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1384 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1037 $table->add (1, 8, new CFPlus::UI::CheckBox 1385 $table->add_at (1, 8, new CFPlus::UI::Entry
1038 state => $CFG->{face_prefetch}, 1386 text => $CFG->{output_rate},
1039 tooltip => "<b>Background Image Prefetch</b>\n\n" 1387 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1040 . "If enabled, the client automatically pre-fetches images from the server. " 1388 . "when sending data. When 0 or unset, the server "
1041 . "This might increase or create lag, but increases the chances " 1389 . "default will be used, which is usually around 100kb/s. Most servers will "
1042 . "of faces being ready for display when you encounter them. " 1390 . "dynamically find an optimal rate, so adjust this only when necessary.",
1043 . "It also uses up server bandwidth on every connect, "
1044 . "so only set it if you really need to prefetch images. "
1045 . "This option can be set and unset any time.",
1046 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1391 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1047 ); 1392 );
1048 1393
1049 $table->add (0, 9, 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");
1050 $table->add (1, 9, new CFPlus::UI::Entry 1395 $table->add_at (1, 9, new CFPlus::UI::Entry
1051 text => $CFG->{output_count}, 1396 text => $CFG->{output_count},
1052 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.",
1053 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1398 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1054 ); 1399 );
1055 1400
1056 $table->add (0, 10, 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");
1057 $table->add (1, 10, new CFPlus::UI::Entry 1402 $table->add_at (1, 10, new CFPlus::UI::Entry
1058 text => $CFG->{output_sync}, 1403 text => $CFG->{output_sync},
1059 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.",
1060 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1405 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1061 ); 1406 );
1062 1407
1063 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1408 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1064 expand => 1, 1409 expand => 1,
1065 align => 0, 1410 align => 0,
1066 text => "Login", 1411 text => "Login",
1067 on_activate => sub { 1412 on_activate => sub {
1068 $CONN ? stop_game 1413 $CONN ? stop_game
1069 : start_game; 1414 : start_game;
1070 0 1415 1
1071 }, 1416 },
1072 ); 1417 );
1073 1418
1074 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1419 $vbox->add (new CFPlus::UI::FancyFrame
1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1420 label => "Server Info",
1076 text => $CFG->{say_command}, 1421 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1077 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. "
1078 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1079 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1080 on_changed => sub {
1081 my ($self, $value) = @_;
1082 $CFG->{say_command} = $value;
1083 0
1084 }
1085 ); 1422 );
1086 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
1087 $table->add (0, 13, 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");
1088 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1433 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1089 state => $CFG->{show_tips}, 1434 state => $CFG->{show_tips},
1090 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?",
1091 on_changed => sub { 1436 on_changed => sub {
1092 my ($self, $value) = @_; 1437 my ($self, $value) = @_;
1093 $CFG->{show_tips} = $value; 1438 $CFG->{show_tips} = $value;
1094 0 1439 0
1095 } 1440 }
1096 ); 1441 );
1097 1442
1098 $vbox->add (new CFPlus::UI::FancyFrame 1443 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1099 label => "Server Info", 1444 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1100 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1445 text => $CFG->{logview_max_par},
1101 ); 1446 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1102 1447 . "sends more messages than this number, older messages get removed to save memory and "
1103 $vbox 1448 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1104}
1105
1106sub message_window {
1107 my $window = new CFPlus::UI::Toplevel
1108 name => "message_window",
1109 title => "Messages",
1110 border_bg => [1, 1, 1, 1],
1111 x => "max",
1112 y => 0,
1113 force_w => $::WIDTH * 0.4,
1114 force_h => $::HEIGHT * 0.5,
1115 child => (my $vbox = new CFPlus::UI::VBox),
1116 has_close_button => 1;
1117
1118 $vbox->add ($LOGVIEW);
1119
1120 $vbox->add (my $input = new CFPlus::UI::Entry
1121 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1122 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1123 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1124 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1125 on_focus_in => sub { 1449 on_changed => sub {
1126 my ($input, $prev_focus) = @_; 1450 my ($self, $value) = @_;
1127 1451 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1128 delete $input->{refocus_map};
1129
1130 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1131 $input->{refocus_map} = 1;
1132 }
1133 delete $input->{auto_activated};
1134
1135 0 1452 0
1136 }, 1453 },
1137 on_activate => sub {
1138 my ($input, $text) = @_;
1139 $input->set_text ('');
1140
1141 if ($text =~ /^\/(.*)/) {
1142 $::CONN->user_send ($1);
1143 } else {
1144 my $say_cmd = $::CFG->{say_command} || 'say';
1145 $::CONN->user_send ("$say_cmd $text");
1146 }
1147 if ($input->{refocus_map}) {
1148 delete $input->{refocus_map};
1149 $MAPWIDGET->focus_in
1150 }
1151
1152 0
1153 },
1154 on_escape => sub {
1155 $MAPWIDGET->grab_focus;
1156
1157 0
1158 },
1159 );
1160
1161 $CONSOLE = {
1162 window => $window,
1163 input => $input,
1164 }; 1454 );
1165 1455
1166 $window 1456 $table
1167} 1457}
1168 1458
1169sub autopickup_setup { 1459sub autopickup_setup {
1460 my $r = new CFPlus::UI::ScrolledWindow (
1461 expand => 1,
1462 scroll_y => 1
1463 );
1170 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 );
1171 1468
1172 for ( 1469 for (
1173 ["General", 0, 0, 1470 ["General", 0, 0,
1174 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1471 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1175 ["Inhibit autopickup" => PICKUP_INHIBIT], 1472 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Boots" => PICKUP_BOOTS], 1486 ["Boots" => PICKUP_BOOTS],
1190 ["Gloves" => PICKUP_GLOVES], 1487 ["Gloves" => PICKUP_GLOVES],
1191 ["Cloaks" => PICKUP_CLOAK], 1488 ["Cloaks" => PICKUP_CLOAK],
1192 ], 1489 ],
1193 1490
1194 ["Readables", 2, 2, 1491 ["Readables", 2, 0,
1195 ["Spellbooks" => PICKUP_SPELLBOOK], 1492 ["Spellbooks" => PICKUP_SPELLBOOK],
1196 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1493 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1197 ["Normal Books/Scrolls" => PICKUP_READABLES], 1494 ["Normal Books/Scrolls" => PICKUP_READABLES],
1198 ], 1495 ],
1199 ["Misc", 2, 7, 1496 ["Misc", 2, 5,
1200 ["Food" => PICKUP_FOOD], 1497 ["Food" => PICKUP_FOOD],
1201 ["Drinks" => PICKUP_DRINK], 1498 ["Drinks" => PICKUP_DRINK],
1202 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1499 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1203 ["Keys" => PICKUP_KEY], 1500 ["Keys" => PICKUP_KEY],
1204 ["Magical Items" => PICKUP_MAGICAL], 1501 ["Magical Items" => PICKUP_MAGICAL],
1205 ["Potions" => PICKUP_POTION], 1502 ["Potions" => PICKUP_POTION],
1206 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1503 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1207 ["Ignore cursed" => PICKUP_NOT_CURSED], 1504 ["Ignore cursed" => PICKUP_NOT_CURSED],
1208 ["Jewelery" => PICKUP_JEWELS], 1505 ["Jewelery" => PICKUP_JEWELS],
1506 ["Flesh" => PICKUP_FLESH],
1209 ], 1507 ],
1210 ["Weight/Value ratio", 2, 17] 1508 ["Weight/Value ratio", 2, 17]
1211 ) 1509 )
1212 { 1510 {
1213 my ($title, $x, $y, @bits) = @$_; 1511 my ($title, $x, $y, @bits) = @$_;
1214 $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]);
1215 1513
1216 for (@bits) { 1514 for (@bits) {
1217 ++$y; 1515 ++$y;
1218 1516
1219 my $mask = $_->[1]; 1517 my $mask = $_->[1];
1220 $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);
1221 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1519 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1222 state => $::CFG->{pickup} & $mask, 1520 state => $::CFG->{pickup} & $mask,
1223 on_changed => sub { 1521 on_changed => sub {
1224 my ($box, $value) = @_; 1522 my ($box, $value) = @_;
1225 1523
1226 if ($value) { 1524 if ($value) {
1237 1535
1238 ${$_->[2]} = $checkbox if $_->[2]; 1536 ${$_->[2]} = $checkbox if $_->[2];
1239 } 1537 }
1240 } 1538 }
1241 1539
1242 $table->add (2, 18, new CFPlus::UI::ValSlider 1540 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1243 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1541 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1244 template => ">= 99", 1542 template => ">= 99",
1245 to_value => sub { ">= " . 5 * $_[0] }, 1543 to_value => sub { ">= " . 5 * $_[0] },
1246 on_changed => sub { 1544 on_changed => sub {
1247 my ($slider, $value) = @_; 1545 my ($slider, $value) = @_;
1250 $::CFG->{pickup} |= int $value 1548 $::CFG->{pickup} |= int $value
1251 if $value; 1549 if $value;
1252 1; 1550 1;
1253 }); 1551 });
1254 1552
1255 $table->add (3, 18, new CFPlus::UI::Button 1553 $table->add_at (3, 18, new CFPlus::UI::Button
1256 text => "set", 1554 text => "set",
1257 on_activate => sub { 1555 on_activate => sub {
1258 $::CONN->send_command ("pickup $::CFG->{pickup}") 1556 $::CONN->send_command ("pickup $::CFG->{pickup}")
1259 if defined $::CONN; 1557 if defined $::CONN;
1260 0 1558 0
1261 }); 1559 });
1262 1560
1263 $table 1561 $r
1264} 1562}
1265 1563
1266my %SORT_ORDER = ( 1564my %SORT_ORDER = (
1267 type => undef, 1565 type => undef,
1268 mtime => sub { sort { 1566 mtime => sub {
1567 my $NOW = time;
1568 sort {
1569 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1570 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1571
1269 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1572 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1270 or $b->{mtime} <=> $a->{mtime} 1573 or $btime <=> $atime
1271 or $a->{type} <=> $b->{type} 1574 or $a->{type} <=> $b->{type}
1575 } @_
1272 } @_ }, 1576 },
1273 weight => sub { sort { 1577 weight => sub { sort {
1274 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1578 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1275 or $a->{type} <=> $b->{type} 1579 or $a->{type} <=> $b->{type}
1276 } @_ }, 1580 } @_ },
1277); 1581);
1302 #TODO# update to weigh/maxweight 1606 #TODO# update to weigh/maxweight
1303 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1607 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1304 1608
1305 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1609 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1306 $sw1->add ($INV = new CFPlus::UI::Inventory); 1610 $sw1->add ($INV = new CFPlus::UI::Inventory);
1611 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1307 1612
1308 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1613 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1309 1614
1310 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1615 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1311 1616
1314 1619
1315 # XXX: Call after $INVR = ... because set_opencont sets the items 1620 # XXX: Call after $INVR = ... because set_opencont sets the items
1316 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1621 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1317 1622
1318 $hb 1623 $hb
1624}
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;
1319} 1664}
1320 1665
1321sub toggle_player_page { 1666sub toggle_player_page {
1322 my ($widget) = @_; 1667 my ($widget) = @_;
1323 1668
1340 has_close_button => 1 1685 has_close_button => 1
1341 ; 1686 ;
1342 1687
1343 my $ntb = 1688 my $ntb =
1344 $PL_NOTEBOOK = 1689 $PL_NOTEBOOK =
1345 new CFPlus::UI::Notebook expand => 1, debug => 1; 1690 new CFPlus::UI::Notebook expand => 1;
1346 1691
1347 $ntb->add ( 1692 $ntb->add_tab (
1348 "Statistics (F2)" => $STATS_PAGE = stats_window, 1693 "Statistics (F2)" => $STATS_PAGE = stats_window,
1349 "Shows statistics, where all your Stats and Resistances are shown." 1694 "Shows statistics, where all your Stats and Resistances are shown."
1350 ); 1695 );
1351 $ntb->add ( 1696 $ntb->add_tab (
1352 "Skills (F3)" => $SKILL_PAGE = skill_window, 1697 "Skills (F3)" => $SKILL_PAGE = skill_window,
1353 "Shows all your Skills." 1698 "Shows all your Skills."
1354 ); 1699 );
1355 1700
1356 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1701 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1357 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1702 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1358 $ntb->add ( 1703 $ntb->add_tab (
1359 "Spellbook (F4)" => $spellsw, 1704 "Spellbook (F4)" => $spellsw,
1360 "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."
1361 ); 1706 );
1362 $ntb->add ( 1707 $ntb->add_tab (
1363 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1708 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1364 "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 :). "
1365 . "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."
1366 ); 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.");
1367 1717
1368 $ntb->set_current_page ($INVENTORY_PAGE); 1718 $ntb->set_current_page ($INVENTORY_PAGE);
1369 1719
1370 $plwin->add ($ntb); 1720 $plwin->add ($ntb);
1371 $plwin 1721 $plwin
1372} 1722}
1373 1723
1374sub update_bindings {
1375 $BIND_UPD_CB->() if $BIND_UPD_CB;
1376}
1377
1378sub keyboard_setup { 1724sub keyboard_setup {
1379 my $binding_list = new CFPlus::UI::VBox; 1725 CFPlus::Macro::keyboard_setup
1380
1381 my $refresh;
1382 $refresh = $BIND_UPD_CB = sub {
1383 $binding_list->clear ();
1384
1385 return unless $PROFILE;
1386
1387 for my $mod (keys %{$PROFILE->{bindings}}) {
1388 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1389 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1390 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1391
1392 my $lbl = join "; ", @$cmds;
1393 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1394 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1395 $hb->add (new CFPlus::UI::Button
1396 text => "delete",
1397 tooltip => "Deletes the binding",
1398 on_activate => sub {
1399 $binding_list->remove ($hb);
1400 delete $PROFILE->{bindings}{$mod}{$sym};
1401 0
1402 });
1403
1404 $hb->add (new CFPlus::UI::Button
1405 text => "edit",
1406 tooltip => "Edits the binding",
1407 on_activate => sub {
1408 $::BIND_EDITOR->set_binding (
1409 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1410 sub {
1411 my ($nmod, $nsym, $ncmds) = @_;
1412 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1413 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1414 $refresh->();
1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1416 $SETUP_DIALOG->show;
1417 },
1418 sub {
1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420 $SETUP_DIALOG->show;
1421 });
1422 $::BIND_EDITOR->show;
1423 $SETUP_DIALOG->hide;
1424 0
1425 });
1426
1427 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1428 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1429 }
1430 }
1431 };
1432
1433 my $vb = new CFPlus::UI::VBox;
1434 $vb->add (new CFPlus::UI::FancyFrame
1435 label => "Options",
1436 child => (my $hb = new CFPlus::UI::HBox),
1437 );
1438 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1439 $hb->add (new CFPlus::UI::CheckBox
1440 expand => 1,
1441 state => $CFG->{shift_fire_stop},
1442 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1443 on_changed => sub {
1444 my ($cbox, $value) = @_;
1445 $CFG->{shift_fire_stop} = $value;
1446 0
1447 });
1448
1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Bindings",
1451 child => $binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1726}
1492 1727
1493sub help_window { 1728sub help_window {
1494 my $win = new CFPlus::UI::Toplevel 1729 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1730 x => 'center',
1652 1887
1653sub show_tip_of_the_day { 1888sub show_tip_of_the_day {
1654 # find all tips 1889 # find all tips
1655 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1890 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1656 1891
1657 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1892 CFPlus::DB::get state => "tip_of_the_day", sub {
1893 my ($todindex) = @_;
1658 $todindex = 0 if $todindex >= @tod; 1894 $todindex = 0 if $todindex >= @tod;
1659 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1895 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1660 1896
1661 # create dialog 1897 # create dialog
1662 my $dialog; 1898 my $dialog;
1663 1899
1664 my $close = sub { 1900 my $close = sub {
1665 $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;
1666 }; 1939 };
1667
1668 $dialog = new CFPlus::UI::Toplevel
1669 x => "center",
1670 y => "center",
1671 z => 3,
1672 name => 'tip_of_the_day',
1673 force_w => int $WIDTH * 4/9,
1674 force_h => int $WIDTH * 2/9,
1675 title => "Tip of the day #" . (1 + $todindex),
1676 child => my $vbox = new CFPlus::UI::VBox,
1677 has_close_button => 1,
1678 on_delete => $close,
1679 ;
1680
1681 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1682 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1683 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1684
1685 $vbox->add (my $table = new CFPlus::UI::Table);
1686
1687 $table->add (0, 0, new CFPlus::UI::Button
1688 text => "Close",
1689 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>.",
1690 on_activate => $close,
1691 );
1692
1693 $table->add (2, 0, new CFPlus::UI::Button
1694 text => "Next",
1695 tooltip => "Show the next <b>Tip of the day</b>.",
1696 on_activate => sub {
1697 $close->();
1698 &show_tip_of_the_day;
1699 },
1700 );
1701
1702 $dialog->show;
1703} 1940}
1704 1941
1705sub sdl_init { 1942sub sdl_init {
1706 CFPlus::SDL_Init 1943 CFPlus::SDL_Init
1707 and die "SDL::Init failed!\n"; 1944 and die "SDL::Init failed!\n";
1708} 1945}
1709 1946
1710sub video_init { 1947sub video_init {
1711 sdl_init;
1712
1713 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1948 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1714 1949
1715 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1950 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1716 1951
1717 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1952 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1718 $FULLSCREEN = $CFG->{fullscreen}; 1953 $FULLSCREEN = $CFG->{fullscreen};
1719 $FAST = $CFG->{fast}; 1954 $FAST = $CFG->{fast};
1720 1955
1721 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1956 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1722 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1957 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1723 1958
1724 $SDL_ACTIVE = 1; 1959 $SDL_ACTIVE = 1;
1725 $LAST_REFRESH = time - 0.01; 1960 $LAST_REFRESH = time - 0.01;
1726 1961
1741 padding => 0, 1976 padding => 0,
1742 z => 100, 1977 z => 100,
1743 force_x => "max", 1978 force_x => "max",
1744 force_y => 0; 1979 force_y => 0;
1745 $DEBUG_STATUS->show; 1980 $DEBUG_STATUS->show;
1746
1747 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1748 1981
1749 $STATUSBOX = new CFPlus::UI::Statusbox; 1982 $STATUSBOX = new CFPlus::UI::Statusbox;
1750 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1983 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1751 1984
1752 (new CFPlus::UI::Frame 1985 (new CFPlus::UI::Frame
1770 2003
1771 $MAPWIDGET = new CFPlus::MapWidget; 2004 $MAPWIDGET = new CFPlus::MapWidget;
1772 $MAPWIDGET->connect (activate_console => sub { 2005 $MAPWIDGET->connect (activate_console => sub {
1773 my ($mapwidget, $preset) = @_; 2006 my ($mapwidget, $preset) = @_;
1774 2007
1775 if ($CONSOLE) { 2008 $MESSAGE_WINDOW->activate_console ($preset)
1776 $CONSOLE->{input}->{auto_activated} = 1; 2009 if $MESSAGE_WINDOW;
1777 $CONSOLE->{input}->grab_focus;
1778
1779 if ($preset && $CONSOLE->{input}->get_text eq '') {
1780 $CONSOLE->{input}->set_text ($preset);
1781 }
1782 }
1783 }); 2010 });
1784 $MAPWIDGET->show; 2011 $MAPWIDGET->show;
1785 $MAPWIDGET->grab_focus; 2012 $MAPWIDGET->grab_focus;
1786
1787 $LOGVIEW = new CFPlus::UI::TextScroller
1788 expand => 1,
1789 font => $FONT_FIXED,
1790 fontsize => $::CFG->{log_fontsize},
1791 indent => -4,
1792 can_hover => 1,
1793 can_events => 1,
1794 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1795 ;
1796 2013
1797 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2014 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1798 title => "Setup", 2015 title => "Setup",
1799 name => "setup_dialog", 2016 name => "setup_dialog",
1800 x => 'center', 2017 x => 'center',
1804 force_h => $::HEIGHT * 0.6, 2021 force_h => $::HEIGHT * 0.6,
1805 has_close_button => 1, 2022 has_close_button => 1,
1806 ; 2023 ;
1807 2024
1808 $METASERVER = metaserver_dialog; 2025 $METASERVER = metaserver_dialog;
2026 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1809 2027
1810 $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,
1811 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2029 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1812 2030
1813 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2031 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1814 "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.");
1815 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2033 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1816 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2034 "Configure various client-specific settings.");
1817 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2035 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1818 "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.");
1819 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2037 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1820 "Configure the use of audio, sound effects and background music."); 2038 "Configure the use of audio, sound effects and background music.");
1821 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2039 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1822 "Lets you define, edit and delete key bindings." 2040 "Lets you define, edit and delete key bindings."
1823 . "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 "
1824 . "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 "
1825 . "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. "
1826 . "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 "
1827 . "binding editor closes"); 2045 . "binding editor closes");
1828 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2046 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1829 "Some debuggin' options. Do not ask."); 2047 "Some debuggin' options. Do not ask.");
1830 2048
1831 $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
1832 2050
1833 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2051 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1834 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.");
1835 2053
1836 $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,
1837 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.");
1838 2056
1839 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
1840 2058
1841 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2059 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1852 }, 2070 },
1853 ); 2071 );
1854 2072
1855 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2073 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1856 tooltip => "View Documentation"); 2074 tooltip => "View Documentation");
2075
1857 2076
1858 $BUTTONBAR->add (new CFPlus::UI::Button 2077 $BUTTONBAR->add (new CFPlus::UI::Button
1859 text => "Quit", 2078 text => "Quit",
1860 tooltip => "Terminates the program", 2079 tooltip => "Terminates the program",
1861 on_activate => sub { 2080 on_activate => sub {
1879 CFPlus::OpenGL::shutdown; 2098 CFPlus::OpenGL::shutdown;
1880 2099
1881 undef $SDL_ACTIVE; 2100 undef $SDL_ACTIVE;
1882} 2101}
1883 2102
1884my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1885my $bgmusic;#TODO#hack#d#
1886
1887sub audio_channel_finished {
1888 my ($channel) = @_;
1889
1890 #warn "channel $channel finished\n";#d#
1891}
1892
1893sub audio_music_finished {
1894 return unless $CFG->{bgm_enable};
1895
1896 # TODO: hack, do play loop and mood music
1897 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1898 $bgmusic->play (0);
1899
1900 push @bgmusic, shift @bgmusic;
1901}
1902
1903sub audio_init {
1904 if ($CFG->{audio_enable}) {
1905 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1906 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1907
1908 unless ($SDL_MIXER) {
1909 status "Unable to open sound device: there will be no sound";
1910 return;
1911 }
1912
1913 CFPlus::Mix_AllocateChannels 8;
1914 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1915
1916 audio_music_finished;
1917
1918 while (<$fh>) {
1919 next if /^\s*#/;
1920 next if /^\s*$/;
1921
1922 my ($file, $volume, $event) = split /\s+/, $_, 3;
1923
1924 push @SOUNDS, "$volume,$file";
1925
1926 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1927 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1928 $chunk->volume ($volume * 128 / 100);
1929 $chunk
1930 };
1931 }
1932 } else {
1933 status "unable to open sound config: $!";
1934 }
1935 }
1936}
1937
1938sub audio_shutdown {
1939 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1940 undef $SDL_MIXER;
1941 @SOUNDS = ();
1942 %AUDIO_CHUNKS = ();
1943}
1944
1945my %animate_object; 2103my %animate_object;
1946my $animate_timer; 2104my $animate_timer;
1947 2105
1948my $fps = 9; 2106my $fps = 9;
1949 2107
1950my %demo;#d#
1951
1952sub force_refresh { 2108sub force_refresh {
2109 if ($ENV{CFPLUS_DEBUG} & 4) {
1953 $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;
1954 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2111 debug sprintf "%3.2f", $fps;
2112 }
1955 2113
1956 $CFPlus::UI::ROOT->draw; 2114 $CFPlus::UI::ROOT->draw;
1957 2115 CFPlus::SDL_GL_SwapBuffers;
1958 $WANT_REFRESH = 0;
1959 $CAN_REFRESH = 0;
1960 $LAST_REFRESH = $NOW; 2116 $LAST_REFRESH = $NOW;
1961 2117 $WANT_REFRESH->stop;
1962 CFPlus::SDL_GL_SwapBuffers;
1963} 2118}
1964 2119
2120$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2121
1965my $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 {
1966 $NOW = time; 2123 $NOW = time;
1967 2124
1968 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2125 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1969 for CFPlus::SDL_PollEvent; 2126 for CFPlus::poll_events;
1970 2127
1971 if (%animate_object) { 2128 if (%animate_object) {
1972 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2129 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1973 $WANT_REFRESH++; 2130 $WANT_REFRESH->start;
1974 }
1975
1976 if ($WANT_REFRESH) {
1977 force_refresh;
1978 } else {
1979 $CAN_REFRESH = 1;
1980 } 2131 }
1981}); 2132});
1982 2133
1983sub animation_start { 2134sub animation_start {
1984 my ($widget) = @_; 2135 my ($widget) = @_;
1988sub animation_stop { 2139sub animation_stop {
1989 my ($widget) = @_; 2140 my ($widget) = @_;
1990 delete $animate_object{$widget}; 2141 delete $animate_object{$widget};
1991} 2142}
1992 2143
1993# check once/second for faces that need to be prefetched
1994# this should, of course, only run on demand, but
1995# SDL forces worse things on us....
1996
1997Event->timer (after => 1, interval => 0.25, cb => sub {
1998 $CONN->face_prefetch
1999 if $CONN;
2000});
2001
2002%SDL_CB = ( 2144%SDL_CB = (
2003 CFPlus::SDL_QUIT => sub { 2145 CFPlus::SDL_QUIT => sub {
2004 Event::unloop -1; 2146 exit;
2005 }, 2147 },
2006 CFPlus::SDL_VIDEORESIZE => sub { 2148 CFPlus::SDL_VIDEORESIZE => sub {
2007 }, 2149 },
2008 CFPlus::SDL_VIDEOEXPOSE => sub { 2150 CFPlus::SDL_VIDEOEXPOSE => sub {
2009 CFPlus::UI::full_refresh; 2151 CFPlus::UI::full_refresh;
2010 }, 2152 },
2011 CFPlus::SDL_ACTIVEEVENT => sub { 2153 CFPlus::SDL_ACTIVEEVENT => sub {
2012# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2154# not useful, as APPACTIVE include sonly iconified state, not unmapped
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#
2157# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2158# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2159# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2013 }, 2160 },
2014 CFPlus::SDL_KEYDOWN => sub { 2161 CFPlus::SDL_KEYDOWN => sub {
2015 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2162 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2016 # alt-enter 2163 # alt-enter
2017 $FULLSCREEN_ENABLE->toggle; 2164 $FULLSCREEN_ENABLE->toggle;
2038 2185
2039$SIG{INT} = $SIG{TERM} = sub { exit }; 2186$SIG{INT} = $SIG{TERM} = sub { exit };
2040 2187
2041{ 2188{
2042 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2189 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2190 CFPlus::DB::Server::run;
2191
2043 CFPlus::UI::set_layout ($::CFG->{layout}); 2192 CFPlus::UI::set_layout ($::CFG->{layout});
2044 2193
2045 my %DEF_CFG = ( 2194 my %DEF_CFG = (
2046 sdl_mode => 0, 2195 sdl_mode => 0,
2047 width => 640,
2048 height => 480,
2049 fullscreen => 0, 2196 fullscreen => 0,
2050 fast => 0, 2197 fast => 0,
2051 map_scale => 1, 2198 map_scale => 1,
2052 fow_enable => 1, 2199 fow_enable => 1,
2053 fow_intensity => 0.45, 2200 fow_intensity => 0,
2054 fow_smooth => 0, 2201 map_smoothing => 1,
2055 gui_fontsize => 1, 2202 gui_fontsize => 1,
2056 log_fontsize => 0.7, 2203 log_fontsize => 0.7,
2057 gauge_fontsize => 1, 2204 gauge_fontsize => 1,
2058 gauge_size => 0.35, 2205 gauge_size => 0.35,
2059 stat_fontsize => 0.7, 2206 stat_fontsize => 0.7,
2060 mapsize => 100, 2207 mapsize => 100,
2061 say_command => 'say',
2062 audio_enable => 1, 2208 audio_enable => 1,
2209 effects_enable => 1,
2210 effects_volume => 1,
2063 bgm_enable => 1, 2211 bgm_enable => 1,
2064 bgm_volume => 0.25, 2212 bgm_volume => 0.5,
2065 face_prefetch => 0,
2066 output_sync => 1, 2213 output_sync => 1,
2067 output_count => 1, 2214 output_count => 1,
2215 output_rate => "",
2068 pickup => 0, 2216 pickup => 0,
2069 inv_sort => "mtime", 2217 inv_sort => "mtime",
2070 default => "profile", # default profile 2218 default => "profile", # default profile
2071 show_tips => 1, 2219 show_tips => 1,
2220 logview_max_par => 1000,
2072 ); 2221 );
2073 2222
2074 while (my ($k, $v) = each %DEF_CFG) { 2223 while (my ($k, $v) = each %DEF_CFG) {
2075 $CFG->{$k} = $v unless exists $CFG->{$k}; 2224 $CFG->{$k} = $v unless exists $CFG->{$k};
2076 } 2225 }
2077 2226
2078 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2227 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2228 $PROFILE = $CFG->{profile}{default};
2229
2230 # convert old bindings (only default profile matters)
2231 if (my $bindings = delete $PROFILE->{bindings}) {
2232 while (my ($mod, $syms) = each %$bindings) {
2233 while (my ($sym, $cmds) = each %$syms) {
2234 push @{ $PROFILE->{macro} }, {
2235 accelkey => [$mod*1, $sym*1],
2236 action => $cmds,
2237 };
2238 }
2239 }
2240 }
2079 2241
2080 sdl_init; 2242 sdl_init;
2081 2243
2082 @SDL_MODES = reverse 2244 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2083 grep $_->[0] >= 640 && $_->[1] >= 480, 2245 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2084 CFPlus::SDL_ListModes;
2085
2086 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2246 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2247
2248 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2087 2249
2088 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2250 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2089 2251
2090 { 2252 {
2091 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2253 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2132 2294
2133Event::loop; 2295Event::loop;
2134#CFPlus::SDL_Quit; 2296#CFPlus::SDL_Quit;
2135#CFPlus::_exit 0; 2297#CFPlus::_exit 0;
2136 2298
2299END {
2300 video_shutdown;
2301 audio_shutdown;
2137END { CFPlus::SDL_Quit } 2302 CFPlus::SDL_Quit;
2303 CFPlus::DB::Server::stop;
2304}
2138 2305
2139=head1 NAME 2306=head1 NAME
2140 2307
2141cfplus - A Crossfire+ and Crossfire game client 2308cfplus - A Crossfire TRT and Crossfire game client
2142 2309
2143=head1 SYNOPSIS 2310=head1 SYNOPSIS
2144 2311
2145Just run it - no commandline arguments are supported. 2312Just run it - no commandline arguments are supported.
2146 2313
2147=head1 USAGE 2314=head1 USAGE
2148 2315
2149cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2316cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2150fullscreen and interactively. 2317be used in fullscreen mode and interactively.
2151 2318
2152=head1 DEBUGGING 2319=head1 DEBUGGING
2153 2320
2154 2321
2155CFPLUS_DEBUG - environment variable 2322CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines