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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.218 by root, Sun Aug 19 14:17:05 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines