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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.198 by root, Tue Jul 31 02:45:39 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines