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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines