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.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.133 by root, Sun Dec 3 01:03:49 2006 UTC

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

Diff Legend

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