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

Diff Legend

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