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

Diff Legend

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