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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines