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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines