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

Diff Legend

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