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.87 by root, Sun Jul 2 21:41:34 2006 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines