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.98 by root, Sat Jul 22 13:20:33 2006 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines