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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines