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.86 by root, Sun Jul 2 21:07:27 2006 UTC vs.
Revision 1.207 by root, Thu Aug 9 11:02:08 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines