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

Diff Legend

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