ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines