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.63 by root, Wed Jun 7 05:54:09 2006 UTC vs.
Revision 1.228 by root, Mon Oct 8 16:10:14 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines