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

Diff Legend

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