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.90 by elmex, Mon Jul 10 06:59:14 2006 UTC vs.
Revision 1.215 by root, Fri Aug 17 21:18:01 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines