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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines