ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.87 by root, Sun Jul 2 21:41:34 2006 UTC vs.
Revision 1.221 by root, Wed Aug 22 21:14:06 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines