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.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines