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.72 by elmex, Tue Jun 13 18:14:03 2006 UTC vs.
Revision 1.201 by root, Fri Aug 3 02:20:32 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines