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.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines