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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.200 by root, Thu Aug 2 14:35:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines