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.91 by root, Tue Jul 11 13:51:38 2006 UTC vs.
Revision 1.221 by root, Wed Aug 22 21:14:06 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines