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.78 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines