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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines