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.13 by root, Fri May 26 20:50:35 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
… …
81our $LOGVIEW; 108our $LOGVIEW;
82our $CONSOLE; 109our $CONSOLE;
83our $METASERVER; 110our $METASERVER;
84our $LOGIN_BUTTON; 111our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 112our $QUIT_DIALOG;
113our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE;
115our $PICKUP_ENABLE;
116our $SERVER_INFO;
86 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;
87our $FLOORBOX; 134our $FLOORBOX;
88our $GAUGES; 135our $GAUGES;
89our $STATWIDS; 136our $STATWIDS;
90 137
91our $SDL_ACTIVE; 138our $SDL_ACTIVE;
… …
97 144
98our $ALT_ENTER_MESSAGE; 145our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 146our $STATUSBOX;
100our $DEBUG_STATUS; 147our $DEBUG_STATUS;
101 148
102our $INVWIN;
103our $INV; 149our $INV;
104our $INVR; 150our $INVR;
105our $INVR_LBL; 151our $INV_RIGHT_HB;
152
153our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
106 157
107sub status { 158sub status {
108 $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]);
109} 160}
110 161
111sub debug { 162sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request; 164}
114 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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;
115} 416}
116 417
117sub start_game { 418sub start_game {
118 status "logging in..."; 419 status "logging in...";
119 420
421 $LOGIN_BUTTON->set_text ("Logout");
422 $SETUP_DIALOG->hide;
423
120 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;
121 425
122 my ($host, $port) = split /:/, $CFG->{host}; 426 my ($host, $port) = split /:/, $PROFILE->{host};
123 427
124 $MAP = new CFClient::Map $mapsize, $mapsize; 428 $MAP = new CFPlus::Map;
125 429
126 $CONN = eval { 430 $CONN = eval {
127 new CFClient::Protocol 431 new CFPlus::Protocol
128 host => $host, 432 host => $host,
129 port => $port || 13327, 433 port => $port || 13327,
130 user => $CFG->{user}, 434 user => $PROFILE->{user},
131 pass => $CFG->{password}, 435 pass => $PROFILE->{password},
132 mapw => $mapsize, 436 mapw => $mapsize,
133 maph => $mapsize, 437 maph => $mapsize,
438
439 client => "cfplus $CFPlus::VERSION $] $^O",
134 440
135 map_widget => $MAPWIDGET, 441 map_widget => $MAPWIDGET,
136 logview => $LOGVIEW, 442 logview => $LOGVIEW,
137 statusbox => $STATUSBOX, 443 statusbox => $STATUSBOX,
138 map => $MAP, 444 map => $MAP,
139 mapmap => $MAPMAP, 445 mapmap => $MAPMAP,
446 query => \&server_query,
447
448 setup_req => {
449 smoothing => $CFG->{map_smoothing}*1,
450 },
140 451
141 sound_play => sub { 452 sound_play => sub {
142 my ($x, $y, $soundnum, $type) = @_; 453 my ($x, $y, $soundnum, $type) = @_;
143 454
144 $SDL_MIXER 455 $SDL_MIXER
… …
150 $chunk->play; 461 $chunk->play;
151 }, 462 },
152 }; 463 };
153 464
154 if ($CONN) { 465 if ($CONN) {
155 CFClient::lowdelay fileno $CONN->{fh}; 466 CFPlus::lowdelay fileno $CONN->{fh};
156 467
157 $LOGIN_BUTTON->set_text ("Logout");
158 status "login successful"; 468 status "login successful";
159
160 $BUTTONBAR->{children}[1]->emit ("activate")
161 if $BUTTONBAR->{children}[1]->{state};
162
163 } else { 469 } else {
164 status "unable to connect"; 470 status "unable to connect";
165 stop_game(); 471 stop_game();
166 } 472 }
167} 473}
168 474
169sub stop_game { 475sub stop_game {
476 $LOGIN_BUTTON->set_text ("Login");
477 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
478 $SETUP_DIALOG->show;
479 $PL_WINDOW->hide;
480 $SPELL_LIST->clear_spells;
481
170 return unless $CONN; 482 return unless $CONN;
171 483
172 status "connection closed"; 484 status "connection closed";
173 $LOGIN_BUTTON->set_text ("Login"); 485
486 destroy_query_dialog $CONN;
174 $CONN->destroy; 487 $CONN->destroy;
175 $CONN = 0; # false, does not autovivify 488 $CONN = 0; # false, does not autovivify
176 489
177 $BUTTONBAR->{children}[1]->emit ("activate") 490 undef $MAP;
178 unless $BUTTONBAR->{children}[1]->{state};
179} 491}
180 492
181sub client_setup { 493sub graphics_setup {
182 my $dialog = new CFClient::UI::FancyFrame 494 my $vbox = new CFPlus::UI::VBox;
183 title => "Client Setup", 495
184 child => (my $vbox = new CFClient::UI::VBox);
185 $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]);
186 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
187 $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");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 506 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
189 507
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, 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]);
191 $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");
192 510
193 $mode_slider->connect (changed => sub { 511 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 512 my ($self, $value) = @_;
195 513
196 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 514 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
197 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 515 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
198 }); 516 });
199 $mode_slider->emit (changed => $mode_slider->{range}[0]); 517 $mode_slider->emit (changed => $mode_slider->{range}[0]);
200 518
201 my $row = 1;
202
203 $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");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 520 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
205 state => $CFG->{fullscreen}, 521 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 522 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 523 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
208 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value;
210 }
211 ); 524 );
212 525
213 $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");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 527 $table->add (1, $row++, new CFPlus::UI::CheckBox
215 state => $CFG->{fast}, 528 state => $CFG->{fast},
216 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.",
217 connect_changed => sub { 543 on_activate => sub {
218 my ($self, $value) = @_; 544 video_shutdown ();
219 $CFG->{fast} = $value; 545 video_init ();
546 0
220 } 547 }
221 ); 548 );
222 549
223 $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");
224 $table->add (1, $row++, new CFClient::UI::Slider 551 $table->add (1, $row++, new CFPlus::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 552 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 553 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 554 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value;
230 }
231 ); 555 );
232 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
233 $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");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 567 $table->add (1, $row++, new CFPlus::UI::CheckBox
235 state => $CFG->{fow_enable}, 568 state => $CFG->{fow_enable},
236 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.",
237 connect_changed => sub { 570 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value;
240 }
241 ); 571 );
242 572
243 $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");
244 $table->add (1, $row++, new CFClient::UI::Slider 574 $table->add (1, $row++, new CFPlus::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 575 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
246 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.",
247 connect_changed => sub { 577 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value;
250 }
251 ); 578 );
252 579
253 $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");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 581 $table->add (1, $row++, new CFPlus::UI::CheckBox
255 state => $CFG->{fow_smooth}, 582 state => $CFG->{fow_smooth},
256 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.",
257 connect_changed => sub { 584 on_changed => sub {
258 my ($self, $value) = @_; 585 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 586 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::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
261 } 589 }
262 ); 590 );
263 591
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
267 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
268 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 );
270
271 $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");
272 $table->add (1, $row++, new CFClient::UI::Slider 593 $table->add (1, $row++, new CFPlus::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 594 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
274 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.",
275 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 596 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
276 ); 597 );
277 598
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279
280 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub {
284 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize;
286 }
287 );
288
289 $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");
290 $table->add (1, $row++, new CFClient::UI::Slider 600 $table->add (1, $row++, new CFPlus::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 601 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
292 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.",
293 connect_changed => sub { 603 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 604 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 605 &set_gauge_window_fontsize;
606 0
296 } 607 }
297 ); 608 );
298 609
299 $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");
300 $table->add (1, $row++, new CFClient::UI::Slider 611 $table->add (1, $row++, new CFPlus::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 612 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 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.",
303 connect_changed => sub { 614 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 615 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 616 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
617 0
306 } 618 }
307 ); 619 );
308 620
309 $table->add (1, $row++, new CFClient::UI::Button 621 $vbox
310 expand => 1, align => 0, text => "Apply", 622}
311 tooltip => "Apply the video settings",
312 connect_activate => sub {
313 video_shutdown ();
314 video_init ();
315 }
316 );
317 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
318 $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");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 632 $table->add (1, $row++, new CFPlus::UI::CheckBox
320 state => $CFG->{audio_enable}, 633 state => $CFG->{audio_enable},
321 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.",
322 connect_changed => sub { 635 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
323 $CFG->{audio_enable} = $_[1];
324 }
325 ); 636 );
326# $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");
327# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 638# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 639# $CFG->{effects_volume} = $_[1];
329# }); 640# });
330 $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");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 642 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 643 $hbox->add (new CFPlus::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 644 expand => 1, state => $CFG->{bgm_enable},
334 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.",
335 connect_changed => sub { 646 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
336 $CFG->{bgm_enable} = $_[1];
337 }
338 ); 647 );
339 $hbox->add (new CFClient::UI::Slider 648 $hbox->add (new CFPlus::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 649 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 650 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 651 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
343 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128;
345 }
346 ); 652 );
347 653
348 $table->add (1, $row++, new CFClient::UI::Button 654 $table->add (1, $row++, new CFPlus::UI::Button
349 expand => 1, align => 0, text => "Apply", 655 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 656 tooltip => "Apply the audio settings",
351 connect_activate => sub { 657 on_activate => sub {
352 audio_shutdown (); 658 audio_shutdown ();
353 audio_init (); 659 audio_init ();
660 0
354 } 661 }
355 ); 662 );
356 663
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 664 $vbox
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command},
360 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. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 connect_changed => sub {
364 my ($self, $value) = @_;
365 $CFG->{say_command} = $value;
366 }
367 );
368
369 $dialog
370}
371
372sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize});
375 }
376} 665}
377 666
378sub set_gauge_window_fontsize { 667sub set_gauge_window_fontsize {
379 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 668 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
380 $_->set_fontsize ($::CFG->{gauge_fontsize}); 669 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
382} 671}
383 672
384sub make_gauge_window { 673sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 674 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 675
387 my $win = new CFClient::UI::Frame ( 676 my $win = new CFPlus::UI::Frame (
388 req_y => -1, 677 force_x => 0,
678 force_y => "max",
389 user_w => $WIDTH, 679 force_w => $WIDTH,
390 user_h => $gh, 680 force_h => $gh,
391 ); 681 );
392 682
393 $win->add (my $hbox = new CFClient::UI::HBox 683 $win->add (my $hbox = new CFPlus::UI::HBox
394 children => [ 684 children => [
395 (new CFClient::UI::HBox expand => 1), 685 (new CFPlus::UI::HBox expand => 1),
396 (new CFClient::UI::VBox children => [ 686 (new CFPlus::UI::VBox children => [
397 (new CFClient::UI::Empty expand => 1), 687 (new CFPlus::UI::Empty expand => 1),
398 (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)),
399 ]), 689 ]),
400 (my $vbox = new CFClient::UI::VBox), 690 (my $vbox = new CFPlus::UI::VBox),
401 ], 691 ],
402 ); 692 );
403 693
404 $vbox->add (new CFClient::UI::HBox 694 $vbox->add (new CFPlus::UI::HBox
405 expand => 1, 695 expand => 1,
406 children => [ 696 children => [
407 (new CFClient::UI::Empty expand => 1), 697 (new CFPlus::UI::Empty expand => 1),
408 (my $hb = new CFClient::UI::HBox), 698 (my $hb = new CFPlus::UI::HBox),
409 ], 699 ],
410 ); 700 );
411 701
412 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 702 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
413 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.");
414 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 703 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
415 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.");
416 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 704 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
417 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.");
418 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 705 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
419 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.");
420 706
421 $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");
422 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.");
423 $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");
424 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
425 709
426 $GAUGES = { 710 $GAUGES = {
427 exp => $exp, win => $win, range => $rng, 711 exp => $exp, win => $win, range => $rng,
428 food => $fg, mana => $mg, hp => $hg, grace => $gg 712 food => $fg, mana => $mg, hp => $hg, grace => $gg
429 }; 713 };
… …
431 &set_gauge_window_fontsize; 715 &set_gauge_window_fontsize;
432 716
433 $win 717 $win
434} 718}
435 719
720sub debug_setup {
721 my $table = new CFPlus::UI::Table;
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
436sub make_stats_window { 750sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 751 my $r = new CFPlus::UI::ScrolledWindow (
752 expand => 1,
753 scroll_y => 1
754 );
755 $r->add (my $vb = new CFPlus::UI::VBox);
438 756
439 $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
440 $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,
441 can_hover => 1, can_events => 1, 763 can_hover => 1, can_events => 1,
442 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.");
443 $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,
444 can_hover => 1, can_events => 1, 766 can_hover => 1, can_events => 1,
445 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).");
446 768
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 769 $pi->add (my $hb0 = new CFPlus::UI::HBox);
448 $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,
449 can_hover => 1, can_events => 1, 771 can_hover => 1, can_events => 1,
450 tooltip => "This is the amount the Player weights."); 772 tooltip => "The weight of the player including all inventory items.");
451 $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,
452 can_hover => 1, can_events => 1, 774 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit, you can't carry more than this."); 775 tooltip => "The weight limit: you cannot carry more than this.");
454 776
455 777 $vb->add (new CFPlus::UI::FancyFrame
778 label => "Primary/Secondary Statistics",
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 779 child => (my $hb = new CFPlus::UI::HBox expand => 1),
780 );
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 781 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
458 782
459 my $color2 = [1, 1, 0]; 783 my $color2 = [1, 1, 0];
460 784
461 for ( 785 for (
462 [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],
463 [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],
464 [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],
465 [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],
466 [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],
467 [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],
468 [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],
469 793
470 [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],
471 [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],
472 [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],
473 [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],
474 [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],
475 [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],
476 ) { 800 ) {
477 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 801 my ($col, $row, $id, $label, $template) = @$_;
478 802
479 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 803 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
480 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");
481 $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
482 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");
483 } 809 }
484 810
811 $vb->add (new CFPlus::UI::FancyFrame
812 label => "Resistancies",
485 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 813 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
814 );
486 815
487 my $row = 0; 816 my $row = 0;
488 my $col = 0; 817 my $col = 0;
489 818
490 my %resist_names = ( 819 my %resist_names = (
820 slow => ["Slow",
491 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",
492 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",
493 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",
494 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",
495 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",
496 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",
497 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",
498 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",
499 pois => "<b>Poison</b> (resistance to getting poisoned)", 837 "<b>Poison</b> (resistance to getting poisoned)"],
838 para => ["Paralysation",
500 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",
501 deat => "<b>Death</b> (resistance against death spells)", 841 "<b>Death</b> (resistance against death spells)"],
502 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",
503 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",
504 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",
505 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",
506 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",
507 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",
508 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)"],
509 ); 856 );
510 for (qw/slow holyw conf fire depl magic 857 for (qw/slow holyw conf fire depl magic
511 drain acid pois para deat phys 858 drain acid pois para deat phys
512 blind fear tund elec cold ghit/) 859 blind fear tund elec cold ghit/)
513 { 860 {
514 $tbl2->add ($col, $row, 861 $tbl2->add ($col, $row,
515 $STATWIDS->{"res_$_"} = 862 $STATWIDS->{"res_$_"} =
516 new CFClient::UI::Label 863 new CFPlus::UI::Label
517 font => $FONT_FIXED, 864 font => $FONT_FIXED,
518 template => "-100%", 865 template => "-100%",
519 align => +1, 866 align => +1,
520 valign => 0, 867 valign => 0,
521 can_events => 1, 868 can_events => 1,
522 can_hover => 1, 869 can_hover => 1,
523 tooltip => $resist_names{$_}, 870 tooltip => $resist_names{$_}->[1],
524 ); 871 );
525 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 872 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
526 font => $FONT_FIXED, 873 font => $FONT_FIXED,
527 can_hover => 1, 874 can_hover => 1,
528 can_events => 1, 875 can_events => 1,
529 image => "ui/resist/resist_$_.png", 876 path => "ui/resist/resist_$_.png",
530 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],
531 ); 885 );
532 886
533 $row++; 887 $row++;
534 if ($row % 6 == 0) { 888 if ($row % 6 == 0) {
535 $col += 2; 889 $col += 3;
536 $row = 0; 890 $row = 0;
537 } 891 }
538 } 892 }
539 893
540 &set_stats_window_fontsize;
541 update_stats_window ({}); 894 #update_stats_window ({});
542 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]);
543 $tgw 902 $sw
544} 903}
545 904
546sub formsep { 905sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 906 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548}
549
550sub update_stats_window {
551 my ($stats) = @_;
552
553 # I love text protocols...
554
555 my $hp = $stats->{+CS_STAT_HP} * 1;
556 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
557 my $sp = $stats->{+CS_STAT_SP} * 1;
558 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
559 my $fo = $stats->{+CS_STAT_FOOD} * 1;
560 my $fo_m = 999;
561 my $gr = $stats->{+CS_STAT_GRACE} * 1;
562 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
563
564 $GAUGES->{hp} ->set_value ($hp, $hp_m);
565 $GAUGES->{mana} ->set_value ($sp, $sp_m);
566 $GAUGES->{food} ->set_value ($fo, $fo_m);
567 $GAUGES->{grace} ->set_value ($gr, $gr_m);
568 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
569 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
570 my $rng = $stats->{+CS_STAT_RANGE};
571 $rng =~ s/^Range: //; # thank you so much dear server
572 $GAUGES->{range} ->set_text ("Rng: " . $rng);
573 my $title = $stats->{+CS_STAT_TITLE};
574 $title =~ s/^Player: //;
575 $STATWIDS->{title} ->set_text ("Title: " . $title);
576
577 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
578 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
579 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
580 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
581 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
582 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
583 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
584 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
585 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
586 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
587 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
588 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
589 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
590
591 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
592
593 # TODO: replace by CS_STAT_RES_xxx constants
594 my %tbl = (
595 phys => 100,
596 magic => 101,
597 fire => 102,
598 elec => 103,
599 cold => 104,
600 conf => 105,
601 acid => 106,
602 drain => 107,
603 ghit => 108,
604 pois => 109,
605 slow => 110,
606 para => 111,
607 tund => 112,
608 fear => 113,
609 depl => 113,
610 deat => 115,
611 holyw => 116,
612 blind => 117,
613 );
614
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl;
617}
618
619sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627} 907}
628 908
629my $METASERVER_ATIME; 909my $METASERVER_ATIME;
630 910
631sub update_metaserver { 911sub update_metaserver {
632 my ($HOST) = @_; 912 my ($metaserver_dialog) = @_;
913
914 $METASERVER = $metaserver_dialog
915 if defined $metaserver_dialog;
633 916
634 return if $METASERVER_ATIME > time; 917 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 918 $METASERVER_ATIME = time + 60;
636 919
637 my $table = $METASERVER->{table}; 920 my $table = $METASERVER->{table};
638 $table->clear; 921 $table->clear;
639 $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...");
640 923
641 my $buf; 924 my $ok = 0;
642 925
643 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 926 CFPlus::background {
927 my $ua = CFPlus::lwp_useragent;
644 928
645 unless ($fh) { 929 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
646 $label->set_text ("unable to contact metaserver: $!"); 930 } sub {
647 return; 931 my ($msg) = @_;
648 } 932 if ($msg) {
649
650 Event->io (fd => $fh, poll => 'r', cb => sub {
651 my $res = sysread $fh, $buf, 8192, length $buf;
652
653 if (!defined $res) {
654 $_[0]->w->cancel;
655 $label->set_text ("error while retrieving server list: $!");
656 } elsif ($res == 0) {
657 $_[0]->w->cancel;
658 status "server list retrieved";
659
660 utf8::decode $buf if utf8::valid $buf;
661
662 $table->clear; 933 $table->clear;
663 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 );
664 my @col = qw(Use #Users Host Uptime Version Description); 942 my @col = qw(#Users Host Uptime Version Description);
665 $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[$_])
666 for 0 .. $#col; 947 for 0 .. $#col;
667 948
668 my @align = qw(1 0 1 1 -1); 949 my @align = qw(1 0 1 1 -1);
669 950
670 my $y = 0; 951 my $y = 0;
671 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 952 for my $m (@{ $msg->{servers} }) {
672 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)};
673 955
674 for ($desc) { 956 for ($desc) {
675 s/<br>/\n/gi; 957 s/<br>/\n/gi;
676 s/<li>/\n· /gi; 958 s/<li>/\n· /gi;
677 s/<.*?>//sgi; 959 s/<.*?>//sgi;
678 s/&/&amp;/g; 960 s/&amp;/&/g;
679 s/</&lt;/g; 961 s/&lt;/</g;
680 s/>/&gt;/g; 962 s/&gt;/>/g;
681 } 963 }
682 964
683 $uptime = sprintf "%dd %02d:%02d:%02d", 965 $uptime = sprintf "%dd %02d:%02d:%02d",
684 (int $m->[8] / 86400), 966 (int $uptime / 86400),
685 (int $m->[8] / 3600) % 24, 967 (int $uptime / 3600) % 24,
686 (int $m->[8] / 60) % 60, 968 (int $uptime / 60) % 60,
687 $m->[8] % 60; 969 $uptime % 60;
688 970
689 $m = [$users, $host, $uptime, $version, $desc]; 971 $m = [$users, $host, $uptime, $version, $desc];
690 972
691 $y++; 973 $y++;
692 974
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 975 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_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 {
695 $HOST->set_text ($CFG->{host} = $host); 980 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
981 $METASERVER->hide;
982 0
983 },
696 }), 984 ),
697 (new CFClient::UI::Empty expand => 1), 985 (new CFPlus::UI::Empty expand => 1),
698 ]); 986 ]);
699 987
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 988 $table->add ($_, $y, new CFPlus::UI::Label
701 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)
702 for 0 .. $#$m; 998 for 0 .. $#$m;
703 } 999 }
1000 } else {
1001 $ok or $label->set_text ("error while contacting metaserver");
1002 }
1003 };
1004
1005}
1006
1007sub metaserver_dialog {
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
1013 title => "Server List",
1014 name => 'metaserver_dialog',
1015 x => 'center',
1016 y => 'center',
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,
1023 on_visibility_change => sub {
1024 update_metaserver ($_[0]) if $_[1];
1025 0
704 } 1026 },
705 }); 1027 ;
1028
1029 $dialog
706} 1030}
707 1031
708sub server_setup { 1032sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 1033 my $vbox = new CFPlus::UI::VBox;
710 title => "Server Setup", 1034
711 child => (my $vbox = new CFClient::UI::VBox); 1035 $vbox->add (new CFPlus::UI::FancyFrame
712 1036 label => "Connection Settings",
713 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1037 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1038 );
714 $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");
715 1040
716 { 1041 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1042 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
718 1043
719 $vbox->add ( 1044 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 1045 $HOST_ENTRY = new CFPlus::UI::Entry
721 expand => 1, 1046 expand => 1,
722 text => $CFG->{host}, 1047 text => $CFG->{profile}{default}{host},
723 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",
724 connect_changed => sub { 1049 on_changed => sub {
725 my ($self, $value) = @_; 1050 my ($self, $value) = @_;
726 $CFG->{host} = $value; 1051 $CFG->{profile}{default}{host} = $value;
1052 0
727 } 1053 }
728 ); 1054 );
729 1055
730 $METASERVER = metaserver_dialog;
731
732 $vbox->add (new CFClient::UI::Flopper 1056 $vbox->add (new CFPlus::UI::Button
733 expand => 1, 1057 expand => 1,
734 text => "Server List", 1058 text => "Server List",
735 other => $METASERVER, 1059 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 1060 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 1061 on_activate => sub { $METASERVER->toggle_visibility; 0 },
738 update_metaserver $HOST; 1062 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
739 }
740 ); 1063 );
741 } 1064 }
742 1065
743 $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");
744 $table->add (1, 4, new CFClient::UI::Entry 1067 $table->add (1, 4, new CFPlus::UI::Entry
745 text => $CFG->{user}, 1068 text => $CFG->{profile}{default}{user},
746 tooltip => "The name of your character on the server", 1069 tooltip => "The name of your character on the server",
747 connect_changed => sub { 1070 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
748 my ($self, $value) = @_;
749 $CFG->{user} = $value;
750 }
751 ); 1071 );
752 1072
753 $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");
754 $table->add (1, 5, new CFClient::UI::Entry 1074 $table->add (1, 5, new CFPlus::UI::Entry
755 text => $CFG->{password}, 1075 text => $CFG->{profile}{default}{password},
756 hidden => 1, 1076 hidden => 1,
757 tooltip => "The password for your character", 1077 tooltip => "The password for your character",
758 connect_changed => sub { 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
759 my ($self, $value) = @_;
760 $CFG->{password} = $value;
761 }
762 ); 1079 );
763 1080
764 $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");
765 $table->add (1, 7, new CFClient::UI::Slider 1082 $table->add (1, 7, new CFPlus::UI::Slider
766 req_w => 100, 1083 force_w => 100,
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1084 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 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. "
769 . "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, "
770 . "but you also increase bandwidth requirements and latency. " 1087 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 1088 . "This option is only used once at log-in.",
772 connect_changed => sub { 1089 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
773 my ($self, $value) = @_;
774
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 },
777 ); 1090 );
778 1091
779 $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");
780 $table->add (1, 8, new CFClient::UI::CheckBox 1093 $table->add (1, 8, new CFPlus::UI::CheckBox
781 state => $CFG->{face_prefetch}, 1094 state => $CFG->{face_prefetch},
782 tooltip => "<b>Background Image Prefetch</b>\n\n" 1095 tooltip => "<b>Background Image Prefetch</b>\n\n"
783 . "If enabled, the client automatically pre-fetches images from the server. " 1096 . "If enabled, the client automatically pre-fetches images from the server. "
784 . "This might increase or create lag, but increases the chances " 1097 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 1098 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 1099 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 1100 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 1101 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1102 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
790 ); 1103 );
791 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
792 $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");
793 $table->add (1, 9, new CFClient::UI::Entry 1115 $table->add (1, 10, new CFPlus::UI::Entry
794 text => $CFG->{output_count}, 1116 text => $CFG->{output_count},
795 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.",
796 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1118 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
797 ); 1119 );
798 1120
799 $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");
800 $table->add (1, 10, new CFClient::UI::Entry 1122 $table->add (1, 11, new CFPlus::UI::Entry
801 text => $CFG->{output_sync}, 1123 text => $CFG->{output_sync},
802 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.",
803 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1125 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
804 ); 1126 );
805 1127
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1128 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
807 expand => 1, 1129 expand => 1,
808 align => 0, 1130 align => 0,
809 text => "Login", 1131 text => "Login",
810 connect_activate => sub { 1132 on_activate => sub {
811 $CONN ? stop_game 1133 $CONN ? stop_game
812 : start_game; 1134 : start_game;
1135 0
813 }, 1136 },
814 ); 1137 );
815 1138
816 $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
817} 1190}
818 1191
819sub message_window { 1192sub message_window {
820 my $window = new CFClient::UI::FancyFrame 1193 my $window = new CFPlus::UI::Toplevel
1194 name => "message_window",
821 title => "Messages", 1195 title => "Messages",
822 border_bg => [1, 1, 1, 1], 1196 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 1197 x => "max",
824 user_w => int $::WIDTH / 3, 1198 y => 0,
1199 force_w => $::WIDTH * 0.4,
825 user_h => int $::HEIGHT / 5, 1200 force_h => $::HEIGHT * 0.5,
826 child => (my $vbox = new CFClient::UI::VBox); 1201 child => (my $vbox = new CFPlus::UI::VBox),
1202 has_close_button => 1;
827 1203
828 $vbox->add ($LOGVIEW); 1204 $vbox->add ($LOGVIEW);
829 1205
830 $vbox->add (my $input = new CFClient::UI::Entry 1206 $vbox->add (my $input = new CFPlus::UI::Entry
831 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> "
832 . "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>...). "
833 . "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). "
834 . "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.",
835 connect_focus_in => sub { 1211 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 1212 my ($input, $prev_focus) = @_;
837 1213
838 delete $input->{refocus_map}; 1214 delete $input->{refocus_map};
839 1215
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1216 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 1217 $input->{refocus_map} = 1;
842 } 1218 }
843 delete $input->{auto_activated}; 1219 delete $input->{auto_activated};
1220
1221 0
844 }, 1222 },
845 connect_activate => sub { 1223 on_activate => sub {
846 my ($input, $text) = @_; 1224 my ($input, $text) = @_;
847 $input->set_text (''); 1225 $input->set_text ('');
848 1226
849 if ($text =~ /^\/(.*)/) { 1227 if ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 1228 $::CONN->user_send ($1);
… …
854 } 1232 }
855 if ($input->{refocus_map}) { 1233 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 1234 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 1235 $MAPWIDGET->focus_in
858 } 1236 }
1237
1238 0
859 }, 1239 },
860 connect_escape => sub { 1240 on_escape => sub {
861 $MAPWIDGET->focus_in 1241 $MAPWIDGET->grab_focus;
1242
1243 0
862 }, 1244 },
863 ); 1245 );
864 1246
865 $CONSOLE = { 1247 $CONSOLE = {
866 window => $window, 1248 window => $window,
867 input => $input 1249 input => $input,
868 }; 1250 };
869 1251
870 $window 1252 $window
1253}
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;
871} 1593}
872 1594
873sub open_quit_dialog { 1595sub open_quit_dialog {
874 unless ($QUIT_DIALOG) { 1596 unless ($QUIT_DIALOG) {
1597 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1598 x => "center",
1599 y => "center",
1600 z => 50,
1601 title => "Really Quit?",
1602 on_key_down => sub {
1603 my ($dialog, $ev) = @_;
1604 $ev->{sym} == 27 and $dialog->hide;
1605 }
1606 ;
875 1607
876 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
877
878 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1608 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
879 1609
880 $vb->add (new CFClient::UI::Label 1610 $vb->add (new CFPlus::UI::Label
881 text => "You should find a savebed and apply it first!", 1611 text => "You should find a savebed and apply it first!",
882 max_w => $WIDTH * 0.25, 1612 max_w => $WIDTH * 0.25,
883 ellipsize => 0, 1613 ellipsize => 0,
884 ); 1614 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1615 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 1616 $hb->add (new CFPlus::UI::Button
887 text => "Ok", 1617 text => "Ok",
888 expand => 1, 1618 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 1619 on_activate => sub { $QUIT_DIALOG->hide; 0 },
890 ); 1620 );
891 $hb->add (new CFClient::UI::Button 1621 $hb->add (new CFPlus::UI::Button
892 text => "Quit anyway", 1622 text => "Quit anyway",
893 expand => 1, 1623 expand => 1,
894 connect_activate => sub { exit }, 1624 on_activate => sub { exit },
895 ); 1625 );
896
897 $QUIT_DIALOG->show_centered;
898 } else {
899 $QUIT_DIALOG->show_centered;
900 } 1626 }
901}
902 1627
903sub make_inventory_window { 1628 $QUIT_DIALOG->show;
904 my $invwin = new CFClient::UI::FancyFrame 1629 $QUIT_DIALOG->grab_focus;
905 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
906
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
908
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
910 $vb1->add (my $lbl = new CFClient::UI::Label align => 0);
911 $lbl->set_text ("Player");
912 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label align => 0);
916 $INVR_LBL->set_text ("Floor");
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918
919 $invwin
920} 1630}
921 1631
922sub make_help_window { 1632sub show_tip_of_the_day {
923 my $win = new CFClient::UI::FancyFrame 1633 # find all tips
924 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1634 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
925 1635
926 $win->add (my $vbox = new CFClient::UI::VBox); 1636 CFPlus::DB::get state => "tip_of_the_day", sub {
927
928 $vbox->add (my $buttons = new CFClient::UI::HBox);
929 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
930
931 for (
932 [intro => "Introduction"],
933 [manual => "Manual"],
934 [command_help => "Commands"],
935 [skill_help => "Skills"],
936 ) {
937 my ($pod, $label) = @$_; 1637 my ($todindex) = @_;
1638 $todindex = 0 if $todindex >= @tod;
1639 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
938 1640
939 $buttons->add (new CFClient::UI::Button 1641 # create dialog
1642 my $dialog;
1643
1644 my $close = sub {
1645 $dialog->destroy;
1646 };
1647
1648 $dialog = new CFPlus::UI::Toplevel
1649 x => "center",
1650 y => "center",
1651 z => 3,
1652 name => 'tip_of_the_day',
1653 force_w => int $WIDTH * 4/9,
1654 force_h => int $WIDTH * 2/9,
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 ;
1660
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]);
1664
1665 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1666
1667 $table->add (0, 0, new CFPlus::UI::Button
940 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>.",
941 connect_activate => sub { 1676 on_activate => sub {
942 my $parser = new Pod::POM; 1677 $close->();
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1678 &show_tip_of_the_day;
944
945 $viewer->clear;
946
947 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
948 for @{ CFClient::pod_to_pango_list $pom };
949
950 $viewer->set_offset (0);
951 }, 1679 },
952 ); 1680 );
1681
1682 $dialog->show;
953 } 1683 };
954
955 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
956
957 $win
958} 1684}
959 1685
960sub sdl_init { 1686sub sdl_init {
961 CFClient::SDL_Init 1687 CFPlus::SDL_Init
962 and die "SDL::Init failed!\n"; 1688 and die "SDL::Init failed!\n";
963} 1689}
964 1690
965sub video_init { 1691sub video_init {
966 sdl_init; 1692 sdl_init;
… …
971 1697
972 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1698 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
973 $FULLSCREEN = $CFG->{fullscreen}; 1699 $FULLSCREEN = $CFG->{fullscreen};
974 $FAST = $CFG->{fast}; 1700 $FAST = $CFG->{fast};
975 1701
976 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1702 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
977 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1703 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
978 1704
979 $SDL_ACTIVE = 1; 1705 $SDL_ACTIVE = 1;
980 $LAST_REFRESH = time - 0.01; 1706 $LAST_REFRESH = time - 0.01;
981 1707
982 CFClient::OpenGL::init; 1708 CFPlus::OpenGL::init;
983 1709
984 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1710 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
985 1711
986 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1712 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
987 1713
988 ############################################################################# 1714 #############################################################################
989 1715
990 if ($DEBUG_STATUS) { 1716 if ($DEBUG_STATUS) {
991 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1717 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
992 } else { 1718 } else {
993 # create the widgets 1719 # create the widgets
994 1720
995 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1721 $DEBUG_STATUS = new CFPlus::UI::Label
1722 padding => 0,
1723 z => 100,
1724 force_x => "max",
1725 force_y => 0;
996 $DEBUG_STATUS->show; 1726 $DEBUG_STATUS->show;
997 1727
998 $STATUSBOX = new CFClient::UI::Statusbox; 1728 $STATUSBOX = new CFPlus::UI::Statusbox;
999 $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]);
1000 1730
1001 (new CFClient::UI::Frame 1731 (new CFPlus::UI::Frame
1002 bg => [0, 0, 0, 0.4], 1732 bg => [0, 0, 0, 0.4],
1003 req_y => -1, 1733 force_x => 0,
1734 force_y => "max",
1004 child => $STATUSBOX, 1735 child => $STATUSBOX,
1005 )->show; 1736 )->show;
1006 1737
1007 CFClient::UI::FancyFrame->new ( 1738 CFPlus::UI::Toplevel->new (
1739 title => "Map",
1740 name => "mapmap",
1741 x => 0,
1742 y => $FONTSIZE + 8,
1008 border_bg => [1, 1, 1, 192/255], 1743 border_bg => [1, 1, 1, 192/255],
1009 bg => [1, 1, 1, 0], 1744 bg => [1, 1, 1, 0],
1010 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1745 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1011 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.",
1012 ), 1747 ),
1013 )->show; 1748 )->show;
1014 1749
1015 $MAPWIDGET = new CFClient::MapWidget; 1750 $MAPWIDGET = new CFPlus::MapWidget;
1016 $MAPWIDGET->connect (activate_console => sub { 1751 $MAPWIDGET->connect (activate_console => sub {
1017 my ($mapwidget, $preset) = @_; 1752 my ($mapwidget, $preset) = @_;
1018 1753
1019 if ($CONSOLE) { 1754 if ($CONSOLE) {
1020 $CONSOLE->{input}->{auto_activated} = 1; 1755 $CONSOLE->{input}->{auto_activated} = 1;
1021 $CONSOLE->{input}->focus_in; 1756 $CONSOLE->{input}->grab_focus;
1022 1757
1023 if ($preset && $CONSOLE->{input}->get_text eq '') { 1758 if ($preset && $CONSOLE->{input}->get_text eq '') {
1024 $CONSOLE->{input}->set_text ($preset); 1759 $CONSOLE->{input}->set_text ($preset);
1025 } 1760 }
1026 } 1761 }
1027 }); 1762 });
1028 $MAPWIDGET->show; 1763 $MAPWIDGET->show;
1029 $MAPWIDGET->focus_in; 1764 $MAPWIDGET->grab_focus;
1030 1765
1031 $LOGVIEW = new CFClient::UI::TextView 1766 $LOGVIEW = new CFPlus::UI::TextScroller
1032 expand => 1, 1767 expand => 1,
1033 font => $FONT_FIXED, 1768 font => $FONT_FIXED,
1034 fontsize => $::CFG->{log_fontsize}, 1769 fontsize => $::CFG->{log_fontsize},
1770 indent => -4,
1035 can_hover => 1, 1771 can_hover => 1,
1036 can_events => 1, 1772 can_events => 1,
1773 max_par => $CFG->{logview_max_par},
1037 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.",
1038 ; 1775 ;
1039 1776
1040 $BUTTONBAR = new CFClient::UI::HBox; 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 ;
1041 1787
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1788 $METASERVER = metaserver_dialog;
1043 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1789
1044 $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,
1045 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
1046 $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,
1047 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.");
1048 1820
1049 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
1050 1822
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1052 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1053 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1823 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1054 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.");
1055 1825
1056 $BUTTONBAR->add (new CFClient::UI::Button 1826 $BUTTONBAR->add (new CFPlus::UI::Button
1057 text => "Save Config", 1827 text => "Save Config",
1058 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.",
1059 connect_activate => sub { 1829 on_activate => sub {
1830 $::CFG->{layout} = CFPlus::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1831 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1061 status "Configuration Saved"; 1832 status "Configuration Saved";
1833 0
1062 }, 1834 },
1063 ); 1835 );
1064 1836
1065 $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,
1066 tooltip => "View Documentation"); 1838 tooltip => "View Documentation");
1067 1839
1840
1068 $BUTTONBAR->add (new CFClient::UI::Button 1841 $BUTTONBAR->add (new CFPlus::UI::Button
1069 text => "Quit", 1842 text => "Quit",
1070 tooltip => "Terminates the program", 1843 tooltip => "Terminates the program",
1071 connect_activate => sub { 1844 on_activate => sub {
1072 if ($CONN) { 1845 if ($CONN) {
1073 open_quit_dialog; 1846 open_quit_dialog;
1074 } else { 1847 } else {
1075 exit; 1848 exit;
1076 } 1849 }
1850 0
1077 }, 1851 },
1078 ); 1852 );
1079 1853
1080 $BUTTONBAR->show; 1854 $BUTTONBAR->show;
1081 1855 $SETUP_DIALOG->show;
1082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1083
1084 # delay till geometry is constant
1085 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1086 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1087 my $widget = $GAUGES->{win};
1088 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1089 });
1090 force_refresh ();
1091 } 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;
1092} 1978}
1093 1979
1094sub video_shutdown { 1980sub video_shutdown {
1981 CFPlus::OpenGL::shutdown;
1982
1095 undef $SDL_ACTIVE; 1983 undef $SDL_ACTIVE;
1096} 1984}
1097 1985
1098my @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#
1099my $bgmusic;#TODO#hack#d# 1987my $bgmusic;#TODO#hack#d#
… …
1106 1994
1107sub audio_music_finished { 1995sub audio_music_finished {
1108 return unless $CFG->{bgm_enable}; 1996 return unless $CFG->{bgm_enable};
1109 1997
1110 # TODO: hack, do play loop and mood music 1998 # TODO: hack, do play loop and mood music
1111 $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]";
1112 $bgmusic->play (0); 2000 $bgmusic->play (0);
1113 2001
1114 push @bgmusic, shift @bgmusic; 2002 push @bgmusic, shift @bgmusic;
1115} 2003}
1116 2004
1117sub audio_init { 2005sub audio_init {
1118 if ($CFG->{audio_enable}) { 2006 if ($CFG->{audio_enable}) {
1119 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2007 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1120 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2008 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1121 2009
1122 unless ($SDL_MIXER) { 2010 unless ($SDL_MIXER) {
1123 status "Unable to open sound device: there will be no sound"; 2011 status "Unable to open sound device: there will be no sound";
1124 return; 2012 return;
1125 } 2013 }
1126 2014
1127 CFClient::Mix_AllocateChannels 8; 2015 CFPlus::Mix_AllocateChannels 8;
1128 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2016 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1129 2017
1130 audio_music_finished; 2018 audio_music_finished;
1131 2019
2020 local $_;
1132 while (<$fh>) { 2021 while (<$fh>) {
1133 next if /^\s*#/; 2022 next if /^\s*#/;
1134 next if /^\s*$/; 2023 next if /^\s*$/;
1135 2024
1136 my ($file, $volume, $event) = split /\s+/, $_, 3; 2025 my ($file, $volume, $event) = split /\s+/, $_, 3;
1137 2026
1138 push @SOUNDS, "$volume,$file"; 2027 push @SOUNDS, "$volume,$file";
1139 2028
1140 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2029 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1141 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";
1142 $chunk->volume ($volume * 128 / 100); 2031 $chunk->volume ($volume * 128 / 100);
1143 $chunk 2032 $chunk
1144 }; 2033 };
1145 } 2034 }
1146 } else { 2035 } else {
… …
1148 } 2037 }
1149 } 2038 }
1150} 2039}
1151 2040
1152sub audio_shutdown { 2041sub audio_shutdown {
1153 CFClient::Mix_CloseAudio if $SDL_MIXER; 2042 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1154 undef $SDL_MIXER; 2043 undef $SDL_MIXER;
1155 @SOUNDS = (); 2044 @SOUNDS = ();
1156 %AUDIO_CHUNKS = (); 2045 %AUDIO_CHUNKS = ();
1157} 2046}
1158 2047
… …
1163 2052
1164my %demo;#d# 2053my %demo;#d#
1165 2054
1166sub force_refresh { 2055sub force_refresh {
1167 $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;
1168 debug sprintf "%3.2f", $fps; 2057 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1169 2058
1170 $CFClient::UI::ROOT->draw; 2059 $CFPlus::UI::ROOT->draw;
1171 2060
1172 $WANT_REFRESH = 0; 2061 $WANT_REFRESH = 0;
1173 $CAN_REFRESH = 0; 2062 $CAN_REFRESH = 0;
1174 $LAST_REFRESH = $NOW; 2063 $LAST_REFRESH = $NOW;
1175 2064
11760 && do {
1177 # some weird model-drawing code, just a joke right now
1178 use CFClient::OpenGL;
1179
1180 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1181 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1182 $demo{r} ||= do {
1183 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1184 $mod->{v} = pack "f*", @{$mod->{v}};
1185 $_ = [scalar @$_, pack "S!*", @$_]
1186 for values %{$mod->{g}};
1187 $mod
1188 };
1189
1190 my $r = $demo{r} or die;
1191
1192 glDepthMask 1;
1193 glClear GL_DEPTH_BUFFER_BIT;
1194 glEnable GL_TEXTURE_2D;
1195 glEnable GL_DEPTH_TEST;
1196 glEnable GL_CULL_FACE;
1197 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1198
1199 glMatrixMode GL_PROJECTION;
1200 glLoadIdentity;
1201 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1202 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1203 glMatrixMode GL_MODELVIEW;
1204 glLoadIdentity;
1205
1206 glPushMatrix;
1207 glTranslate 0, 0, -800;
1208 glScale 1, -1, 1;
1209 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1210 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1211 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1212 glScale 50, 50, 50;
1213
1214 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1215 while (my ($k, $v) = each %{$r->{g}}) {
1216 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1217 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1218 }
1219
1220 glPopMatrix;
1221
1222 glShadeModel GL_FLAT;
1223 glDisable GL_DEPTH_TEST;
1224 glDisable GL_TEXTURE_2D;
1225 glDepthMask 0;
1226
1227 $WANT_REFRESH++;
1228};
1229
1230 CFClient::SDL_GL_SwapBuffers; 2065 CFPlus::SDL_GL_SwapBuffers;
1231} 2066}
1232 2067
1233my $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 {
1234 $NOW = time; 2069 $NOW = time;
1235 2070
1236 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2071 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1237 for CFClient::SDL_PollEvent; 2072 for CFPlus::SDL_PollEvent;
1238 2073
1239 if (%animate_object) { 2074 if (%animate_object) {
1240 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2075 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1241 $WANT_REFRESH++; 2076 $WANT_REFRESH++;
1242 } 2077 }
… …
1266 $CONN->face_prefetch 2101 $CONN->face_prefetch
1267 if $CONN; 2102 if $CONN;
1268}); 2103});
1269 2104
1270%SDL_CB = ( 2105%SDL_CB = (
1271 CFClient::SDL_QUIT => sub { 2106 CFPlus::SDL_QUIT => sub {
1272 Event::unloop -1; 2107 exit;
1273 }, 2108 },
1274 CFClient::SDL_VIDEORESIZE => sub { 2109 CFPlus::SDL_VIDEORESIZE => sub {
1275 }, 2110 },
1276 CFClient::SDL_VIDEOEXPOSE => sub { 2111 CFPlus::SDL_VIDEOEXPOSE => sub {
1277 CFClient::UI::full_refresh; 2112 CFPlus::UI::full_refresh;
1278 }, 2113 },
1279 CFClient::SDL_ACTIVEEVENT => sub { 2114 CFPlus::SDL_ACTIVEEVENT => sub {
1280# 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;
1281 }, 2120 },
1282 CFClient::SDL_KEYDOWN => sub { 2121 CFPlus::SDL_KEYDOWN => sub {
1283 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2122 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1284 # alt-enter 2123 # alt-enter
2124 $FULLSCREEN_ENABLE->toggle;
1285 video_shutdown; 2125 video_shutdown;
1286 $CFG->{fullscreen} = !$CFG->{fullscreen};
1287 video_init; 2126 video_init;
1288 } else { 2127 } else {
1289 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2128 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1290 } 2129 }
1291 }, 2130 },
1292 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2131 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1293 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2132 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1294 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2133 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1295 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2134 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1296 CFClient::SDL_USEREVENT => sub { 2135 CFPlus::SDL_USEREVENT => sub {
1297 if ($_[0]{code} == 1) { 2136 if ($_[0]{code} == 1) {
1298 audio_channel_finished $_[0]{data1}; 2137 audio_channel_finished $_[0]{data1};
1299 } elsif ($_[0]{code} == 0) { 2138 } elsif ($_[0]{code} == 0) {
1300 audio_music_finished; 2139 audio_music_finished;
1301 } 2140 }
… …
1305############################################################################# 2144#############################################################################
1306 2145
1307$SIG{INT} = $SIG{TERM} = sub { exit }; 2146$SIG{INT} = $SIG{TERM} = sub { exit };
1308 2147
1309{ 2148{
1310 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1311
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 2149 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2150 CFPlus::DB::Server::run;
2151
2152 CFPlus::UI::set_layout ($::CFG->{layout});
1313 2153
1314 my %DEF_CFG = ( 2154 my %DEF_CFG = (
1315 sdl_mode => 0, 2155 sdl_mode => 0,
1316 width => 640, 2156 width => 640,
1317 height => 480, 2157 height => 480,
1318 fullscreen => 0, 2158 fullscreen => 0,
1319 fast => 0, 2159 fast => 0,
1320 map_scale => 1, 2160 map_scale => 1,
1321 fow_enable => 1, 2161 fow_enable => 1,
1322 fow_intensity => 0.45, 2162 fow_intensity => 0.45,
1323 fow_smooth => 0, 2163 fow_smooth => 0,
2164 map_smoothing => 1,
1324 gui_fontsize => 1, 2165 gui_fontsize => 1,
1325 log_fontsize => 1, 2166 log_fontsize => 0.7,
1326 gauge_fontsize=> 1, 2167 gauge_fontsize => 1,
1327 gauge_size => 0.35, 2168 gauge_size => 0.35,
1328 stat_fontsize => 1, 2169 stat_fontsize => 0.7,
1329 mapsize => 100, 2170 mapsize => 100,
1330 host => "crossfire.schmorp.de",
1331 say_command => 'say', 2171 say_command => 'chat',
1332 audio_enable => 1, 2172 audio_enable => 1,
1333 bgm_enable => 1, 2173 bgm_enable => 1,
1334 bgm_volume => 0.25, 2174 bgm_volume => 0.25,
1335 face_prefetch => 0, 2175 face_prefetch => 0,
1336 output_sync => 1, 2176 output_sync => 1,
1337 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 );
1338 ); 2185
1339
1340 while (my ($k, $v) = each %DEF_CFG) { 2186 while (my ($k, $v) = each %DEF_CFG) {
1341 $CFG->{$k} = $v unless exists $CFG->{$k}; 2187 $CFG->{$k} = $v unless exists $CFG->{$k};
1342 } 2188 }
1343 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
1344 sdl_init; 2205 sdl_init;
1345 2206
1346 @SDL_MODES = reverse 2207 @SDL_MODES = reverse
1347 grep $_->[0] >= 640 && $_->[1] >= 480, 2208 grep $_->[0] >= 640 && $_->[1] >= 480,
1348 CFClient::SDL_ListModes; 2209 CFPlus::SDL_ListModes;
1349 2210
1350 @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)";
1351 2212
1352 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2213 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1353 2214
1354 { 2215 {
1355 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2216 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1356 DejaVuSans.ttf 2217 DejaVuSans.ttf
1357 DejaVuSansMono.ttf 2218 DejaVuSansMono.ttf
1358 DejaVuSans-Bold.ttf 2219 DejaVuSans-Bold.ttf
1359 DejaVuSansMono-Bold.ttf 2220 DejaVuSansMono-Bold.ttf
1360 DejaVuSans-Oblique.ttf 2221 DejaVuSans-Oblique.ttf
1361 DejaVuSansMono-Oblique.ttf 2222 DejaVuSansMono-Oblique.ttf
1362 DejaVuSans-BoldOblique.ttf 2223 DejaVuSans-BoldOblique.ttf
1363 DejaVuSansMono-BoldOblique.ttf 2224 DejaVuSansMono-BoldOblique.ttf
1364 ); 2225 );
1365 2226
1366 CFClient::add_font $_ for @fonts; 2227 CFPlus::add_font $_ for @fonts;
1367 2228
1368 CFClient::pango_init; 2229 CFPlus::pango_init;
1369 2230
1370 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2231 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1371 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2232 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1372 2233
1373 $FONT_PROP->make_default; 2234 $FONT_PROP->make_default;
1374 } 2235 }
1375 2236
1376# compare mono (ft) vs. rgba (cairo) 2237# compare mono (ft) vs. rgba (cairo)
1377# ft - 1.8s, cairo 3s, even in alpha-only mode 2238# ft - 1.8s, cairo 3s, even in alpha-only mode
1378# for my $rgba (0..1) { 2239# for my $rgba (0..1) {
1379# my $t1 = Time::HiRes::time; 2240# my $t1 = Time::HiRes::time;
1380# for (1..1000) { 2241# for (1..1000) {
1381# my $layout = CFClient::Layout->new ($rgba); 2242# my $layout = CFPlus::Layout->new ($rgba);
1382# $layout->set_text ("hallo" x 100); 2243# $layout->set_text ("hallo" x 100);
1383# $layout->render; 2244# $layout->render;
1384# } 2245# }
1385# my $t2 = Time::HiRes::time; 2246# my $t2 = Time::HiRes::time;
1386# warn $t2-$t1; 2247# warn $t2-$t1;
1387# } 2248# }
1388 2249
2250 $startup_done->();
2251
1389 video_init; 2252 video_init;
1390 audio_init; 2253 audio_init;
1391} 2254}
1392 2255
2256show_tip_of_the_day if $CFG->{show_tips};
2257
1393Event::loop; 2258Event::loop;
2259#CFPlus::SDL_Quit;
2260#CFPlus::_exit 0;
1394 2261
1395END { CFClient::SDL_Quit } 2262END {
2263 CFPlus::SDL_Quit;
2264 CFPlus::DB::Server::stop;
2265}
1396 2266
1397=head1 NAME 2267=head1 NAME
1398 2268
1399pclient - A Crossfire+ and Crossfire game client 2269cfplus - A Crossfire+ and Crossfire game client
1400 2270
1401=head1 SYNOPSIS 2271=head1 SYNOPSIS
1402 2272
1403Just run it - no commandline arguments are supported. 2273Just run it - no commandline arguments are supported.
1404 2274
1405=head1 USAGE 2275=head1 USAGE
1406 2276
1407Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 2277cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1408fullscreen and interactively. 2278fullscreen and interactively.
1409 2279
2280=head1 DEBUGGING
2281
2282
2283CFPLUS_DEBUG - environment variable
2284
2285 1 draw borders around widgets
2286 2 add low-level widget info to tooltips
2287 4 show fps
2288 8 suppress tooltips
2289
1410=head1 AUTHOR 2290=head1 AUTHOR
1411 2291
1412Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2292Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1413 2293
1414 2294

Diff Legend

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