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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines