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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines