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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines