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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines