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.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.215 by root, Fri Aug 17 21:18:01 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines