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.74 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.196 by root, Tue Jul 31 02:03:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines