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

Diff Legend

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