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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines