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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines