ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.207 by root, Thu Aug 9 11:02:08 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines