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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.231 by elmex, Sun Oct 14 10:33:50 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3# do splash-screen thingy on win32
4my $startup_done = sub { };
5BEGIN {
6 if (%PAR::LibCache && $^O eq "MSWin32") {
7 while (my ($filename, $zip) = each %PAR::LibCache) {
8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
9 }
10
11 require Win32::GUI::SplashScreen;
12
13 Win32::GUI::SplashScreen::Show (
14 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
15 );
16
17 $startup_done = sub {
18 Win32::GUI::SplashScreen::Done (1);
19 };
20 }
21}
2 22
3use strict; 23use strict;
4use utf8; 24use utf8;
25
26use Carp 'verbose';
5 27
6# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
7BEGIN { 29BEGIN {
8 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 32
33 my $root = $ENV{PAR_TEMP};
34
11 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 36 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 37 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 38 $zip->extractMember ($_, "$root/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 39 unless -e "$root/$1";
16 } 40 }
17 } 41 }
18 42
19 # TODO: pango-rc file, anybody? 43 if ($^O eq "MSWin32") {
44 # pango is relocatable on win32
45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
49 # unix, need to patch pango rc file
50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
52 local $/;
53 my $rc = <$fh>;
54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
20 55
21 unshift @INC, $ENV{PAR_TEMP}; 56 mkdir "$root/pango-modules";
57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
58 or die "$root/pango-modules/pango.modules: $!";
59 print $fh $rc;
60
61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
63 or die "$ENV{PANGO_RC_FILE}: $!";
64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
65 }
66
67 unshift @INC, $root;
22 } 68 }
23} 69}
24 70
25# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 73 if %PAR::LibCache;
28 74
29use Time::HiRes 'time'; 75use Time::HiRes 'time';
30use Event; 76use Event;
77use List::Util qw(max min);
31 78
32use Crossfire; 79use Crossfire;
33use Crossfire::Protocol::Constants; 80use Crossfire::Protocol::Constants;
34 81
35use Compress::LZF; 82use Compress::LZF;
36 83
37use CFClient; 84use CFPlus;
38use CFClient::OpenGL (); 85use CFPlus::OpenGL ();
39use CFClient::Protocol; 86use CFPlus::Protocol;
87use CFPlus::DB;
40use CFClient::UI; 88use CFPlus::UI;
89use CFPlus::UI::Canvas;
90use CFPlus::UI::Inventory;
91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
41use CFClient::Pod; 95use CFPlus::Pod;
42use CFClient::BindingEditor;
43use CFClient::MapWidget; 96use CFPlus::MapWidget;
97use CFPlus::Macro;
44 98
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 100$SIG{PIPE} = 'IGNORE';
47 101
102$Event::Eval = 1;
48$Event::DIED = sub { 103$Event::DIED = sub {
49 # TODO: display dialog box or so 104 CFPlus::fatal Carp::longmess $_[1]
50 Carp::confess $_[1];#d#TODO: remove when stable
51 CFClient::error $_[1];
52}; 105};
53
54#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
55
56our $VERSION = '0.1';
57 106
58my $MAX_FPS = 60; 107my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 108my $MIN_FPS = 5; # unused as of yet
60 109
61our $META_SERVER = "crossfire.real-time.com:13326"; 110our $META_SERVER = "http://metaserver.schmorp.de/current.json";
62 111
63our $LAST_REFRESH; 112our $LAST_REFRESH;
64our $NOW; 113our $NOW;
65 114
66our $CFG; 115our $CFG;
67our $CONN; 116our $CONN;
117our $PROFILE; # current profile
68our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
69 119
70our $WANT_REFRESH; 120our $WANT_REFRESH;
71our $CAN_REFRESH;
72 121
73our @SDL_MODES; 122our @SDL_MODES;
74our $WIDTH; 123our $WIDTH;
75our $HEIGHT; 124our $HEIGHT;
76our $FULLSCREEN; 125our $FULLSCREEN;
80our $FONT_FIXED; 129our $FONT_FIXED;
81 130
82our $MAP; 131our $MAP;
83our $MAPMAP; 132our $MAPMAP;
84our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
85our $BUTTONBAR; 135our $BUTTONBAR;
86our $LOGVIEW;
87our $CONSOLE;
88our $METASERVER; 136our $METASERVER;
89our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
90our $QUIT_DIALOG; 138our $QUIT_DIALOG;
91our $HOST_ENTRY; 139our $HOST_ENTRY;
92our $FULLSCREEN_ENABLE; 140our $FULLSCREEN_ENABLE;
94our $SERVER_INFO; 142our $SERVER_INFO;
95 143
96our $SETUP_DIALOG; 144our $SETUP_DIALOG;
97our $SETUP_NOTEBOOK; 145our $SETUP_NOTEBOOK;
98our $SETUP_SERVER; 146our $SETUP_SERVER;
147our $SETUP_LOGIN;
99our $SETUP_KEYBOARD; 148our $SETUP_KEYBOARD;
100 149
101our $PL_NOTEBOOK; 150our $PL_NOTEBOOK;
102our $PL_WINDOW; 151our $PL_WINDOW;
103 152
153our $MUSIC_PLAYING_WIDGET;
154our $LICENSE_WIDGET;
155
156our $PICKUP_PAGE;
104our $INVENTORY_PAGE; 157our $INVENTORY_PAGE;
105our $STATS_PAGE; 158our $STATS_PAGE;
106our $SKILL_PAGE; 159our $SKILL_PAGE;
107our $SPELL_PAGE; 160our $SPELL_PAGE;
161our $SPELL_LIST;
108 162
109our $HELP_WINDOW; 163our $HELP_WINDOW;
110our $MESSAGE_WINDOW; 164our $MESSAGE_WINDOW;
111our $FLOORBOX; 165our $FLOORBOX;
112our $GAUGES; 166our $GAUGES;
113our $STATWIDS; 167our $STATWIDS;
114 168
115our $SDL_ACTIVE; 169our $SDL_ACTIVE;
116our %SDL_CB; 170our %SDL_CB;
117 171
118our $SDL_MIXER;
119our @SOUNDS; # event => file mapping
120our %AUDIO_CHUNKS; # audio files
121
122our $ALT_ENTER_MESSAGE; 172our $ALT_ENTER_MESSAGE;
123our $STATUSBOX; 173our $STATUSBOX;
124our $DEBUG_STATUS; 174our $DEBUG_STATUS;
125 175
126our $INV; 176our $INV;
127our $INVR; 177our $INVR;
128our $INV_RIGHT_HB; 178our $INVR_HB;
129 179
130our $BIND_EDITOR; 180#############################################################################
131our $BIND_UPD_CB;
132
133our $PICKUP_CFG;
134 181
135sub status { 182sub status {
136 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 183 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137} 184}
138 185
139sub debug { 186sub debug {
140 $DEBUG_STATUS->set_text ($_[0]); 187 $DEBUG_STATUS->set_text ($_[0]);
141} 188}
189
190sub message {
191 $MESSAGE_WINDOW->message (@_);
192}
193
194#############################################################################
195#TODO: maybe move into own audio module...
196
197our $SDL_MIXER;
198
199our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
200our $MUSIC_WANT; # arryref of ambient music we want to play
201our @MUSIC_HAVE; # ambient music we have on disk
202our $MUSIC_START;
203our @MUSIC_JINGLE; # which jingles to play next
204our $MUSIC_PLAYING_DATA;
205our $MUSIC_PLAYING_META;
206our $MUSIC_PLAYER;
207our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
208
209our %AUDIO_CHUNK; # audio "files"
210our %AUDIO_PLAY; # which audio faces should be played
211
212sub audio_channel_finished {
213 my ($channel) = @_;
214
215# warn "channel $channel finished\n";#d#
216}
217
218sub audio_sound_push($) {
219 my ($face) = @_;
220
221 $CFG->{effects_enable}
222 or return;
223
224 $AUDIO_PLAY{$face}
225 or return;
226
227 if (my $chunk = $AUDIO_CHUNK{$face}) {
228 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
229 my (undef, $dx, $dy, $vol) = @$_;
230
231 my $channel = CFPlus::Channel::find;
232 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
233 $channel->set_position_r ($dx, $dy, 20);
234 $chunk->play ($channel);
235 }
236 } else {
237 # sound_meta not set means data is in flight either way
238 my $meta = $CONN->{face}[$face]
239 or return;
240
241 $meta->{data}
242 or return;
243
244 # if its a jingle, play it as ambient music
245 if ($meta->{data}{jingle}) {
246 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
247 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
248 &audio_music_push ($face);
249 }
250 } else {
251 # fetch from database
252 CFPlus::DB::get res_data => $meta->{name}, sub {
253 my $rwops = new CFPlus::RW $_[0];
254 my $chunk = new CFPlus::MixChunk $rwops
255 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
256 $chunk->volume (($meta->{data}{volume} || 1) * 128);
257 $AUDIO_CHUNK{$face} = $chunk;
258
259 audio_sound_push ($face);
260 };
261 }
262 }
263}
264
265sub audio_sound_play {
266 my ($face, $dx, $dy, $vol) = @_;
267
268 $SDL_MIXER
269 or return;
270 $CFG->{effects_enable}
271 or return;
272
273 my $queue = $AUDIO_PLAY{$face} ||= [];
274 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
275 audio_sound_push $face
276 unless @$queue > 1;
277}
278
279sub audio_music_set_meta {
280 my ($meta) = @_;
281
282 $MUSIC_PLAYING_META = $meta;
283 $MUSIC_PLAYING_WIDGET->set_markup (
284 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
285 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
286 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
287 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
288 );
289}
290
291sub audio_music_update_volume {
292 return unless $MUSIC_PLAYING_META;
293 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
294 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
295 CFPlus::MixMusic::volume $base * $volume * 128;
296}
297
298sub audio_music_start {
299 my $meta = $MUSIC_PLAYING_META;
300
301 CFPlus::DB::get res_data => $meta->{name}, sub {
302 return unless $SDL_MIXER;
303
304 # music might have changed...
305 $meta eq $MUSIC_PLAYING_META
306 or return &audio_music_start ();
307
308 audio_music_update_volume;
309
310 $MUSIC_PLAYING_DATA = \$_[0];
311
312 my $rwops = $meta->{path}
313 ? new_from_file CFPlus::RW $meta->{path}
314 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
315
316 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
317 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
318
319 my $NOW = time;
320
321 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
322 my $pos = $MUSIC_PLAYING_META->{stop_pos};
323 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
324 $MUSIC_START = time - $pos;
325 } else {
326 $MUSIC_PLAYER->play (0);
327 $MUSIC_START = time;
328 }
329
330 delete $meta->{stop_time};
331 delete $meta->{stop_pos};
332 }
333}
334
335sub audio_music_push {
336 return unless $SDL_MIXER;
337
338 my $fade_out;
339
340 if (@MUSIC_JINGLE) {
341 @MUSIC_HAVE = $MUSIC_JINGLE[0];
342 $fade_out = 333;
343 } else {
344 return unless $CFG->{bgm_enable};
345
346 my @have =
347 grep $_ && $_->{data},
348 map $CONN->{face}[$_],
349 @$MUSIC_WANT;
350
351 # randomize music a bit so that the order is not always the same
352 $_->{stop_time} ||= rand for @have;
353
354 @MUSIC_HAVE = @have
355 if @have;
356
357 # default MUSIC_HAVE == MUSIC_DEFAULT
358 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
359 $fade_out = 700;
360 }
361
362 # if the currently playing song is acceptable, let it continue
363 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
364
365 my $NOW = time;
366
367 if ($MUSIC_PLAYING_META) {
368 $MUSIC_PLAYING_META->{stop_time} = $NOW;
369 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
370 CFPlus::MixMusic::fade_out $fade_out;
371 } else {
372 # sort by stop time, oldest first
373 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
374
375 # if the most recently-played piece played very recently,
376 # resume it, else choose the oldest piece for rotation.
377 audio_music_set_meta
378 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
379 ? $MUSIC_HAVE[-1]
380 : $MUSIC_HAVE[0];
381
382 audio_music_start;
383 }
384}
385
386sub audio_music_set_ambient {
387 my ($songs) = @_;
388
389 $MUSIC_WANT = $songs;
390 audio_music_push;
391}
392
393sub audio_music_finished {
394 if ($MUSIC_PLAYING_META) {
395 $MUSIC_PLAYING_META->{stop_time} = time;
396 }
397
398 # we compress multiple jingles of the same type
399 shift @MUSIC_JINGLE
400 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
401
402 $MUSIC_PLAYING_WIDGET->clear;
403
404 undef $MUSIC_PLAYER;
405 undef $MUSIC_PLAYING_META;
406 undef $MUSIC_PLAYING_DATA;
407
408 audio_music_push;
409}
410
411sub audio_init {
412 if ($CFG->{audio_enable}) {
413 $ENV{MIX_EFFECTSMAXSPEED} = 1;
414 $SDL_MIXER = !CFPlus::Mix_OpenAudio
415 $CFG->{audio_hw_frequency},
416 CFPlus::MIX_DEFAULT_FORMAT,
417 $CFG->{audio_hw_channels},
418 $CFG->{audio_hw_chunksize};
419
420 if ($SDL_MIXER) {
421 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
422
423 audio_music_finished;
424 } else {
425 status "Unable to open sound device: there will be no sound";
426 }
427 } else {
428 undef $SDL_MIXER;
429 }
430
431 sub audio_tab_update;
432 audio_tab_update;
433}
434
435sub audio_shutdown {
436 undef $MUSIC_PLAYER;
437 undef $MUSIC_PLAYING_META;
438 undef $MUSIC_PLAYING_DATA;
439
440 $MUSIC_WANT = [];
441 @MUSIC_JINGLE = ();
442 %AUDIO_PLAY = ();
443 %AUDIO_CHUNK = ();
444
445 CFPlus::Mix_CloseAudio if $SDL_MIXER;
446 undef $SDL_MIXER;
447}
448
449#############################################################################
142 450
143sub destroy_query_dialog { 451sub destroy_query_dialog {
144 (delete $_[0]{query_dialog})->destroy 452 (delete $_[0]{query_dialog})->destroy
145 if $_[0]{query_dialog}; 453 if $_[0]{query_dialog};
146} 454}
147 455
456# FIXME: a very ugly hack to wait for stat update look below! #d#
457our $QUERY_TIMER; #d#
458
148# server query dialog 459# server query dialog
149sub server_query { 460sub server_query {
150 my ($conn, $flags, $prompt) = @_; 461 my ($conn, $flags, $prompt) = @_;
151 462
463 # FIXME: a very ugly hack to wait for stat update #d#
464 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
465 unless ($QUERY_TIMER) {
466 $QUERY_TIMER =
467 Event->timer (
468 after => 1,
469 cb => sub {
470 server_query ($conn, $flags, $prompt, 1);
471 $QUERY_TIMER = undef
472 }
473 );
474 return;
475 }
476 }
477
152 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 478 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
153 x => "center", 479 x => "center",
154 y => "center", 480 y => "center",
155 title => "Server Query", 481 title => "Server Query",
156 child => my $vbox = new CFClient::UI::VBox, 482 child => my $vbox = new CFPlus::UI::VBox,
157 ; 483 ;
158 484
159 my @dialog = my $label = new CFClient::UI::Label 485 my @dialog = my $label = new CFPlus::UI::Label
160 max_w => $::WIDTH * 0.4, 486 max_w => $::WIDTH * 0.8,
161 ellipsise => 0, 487 ellipsise => 0,
162 text => $prompt; 488 text => $prompt;
163 489
164 if ($flags & CS_QUERY_YESNO) { 490 if ($flags & CS_QUERY_YESNO) {
165 push @dialog, my $hbox = new CFClient::UI::HBox; 491 push @dialog, my $hbox = new CFPlus::UI::HBox;
166 492
167 $hbox->add (new CFClient::UI::Button 493 $hbox->add (new CFPlus::UI::Button
168 text => "No", 494 text => "No",
169 on_activate => sub { 495 on_activate => sub {
170 $conn->send ("reply n"); 496 $conn->send ("reply n");
171 $dialog->destroy; 497 $dialog->destroy;
172 0 498 0
173 } 499 }
174 ); 500 );
175 $hbox->add (new CFClient::UI::Button 501 $hbox->add (new CFPlus::UI::Button
176 text => "Yes", 502 text => "Yes",
177 on_activate => sub { 503 on_activate => sub {
178 $conn->send ("reply y"); 504 $conn->send ("reply y");
179 destroy_query_dialog $conn; 505 destroy_query_dialog $conn;
180 0 506 0
182 ); 508 );
183 509
184 $dialog->grab_focus; 510 $dialog->grab_focus;
185 511
186 } elsif ($flags & CS_QUERY_SINGLECHAR) { 512 } elsif ($flags & CS_QUERY_SINGLECHAR) {
187 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
188
189 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 513 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190 $MESSAGE_WINDOW->show; 514 $dialog->{tooltip} = "#charcreation_focus";
191 515
192 unshift @dialog, new CFClient::UI::Label 516 unshift @dialog, new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 517 max_w => $::WIDTH * 0.8,
194 ellipsise => 0, 518 ellipsise => 0,
195 markup => "\nOr use your keyboard and the text entry below:\n"; 519 markup => "\nOr use your keyboard and the text entry below:\n";
196 520
197 unshift @dialog, my $table = new CFClient::UI::Table; 521 unshift @dialog, my $table = new CFPlus::UI::Table;
198 522
199 $table->add (0, 0, new CFClient::UI::Button 523 $table->add_at (0, 0, new CFPlus::UI::Button
200 text => "Next Race", 524 text => "Next Race",
201 on_activate => sub { 525 on_activate => sub {
202 $conn->send ("reply n"); 526 $conn->send ("reply n");
203 destroy_query_dialog $conn; 527 destroy_query_dialog $conn;
204 0 528 0
205 }, 529 },
206 ); 530 );
207 $table->add (2, 0, new CFClient::UI::Button 531 $table->add_at (2, 0, new CFPlus::UI::Button
208 text => "Accept", 532 text => "Accept",
209 on_activate => sub { 533 on_activate => sub {
210 $conn->send ("reply d"); 534 $conn->send ("reply d");
211 destroy_query_dialog $conn; 535 destroy_query_dialog $conn;
212 0 536 0
213 }, 537 },
214 ); 538 );
215 539
540 if ($conn->{chargen_race_description}) {
541 unshift @dialog, new CFPlus::UI::Label
542 max_w => $::WIDTH * 0.8,
543 ellipsise => 0,
544 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
545 ;
546 }
547
548 unshift @dialog, new CFPlus::UI::Face
549 face => $conn->{player}{face},
550 bg => [.2, .2, .2, 1],
551 min_w => 64,
552 min_h => 64,
553 ;
554
555 if ($conn->{chargen_race_title}) {
556 unshift @dialog, new CFPlus::UI::Label
557 allign => 1,
558 ellipsise => 0,
559 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
560 ;
561 }
562
216 unshift @dialog, new CFClient::UI::Label 563 unshift @dialog, new CFPlus::UI::Label
217 max_w => $::WIDTH * 0.4, 564 max_w => $::WIDTH * 0.4,
218 ellipsise => 0, 565 ellipsise => 0,
219 markup => 566 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
220 "<big><b>Character Creation: Race</b></big>\n\n"
221 . "Look at the <b>Messages</b> window to see a description of this race "
222 . "and the center of the screen to see how this race looks like "
223 . "(<small>below this dialog window: you may need to move the dialog away and "
224 . "click into the display area to make it visible</small>).\n\n"
225 . "You can look at another race, or accept this race (you will cycle back to "
226 . "this race eventually, so you can take your time making this important choice."
227 ; 567 ;
228 568
229 } elsif ($prompt =~ /roll new stats/) { 569 } elsif ($prompt =~ /roll new stats/) {
230 if (my $stat = delete $conn->{stat_change_with}) { 570 if (my $stat = delete $conn->{stat_change_with}) {
231 $conn->send ("reply $stat"); 571 $conn->send ("reply $stat");
232 destroy_query_dialog $conn; 572 destroy_query_dialog $conn;
233 return; 573 return;
234 } 574 }
235 575
236 $STATS_PAGE->show;
237 $MESSAGE_WINDOW->hide;
238
239 unshift @dialog, new CFClient::UI::Label 576 unshift @dialog, new CFPlus::UI::Label
240 max_w => $::WIDTH * 0.4, 577 max_w => $::WIDTH * 0.4,
241 ellipsise => 0, 578 ellipsise => 0,
242 markup => "\nOr use your keyboard and the text entry below:\n"; 579 markup => "\nOr use your keyboard and the text entry below:\n";
243 580
244 unshift @dialog, my $table = new CFClient::UI::Table; 581 unshift @dialog, my $table = new CFPlus::UI::Table;
245 582
246 # left: re-roll 583 # left: re-roll
247 $table->add (0, 0, new CFClient::UI::Button 584 $table->add_at (0, 0, new CFPlus::UI::Button
248 text => "Roll Again", 585 text => "Roll Again",
249 on_activate => sub { 586 on_activate => sub {
250 $conn->send ("reply y"); 587 $conn->send ("reply y");
251 destroy_query_dialog $conn; 588 destroy_query_dialog $conn;
252 0 589 0
253 }, 590 },
254 ); 591 );
255 592
256 # center: swap stats 593 # center: swap stats
257 my ($sw1, $sw2) = map +(new CFClient::UI::Selector 594 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258 expand => 1, 595 expand => 1,
259 value => $_, 596 value => $_,
260 options => [ 597 options => [
261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 598 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 599 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
266 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 603 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 604 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268 ], 605 ],
269 ), 1 .. 2; 606 ), 1 .. 2;
270 607
271 $table->add (2, 0, new CFClient::UI::Button 608 $table->add_at (2, 0, new CFPlus::UI::Button
272 text => "Swap Stats", 609 text => "Swap Stats",
273 on_activate => sub { 610 on_activate => sub {
274 $conn->{stat_change_with} = $sw2->{value}; 611 $conn->{stat_change_with} = $sw2->{value};
275 $conn->send ("reply $sw1->{value}"); 612 $conn->send ("reply $sw1->{value}");
276 destroy_query_dialog $conn; 613 destroy_query_dialog $conn;
277 0 614 0
278 }, 615 },
279 ); 616 );
280 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 617 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281 618
282 # right: accept 619 # right: accept
283 $table->add (4, 0, new CFClient::UI::Button 620 $table->add_at (4, 0, new CFPlus::UI::Button
284 text => "Accept", 621 text => "Accept",
285 on_activate => sub { 622 on_activate => sub {
286 $conn->send ("reply n"); 623 $conn->send ("reply n");
287 $STATS_PAGE->hide; 624 $STATS_PAGE->hide;
288 destroy_query_dialog $conn; 625 destroy_query_dialog $conn;
289 0 626 0
290 }, 627 },
291 ); 628 );
292 629
293 unshift @dialog, my $hbox = new CFClient::UI::HBox; 630 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294 for ( 631 for (
295 [Str => CS_STAT_STR], 632 [Str => CS_STAT_STR],
296 [Dex => CS_STAT_DEX], 633 [Dex => CS_STAT_DEX],
297 [Con => CS_STAT_CON], 634 [Con => CS_STAT_CON],
298 [Int => CS_STAT_INT], 635 [Int => CS_STAT_INT],
299 [Wis => CS_STAT_WIS], 636 [Wis => CS_STAT_WIS],
300 [Pow => CS_STAT_POW], 637 [Pow => CS_STAT_POW],
301 [Cha => CS_STAT_CHA], 638 [Cha => CS_STAT_CHA],
302 ) { 639 ) {
303 my ($name, $id) = @$_; 640 my ($name, $id) = @$_;
304 $hbox->add (new CFClient::UI::Label 641 $hbox->add (new CFPlus::UI::Label
305 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 642 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306 align => 0, 643 align => 0,
307 expand => 1, 644 expand => 1,
308 can_events => 1, 645 can_events => 1,
309 can_hover => 1, 646 can_hover => 1,
310 tooltip => $CFClient::STAT_TOOLTIP{$name}, 647 tooltip => "#stat_$name",
311 ); 648 );
312 } 649 }
313 650
314 unshift @dialog, new CFClient::UI::Label 651 unshift @dialog, new CFPlus::UI::Label
315 max_w => $::WIDTH * 0.4, 652 max_w => $::WIDTH * 0.4,
316 ellipsise => 0, 653 ellipsise => 0,
317 markup => 654 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
318 "<big><b>Character Creation: Stats</b></big>\n\n"
319 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
320 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321 . "They will be modified later by both the race and the class you choose.\n\n"
322 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323 ; 655 ;
324 } 656 }
325 657
326 push @dialog, my $entry = new CFClient::UI::Entry 658 push @dialog, my $entry = new CFPlus::UI::Entry
327 on_changed => sub { 659 on_changed => sub {
328 $conn->send ("reply $_[1]"); 660 $conn->send ("reply $_[1]");
329 destroy_query_dialog $conn; 661 destroy_query_dialog $conn;
330 0 662 0
331 }, 663 },
334 $entry->grab_focus; 666 $entry->grab_focus;
335 667
336 } else { 668 } else {
337 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 669 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338 670
339 push @dialog, my $entry = new CFClient::UI::Entry 671 push @dialog, my $entry = new CFPlus::UI::Entry
340 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 672 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341 on_activate => sub { 673 on_activate => sub {
342 $conn->send ("reply $_[1]"); 674 $conn->send ("reply $_[1]");
343 destroy_query_dialog $conn; 675 destroy_query_dialog $conn;
344 0 676 0
358 $LOGIN_BUTTON->set_text ("Logout"); 690 $LOGIN_BUTTON->set_text ("Logout");
359 $SETUP_DIALOG->hide; 691 $SETUP_DIALOG->hide;
360 692
361 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 693 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362 694
363 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 695 my ($host, $port) = split /:/, $PROFILE->{host};
364 696
365 $MAP = new CFClient::Map $mapsize, $mapsize; 697 $MAP = new CFPlus::Map;
366 698
367 $CONN = eval { 699 $CONN = eval {
368 new CFClient::Protocol 700 new CFPlus::Protocol
369 host => $host, 701 host => $host,
370 port => $port || 13327, 702 port => $port || 13327,
371 user => $CFG->{profile}{default}{user}, 703 user => $PROFILE->{user},
372 pass => $CFG->{profile}{default}{password}, 704 pass => $PROFILE->{password},
373 mapw => $mapsize, 705 mapw => $mapsize,
374 maph => $mapsize, 706 maph => $mapsize,
375 707
708 client => "cfplus $CFPlus::VERSION $] $^O",
709
376 map_widget => $MAPWIDGET, 710 map_widget => $MAPWIDGET,
377 logview => $LOGVIEW,
378 statusbox => $STATUSBOX, 711 statusbox => $STATUSBOX,
379 map => $MAP, 712 map => $MAP,
380 mapmap => $MAPMAP, 713 mapmap => $MAPMAP,
381 query => \&server_query, 714 query => \&server_query,
382 715
383 sound_play => sub { 716 setup_req => {
384 my ($x, $y, $soundnum, $type) = @_; 717 smoothing => $CFG->{map_smoothing}*1,
385
386 $SDL_MIXER
387 or return;
388
389 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
390 or return;
391
392 $chunk->play;
393 }, 718 },
394 }; 719 };
395 720
396 if ($CONN) { 721 if ($CONN) {
397 CFClient::lowdelay fileno $CONN->{fh}; 722 CFPlus::lowdelay fileno $CONN->{fh};
398 723
399 status "login successful"; 724 status "login successful";
400 } else { 725 } else {
401 status "unable to connect"; 726 status "unable to connect";
402 stop_game(); 727 stop_game();
403 } 728 }
404} 729}
405 730
406sub stop_game { 731sub stop_game {
407 $LOGIN_BUTTON->set_text ("Login"); 732 $LOGIN_BUTTON->set_text ("Login / Register");
408 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 733 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
409 $SETUP_DIALOG->show; 734 $SETUP_DIALOG->show;
410 $PL_WINDOW->hide; 735 $PL_WINDOW->hide;
411 $SPELL_PAGE->clear_spells; 736 $SPELL_LIST->clear_spells;
737 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
738
739 &audio_music_set_ambient ([]);
412 740
413 return unless $CONN; 741 return unless $CONN;
414 742
415 status "connection closed"; 743 status "connection closed";
416 744
420 748
421 undef $MAP; 749 undef $MAP;
422} 750}
423 751
424sub graphics_setup { 752sub graphics_setup {
425 my $vbox = new CFClient::UI::VBox; 753 my $vbox = new CFPlus::UI::VBox;
426 754
427 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 755 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428 756
757 my $row = 0;
758
759 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
760 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
761 can_events => 1,
762 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
763
764 my $vidmode_tooltip =
765 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
766 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
767
429 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 769 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
431 770
771 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
432 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 772 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
433 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 773 tooltip => $vidmode_tooltip);
774 $hbox->add (my $mode_label = new CFPlus::UI::Label
775 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
776 can_events => 1, tooltip => $vidmode_tooltip);
434 777
435 $mode_slider->connect (changed => sub { 778 $mode_slider->connect (changed => sub {
436 my ($self, $value) = @_; 779 my ($self, $value) = @_;
437 780
438 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 781 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
439 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 782 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
440 }); 783 });
441 $mode_slider->emit (changed => $mode_slider->{range}[0]); 784 $mode_slider->emit (changed => $mode_slider->{range}[0]);
442 785
443 my $row = 1;
444
445 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 787 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447 state => $CFG->{fullscreen}, 788 state => $CFG->{fullscreen},
448 tooltip => "Bring the client into fullscreen mode.", 789 tooltip => "Bring the client into fullscreen mode.",
449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450 ); 791 );
451 792
793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
795 state => $CFG->{force_opengl11},
796 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
797 . "higher memory usage and slower performance. It will, however, help tremendously on "
798 . "cards that claim to support a feature but fall back to software rendering. "
799 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
800 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
801 . "experience extremely low framerates and your card should do better, try this option.</b>",
802 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
803 );
804
805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
807 state => $CFG->{texture_compression},
808 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
809 . "will save a lot of memory and increase performance. The compression algorithm "
810 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
811 . "forced OpenGL 1.1 mode.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
813 );
814
452 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453 $table->add (1, $row++, new CFClient::UI::CheckBox 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
454 state => $CFG->{fast}, 817 state => $CFG->{fast},
455 tooltip => "Lower the visual quality considerably to speed up rendering.", 818 tooltip => "Lower the visual quality considerably to speed up rendering.",
456 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 819 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457 ); 820 );
458 821
822 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
823 $table->add_at (1, $row++, new CFPlus::UI::Slider
824 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
825 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
826 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
827 );
828
829 $table->add_at (1, $row++, new CFPlus::UI::Button
830 expand => 1, align => 0, text => "Apply",
831 tooltip => "Apply the video settings above.",
832 on_activate => sub {
833 video_shutdown ();
834 video_init ();
835 0
836 }
837 );
838
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460 $table->add (1, $row++, new CFClient::UI::Slider 840 $table->add_at (1, $row++, new CFPlus::UI::Slider
461 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 841 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 842 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 843 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464 ); 844 );
465 845
846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
848 state => $CFG->{map_smoothing},
849 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
850 . "This increases load on the graphics subsystem and works only with TRT servers. "
851 . "Changes take effect at next login only.",
852 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
853 );
854
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 855 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
467 $table->add (1, $row++, new CFClient::UI::CheckBox 856 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
468 state => $CFG->{fow_enable}, 857 state => $CFG->{fow_enable},
469 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 858 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
470 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471 ); 860 );
472 861
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 862 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474 $table->add (1, $row++, new CFClient::UI::Slider 863 $table->add_at (1, $row++, new CFPlus::UI::Slider
475 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 864 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 865 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
477 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 866 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478 ); 867 );
479 868
480 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481 $table->add (1, $row++, new CFClient::UI::CheckBox
482 state => $CFG->{fow_smooth},
483 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484 on_changed => sub {
485 my ($self, $value) = @_;
486 $CFG->{fow_smooth} = $value;
487 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
488 0
489 }
490 );
491
492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493 $table->add (1, $row++, new CFClient::UI::Slider
494 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
496 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497 );
498
499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 869 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500 $table->add (1, $row++, new CFClient::UI::Slider 870 $table->add_at (1, $row++, new CFPlus::UI::Slider
501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 871 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 872 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
873 . "but you still need to press apply to correctly re-layout the widget.",
503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 874 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504 ); 875 );
505 876
506 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507 $table->add (1, $row++, new CFClient::UI::Slider 878 $table->add_at (1, $row++, new CFPlus::UI::Slider
508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 879 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 880 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510 on_changed => sub { 881 on_changed => sub {
511 $CFG->{gauge_fontsize} = $_[1]; 882 $CFG->{gauge_fontsize} = $_[1];
512 &set_gauge_window_fontsize; 883 &set_gauge_window_fontsize;
513 0 884 0
514 } 885 }
515 ); 886 );
516 887
517 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 888 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518 $table->add (1, $row++, new CFClient::UI::Slider 889 $table->add_at (1, $row++, new CFPlus::UI::Slider
519 range => [$CFG->{gauge_size}, 0.2, 0.8], 890 range => [$CFG->{gauge_size}, 0.2, 0.8],
520 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 891 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521 on_changed => sub { 892 on_changed => sub {
522 $CFG->{gauge_size} = $_[1]; 893 $CFG->{gauge_size} = $_[1];
523 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 894 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524 0 895 0
525 } 896 }
526 ); 897 );
527 898
528 $table->add (1, $row++, new CFClient::UI::Button
529 expand => 1, align => 0, text => "Apply",
530 tooltip => "Apply the video settings",
531 on_activate => sub {
532 video_shutdown ();
533 video_init ();
534 0
535 }
536 );
537
538 $vbox 899 $vbox
539} 900}
540 901
902our $AUDIO_HW_CHUNKSIZE;
903our $AUDIO_INFO;
904
905sub audio_tab_update {
906 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
907
908 $AUDIO_HW_CHUNKSIZE->set_options ([
909 [0, "default", "Use System Default"],
910 map {
911 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
912 [$_, $ms, "$ms ($_ samples)"],
913 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
914 ]);
915
916 my $text = !$freq
917 ? "audio is off"
918 : "audio is enabled\n"
919 . "frequency (Hz): $freq\n"
920 . "channels: $chans";
921
922 $AUDIO_INFO->set_text ($text);
923}
924
541sub audio_setup { 925sub audio_setup {
542 my $vbox = new CFClient::UI::VBox; 926 my $vbox = new CFPlus::UI::VBox;
543 927
544 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 928 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
545 929
546 my $row = 0; 930 my $row = 0;
547 931
548 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 932 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549 $table->add (1, $row++, new CFClient::UI::CheckBox 933 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
550 state => $CFG->{audio_enable}, 934 state => $CFG->{audio_enable},
551 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.", 935 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.",
552 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 936 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
553 ); 937 );
938
554# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 939 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
555# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 940 $table->add_at (1, $row, new CFPlus::UI::CheckBox
941 expand => 1, state => $CFG->{effects_enable},
942 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
943 on_changed => sub {
556# $CFG->{effects_volume} = $_[1]; 944 $CFG->{effects_enable} = $_[1];
557# }); 945 $CONN->update_fx_want if $CONN;
946 1
947 }
948 );
949 $table->add_at (2, $row++, new CFPlus::UI::Slider
950 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
951 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
952 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
953 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
954 );
955
558 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 956 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
559 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 957 $table->add_at (1, $row, new CFPlus::UI::CheckBox
560 $hbox->add (new CFClient::UI::CheckBox
561 expand => 1, state => $CFG->{bgm_enable}, 958 expand => 1, state => $CFG->{bgm_enable},
562 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 959 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
563 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 960 on_changed => sub {
961 $CFG->{bgm_enable} = $_[1];
962 $CONN->update_fx_want if $CONN;
963 audio_music_push;
964 1
965 }
564 ); 966 );
565 $hbox->add (new CFClient::UI::Slider 967 $table->add_at (2, $row++, new CFPlus::UI::Slider
566 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 968 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567 tooltip => "The volume of the background music. Changes are instant.", 969 tooltip => "The volume of the background music. Changes are instant.",
568 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 970 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
569 ); 971 );
570 972
973 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
974 $table->add_at (1, $row++, new CFPlus::UI::Selector
975 c_colspan => 2, expand => 1,
976 value => $CFG->{audio_hw_frequency},
977 options => [
978 [ 0, "default" , "Use System Default"],
979 [11025, "11 kHz" , "11kHz (low quality)"],
980 [22050, "22 kHz" , "22kHz (reduced quality)"],
981 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
982 [48000, "48 kHz" , "48kHz (studio quality)"],
983 ],
984 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
985 on_changed => sub {
986 $CFG->{audio_hw_frequency} = $_[1];
987 audio_tab_update;
988 1
989 }
990 );
991
992 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
993 $table->add_at (1, $row++, new CFPlus::UI::Selector
994 c_colspan => 2, expand => 1,
995 value => $CFG->{audio_hw_channels},
996 options => [
997 [0, "default" , "Use System Default"],
998 [1, "Mono" , "Mono (single channel, low quality)"],
999 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
1000 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
1001 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
1002 ],
1003 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1004 on_changed => sub {
1005 $CFG->{audio_hw_channels} = $_[1];
1006 audio_tab_update;
1007 1
1008 }
1009 );
1010
1011 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1012 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1013 c_colspan => 2, expand => 1,
1014 value => $CFG->{audio_hw_chunksize},
1015 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1016 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1017 on_changed => sub {
1018 $CFG->{audio_hw_chunksize} = $_[1];
1019 audio_tab_update;
1020 1
1021 }
1022 );
1023
1024 # should really be a slider
1025 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1026 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1027 c_colspan => 2, expand => 1,
1028 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1029 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1030 template => ">= 99",
1031 on_changed => sub {
1032 my ($slider, $value) = @_;
1033
1034 $CFG->{audio_mix_channels} = $value
1035 if $value;
1036 1;
1037 }
1038 );
1039
571 $table->add (1, $row++, new CFClient::UI::Button 1040 $table->add_at (1, $row++, new CFPlus::UI::Button
572 expand => 1, align => 0, text => "Apply", 1041 c_colspan => 2, expand => 1, align => 0, text => "Apply",
573 tooltip => "Apply the audio settings", 1042 tooltip => "Apply the audio settings",
574 on_activate => sub { 1043 on_activate => sub {
575 audio_shutdown (); 1044 audio_shutdown ();
576 audio_init (); 1045 audio_init ();
577 0 1046 0
578 } 1047 }
579 ); 1048 );
580 1049
1050 $vbox->add (new CFPlus::UI::FancyFrame
1051 expand => 1,
1052 label => "Audio Info",
1053 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1054 );
1055
1056 audio_tab_update;
1057
581 $vbox 1058 $vbox
582} 1059}
583 1060
584sub set_gauge_window_fontsize { 1061sub set_gauge_window_fontsize {
585 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 1062 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
588} 1065}
589 1066
590sub make_gauge_window { 1067sub make_gauge_window {
591 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1068 my $gh = int $HEIGHT * $CFG->{gauge_size};
592 1069
593 my $win = new CFClient::UI::Frame ( 1070 my $win = new CFPlus::UI::Frame (
594 force_x => 0, 1071 force_x => 0,
595 force_y => "max", 1072 force_y => "max",
596 force_w => $WIDTH, 1073 force_w => $WIDTH,
597 force_h => $gh, 1074 force_h => $gh,
598 ); 1075 );
599 1076
600 $win->add (my $hbox = new CFClient::UI::HBox 1077 $win->add (my $hbox = new CFPlus::UI::HBox
601 children => [ 1078 children => [
602 (new CFClient::UI::HBox expand => 1), 1079 (new CFPlus::UI::HBox expand => 1),
603 (new CFClient::UI::VBox children => [ 1080 (new CFPlus::UI::VBox children => [
604 (new CFClient::UI::Empty expand => 1), 1081 (new CFPlus::UI::Empty expand => 1),
605 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 1082 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606 ]), 1083 ]),
607 (my $vbox = new CFClient::UI::VBox), 1084 (my $vbox = new CFPlus::UI::VBox),
608 ], 1085 ],
609 ); 1086 );
610 1087
611 $vbox->add (new CFClient::UI::HBox 1088 $vbox->add (new CFPlus::UI::HBox
612 expand => 1, 1089 expand => 1,
613 children => [ 1090 children => [
614 (new CFClient::UI::Empty expand => 1), 1091 (new CFPlus::UI::Empty expand => 1),
615 (my $hb = new CFClient::UI::HBox), 1092 (my $hb = new CFPlus::UI::HBox),
616 ], 1093 ],
617 ); 1094 );
618 1095
619 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 1096 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
620 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
621 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 1097 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
622 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
623 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 1098 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
624 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
625 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 1099 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
626 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
627 1100
628 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 1101 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
629 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); 1102 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1103 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
630 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 1104 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
631 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632 1105
633 $GAUGES = { 1106 $GAUGES = {
1107 exp => $exp, prg => $prg, sklprg => $sklprg,
634 exp => $exp, win => $win, range => $rng, 1108 win => $win, range => $rng,
635 food => $fg, mana => $mg, hp => $hg, grace => $gg 1109 hp => $hg, mana => $mg, grace => $gg, food => $fg,
636 }; 1110 };
637 1111
638 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
639 1113
640 $win 1114 $win
641} 1115}
642 1116
643sub debug_setup { 1117sub debug_setup {
644 my $table = new CFClient::UI::Table; 1118 my $table = new CFPlus::UI::Table;
645 1119
646 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 1120 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1121 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
648 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 1122 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
649 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1123 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
650 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 1124 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
651 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1125 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
652 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 1126 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1127 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1128 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
654 1129
655 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 1130 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
656 1131
657 for my $x (0..2) { 1132 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
658 for my $y (0 .. 2) { 1133 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
659 $table->add ($x + 3, $y, 1134 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
660 new CFClient::UI::Entry 1135 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
661 text => $default_smooth[$x * 3 + $y], 1136 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
662 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 1137 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
663 ); 1138
664 } 1139 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1140
1141 $c->add_items ({
1142 type => "line_loop",
1143 color => [0, 1, 0],
1144 width => 9,
1145 coord_mode => "abs",
1146 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
665 } 1147 });
666 1148
1149 $c->add_items ({
1150 type => "lines",
1151 color => [1, 1, 0],
1152 width => 2,
1153 coord_mode => "rel",
1154 coord => [[0,0], [1,1], [1,0], [0,1]],
1155 });
1156
1157 $c->add_items ({
1158 type => "polygon",
1159 color => [0, 0.43, 0],
1160 width => 2,
1161 coord_mode => "rel",
1162 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1163 });
667 1164
668 $table 1165 $table
669} 1166}
670 1167
671sub stats_window { 1168sub stats_window {
672 my $r = new CFClient::UI::ScrolledWindow ( 1169 my $r = new CFPlus::UI::ScrolledWindow (
673 expand => 1, 1170 expand => 1,
674 scroll_y => 1 1171 scroll_y => 1
675 ); 1172 );
676 $r->add (my $vb = new CFClient::UI::VBox); 1173 $r->add (my $vb = new CFPlus::UI::VBox);
677 1174
1175 $vb->add (new CFPlus::UI::FancyFrame
1176 label => "Player",
1177 child => (my $pi = new CFPlus::UI::VBox),
1178 );
1179
678 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1180 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679 can_hover => 1, can_events => 1, 1181 can_hover => 1, can_events => 1,
680 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1182 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
681 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1183 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682 can_hover => 1, can_events => 1, 1184 can_hover => 1, can_events => 1,
683 tooltip => "The map you are currently on (if supported by the server)."); 1185 tooltip => "The map you are currently on (if supported by the server).");
684 1186
685 $vb->add (my $hb0 = new CFClient::UI::HBox); 1187 $pi->add (my $hb0 = new CFPlus::UI::HBox);
686 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1188 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687 can_hover => 1, can_events => 1, 1189 can_hover => 1, can_events => 1,
688 tooltip => "The weight of the player including all inventory items."); 1190 tooltip => "The weight of the player including all inventory items.");
689 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1191 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
690 can_hover => 1, can_events => 1, 1192 can_hover => 1, can_events => 1,
691 tooltip => "The weight limit: you cannot carry more than this."); 1193 tooltip => "The weight limit: you cannot carry more than this.");
692 1194
1195 $vb->add (new CFPlus::UI::FancyFrame
1196 label => "Primary/Secondary Statistics",
693 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1197 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1198 );
694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 1199 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
695 1200
696 my $color2 = [1, 1, 0]; 1201 my $color2 = [1, 1, 0];
697 1202
698 for ( 1203 for (
699 [0, 0, st_str => "Str", 30], 1204 [0, 0, st_str => "Str", 30],
711 [2, 4, st_spd => "Spd", 10.54], 1216 [2, 4, st_spd => "Spd", 10.54],
712 [2, 5, st_wspd => "WSp", 10.54], 1217 [2, 5, st_wspd => "WSp", 10.54],
713 ) { 1218 ) {
714 my ($col, $row, $id, $label, $template) = @$_; 1219 my ($col, $row, $id, $label, $template) = @$_;
715 1220
716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 1221 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1222 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 1223 align => +1, template => $template, tooltip => "#stat_$label");
719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 1224 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1225 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 1226 align => -1, text => $label, tooltip => "#stat_$label");
722 } 1227 }
723 1228
1229 $vb->add (new CFPlus::UI::FancyFrame
1230 label => "Resistancies",
724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 1231 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1232 );
725 1233
726 my $row = 0; 1234 my $row = 0;
727 my $col = 0; 1235 my $col = 0;
728 1236
729 my %resist_names = ( 1237 my %resist_names = (
762 cold => ["Cold", 1270 cold => ["Cold",
763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1271 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit", 1272 ghit => ["Ghost hit",
765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1273 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
766 ); 1274 );
1275
767 for (qw/slow holyw conf fire depl magic 1276 for (qw/slow holyw conf fire depl magic
768 drain acid pois para deat phys 1277 drain acid pois para deat phys
769 blind fear tund elec cold ghit/) 1278 blind fear tund elec cold ghit/)
770 { 1279 {
771 $tbl2->add ($col, $row, 1280 $tbl2->add_at ($col, $row,
772 $STATWIDS->{"res_$_"} = 1281 $STATWIDS->{"res_$_"} =
773 new CFClient::UI::Label 1282 new CFPlus::UI::Label
774 font => $FONT_FIXED, 1283 font => $FONT_FIXED,
775 template => "-100%", 1284 template => "-100%",
776 align => +1, 1285 align => +1,
777 valign => 0, 1286 valign => 0,
778 can_events => 1, 1287 can_events => 1,
779 can_hover => 1, 1288 can_hover => 1,
780 tooltip => $resist_names{$_}->[1], 1289 tooltip => $resist_names{$_}->[1],
781 ); 1290 );
782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 1291 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
783 font => $FONT_FIXED, 1292 font => $FONT_FIXED,
784 can_hover => 1, 1293 can_hover => 1,
785 can_events => 1, 1294 can_events => 1,
786 path => "ui/resist/resist_$_.png", 1295 path => "ui/resist/resist_$_.png",
787 tooltip => $resist_names{$_}->[1], 1296 tooltip => $resist_names{$_}->[1],
788 ); 1297 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 1298 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
790 text => $resist_names{$_}->[0], 1299 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED, 1300 font => $FONT_FIXED,
792 can_hover => 1, 1301 can_hover => 1,
793 can_events => 1, 1302 can_events => 1,
794 tooltip => $resist_names{$_}->[1], 1303 tooltip => $resist_names{$_}->[1],
805 1314
806 $r 1315 $r
807} 1316}
808 1317
809sub skill_window { 1318sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 1319 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1320
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1321 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1322
812 $sw 1323 $sw
813} 1324}
814 1325
815sub formsep($) { 1326sub formsep($) {
816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1327 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
827 return if $METASERVER_ATIME > time; 1338 return if $METASERVER_ATIME > time;
828 $METASERVER_ATIME = time + 60; 1339 $METASERVER_ATIME = time + 60;
829 1340
830 my $table = $METASERVER->{table}; 1341 my $table = $METASERVER->{table};
831 $table->clear; 1342 $table->clear;
832 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1343 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
833 1344
834 my $buf; 1345 my $ok = 0;
835 1346
836 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1347 CFPlus::background {
1348 my $ua = CFPlus::lwp_useragent;
837 1349
838 unless ($fh) { 1350 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
839 $label->set_text ("unable to contact metaserver: $!"); 1351 } sub {
840 return; 1352 my ($msg) = @_;
841 } 1353 if ($msg) {
842
843 Event->io (fd => $fh, poll => 'r', cb => sub {
844 my $res = sysread $fh, $buf, 8192, length $buf;
845
846 if (!defined $res) {
847 $_[0]->w->cancel;
848 $label->set_text ("error while retrieving server list: $!");
849 } elsif ($res == 0) {
850 $_[0]->w->cancel;
851 status "server list retrieved";
852
853 utf8::decode $buf if utf8::valid $buf;
854
855 $table->clear; 1354 $table->clear;
856 1355
857 my @tip = ( 1356 my @tip = (
858 "The current number of users logged in on the server.", 1357 "The current number of users logged in on the server.",
859 "The hostname of the server.", 1358 "The hostname of the server.",
860 "The time this server has been running without being restarted.", 1359 "The time this server has been running without being restarted.",
861 "The server software version - a '+' indicates a Crossfire+ server.", 1360 "The server software version - a '+' indicates a Crossfire+ server.",
862 "Short information about this server provided by its admins.", 1361 "Short information about this server provided by its admins.",
863 ); 1362 );
864 my @col = qw(#Users Host Uptime Version Description); 1363 my @col = qw(#Users Host Uptime Version Description);
865 $table->add ($_, 0, new CFClient::UI::Label 1364 $table->add_at ($_, 0, new CFPlus::UI::Label
866 can_hover => 1, can_events => 1, 1365 can_hover => 1, can_events => 1,
867 align => 0, fg => [1, 1, 0], 1366 align => 0, fg => [1, 1, 0],
868 text => $col[$_], tooltip => $tip[$_]) 1367 text => $col[$_], tooltip => $tip[$_])
869 for 0 .. $#col; 1368 for 0 .. $#col;
870 1369
871 my @align = qw(1 0 1 1 -1); 1370 my @align = qw(1 0 1 1 -1);
872 1371
873 my $y = 0; 1372 my $y = 0;
874 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1373 for my $m (@{ $msg->{servers} }) {
875 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1374 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1375 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
876 1376
877 for ($desc) { 1377 for ($desc) {
878 s/<br>/\n/gi; 1378 s/<br>/\n/gi;
879 s/<li>/\n· /gi; 1379 s/<li>/\n· /gi;
880 s/<.*?>//sgi; 1380 s/<.*?>//sgi;
881 s/&/&amp;/g; 1381 s/&amp;/&/g;
882 s/</&lt;/g; 1382 s/&lt;/</g;
883 s/>/&gt;/g; 1383 s/&gt;/>/g;
884 } 1384 }
885 1385
886 $uptime = sprintf "%dd %02d:%02d:%02d", 1386 $uptime = sprintf "%dd %02d:%02d:%02d",
887 (int $m->[8] / 86400), 1387 (int $uptime / 86400),
888 (int $m->[8] / 3600) % 24, 1388 (int $uptime / 3600) % 24,
889 (int $m->[8] / 60) % 60, 1389 (int $uptime / 60) % 60,
890 $m->[8] % 60; 1390 $uptime % 60;
891 1391
892 $m = [$users, $host, $uptime, $version, $desc]; 1392 $m = [$users, $host, $uptime, $version, $desc];
893 1393
894 $y++; 1394 $y++;
895 1395
896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 1396 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
897 (new CFClient::UI::Button 1397 (new CFPlus::UI::Button
898 text => "Use", 1398 text => "Use",
899 tooltip => "Put this server into the <b>Host:Port</b> field", 1399 tooltip => "Put this server into the <b>Host:Port</b> field",
900 on_activate => sub { 1400 on_activate => sub {
901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1401 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
902 $METASERVER->hide; 1402 $METASERVER->hide;
903 0 1403 0
904 }, 1404 },
905 ), 1405 ),
906 (new CFClient::UI::Empty expand => 1), 1406 (new CFPlus::UI::Empty expand => 1),
907 ]); 1407 ]);
908 1408
909 $table->add ($_, $y, new CFClient::UI::Label 1409 $table->add_at ($_, $y, new CFPlus::UI::Label
1410 max_w => $::WIDTH * 0.4,
910 ellipsise => 0, 1411 ellipsise => 0,
911 align => $align[$_], 1412 align => $align[$_],
912 text => $m->[$_], 1413 text => $m->[$_],
913 tooltip => $tip[$_], 1414 tooltip => $tip[$_],
1415 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
914 can_hover => 1, 1416 can_hover => 1,
915 can_events => 1, 1417 can_events => 1,
916 fontsize => 0.8) 1418 fontsize => 0.8)
917 for 0 .. $#$m; 1419 for 0 .. $#$m;
918 } 1420 }
1421 } else {
1422 $ok or $label->set_text ("error while contacting metaserver");
919 } 1423 }
920 }); 1424 };
1425
921} 1426}
922 1427
923sub metaserver_dialog { 1428sub metaserver_dialog {
924 my $vbox = new CFClient::UI::VBox; 1429 my $vbox = new CFPlus::UI::VBox;
925 my $table = new CFClient::UI::Table; 1430 my $table = new CFPlus::UI::Table;
926 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 1431 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
927 1432
928 my $dialog = new CFClient::UI::FancyFrame 1433 my $dialog = new CFPlus::UI::Toplevel
929 title => "Server List", 1434 title => "Server List",
930 name => 'metaserver_dialog', 1435 name => 'metaserver_dialog',
931 x => 'center', 1436 x => 'center',
932 y => 'center', 1437 y => 'center',
933 z => 3, 1438 z => 3,
1439 force_w => $::WIDTH * 0.9,
934 force_h => $::HEIGHT * 0.4, 1440 force_h => $::HEIGHT * 0.7,
935 child => $vbox, 1441 child => $vbox,
936 has_close_button => 1, 1442 has_close_button => 1,
937 table => $table, 1443 table => $table,
938 on_visibility_change => sub { 1444 on_visibility_change => sub {
939 update_metaserver ($_[0]) if $_[1]; 1445 update_metaserver ($_[0]) if $_[1];
942 ; 1448 ;
943 1449
944 $dialog 1450 $dialog
945} 1451}
946 1452
947sub server_setup { 1453sub login_setup {
948 my $vbox = new CFClient::UI::VBox; 1454 my $vbox = new CFPlus::UI::VBox;
949 1455
1456 $vbox->add (new CFPlus::UI::FancyFrame
1457 label => "Login Settings",
950 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1458 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1459 );
951 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1460 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
952 1461
953 { 1462 {
954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1463 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
955 1464
956 $vbox->add ( 1465 $vbox->add (
957 $HOST_ENTRY = new CFClient::UI::Entry 1466 $HOST_ENTRY = new CFPlus::UI::Entry
958 expand => 1, 1467 expand => 1,
959 text => $CFG->{profile}{default}{host}, 1468 text => $CFG->{profile}{default}{host},
960 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1469 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
961 on_changed => sub { 1470 on_changed => sub {
962 my ($self, $value) = @_; 1471 my ($self, $value) = @_;
963 $CFG->{profile}{default}{host} = $value; 1472 $CFG->{profile}{default}{host} = $value;
964 0 1473 1
965 } 1474 }
966 ); 1475 );
967 1476
968 $vbox->add (new CFClient::UI::Button 1477 $vbox->add (new CFPlus::UI::Button
969 expand => 1, 1478 expand => 1,
970 text => "Server List", 1479 text => "Server List",
971 other => $METASERVER, 1480 other => $METASERVER,
972 tooltip => "Show a list of available crossfire servers", 1481 tooltip => "Show a list of available crossfire servers",
973 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1482 on_activate => sub { $METASERVER->toggle_visibility; 0 },
974 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1483 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
975 ); 1484 );
976 } 1485 }
977 1486
978 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1487 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
979 $table->add (1, 4, new CFClient::UI::Entry 1488 $table->add_at (1, 4, new CFPlus::UI::Entry
980 text => $CFG->{profile}{default}{user}, 1489 text => $CFG->{profile}{default}{user},
981 tooltip => "The name of your character on the server", 1490 tooltip => "The name of your character on the server",
982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1491 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
983 ); 1492 );
984 1493
985 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1494 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
986 $table->add (1, 5, new CFClient::UI::Entry 1495 $table->add_at (1, 5, new CFPlus::UI::Entry
987 text => $CFG->{profile}{default}{password}, 1496 text => $CFG->{profile}{default}{password},
988 hidden => 1, 1497 hidden => 1,
989 tooltip => "The password for your character", 1498 tooltip => "The password for your character",
990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1499 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
991 ); 1500 );
992 1501
1502 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1503 expand => 1,
1504 align => 0,
1505 text => "Login / Register",
1506 tooltip => "This button will either login to the account configured above or register a new account.",
1507 on_activate => sub {
1508 $CONN ? stop_game
1509 : start_game;
1510 1
1511 },
1512 );
1513
1514 $vbox
1515}
1516
1517sub server_setup {
1518 my $vbox = new CFPlus::UI::VBox;
1519
1520 $vbox->add (new CFPlus::UI::FancyFrame
1521 label => "Connection Settings",
1522 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1523 );
1524
993 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1525 $table->add_at (0, 1, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
994 $table->add (1, 7, new CFClient::UI::Slider 1526 $table->add_at (1, 1, new CFPlus::UI::Slider
995 force_w => 100, 1527 force_w => 100,
996 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1528 range => [$CFG->{mapsize}, 10, 100, 0, 1],
997 tooltip => "This is the size of the portion of the map update the server sends you. " 1529 tooltip => "This is the size of the portion of the map update the server sends you. "
998 . "If you set this to a high value you will be able to see further, " 1530 . "If you set this to a high value you will be able to see further, "
999 . "but you also increase bandwidth requirements and latency. " 1531 . "but you also increase bandwidth requirements and latency. "
1000 . "This option is only used once at log-in.", 1532 . "This option is only used once at log-in.",
1001 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1533 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1002 ); 1534 );
1003 1535
1004 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1536 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1005 $table->add (1, 8, new CFClient::UI::CheckBox 1537 $table->add_at (1, 2, new CFPlus::UI::Entry
1006 state => $CFG->{face_prefetch}, 1538 text => $CFG->{output_rate},
1007 tooltip => "<b>Background Image Prefetch</b>\n\n" 1539 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1008 . "If enabled, the client automatically pre-fetches images from the server. " 1540 . "when sending data. When 0 or unset, the server "
1009 . "This might increase or create lag, but increases the chances " 1541 . "default will be used, which is usually around 100kb/s. Most servers will "
1010 . "of faces being ready for display when you encounter them. " 1542 . "dynamically find an optimal rate, so adjust this only when necessary.",
1011 . "It also uses up server bandwidth on every connect, "
1012 . "so only set it if you really need to prefetch images. "
1013 . "This option can be set and unset any time.",
1014 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1543 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1015 ); 1544 );
1016 1545
1017 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1546 $table->add_at (0, 3, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1018 $table->add (1, 9, new CFClient::UI::Entry 1547 $table->add_at (1, 3, new CFPlus::UI::Entry
1019 text => $CFG->{output_count}, 1548 text => $CFG->{output_count},
1020 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1549 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1021 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1550 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1022 ); 1551 );
1023 1552
1024 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1553 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1025 $table->add (1, 10, new CFClient::UI::Entry 1554 $table->add_at (1, 4, new CFPlus::UI::Entry
1026 text => $CFG->{output_sync}, 1555 text => $CFG->{output_sync},
1027 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1556 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1028 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1557 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1029 ); 1558 );
1030 1559
1031 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1560 $vbox->add (new CFPlus::UI::FancyFrame
1032 expand => 1, 1561 label => "Server Info",
1033 align => 0, 1562 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1034 text => "Login", 1563 );
1564
1565 $vbox
1566}
1567
1568sub client_setup {
1569 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1570
1571 my $row = 0;
1572
1573 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1574 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1575 state => $CFG->{show_tips},
1576 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1035 on_activate => sub { 1577 on_changed => sub {
1036 $CONN ? stop_game 1578 my ($self, $value) = @_;
1037 : start_game; 1579 $CFG->{show_tips} = $value;
1580 0
1581 }
1582 );
1583
1584 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1585 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1586 text => $CFG->{logview_max_par},
1587 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1588 . "sends more messages than this number, older messages get removed to save memory and "
1589 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1590 on_changed => sub {
1591 my ($self, $value) = @_;
1592 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1038 0 1593 0
1039 }, 1594 },
1040 ); 1595 );
1041 1596
1042 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1597 $table
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1044 text => $CFG->{say_command},
1045 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. "
1046 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048 on_changed => sub {
1049 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value;
1051 0
1052 }
1053 );
1054
1055 $vbox->add (new CFClient::UI::Label
1056 text => "Server Info",
1057 fontsize => 1.2,
1058 padding_y => 8,
1059 fg => [1, 1, 0, 1],
1060 );
1061
1062 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1063
1064 $vbox
1065}
1066
1067sub message_window {
1068 my $window = new CFClient::UI::FancyFrame
1069 name => "message_window",
1070 title => "Messages",
1071 border_bg => [1, 1, 1, 1],
1072 x => "max",
1073 y => 0,
1074 force_w => $::WIDTH * 0.4,
1075 force_h => $::HEIGHT * 0.5,
1076 child => (my $vbox = new CFClient::UI::VBox),
1077 has_close_button => 1;
1078
1079 $vbox->add ($LOGVIEW);
1080
1081 $vbox->add (my $input = new CFClient::UI::Entry
1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086 on_focus_in => sub {
1087 my ($input, $prev_focus) = @_;
1088
1089 delete $input->{refocus_map};
1090
1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1092 $input->{refocus_map} = 1;
1093 }
1094 delete $input->{auto_activated};
1095
1096 0
1097 },
1098 on_activate => sub {
1099 my ($input, $text) = @_;
1100 $input->set_text ('');
1101
1102 if ($text =~ /^\/(.*)/) {
1103 $::CONN->user_send ($1);
1104 } else {
1105 my $say_cmd = $::CFG->{say_command} || 'say';
1106 $::CONN->user_send ("$say_cmd $text");
1107 }
1108 if ($input->{refocus_map}) {
1109 delete $input->{refocus_map};
1110 $MAPWIDGET->focus_in
1111 }
1112
1113 0
1114 },
1115 on_escape => sub {
1116 $MAPWIDGET->grab_focus;
1117
1118 0
1119 },
1120 );
1121
1122 $CONSOLE = {
1123 window => $window,
1124 input => $input,
1125 };
1126
1127 $window
1128}
1129
1130sub open_quit_dialog {
1131 unless ($QUIT_DIALOG) {
1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 title => "Really Quit?",
1137 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1141 ;
1142
1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1144
1145 $vb->add (new CFClient::UI::Label
1146 text => "You should find a savebed and apply it first!",
1147 max_w => $WIDTH * 0.25,
1148 ellipsize => 0,
1149 );
1150 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1151 $hb->add (new CFClient::UI::Button
1152 text => "Ok",
1153 expand => 1,
1154 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1155 );
1156 $hb->add (new CFClient::UI::Button
1157 text => "Quit anyway",
1158 expand => 1,
1159 on_activate => sub { exit },
1160 );
1161 }
1162
1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1165} 1598}
1166 1599
1167sub autopickup_setup { 1600sub autopickup_setup {
1601 my $r = new CFPlus::UI::ScrolledWindow (
1602 expand => 1,
1603 scroll_y => 1
1604 );
1168 my $table = new CFClient::UI::Table; 1605 $r->add (my $table = new CFPlus::UI::Table
1606 row_expand => [0],
1607 col_expand => [0, 1, 0, 1],
1608 );
1169 1609
1170 for ( 1610 for (
1171 ["General", 0, 0, 1611 ["General", 0, 0,
1172 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1612 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1173 ["Inhibit autopickup" => PICKUP_INHIBIT], 1613 ["Inhibit autopickup" => PICKUP_INHIBIT],
1187 ["Boots" => PICKUP_BOOTS], 1627 ["Boots" => PICKUP_BOOTS],
1188 ["Gloves" => PICKUP_GLOVES], 1628 ["Gloves" => PICKUP_GLOVES],
1189 ["Cloaks" => PICKUP_CLOAK], 1629 ["Cloaks" => PICKUP_CLOAK],
1190 ], 1630 ],
1191 1631
1192 ["Readables", 2, 2, 1632 ["Readables", 2, 0,
1193 ["Spellbooks" => PICKUP_SPELLBOOK], 1633 ["Spellbooks" => PICKUP_SPELLBOOK],
1194 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1634 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1195 ["Normal Books/Scrolls" => PICKUP_READABLES], 1635 ["Normal Books/Scrolls" => PICKUP_READABLES],
1196 ], 1636 ],
1197 ["Misc", 2, 7, 1637 ["Misc", 2, 5,
1198 ["Food" => PICKUP_FOOD], 1638 ["Food" => PICKUP_FOOD],
1199 ["Drinks" => PICKUP_DRINK], 1639 ["Drinks" => PICKUP_DRINK],
1200 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1640 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1201 ["Keys" => PICKUP_KEY], 1641 ["Keys" => PICKUP_KEY],
1202 ["Magical Items" => PICKUP_MAGICAL], 1642 ["Magical Items" => PICKUP_MAGICAL],
1203 ["Potions" => PICKUP_POTION], 1643 ["Potions" => PICKUP_POTION],
1204 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1644 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1205 ["Ignore cursed" => PICKUP_NOT_CURSED], 1645 ["Ignore cursed" => PICKUP_NOT_CURSED],
1206 ["Jewelery" => PICKUP_JEWELS], 1646 ["Jewelery" => PICKUP_JEWELS],
1647 ["Flesh" => PICKUP_FLESH],
1207 ], 1648 ],
1208 ["Weight/Value ratio", 2, 17] 1649 ["Weight/Value ratio", 2, 17]
1209 ) 1650 )
1210 { 1651 {
1211 my ($title, $x, $y, @bits) = @$_; 1652 my ($title, $x, $y, @bits) = @$_;
1212 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1653 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1213 1654
1214 for (@bits) { 1655 for (@bits) {
1215 ++$y; 1656 ++$y;
1216 1657
1217 my $mask = $_->[1]; 1658 my $mask = $_->[1];
1218 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1659 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1219 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1660 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1220 state => $::CFG->{pickup} & $mask, 1661 state => $::CFG->{pickup} & $mask,
1221 on_changed => sub { 1662 on_changed => sub {
1222 my ($box, $value) = @_; 1663 my ($box, $value) = @_;
1223 1664
1224 if ($value) { 1665 if ($value) {
1235 1676
1236 ${$_->[2]} = $checkbox if $_->[2]; 1677 ${$_->[2]} = $checkbox if $_->[2];
1237 } 1678 }
1238 } 1679 }
1239 1680
1240 $table->add (2, 18, new CFClient::UI::ValSlider 1681 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1241 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1682 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242 template => ">= 99", 1683 template => ">= 99",
1243 to_value => sub { ">= " . 5 * $_[0] }, 1684 to_value => sub { ">= " . 5 * $_[0] },
1244 on_changed => sub { 1685 on_changed => sub {
1245 my ($slider, $value) = @_; 1686 my ($slider, $value) = @_;
1248 $::CFG->{pickup} |= int $value 1689 $::CFG->{pickup} |= int $value
1249 if $value; 1690 if $value;
1250 1; 1691 1;
1251 }); 1692 });
1252 1693
1253 $table->add (3, 18, new CFClient::UI::Button 1694 $table->add_at (3, 18, new CFPlus::UI::Button
1254 text => "set", 1695 text => "set",
1255 on_activate => sub { 1696 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}") 1697 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN; 1698 if defined $::CONN;
1258 0 1699 0
1259 }); 1700 });
1260 1701
1261 $table 1702 $r
1262} 1703}
1263 1704
1264my %SORT_ORDER = ( 1705my %SORT_ORDER = (
1265 type => undef, 1706 type => undef,
1266 mtime => sub { sort { 1707 mtime => sub {
1708 my $NOW = time;
1709 sort {
1710 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1711 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1712
1267 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1713 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268 or $b->{mtime} <=> $a->{mtime} 1714 or $btime <=> $atime
1269 or $a->{type} <=> $b->{type} 1715 or $a->{type} <=> $b->{type}
1716 } @_
1270 } @_ }, 1717 },
1271 weight => sub { sort { 1718 weight => sub { sort {
1272 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1719 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273 or $a->{type} <=> $b->{type} 1720 or $a->{type} <=> $b->{type}
1274 } @_ }, 1721 } @_ },
1275); 1722);
1276 1723
1277sub inventory_widget { 1724sub inventory_widget {
1278 my $hb = new CFClient::UI::HBox homogeneous => 1; 1725 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1279 1726
1280 $hb->add (my $vb1 = new CFClient::UI::VBox); 1727 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1281 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1728 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1282 1729
1283 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1730 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1284 1731
1285 use sort 'stable'; 1732 use sort 'stable';
1286 1733
1287 $hb1->add (new CFClient::UI::Selector 1734 $hb1->add (new CFPlus::UI::Selector
1288 value => $::CFG->{inv_sort}, 1735 value => $::CFG->{inv_sort},
1289 options => [ 1736 options => [
1290 [type => "Type/Name"], 1737 [type => "Type/Name"],
1291 [mtime => "Recent/Normal/Locked"], 1738 [mtime => "Recent/Normal/Locked"],
1292 [weight => "Weight/Type"], 1739 [weight => "Weight/Type"],
1294 on_changed => sub { 1741 on_changed => sub {
1295 $::CFG->{inv_sort} = $_[1]; 1742 $::CFG->{inv_sort} = $_[1];
1296 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1743 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1297 }, 1744 },
1298 ); 1745 );
1299 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1746 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1300 #TODO# update to weigh/maxweight 1747 #TODO# update to weigh/maxweight
1301 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1748 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1302 1749
1303 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1750 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304 $sw1->add ($INV = new CFClient::UI::Inventory); 1751 $sw1->add ($INV = new CFPlus::UI::Inventory);
1752 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1305 1753
1306 $hb->add (my $vb2 = new CFClient::UI::VBox); 1754 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1307 1755
1308 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1756 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1309 1757
1310 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1758 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311 $sw2->add ($INVR = new CFClient::UI::Inventory); 1759 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1312 1760
1313 # XXX: Call after $INVR = ... because set_opencont sets the items 1761 # XXX: Call after $INVR = ... because set_opencont sets the items
1314 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1762 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1315 1763
1316 $hb 1764 $hb
1765}
1766
1767sub media_window {
1768 my $vb = new CFPlus::UI::VBox;
1769
1770 $vb->add (new CFPlus::UI::FancyFrame
1771 label => "Currently playing music",
1772 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1773 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1774 );
1775
1776 $vb->add (new CFPlus::UI::FancyFrame
1777 label => "Other media used in this session",
1778 expand => 1,
1779 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1780 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1781 );
1782
1783 $vb
1784}
1785
1786sub add_license {
1787 my ($meta) = @_;
1788
1789 $meta = $meta->{data}
1790 or return;
1791
1792 $meta->{license} || $meta->{author} || $meta->{source}
1793 or return;
1794
1795 $LICENSE_WIDGET->add_paragraph ({
1796 fg => [1, 1, 1, 1],
1797 markup => "<small>"
1798 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1799 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1800 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1801 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1802 . "</small>",
1803 });
1804 $LICENSE_WIDGET->scroll_to_bottom;
1317} 1805}
1318 1806
1319sub toggle_player_page { 1807sub toggle_player_page {
1320 my ($widget) = @_; 1808 my ($widget) = @_;
1321 1809
1326 $PL_WINDOW->show; 1814 $PL_WINDOW->show;
1327 } 1815 }
1328} 1816}
1329 1817
1330sub player_window { 1818sub player_window {
1331 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1819 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1332 x => "center", 1820 x => "center",
1333 y => "center", 1821 y => "center",
1334 force_w => $WIDTH * 9/10, 1822 force_w => $WIDTH * 9/10,
1335 force_h => $HEIGHT * 9/10, 1823 force_h => $HEIGHT * 9/10,
1336 title => "Player", 1824 title => "Player",
1338 has_close_button => 1 1826 has_close_button => 1
1339 ; 1827 ;
1340 1828
1341 my $ntb = 1829 my $ntb =
1342 $PL_NOTEBOOK = 1830 $PL_NOTEBOOK =
1343 new CFClient::UI::Notebook expand => 1, debug => 1; 1831 new CFPlus::UI::Notebook expand => 1;
1344 1832
1345 $ntb->add ( 1833 $ntb->add_tab (
1346 "Statistics (F2)" => $STATS_PAGE = stats_window, 1834 "Statistics (F2)" => $STATS_PAGE = stats_window,
1347 "Shows statistics, where all your Stats and Resistances are shown." 1835 "Shows statistics, where all your Stats and Resistances are shown."
1348 ); 1836 );
1349 $ntb->add ( 1837 $ntb->add_tab (
1350 "Skills (F3)" => $SKILL_PAGE = skill_window, 1838 "Skills (F3)" => $SKILL_PAGE = skill_window,
1351 "Shows all your Skills." 1839 "Shows all your Skills."
1352 ); 1840 );
1353 1841
1354 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1842 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1843 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1356 $ntb->add ( 1844 $ntb->add_tab (
1357 "Spellbook (F4)" => $spellsw, 1845 "Spellbook (F4)" => $spellsw,
1358 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1846 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1359 ); 1847 );
1360 $ntb->add ( 1848 $ntb->add_tab (
1361 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1849 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1362 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1850 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1363 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1851 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1364 ); 1852 );
1853 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1854 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1855
1856 $ntb->add_tab (Media => media_window,
1857 "License, Author and Source info for media sent by the server.");
1365 1858
1366 $ntb->set_current_page ($INVENTORY_PAGE); 1859 $ntb->set_current_page ($INVENTORY_PAGE);
1367 1860
1368 $plwin->add ($ntb); 1861 $plwin->add ($ntb);
1369 $plwin 1862 $plwin
1370} 1863}
1371 1864
1372sub update_bindings {
1373 $BIND_UPD_CB->() if $BIND_UPD_CB;
1374}
1375
1376sub keyboard_setup { 1865sub keyboard_setup {
1377 my $binding_list = new CFClient::UI::VBox; 1866 CFPlus::Macro::keyboard_setup
1378
1379 my $refresh;
1380 $refresh = $BIND_UPD_CB = sub {
1381 $binding_list->clear ();
1382
1383 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1384 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1385 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1386 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1387
1388 my $lbl = join "; ", @$cmds;
1389 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1390 $binding_list->add (my $hb = new CFClient::UI::HBox);
1391 $hb->add (new CFClient::UI::Button
1392 text => "delete",
1393 tooltip => "Deletes the binding",
1394 on_activate => sub {
1395 $binding_list->remove ($hb);
1396 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1397 0
1398 });
1399
1400 $hb->add (new CFClient::UI::Button
1401 text => "edit",
1402 tooltip => "Edits the binding",
1403 on_activate => sub {
1404 $::BIND_EDITOR->set_binding (
1405 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1406 sub {
1407 my ($nmod, $nsym, $ncmds) = @_;
1408 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1409 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1410 $refresh->();
1411 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1412 $SETUP_DIALOG->show;
1413 },
1414 sub {
1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1416 $SETUP_DIALOG->show;
1417 });
1418 $::BIND_EDITOR->show;
1419 $SETUP_DIALOG->hide;
1420 0
1421 });
1422
1423 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1424 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1425 }
1426 }
1427 };
1428
1429 my $vb = new CFClient::UI::VBox;
1430 $vb->add (my $hb = new CFClient::UI::HBox);
1431 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1432 $hb->add (new CFClient::UI::CheckBox
1433 expand => 1,
1434 state => $CFG->{shift_fire_stop},
1435 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1436 on_changed => sub {
1437 my ($cbox, $value) = @_;
1438 $CFG->{shift_fire_stop} = $value;
1439 0
1440 });
1441
1442 $vb->add ($binding_list);
1443 $vb->add (my $hb = new CFClient::UI::HBox);
1444
1445 $hb->add (new CFClient::UI::Button
1446 text => "record new",
1447 expand => 1,
1448 tooltip => "This button opens the binding editor with an empty binding.",
1449 on_activate => sub {
1450 $::BIND_EDITOR->set_binding (undef, undef, [],
1451 sub {
1452 my ($mod, $sym, $cmds) = @_;
1453 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1454 $refresh->();
1455 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1456 $SETUP_DIALOG->show;
1457 },
1458 sub {
1459 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1460 $SETUP_DIALOG->show;
1461 },
1462 );
1463 $SETUP_DIALOG->hide;
1464 $::BIND_EDITOR->show;
1465 0
1466 },
1467 );
1468
1469 $hb->add (new CFClient::UI::Button
1470 text => "close",
1471 tooltip => "Closes the binding window",
1472 expand => 1,
1473 on_activate => sub {
1474 $SETUP_DIALOG->hide;
1475 0
1476 }
1477 );
1478
1479 $refresh->();
1480
1481 $vb
1482}
1483
1484# just weirdness, pls. ignore
1485sub load_html_page {
1486 my ($viewer, $base) = @_;
1487
1488 $viewer->clear;
1489
1490 require LWP::Simple;
1491 require HTML::Parser;
1492 require URI;
1493
1494 my $page = LWP::Simple::get ($base)
1495 or return;
1496
1497 my @s = { };
1498 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500 my $parser = HTML::Parser->new (
1501 text_h => [sub {
1502 my ($text) = @_;
1503 $text =~ s/\s+/ /g;
1504 $s[-1]{text} .= CFClient::asxml $text;
1505 }, "dtext"],
1506 start_h => [sub {
1507 my ($tag, $attr) = @_;
1508 if ($passthrough{$tag}) {
1509 $s[-1]{text} .= "<$tag>";
1510 } elsif ($tag eq "h1") {
1511 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512 } elsif ($tag eq "h2") {
1513 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514 } elsif ($tag eq "h3") {
1515 push @s, { text => "<span size='large'>" };
1516 } elsif ($tag eq "a") {
1517 push @s, { text => "", url => $attr->{href} };
1518 } elsif ($tag eq "p") {
1519 push @s, { };
1520 } elsif ($tag eq "img") {
1521 eval {
1522 push @{$s[-1]{obj}}, new CFClient::UI::Image
1523 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524 $s[-1]{text} .= "\x{fffc}";
1525 };
1526 }
1527 }, "tagname, attr"],
1528 end_h => [sub {
1529 my ($tag) = @_;
1530 if ($passthrough{$tag}) {
1531 $s[-1]{text} .= "</$tag>";
1532 } elsif ($tag =~ /^h\d$/) {
1533 $s[-1]{text} .= "</span>";
1534 push @s, { };
1535 } elsif ($tag eq "a") {
1536 my $S = pop @s;
1537 $s[-1]{text} .= "\x{fffc}";
1538 push @{$s[-1]{obj}}, new CFClient::UI::Label
1539 fg => [0.8, 0.8, 1],
1540 markup => "<u>$S->{text}</u>",
1541 fontsize => 0.8,
1542 can_events => 1,
1543 can_focus => 1,
1544 on_button_up => sub {
1545 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546 },
1547 ;
1548 }
1549 }, "tagname"],
1550 );
1551
1552 $parser->parse ($page);
1553 $parser->eof;
1554
1555 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556 for @s;
1557
1558 $viewer->set_offset (0);
1559} 1867}
1560 1868
1561sub help_window { 1869sub help_window {
1562 my $win = new CFClient::UI::FancyFrame 1870 my $win = new CFPlus::UI::Toplevel
1563 x => 'center', 1871 x => 'center',
1564 y => 'center', 1872 y => 'center',
1565 z => 2, 1873 z => 4,
1566 name => 'doc_browser', 1874 name => 'doc_browser',
1567 force_w => int $WIDTH * 7/8, 1875 force_w => int $WIDTH * 7/8,
1568 force_h => int $HEIGHT * 7/8, 1876 force_h => int $HEIGHT * 7/8,
1569 title => "Help Browser", 1877 title => "Help Browser",
1570 has_close_button => 1; 1878 has_close_button => 1;
1571 1879
1572 $win->add (my $vbox = new CFClient::UI::VBox); 1880 $win->add (my $vbox = new CFPlus::UI::VBox);
1573 1881
1574 $vbox->add (my $buttons = new CFClient::UI::HBox); 1882 $vbox->add (new CFPlus::UI::FancyFrame
1883 label => "Navigation",
1884 child => (my $buttons = new CFPlus::UI::HBox),
1885 );
1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1886 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1576 expand => 1, fontsize => 0.8, padding_x => 4); 1887 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1577 1888
1578 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1889 my @history;
1579 $buttons->add (my $combo = new CFClient::UI::Selector 1890 my @future;
1580 value => undef, 1891 my $curnode;
1581 options => [ 1892
1582 [intro => "Introduction"], 1893 my $load_node; $load_node = sub {
1583 [manual => "Main Manual"], 1894 my ($node, $para) = @_;
1584 [skill_help => "Skill Reference"], 1895
1585 [command_help => "Command Reference"], 1896 $buttons->clear;
1586 [dmcommand_help => "DM Commands"], 1897
1587 [COPYING => "License Terms"], 1898 $buttons->add (new CFPlus::UI::Button
1588 [test => "test (do not select)"], #d#TODO 1899 text => "⇤",
1589 ], 1900 tooltip => "back to the starting page",
1590 on_changed => sub { 1901 on_activate => sub {
1591 my ($self, $pod) = @_; 1902 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1903 unshift @future, @history;
1904 @history = ();
1905 $load_node->(@{shift @future});
1906 },
1907 );
1592 1908
1593 if ($pod eq "test") {#d#TODO 1909 if (@history) {
1594 eval { 1910 $buttons->add (new CFPlus::UI::Button
1595 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html"; 1911 text => "⋘",
1912 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1913 on_activate => sub {
1914 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1915 $load_node->(@{pop @history});
1596 }; 1916 },
1597 warn "$@" if $@; 1917 );
1598 return; 1918 }
1919
1920 if (@future) {
1921 $buttons->add (new CFPlus::UI::Button
1922 text => "⋙",
1923 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1924 on_activate => sub {
1925 push @history, [$curnode, $viewer->current_paragraph];
1926 $load_node->(@{shift @future});
1927 },
1928 );
1929 }
1930
1931 $buttons->add (new CFPlus::UI::Label text => " ");
1932
1933 my @path = CFPlus::Pod::full_path_of $node;
1934 pop @path; # drop current node
1935
1936 for my $node (@path) {
1937 $buttons->add (new CFPlus::UI::Button
1938 text => $node->{kw}[0],
1939 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1940 on_activate => sub {
1941 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1942 $load_node->($node);
1943 },
1944 );
1945 $buttons->add (new CFPlus::UI::Label text => "/");
1946 }
1947
1948 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1949
1950 $curnode = $node;
1951
1952 $viewer->clear;
1953 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1954 $viewer->scroll_to ($para);
1955 };
1956
1957 $load_node->(CFPlus::Pod::find pod => "mainpage");
1958
1959 $CFPlus::Pod::goto_document = sub {
1960 my (@path) = @_;
1961
1962 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1963
1964 $load_node->((CFPlus::Pod::find @path)[0]);
1965 $win->show;
1966 };
1967
1968 $win
1969}
1970
1971sub open_string_query {
1972 my ($title, $cb, $txt, $tooltip) = @_;
1973 my $dialog = new CFPlus::UI::Toplevel
1974 x => "center",
1975 y => "center",
1976 z => 50,
1977 force_w => $WIDTH * 4/5,
1978 title => $title;
1979
1980 $dialog->add (
1981 my $e = new CFPlus::UI::Entry
1982 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1983 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1984 tooltip => $tooltip
1985 );
1986
1987 $e->grab_focus;
1988 $e->set_text ($txt) if $txt;
1989 $dialog->show;
1990}
1991
1992sub open_quit_dialog {
1993 unless ($QUIT_DIALOG) {
1994 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1995 x => "center",
1996 y => "center",
1997 z => 50,
1998 title => "Really Quit?",
1999 on_key_down => sub {
2000 my ($dialog, $ev) = @_;
2001 $ev->{sym} == 27 and $dialog->hide;
1599 } 2002 }
2003 ;
1600 2004
1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod", 2005 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1602 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603 2006
1604 #use Data::Dumper; warn Dumper $pom;#d# 2007 $vb->add (new CFPlus::UI::Label
2008 text => "You should find a savebed and apply it first!",
2009 max_w => $WIDTH * 0.25,
2010 ellipsize => 0,
2011 );
2012 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2013 $hb->add (new CFPlus::UI::Button
2014 text => "Ok",
2015 expand => 1,
2016 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2017 );
2018 $hb->add (new CFPlus::UI::Button
2019 text => "Quit anyway",
2020 expand => 1,
2021 on_activate => sub { Event::unloop_all },
2022 );
2023 }
1605 2024
1606 $viewer->clear; 2025 $QUIT_DIALOG->show;
2026 $QUIT_DIALOG->grab_focus;
2027}
1607 2028
1608# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n", 2029sub show_tip_of_the_day {
1609# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 2030 # find all tips
1610# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 2031 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1611# ]);#d# 2032
2033 CFPlus::DB::get state => "tip_of_the_day", sub {
2034 my ($todindex) = @_;
2035 $todindex = 0 if $todindex >= @tod;
2036 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2037
2038 # create dialog
2039 my $dialog;
2040
2041 my $close = sub {
2042 $dialog->destroy;
2043 };
2044
2045 $dialog = new CFPlus::UI::Toplevel
2046 x => "center",
2047 y => "center",
2048 z => 3,
2049 name => 'tip_of_the_day',
2050 force_w => int $WIDTH * 4/9,
2051 force_h => int $WIDTH * 2/9,
2052 title => "Tip of the day #" . (1 + $todindex),
2053 child => my $vbox = new CFPlus::UI::VBox,
2054 has_close_button => 1,
2055 on_delete => $close,
2056 ;
2057
2058 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
2059 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
2060 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
2061
2062 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
2063
2064 $table->add_at (0, 0, new CFPlus::UI::Button
2065 text => "Close",
2066 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>.",
2067 on_activate => $close,
2068 );
2069
2070 $table->add_at (2, 0, new CFPlus::UI::Button
2071 text => "Next",
2072 tooltip => "Show the next <b>Tip of the day</b>.",
2073 on_activate => sub {
2074 $close->();
2075 &show_tip_of_the_day;
1612 2076 },
1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1614 for @$pom;
1615
1616 $viewer->set_offset (0);
1617
1618 0
1619 }, 2077 );
1620 on_visibility_change => sub { 2078
1621 my ($self, $visible) = @_; 2079 $dialog->show;
1622 return unless $visible;
1623 return if $self->{value};
1624 $self->set_value ("intro");
1625 0
1626 },
1627 ); 2080 };
1628
1629 $win
1630} 2081}
1631 2082
1632sub sdl_init { 2083sub sdl_init {
1633 CFClient::SDL_Init 2084 CFPlus::SDL_Init
1634 and die "SDL::Init failed!\n"; 2085 and die "SDL::Init failed!\n";
1635} 2086}
1636 2087
1637sub video_init { 2088sub video_init {
1638 sdl_init;
1639
1640 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2089 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1641 2090
1642 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2091 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1643 2092
1644 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2093 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1645 $FULLSCREEN = $CFG->{fullscreen}; 2094 $FULLSCREEN = $CFG->{fullscreen};
1646 $FAST = $CFG->{fast}; 2095 $FAST = $CFG->{fast};
1647 2096
1648 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 2097 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1649 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 2098 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1650 2099
1651 $SDL_ACTIVE = 1; 2100 $SDL_ACTIVE = 1;
1652 $LAST_REFRESH = time - 0.01; 2101 $LAST_REFRESH = time - 0.01;
1653 2102
1654 CFClient::OpenGL::init; 2103 CFPlus::OpenGL::init;
2104 CFPlus::Macro::init;
1655 2105
1656 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2106 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1657 2107
1658 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2108 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1659 2109
1660 ############################################################################# 2110 #############################################################################
1661 2111
1662 if ($DEBUG_STATUS) { 2112 if ($DEBUG_STATUS) {
1663 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2113 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1664 } else { 2114 } else {
1665 # create the widgets 2115 # create/configure the widgets
1666 2116
2117 $CFPlus::UI::ROOT->connect (key_down => sub {
2118 my (undef, $ev) = @_;
2119
2120 if (my @macros = CFPlus::Macro::find $ev) {
2121 CFPlus::Macro::execute $_ for @macros;
2122
2123 return 1;
2124 }
2125
2126 0
2127 });
2128
1667 $DEBUG_STATUS = new CFClient::UI::Label 2129 $DEBUG_STATUS = new CFPlus::UI::Label
1668 padding => 0, 2130 padding => 0,
1669 z => 100, 2131 z => 100,
1670 force_x => "max", 2132 force_x => "max",
1671 force_y => 0; 2133 force_y => 0;
1672 $DEBUG_STATUS->show; 2134 $DEBUG_STATUS->show;
1673 2135
1674 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1675
1676 $STATUSBOX = new CFClient::UI::Statusbox; 2136 $STATUSBOX = new CFPlus::UI::Statusbox;
1677 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2137 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1678 2138
1679 (new CFClient::UI::Frame 2139 (new CFPlus::UI::Frame
1680 bg => [0, 0, 0, 0.4], 2140 bg => [0, 0, 0, 0.4],
1681 force_x => 0, 2141 force_x => 0,
1682 force_y => "max", 2142 force_y => "max",
1683 child => $STATUSBOX, 2143 child => $STATUSBOX,
1684 )->show; 2144 )->show;
1685 2145
1686 CFClient::UI::FancyFrame->new ( 2146 CFPlus::UI::Toplevel->new (
1687 title => "Map", 2147 title => "Map",
1688 name => "mapmap", 2148 name => "mapmap",
1689 x => 0, 2149 x => 0,
1690 y => $FONTSIZE + 8, 2150 y => $FONTSIZE + 8,
1691 border_bg => [1, 1, 1, 192/255], 2151 border_bg => [1, 1, 1, 192/255],
1692 bg => [1, 1, 1, 0], 2152 bg => [1, 1, 1, 0],
1693 child => ($MAPMAP = new CFClient::MapWidget::MapMap 2153 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1694 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2154 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1695 ), 2155 ),
1696 )->show; 2156 )->show;
1697 2157
1698 $MAPWIDGET = new CFClient::MapWidget; 2158 $MAPWIDGET = new CFPlus::MapWidget;
1699 $MAPWIDGET->connect (activate_console => sub { 2159 $MAPWIDGET->connect (activate_console => sub {
1700 my ($mapwidget, $preset) = @_; 2160 my ($mapwidget, $preset) = @_;
1701 2161
1702 if ($CONSOLE) { 2162 $MESSAGE_WINDOW->activate_console ($preset)
1703 $CONSOLE->{input}->{auto_activated} = 1; 2163 if $MESSAGE_WINDOW;
1704 $CONSOLE->{input}->grab_focus;
1705
1706 if ($preset && $CONSOLE->{input}->get_text eq '') {
1707 $CONSOLE->{input}->set_text ($preset);
1708 }
1709 }
1710 }); 2164 });
1711 $MAPWIDGET->show; 2165 $MAPWIDGET->show;
1712 $MAPWIDGET->grab_focus; 2166 $MAPWIDGET->grab_focus;
1713 2167
1714 $LOGVIEW = new CFClient::UI::TextScroller 2168 $COMPLETER = new CFPlus::MapWidget::Command::
1715 expand => 1, 2169 command => { },
1716 font => $FONT_FIXED, 2170 tooltip => "#completer_help",
1717 fontsize => $::CFG->{log_fontsize},
1718 indent => -4,
1719 can_hover => 1,
1720 can_events => 1,
1721 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1722 ; 2171 ;
1723 2172
1724 $SETUP_DIALOG = new CFClient::UI::FancyFrame 2173 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1725 title => "Setup", 2174 title => "Setup",
1726 name => "setup_dialog", 2175 name => "setup_dialog",
1727 x => 'center', 2176 x => 'center',
1728 y => 'center', 2177 y => 'center',
1729 z => 2, 2178 z => 2,
1731 force_h => $::HEIGHT * 0.6, 2180 force_h => $::HEIGHT * 0.6,
1732 has_close_button => 1, 2181 has_close_button => 1,
1733 ; 2182 ;
1734 2183
1735 $METASERVER = metaserver_dialog; 2184 $METASERVER = metaserver_dialog;
2185 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1736 2186
1737 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 2187 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1738 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 2188 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1739 2189
2190 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2191 "Configure the server to play on, your username and password.");
1740 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2192 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1741 "Configure the server to play on, your username, password and other server-related options."); 2193 "Configure other server related options.");
1742 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2194 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1743 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2195 "Configure various client-specific settings.");
1744 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2196 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1745 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2197 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1746 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2198 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1747 "Configure the use of audio, sound effects and background music."); 2199 "Configure the use of audio, sound effects and background music.");
1748 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2200 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1749 "Lets you define, edit and delete key bindings." 2201 "Lets you define, edit and delete key bindings."
1750 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2202 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1751 . "with nothing set and the recording started. After doing the actions you " 2203 . "with nothing set and the recording started. After doing the actions you "
1752 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2204 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1753 . "After pressing the combo the binding will be saved automatically and the " 2205 . "After pressing the combo the binding will be saved automatically and the "
1754 . "binding editor closes"); 2206 . "binding editor closes");
1755 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2207 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1756 "Some debuggin' options. Do not ask."); 2208 "Some debuggin' options. Do not ask.");
1757 2209
1758 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2210 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1759 2211
1760 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2212 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1761 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2213 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1762 2214
1763 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2215 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1764 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2216 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1765 2217
1766 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 2218 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
1767 2219
1768 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 2220 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1769 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2221 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1770 2222
1771 $BUTTONBAR->add (new CFClient::UI::Button 2223 $BUTTONBAR->add (new CFPlus::UI::Button
1772 text => "Save Config", 2224 text => "Save Config",
1773 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2225 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1774 on_activate => sub { 2226 on_activate => sub {
1775 $::CFG->{layout} = CFClient::UI::get_layout; 2227 $::CFG->{layout} = CFPlus::UI::get_layout;
1776 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 2228 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1777 status "Configuration Saved"; 2229 status "Configuration Saved";
1778 0 2230 0
1779 }, 2231 },
1780 ); 2232 );
1781 2233
1782 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2234 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1783 tooltip => "View Documentation"); 2235 tooltip => "View Documentation");
1784 2236
2237
1785 $BUTTONBAR->add (new CFClient::UI::Button 2238 $BUTTONBAR->add (new CFPlus::UI::Button
1786 text => "Quit", 2239 text => "Quit",
1787 tooltip => "Terminates the program", 2240 tooltip => "Terminates the program",
1788 on_activate => sub { 2241 on_activate => sub {
1789 if ($CONN) { 2242 if ($CONN) {
1790 open_quit_dialog; 2243 open_quit_dialog;
1791 } else { 2244 } else {
1792 exit; 2245 Event::unloop_all;
1793 } 2246 }
1794 0 2247 0
1795 }, 2248 },
1796 ); 2249 );
1797 2250
1798 $BUTTONBAR->show; 2251 $BUTTONBAR->show;
1799 $SETUP_DIALOG->show; 2252 $SETUP_DIALOG->show;
2253 $MESSAGE_WINDOW->show;
1800 } 2254 }
1801 2255
1802 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2256 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1803} 2257}
1804 2258
1805sub video_shutdown { 2259sub video_shutdown {
1806 CFClient::OpenGL::shutdown; 2260 CFPlus::OpenGL::shutdown;
1807 2261
1808 undef $SDL_ACTIVE; 2262 undef $SDL_ACTIVE;
1809} 2263}
1810 2264
1811my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1812my $bgmusic;#TODO#hack#d#
1813
1814sub audio_channel_finished {
1815 my ($channel) = @_;
1816
1817 #warn "channel $channel finished\n";#d#
1818}
1819
1820sub audio_music_finished {
1821 return unless $CFG->{bgm_enable};
1822
1823 # TODO: hack, do play loop and mood music
1824 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1825 $bgmusic->play (0);
1826
1827 push @bgmusic, shift @bgmusic;
1828}
1829
1830sub audio_init {
1831 if ($CFG->{audio_enable}) {
1832 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
1833 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1834
1835 unless ($SDL_MIXER) {
1836 status "Unable to open sound device: there will be no sound";
1837 return;
1838 }
1839
1840 CFClient::Mix_AllocateChannels 8;
1841 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1842
1843 audio_music_finished;
1844
1845 while (<$fh>) {
1846 next if /^\s*#/;
1847 next if /^\s*$/;
1848
1849 my ($file, $volume, $event) = split /\s+/, $_, 3;
1850
1851 push @SOUNDS, "$volume,$file";
1852
1853 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1854 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1855 $chunk->volume ($volume * 128 / 100);
1856 $chunk
1857 };
1858 }
1859 } else {
1860 status "unable to open sound config: $!";
1861 }
1862 }
1863}
1864
1865sub audio_shutdown {
1866 CFClient::Mix_CloseAudio if $SDL_MIXER;
1867 undef $SDL_MIXER;
1868 @SOUNDS = ();
1869 %AUDIO_CHUNKS = ();
1870}
1871
1872my %animate_object; 2265my %animate_object;
1873my $animate_timer; 2266my $animate_timer;
1874 2267
1875my $fps = 9; 2268my $fps = 9;
1876 2269
1877my %demo;#d#
1878
1879sub force_refresh { 2270sub force_refresh {
2271 if ($ENV{CFPLUS_DEBUG} & 4) {
1880 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2272 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1881 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2273 debug sprintf "%3.2f", $fps;
2274 }
1882 2275
1883 $CFClient::UI::ROOT->draw; 2276 $CFPlus::UI::ROOT->draw;
1884 2277 CFPlus::SDL_GL_SwapBuffers;
1885 $WANT_REFRESH = 0;
1886 $CAN_REFRESH = 0;
1887 $LAST_REFRESH = $NOW; 2278 $LAST_REFRESH = $NOW;
1888 2279 $WANT_REFRESH->stop;
1889 CFClient::SDL_GL_SwapBuffers;
1890} 2280}
1891 2281
2282$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2283
1892my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2284my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1893 $NOW = time; 2285 $NOW = time;
1894 2286
1895 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2287 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1896 for CFClient::SDL_PollEvent; 2288 for CFPlus::poll_events;
1897 2289
1898 if (%animate_object) { 2290 if (%animate_object) {
1899 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2291 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1900 $WANT_REFRESH++; 2292 $WANT_REFRESH->start;
1901 }
1902
1903 if ($WANT_REFRESH) {
1904 force_refresh;
1905 } else {
1906 $CAN_REFRESH = 1;
1907 } 2293 }
1908}); 2294});
1909 2295
1910sub animation_start { 2296sub animation_start {
1911 my ($widget) = @_; 2297 my ($widget) = @_;
1915sub animation_stop { 2301sub animation_stop {
1916 my ($widget) = @_; 2302 my ($widget) = @_;
1917 delete $animate_object{$widget}; 2303 delete $animate_object{$widget};
1918} 2304}
1919 2305
1920# check once/second for faces that need to be prefetched
1921# this should, of course, only run on demand, but
1922# SDL forces worse things on us....
1923
1924Event->timer (after => 1, interval => 0.25, cb => sub {
1925 $CONN->face_prefetch
1926 if $CONN;
1927});
1928
1929%SDL_CB = ( 2306%SDL_CB = (
1930 CFClient::SDL_QUIT => sub { 2307 CFPlus::SDL_QUIT => sub {
1931 Event::unloop -1; 2308 Event::unloop_all;
1932 }, 2309 },
1933 CFClient::SDL_VIDEORESIZE => sub { 2310 CFPlus::SDL_VIDEORESIZE => sub {
1934 }, 2311 },
1935 CFClient::SDL_VIDEOEXPOSE => sub { 2312 CFPlus::SDL_VIDEOEXPOSE => sub {
1936 CFClient::UI::full_refresh; 2313 CFPlus::UI::full_refresh;
1937 }, 2314 },
1938 CFClient::SDL_ACTIVEEVENT => sub { 2315 CFPlus::SDL_ACTIVEEVENT => sub {
1939# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2316# not useful, as APPACTIVE include sonly iconified state, not unmapped
2317# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2318# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2319# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2320# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2321# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1940 }, 2322 },
1941 CFClient::SDL_KEYDOWN => sub { 2323 CFPlus::SDL_KEYDOWN => sub {
1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2324 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1943 # alt-enter 2325 # alt-enter
1944 $FULLSCREEN_ENABLE->toggle; 2326 $FULLSCREEN_ENABLE->toggle;
1945 video_shutdown; 2327 video_shutdown;
1946 video_init; 2328 video_init;
1947 } else { 2329 } else {
1948 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2330 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1949 } 2331 }
1950 }, 2332 },
1951 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2333 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1952 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2334 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1953 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2335 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1954 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2336 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1955 CFClient::SDL_USEREVENT => sub { 2337 CFPlus::SDL_USEREVENT => sub {
1956 if ($_[0]{code} == 1) { 2338 if ($_[0]{code} == 1) {
1957 audio_channel_finished $_[0]{data1}; 2339 audio_channel_finished $_[0]{data1};
1958 } elsif ($_[0]{code} == 0) { 2340 } elsif ($_[0]{code} == 0) {
1959 audio_music_finished; 2341 audio_music_finished;
1960 } 2342 }
1964############################################################################# 2346#############################################################################
1965 2347
1966$SIG{INT} = $SIG{TERM} = sub { exit }; 2348$SIG{INT} = $SIG{TERM} = sub { exit };
1967 2349
1968{ 2350{
1969 local $SIG{__DIE__} = sub {
1970 return unless defined $^S && !$^S;
1971 Carp::confess $_[0];#d#TODO: remove when stable
1972 CFClient::fatal $_[0];
1973 };
1974
1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2351 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2352 CFPlus::DB::Server::run;
2353
1976 CFClient::UI::set_layout ($::CFG->{layout}); 2354 CFPlus::UI::set_layout ($::CFG->{layout});
1977 2355
1978 my %DEF_CFG = ( 2356 my %DEF_CFG = (
1979 sdl_mode => 0, 2357 sdl_mode => 0,
1980 width => 640,
1981 height => 480,
1982 fullscreen => 0, 2358 fullscreen => 0,
1983 fast => 0, 2359 fast => 0,
2360 force_opengl11 => undef,
2361 texture_compression => 1,
1984 map_scale => 1, 2362 map_scale => 1,
1985 fow_enable => 1, 2363 fow_enable => 1,
1986 fow_intensity => 0.45, 2364 fow_intensity => 0,
1987 fow_smooth => 0, 2365 map_smoothing => 1,
1988 gui_fontsize => 1, 2366 gui_fontsize => 1,
1989 log_fontsize => 0.7, 2367 log_fontsize => 0.7,
1990 gauge_fontsize => 1, 2368 gauge_fontsize => 1,
1991 gauge_size => 0.35, 2369 gauge_size => 0.35,
1992 stat_fontsize => 0.7, 2370 stat_fontsize => 0.7,
1993 mapsize => 100, 2371 mapsize => 100,
1994 say_command => 'say',
1995 audio_enable => 1, 2372 audio_enable => 1,
2373 audio_hw_channels => 0,
2374 audio_hw_frequency => 0,
2375 audio_hw_chunksize => 0,
2376 audio_mix_channels => 8,
2377 effects_enable => 1,
2378 effects_volume => 1,
1996 bgm_enable => 1, 2379 bgm_enable => 1,
1997 bgm_volume => 0.25, 2380 bgm_volume => 0.5,
1998 face_prefetch => 0,
1999 output_sync => 1, 2381 output_sync => 1,
2000 output_count => 1, 2382 output_count => 1,
2383 output_rate => "",
2001 pickup => 0, 2384 pickup => 0,
2002 inv_sort => "mtime", 2385 inv_sort => "mtime",
2003 default => "profile", # default profile 2386 default => "profile", # default profile
2387 show_tips => 1,
2388 logview_max_par => 1000,
2004 ); 2389 );
2005 2390
2006 while (my ($k, $v) = each %DEF_CFG) { 2391 while (my ($k, $v) = each %DEF_CFG) {
2007 $CFG->{$k} = $v unless exists $CFG->{$k}; 2392 $CFG->{$k} = $v unless exists $CFG->{$k};
2008 } 2393 }
2009 2394
2010 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2395 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2396 $PROFILE = $CFG->{profile}{default};
2397
2398 # convert old bindings (only default profile matters)
2399 if (my $bindings = delete $PROFILE->{bindings}) {
2400 while (my ($mod, $syms) = each %$bindings) {
2401 while (my ($sym, $cmds) = each %$syms) {
2402 push @{ $PROFILE->{macro} }, {
2403 accelkey => [$mod*1, $sym*1],
2404 action => $cmds,
2405 };
2406 }
2407 }
2408 }
2011 2409
2012 sdl_init; 2410 sdl_init;
2013 2411
2014 @SDL_MODES = reverse 2412 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2015 grep $_->[0] >= 640 && $_->[1] >= 480, 2413 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2016 CFClient::SDL_ListModes;
2017
2018 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2414 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2415
2416 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2019 2417
2020 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2418 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021 2419
2022 { 2420 {
2023 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2421 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024 DejaVuSans.ttf 2422 DejaVuSans.ttf
2025 DejaVuSansMono.ttf 2423 DejaVuSansMono.ttf
2026 DejaVuSans-Bold.ttf 2424 DejaVuSans-Bold.ttf
2027 DejaVuSansMono-Bold.ttf 2425 DejaVuSansMono-Bold.ttf
2028 DejaVuSans-Oblique.ttf 2426 DejaVuSans-Oblique.ttf
2029 DejaVuSansMono-Oblique.ttf 2427 DejaVuSansMono-Oblique.ttf
2030 DejaVuSans-BoldOblique.ttf 2428 DejaVuSans-BoldOblique.ttf
2031 DejaVuSansMono-BoldOblique.ttf 2429 DejaVuSansMono-BoldOblique.ttf
2032 ); 2430 );
2033 2431
2034 CFClient::add_font $_ for @fonts; 2432 CFPlus::add_font $_ for @fonts;
2035 2433
2036 CFClient::pango_init; 2434 CFPlus::pango_init;
2037 2435
2038 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2436 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2437 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040 2438
2041 $FONT_PROP->make_default; 2439 $FONT_PROP->make_default;
2042 } 2440 }
2043 2441
2044# compare mono (ft) vs. rgba (cairo) 2442# compare mono (ft) vs. rgba (cairo)
2045# ft - 1.8s, cairo 3s, even in alpha-only mode 2443# ft - 1.8s, cairo 3s, even in alpha-only mode
2046# for my $rgba (0..1) { 2444# for my $rgba (0..1) {
2047# my $t1 = Time::HiRes::time; 2445# my $t1 = Time::HiRes::time;
2048# for (1..1000) { 2446# for (1..1000) {
2049# my $layout = CFClient::Layout->new ($rgba); 2447# my $layout = CFPlus::Layout->new ($rgba);
2050# $layout->set_text ("hallo" x 100); 2448# $layout->set_text ("hallo" x 100);
2051# $layout->render; 2449# $layout->render;
2052# } 2450# }
2053# my $t2 = Time::HiRes::time; 2451# my $t2 = Time::HiRes::time;
2054# warn $t2-$t1; 2452# warn $t2-$t1;
2056 2454
2057 video_init; 2455 video_init;
2058 audio_init; 2456 audio_init;
2059} 2457}
2060 2458
2459show_tip_of_the_day if $CFG->{show_tips};
2460
2461Event->idle (cb => sub {
2462 $_[0]->w->cancel;
2463 $startup_done->();
2464});
2465
2061Event::loop; 2466Event::loop;
2467
2468#video_shutdown;
2469#audio_shutdown;
2062#CFClient::SDL_Quit; 2470CFPlus::SDL_Quit;
2063#CFClient::_exit 0; 2471CFPlus::DB::Server::stop;
2064
2065END { CFClient::SDL_Quit }
2066 2472
2067=head1 NAME 2473=head1 NAME
2068 2474
2069cfplus - A Crossfire+ and Crossfire game client 2475cfplus - A Crossfire TRT and Crossfire game client
2070 2476
2071=head1 SYNOPSIS 2477=head1 SYNOPSIS
2072 2478
2073Just run it - no commandline arguments are supported. 2479Just run it - no commandline arguments are supported.
2074 2480
2075=head1 USAGE 2481=head1 USAGE
2076 2482
2077cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2483cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2078fullscreen and interactively. 2484be used in fullscreen mode and interactively.
2079 2485
2080=head1 DEBUGGING 2486=head1 DEBUGGING
2081 2487
2082 2488
2083CFPLUS_DEBUG - environment variable 2489CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines