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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.202 by root, Sat Aug 4 03:29:03 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines