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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines