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.44 by elmex, Fri Jun 2 16:32:12 2006 UTC vs.
Revision 1.152 by root, Tue Apr 24 01:13:15 2007 UTC

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

Diff Legend

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