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

Diff Legend

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