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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines