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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines