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.76 by root, Tue Jun 20 08:49:40 2006 UTC vs.
Revision 1.195 by root, Tue Jul 31 01:03:52 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines