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.19 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.142 by root, Mon Mar 12 22:23:09 2007 UTC

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

Diff Legend

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