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

Diff Legend

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