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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines