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.78 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines