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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines