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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines