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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines