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

Diff Legend

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