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.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 2007 UTC

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

Diff Legend

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