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.77 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.198 by root, Tue Jul 31 02:45:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines