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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines