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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines