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.66 by elmex, Thu Jun 8 19:43:26 2006 UTC vs.
Revision 1.202 by root, Sat Aug 4 03:29:03 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines