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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.197 by root, Tue Jul 31 02:25:52 2007 UTC

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

Diff Legend

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