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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines