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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines