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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.201 by root, Fri Aug 3 02:20:32 2007 UTC

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

Diff Legend

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