ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.205 by root, Thu Aug 9 03:40:02 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines