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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.135 by elmex, Tue Dec 5 16:53:29 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines