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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines