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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines