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.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs.
Revision 1.228 by root, Mon Oct 8 16:10:14 2007 UTC

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

Diff Legend

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