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.124 by root, Tue Nov 7 22:41:27 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
5 26
6# do things only needed for single-binary version (par) 27# do things only needed for single-binary version (par)
… …
8 if (%PAR::LibCache) { 29 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 30 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 31
11 while (my ($filename, $zip) = each %PAR::LibCache) { 32 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 33 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 34 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 36 unless -e "$ENV{PAR_TEMP}/$1";
16 } 37 }
17 } 38 }
18 39
… …
32use Crossfire; 53use Crossfire;
33use Crossfire::Protocol::Constants; 54use Crossfire::Protocol::Constants;
34 55
35use Compress::LZF; 56use Compress::LZF;
36 57
37use CFClient; 58use CFPlus;
38use CFClient::OpenGL (); 59use CFPlus::OpenGL ();
39use CFClient::Protocol; 60use CFPlus::Protocol;
40use CFClient::UI; 61use CFPlus::UI;
41use CFClient::Pod; 62use CFPlus::Pod;
42use CFClient::BindingEditor; 63use CFPlus::BindingEditor;
43use CFClient::MapWidget; 64use CFPlus::MapWidget;
44 65
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 66$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 67$SIG{PIPE} = 'IGNORE';
47 68
48$Event::Eval = 0; 69$Event::Eval = 0;
49$Event::DIED = sub { 70$Event::DIED = sub {
50 # TODO: display dialog box or so 71 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 72 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFClient::error $_[1]; 73 return;#d#
74 CFPlus::fatal ($_[1]);
53}; 75};
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 76
66my $MAX_FPS = 60; 77my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 78my $MIN_FPS = 5; # unused as of yet
68 79
69our $META_SERVER = "crossfire.real-time.com:13326"; 80our $META_SERVER = "crossfire.real-time.com:13326";
… …
71our $LAST_REFRESH; 82our $LAST_REFRESH;
72our $NOW; 83our $NOW;
73 84
74our $CFG; 85our $CFG;
75our $CONN; 86our $CONN;
87our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 88our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 89
78our $WANT_REFRESH; 90our $WANT_REFRESH;
79our $CAN_REFRESH; 91our $CAN_REFRESH;
80 92
… …
139our $BIND_UPD_CB; 151our $BIND_UPD_CB;
140 152
141our $PICKUP_CFG; 153our $PICKUP_CFG;
142 154
143sub status { 155sub status {
144 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 157}
146 158
147sub debug { 159sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 160 $DEBUG_STATUS->set_text ($_[0]);
161}
162
163sub message {
164 my ($para) = @_;
165
166 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
167
168 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
169
170 $LOGVIEW->add_paragraph ($para);
171 $LOGVIEW->scroll_to_bottom;
149} 172}
150 173
151sub destroy_query_dialog { 174sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 175 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 176 if $_[0]{query_dialog};
… …
155 178
156# server query dialog 179# server query dialog
157sub server_query { 180sub server_query {
158 my ($conn, $flags, $prompt) = @_; 181 my ($conn, $flags, $prompt) = @_;
159 182
160 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 184 x => "center",
162 y => "center", 185 y => "center",
163 title => "Server Query", 186 title => "Server Query",
164 child => my $vbox = new CFClient::UI::VBox, 187 child => my $vbox = new CFPlus::UI::VBox,
165 ; 188 ;
166 189
167 my @dialog = my $label = new CFClient::UI::Label 190 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 191 max_w => $::WIDTH * 0.4,
169 ellipsise => 0, 192 ellipsise => 0,
170 text => $prompt; 193 text => $prompt;
171 194
172 if ($flags & CS_QUERY_YESNO) { 195 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFClient::UI::HBox; 196 push @dialog, my $hbox = new CFPlus::UI::HBox;
174 197
175 $hbox->add (new CFClient::UI::Button 198 $hbox->add (new CFPlus::UI::Button
176 text => "No", 199 text => "No",
177 on_activate => sub { 200 on_activate => sub {
178 $conn->send ("reply n"); 201 $conn->send ("reply n");
179 $dialog->destroy; 202 $dialog->destroy;
180 0 203 0
181 } 204 }
182 ); 205 );
183 $hbox->add (new CFClient::UI::Button 206 $hbox->add (new CFPlus::UI::Button
184 text => "Yes", 207 text => "Yes",
185 on_activate => sub { 208 on_activate => sub {
186 $conn->send ("reply y"); 209 $conn->send ("reply y");
187 destroy_query_dialog $conn; 210 destroy_query_dialog $conn;
188 0 211 0
… …
190 ); 213 );
191 214
192 $dialog->grab_focus; 215 $dialog->grab_focus;
193 216
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 217 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 218 $dialog->{tooltip} = "#charcreation_focus";
196 219
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 220 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 221 $MESSAGE_WINDOW->show;
199 222
200 unshift @dialog, new CFClient::UI::Label 223 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 224 max_w => $::WIDTH * 0.4,
202 ellipsise => 0, 225 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 226 markup => "\nOr use your keyboard and the text entry below:\n";
204 227
205 unshift @dialog, my $table = new CFClient::UI::Table; 228 unshift @dialog, my $table = new CFPlus::UI::Table;
206 229
207 $table->add (0, 0, new CFClient::UI::Button 230 $table->add (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 231 text => "Next Race",
209 on_activate => sub { 232 on_activate => sub {
210 $conn->send ("reply n"); 233 $conn->send ("reply n");
211 destroy_query_dialog $conn; 234 destroy_query_dialog $conn;
212 0 235 0
213 }, 236 },
214 ); 237 );
215 $table->add (2, 0, new CFClient::UI::Button 238 $table->add (2, 0, new CFPlus::UI::Button
216 text => "Accept", 239 text => "Accept",
217 on_activate => sub { 240 on_activate => sub {
218 $conn->send ("reply d"); 241 $conn->send ("reply d");
219 destroy_query_dialog $conn; 242 destroy_query_dialog $conn;
220 0 243 0
221 }, 244 },
222 ); 245 );
223 246
224 unshift @dialog, new CFClient::UI::Label 247 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 248 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 249 ellipsise => 0,
227 markup => 250 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 ; 251 ;
236 252
237 } elsif ($prompt =~ /roll new stats/) { 253 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 254 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 255 $conn->send ("reply $stat");
… …
242 } 258 }
243 259
244 $STATS_PAGE->show; 260 $STATS_PAGE->show;
245 $MESSAGE_WINDOW->hide; 261 $MESSAGE_WINDOW->hide;
246 262
247 unshift @dialog, new CFClient::UI::Label 263 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 264 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 265 ellipsise => 0,
250 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
251 267
252 unshift @dialog, my $table = new CFClient::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
253 269
254 # left: re-roll 270 # left: re-roll
255 $table->add (0, 0, new CFClient::UI::Button 271 $table->add (0, 0, new CFPlus::UI::Button
256 text => "Roll Again", 272 text => "Roll Again",
257 on_activate => sub { 273 on_activate => sub {
258 $conn->send ("reply y"); 274 $conn->send ("reply y");
259 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
260 0 276 0
261 }, 277 },
262 ); 278 );
263 279
264 # center: swap stats 280 # center: swap stats
265 my ($sw1, $sw2) = map +(new CFClient::UI::Selector 281 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
266 expand => 1, 282 expand => 1,
267 value => $_, 283 value => $_,
268 options => [ 284 options => [
269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 285 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 286 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
274 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 290 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
275 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 291 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
276 ], 292 ],
277 ), 1 .. 2; 293 ), 1 .. 2;
278 294
279 $table->add (2, 0, new CFClient::UI::Button 295 $table->add (2, 0, new CFPlus::UI::Button
280 text => "Swap Stats", 296 text => "Swap Stats",
281 on_activate => sub { 297 on_activate => sub {
282 $conn->{stat_change_with} = $sw2->{value}; 298 $conn->{stat_change_with} = $sw2->{value};
283 $conn->send ("reply $sw1->{value}"); 299 $conn->send ("reply $sw1->{value}");
284 destroy_query_dialog $conn; 300 destroy_query_dialog $conn;
285 0 301 0
286 }, 302 },
287 ); 303 );
288 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 304 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
289 305
290 # right: accept 306 # right: accept
291 $table->add (4, 0, new CFClient::UI::Button 307 $table->add (4, 0, new CFPlus::UI::Button
292 text => "Accept", 308 text => "Accept",
293 on_activate => sub { 309 on_activate => sub {
294 $conn->send ("reply n"); 310 $conn->send ("reply n");
295 $STATS_PAGE->hide; 311 $STATS_PAGE->hide;
296 destroy_query_dialog $conn; 312 destroy_query_dialog $conn;
297 0 313 0
298 }, 314 },
299 ); 315 );
300 316
301 unshift @dialog, my $hbox = new CFClient::UI::HBox; 317 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
302 for ( 318 for (
303 [Str => CS_STAT_STR], 319 [Str => CS_STAT_STR],
304 [Dex => CS_STAT_DEX], 320 [Dex => CS_STAT_DEX],
305 [Con => CS_STAT_CON], 321 [Con => CS_STAT_CON],
306 [Int => CS_STAT_INT], 322 [Int => CS_STAT_INT],
307 [Wis => CS_STAT_WIS], 323 [Wis => CS_STAT_WIS],
308 [Pow => CS_STAT_POW], 324 [Pow => CS_STAT_POW],
309 [Cha => CS_STAT_CHA], 325 [Cha => CS_STAT_CHA],
310 ) { 326 ) {
311 my ($name, $id) = @$_; 327 my ($name, $id) = @$_;
312 $hbox->add (new CFClient::UI::Label 328 $hbox->add (new CFPlus::UI::Label
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 329 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0, 330 align => 0,
315 expand => 1, 331 expand => 1,
316 can_events => 1, 332 can_events => 1,
317 can_hover => 1, 333 can_hover => 1,
318 tooltip => $CFClient::STAT_TOOLTIP{$name}, 334 tooltip => "#stat_$name",
319 ); 335 );
320 } 336 }
321 337
322 unshift @dialog, new CFClient::UI::Label 338 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 339 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 340 ellipsise => 0,
325 markup => 341 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 ; 342 ;
332 } 343 }
333 344
334 push @dialog, my $entry = new CFClient::UI::Entry 345 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 346 on_changed => sub {
336 $conn->send ("reply $_[1]"); 347 $conn->send ("reply $_[1]");
337 destroy_query_dialog $conn; 348 destroy_query_dialog $conn;
338 0 349 0
339 }, 350 },
… …
342 $entry->grab_focus; 353 $entry->grab_focus;
343 354
344 } else { 355 } else {
345 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 356 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
346 357
347 push @dialog, my $entry = new CFClient::UI::Entry 358 push @dialog, my $entry = new CFPlus::UI::Entry
348 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 359 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
349 on_activate => sub { 360 on_activate => sub {
350 $conn->send ("reply $_[1]"); 361 $conn->send ("reply $_[1]");
351 destroy_query_dialog $conn; 362 destroy_query_dialog $conn;
352 0 363 0
… …
364 status "logging in..."; 375 status "logging in...";
365 376
366 $LOGIN_BUTTON->set_text ("Logout"); 377 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 378 $SETUP_DIALOG->hide;
368 379
380 $PROFILE = $CFG->{profile}{default};
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();
… …
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 });
662 671
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 673
665 for my $x (0..2) { 674 for my $x (0..2) {
666 for my $y (0 .. 2) { 675 for my $y (0 .. 2) {
667 $table->add ($x + 3, $y, 676 $table->add ($x + 3, $y,
668 new CFClient::UI::Entry 677 new CFPlus::UI::Entry
669 text => $default_smooth[$x * 3 + $y], 678 text => $default_smooth[$x * 3 + $y],
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 ); 680 );
672 } 681 }
673 } 682 }
… …
675 684
676 $table 685 $table
677} 686}
678 687
679sub stats_window { 688sub stats_window {
680 my $r = new CFClient::UI::ScrolledWindow ( 689 my $r = new CFPlus::UI::ScrolledWindow (
681 expand => 1, 690 expand => 1,
682 scroll_y => 1 691 scroll_y => 1
683 ); 692 );
684 $r->add (my $vb = new CFClient::UI::VBox); 693 $r->add (my $vb = new CFPlus::UI::VBox);
685 694
695 $vb->add (new CFPlus::UI::FancyFrame
696 label => "Player",
697 child => (my $pi = new CFPlus::UI::VBox),
698 );
699
686 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 700 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 701 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."); 702 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, 703 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 704 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 705 tooltip => "The map you are currently on (if supported by the server).");
692 706
693 $vb->add (my $hb0 = new CFClient::UI::HBox); 707 $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, 708 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 709 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 710 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, 711 $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, 712 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 713 tooltip => "The weight limit: you cannot carry more than this.");
700 714
715 $vb->add (new CFPlus::UI::FancyFrame
716 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 717 child => (my $hb = new CFPlus::UI::HBox expand => 1),
718 );
702 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 719 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 720
704 my $color2 = [1, 1, 0]; 721 my $color2 = [1, 1, 0];
705 722
706 for ( 723 for (
707 [0, 0, st_str => "Str", 30], 724 [0, 0, st_str => "Str", 30],
… …
719 [2, 4, st_spd => "Spd", 10.54], 736 [2, 4, st_spd => "Spd", 10.54],
720 [2, 5, st_wspd => "WSp", 10.54], 737 [2, 5, st_wspd => "WSp", 10.54],
721 ) { 738 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 739 my ($col, $row, $id, $label, $template) = @$_;
723 740
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 741 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 742 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 743 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 744 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 745 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 746 align => -1, text => $label, tooltip => "#stat_$label");
730 } 747 }
731 748
749 $vb->add (new CFPlus::UI::FancyFrame
750 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 751 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
752 );
733 753
734 my $row = 0; 754 my $row = 0;
735 my $col = 0; 755 my $col = 0;
736 756
737 my %resist_names = ( 757 my %resist_names = (
… …
776 drain acid pois para deat phys 796 drain acid pois para deat phys
777 blind fear tund elec cold ghit/) 797 blind fear tund elec cold ghit/)
778 { 798 {
779 $tbl2->add ($col, $row, 799 $tbl2->add ($col, $row,
780 $STATWIDS->{"res_$_"} = 800 $STATWIDS->{"res_$_"} =
781 new CFClient::UI::Label 801 new CFPlus::UI::Label
782 font => $FONT_FIXED, 802 font => $FONT_FIXED,
783 template => "-100%", 803 template => "-100%",
784 align => +1, 804 align => +1,
785 valign => 0, 805 valign => 0,
786 can_events => 1, 806 can_events => 1,
787 can_hover => 1, 807 can_hover => 1,
788 tooltip => $resist_names{$_}->[1], 808 tooltip => $resist_names{$_}->[1],
789 ); 809 );
790 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 810 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
791 font => $FONT_FIXED, 811 font => $FONT_FIXED,
792 can_hover => 1, 812 can_hover => 1,
793 can_events => 1, 813 can_events => 1,
794 path => "ui/resist/resist_$_.png", 814 path => "ui/resist/resist_$_.png",
795 tooltip => $resist_names{$_}->[1], 815 tooltip => $resist_names{$_}->[1],
796 ); 816 );
797 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 817 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
798 text => $resist_names{$_}->[0], 818 text => $resist_names{$_}->[0],
799 font => $FONT_FIXED, 819 font => $FONT_FIXED,
800 can_hover => 1, 820 can_hover => 1,
801 can_events => 1, 821 can_events => 1,
802 tooltip => $resist_names{$_}->[1], 822 tooltip => $resist_names{$_}->[1],
… …
813 833
814 $r 834 $r
815} 835}
816 836
817sub skill_window { 837sub skill_window {
818 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 838 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]); 839 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
820 $sw 840 $sw
821} 841}
822 842
823sub formsep($) { 843sub formsep($) {
824 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 844 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
835 return if $METASERVER_ATIME > time; 855 return if $METASERVER_ATIME > time;
836 $METASERVER_ATIME = time + 60; 856 $METASERVER_ATIME = time + 60;
837 857
838 my $table = $METASERVER->{table}; 858 my $table = $METASERVER->{table};
839 $table->clear; 859 $table->clear;
840 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 861
842 my $buf; 862 my $buf;
843 863
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
845 865
… …
868 "The time this server has been running without being restarted.", 888 "The time this server has been running without being restarted.",
869 "The server software version - a '+' indicates a Crossfire+ server.", 889 "The server software version - a '+' indicates a Crossfire+ server.",
870 "Short information about this server provided by its admins.", 890 "Short information about this server provided by its admins.",
871 ); 891 );
872 my @col = qw(#Users Host Uptime Version Description); 892 my @col = qw(#Users Host Uptime Version Description);
873 $table->add ($_, 0, new CFClient::UI::Label 893 $table->add ($_, 0, new CFPlus::UI::Label
874 can_hover => 1, can_events => 1, 894 can_hover => 1, can_events => 1,
875 align => 0, fg => [1, 1, 0], 895 align => 0, fg => [1, 1, 0],
876 text => $col[$_], tooltip => $tip[$_]) 896 text => $col[$_], tooltip => $tip[$_])
877 for 0 .. $#col; 897 for 0 .. $#col;
878 898
… …
899 919
900 $m = [$users, $host, $uptime, $version, $desc]; 920 $m = [$users, $host, $uptime, $version, $desc];
901 921
902 $y++; 922 $y++;
903 923
904 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 924 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
905 (new CFClient::UI::Button 925 (new CFPlus::UI::Button
906 text => "Use", 926 text => "Use",
907 tooltip => "Put this server into the <b>Host:Port</b> field", 927 tooltip => "Put this server into the <b>Host:Port</b> field",
908 on_activate => sub { 928 on_activate => sub {
909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 929 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
910 $METASERVER->hide; 930 $METASERVER->hide;
911 0 931 0
912 }, 932 },
913 ), 933 ),
914 (new CFClient::UI::Empty expand => 1), 934 (new CFPlus::UI::Empty expand => 1),
915 ]); 935 ]);
916 936
917 $table->add ($_, $y, new CFClient::UI::Label 937 $table->add ($_, $y, new CFPlus::UI::Label
918 ellipsise => 0, 938 ellipsise => 0,
919 align => $align[$_], 939 align => $align[$_],
920 text => $m->[$_], 940 text => $m->[$_],
921 tooltip => $tip[$_], 941 tooltip => $tip[$_],
922 can_hover => 1, 942 can_hover => 1,
… …
927 } 947 }
928 }); 948 });
929} 949}
930 950
931sub metaserver_dialog { 951sub metaserver_dialog {
932 my $vbox = new CFClient::UI::VBox; 952 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFClient::UI::Table; 953 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 954 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 955
936 my $dialog = new CFClient::UI::FancyFrame 956 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 957 title => "Server List",
938 name => 'metaserver_dialog', 958 name => 'metaserver_dialog',
939 x => 'center', 959 x => 'center',
940 y => 'center', 960 y => 'center',
941 z => 3, 961 z => 3,
… …
951 971
952 $dialog 972 $dialog
953} 973}
954 974
955sub server_setup { 975sub server_setup {
956 my $vbox = new CFClient::UI::VBox; 976 my $vbox = new CFPlus::UI::VBox;
957 977
978 $vbox->add (new CFPlus::UI::FancyFrame
979 label => "Connection Settings",
958 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 980 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
981 );
959 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 982 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 983
961 { 984 {
962 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 985 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 986
964 $vbox->add ( 987 $vbox->add (
965 $HOST_ENTRY = new CFClient::UI::Entry 988 $HOST_ENTRY = new CFPlus::UI::Entry
966 expand => 1, 989 expand => 1,
967 text => $CFG->{profile}{default}{host}, 990 text => $CFG->{profile}{default}{host},
968 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 991 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
969 on_changed => sub { 992 on_changed => sub {
970 my ($self, $value) = @_; 993 my ($self, $value) = @_;
971 $CFG->{profile}{default}{host} = $value; 994 $CFG->{profile}{default}{host} = $value;
972 0 995 0
973 } 996 }
974 ); 997 );
975 998
976 $vbox->add (new CFClient::UI::Button 999 $vbox->add (new CFPlus::UI::Button
977 expand => 1, 1000 expand => 1,
978 text => "Server List", 1001 text => "Server List",
979 other => $METASERVER, 1002 other => $METASERVER,
980 tooltip => "Show a list of available crossfire servers", 1003 tooltip => "Show a list of available crossfire servers",
981 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1004 on_activate => sub { $METASERVER->toggle_visibility; 0 },
982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1005 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
983 ); 1006 );
984 } 1007 }
985 1008
986 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1009 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
987 $table->add (1, 4, new CFClient::UI::Entry 1010 $table->add (1, 4, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{user}, 1011 text => $CFG->{profile}{default}{user},
989 tooltip => "The name of your character on the server", 1012 tooltip => "The name of your character on the server",
990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
991 ); 1014 );
992 1015
993 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1016 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
994 $table->add (1, 5, new CFClient::UI::Entry 1017 $table->add (1, 5, new CFPlus::UI::Entry
995 text => $CFG->{profile}{default}{password}, 1018 text => $CFG->{profile}{default}{password},
996 hidden => 1, 1019 hidden => 1,
997 tooltip => "The password for your character", 1020 tooltip => "The password for your character",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1021 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
999 ); 1022 );
1000 1023
1001 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1024 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1002 $table->add (1, 7, new CFClient::UI::Slider 1025 $table->add (1, 7, new CFPlus::UI::Slider
1003 force_w => 100, 1026 force_w => 100,
1004 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1027 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1005 tooltip => "This is the size of the portion of the map update the server sends you. " 1028 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, " 1029 . "If you set this to a high value you will be able to see further, "
1007 . "but you also increase bandwidth requirements and latency. " 1030 . "but you also increase bandwidth requirements and latency. "
1008 . "This option is only used once at log-in.", 1031 . "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 }, 1032 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1010 ); 1033 );
1011 1034
1012 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1035 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1013 $table->add (1, 8, new CFClient::UI::CheckBox 1036 $table->add (1, 8, new CFPlus::UI::CheckBox
1014 state => $CFG->{face_prefetch}, 1037 state => $CFG->{face_prefetch},
1015 tooltip => "<b>Background Image Prefetch</b>\n\n" 1038 tooltip => "<b>Background Image Prefetch</b>\n\n"
1016 . "If enabled, the client automatically pre-fetches images from the server. " 1039 . "If enabled, the client automatically pre-fetches images from the server. "
1017 . "This might increase or create lag, but increases the chances " 1040 . "This might increase or create lag, but increases the chances "
1018 . "of faces being ready for display when you encounter them. " 1041 . "of faces being ready for display when you encounter them. "
… …
1020 . "so only set it if you really need to prefetch images. " 1043 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1044 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1045 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1046 );
1024 1047
1025 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1048 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1026 $table->add (1, 9, new CFClient::UI::Entry 1049 $table->add (1, 9, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1050 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.", 1051 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 }, 1052 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1053 );
1031 1054
1032 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1055 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFClient::UI::Entry 1056 $table->add (1, 10, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1057 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.", 1058 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 }, 1059 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1060 );
1038 1061
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1062 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1063 expand => 1,
1041 align => 0, 1064 align => 0,
1042 text => "Login", 1065 text => "Login",
1043 on_activate => sub { 1066 on_activate => sub {
1044 $CONN ? stop_game 1067 $CONN ? stop_game
1045 : start_game; 1068 : start_game;
1046 0 1069 0
1047 }, 1070 },
1048 ); 1071 );
1049 1072
1050 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1073 $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 1074 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1075 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. " 1076 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. " 1077 . "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.", 1078 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1079 on_changed => sub {
1057 my ($self, $value) = @_; 1080 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1081 $CFG->{say_command} = $value;
1059 0 1082 0
1060 } 1083 }
1061 ); 1084 );
1062 1085
1086 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1087 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1088 state => $CFG->{show_tips},
1089 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1090 on_changed => sub {
1091 my ($self, $value) = @_;
1092 $CFG->{show_tips} = $value;
1093 0
1094 }
1095 );
1096
1063 $vbox->add (new CFClient::UI::Label 1097 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1098 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); 1099 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1100 );
1071 1101
1072 $vbox 1102 $vbox
1073} 1103}
1074 1104
1075sub message_window { 1105sub message_window {
1076 my $window = new CFClient::UI::FancyFrame 1106 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1107 name => "message_window",
1078 title => "Messages", 1108 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1109 border_bg => [1, 1, 1, 1],
1080 x => "max", 1110 x => "max",
1081 y => 0, 1111 y => 0,
1082 force_w => $::WIDTH * 0.4, 1112 force_w => $::WIDTH * 0.4,
1083 force_h => $::HEIGHT * 0.5, 1113 force_h => $::HEIGHT * 0.5,
1084 child => (my $vbox = new CFClient::UI::VBox), 1114 child => (my $vbox = new CFPlus::UI::VBox),
1085 has_close_button => 1; 1115 has_close_button => 1;
1086 1116
1087 $vbox->add ($LOGVIEW); 1117 $vbox->add ($LOGVIEW);
1088 1118
1089 $vbox->add (my $input = new CFClient::UI::Entry 1119 $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> " 1120 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>...). " 1121 . "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). " 1122 . "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.", 1123 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1094 on_focus_in => sub { 1124 on_focus_in => sub {
… …
1133 }; 1163 };
1134 1164
1135 $window 1165 $window
1136} 1166}
1137 1167
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 { 1168sub autopickup_setup {
1176 my $table = new CFClient::UI::Table; 1169 my $table = new CFPlus::UI::Table;
1177 1170
1178 for ( 1171 for (
1179 ["General", 0, 0, 1172 ["General", 0, 0,
1180 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1173 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1181 ["Inhibit autopickup" => PICKUP_INHIBIT], 1174 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1215 ], 1208 ],
1216 ["Weight/Value ratio", 2, 17] 1209 ["Weight/Value ratio", 2, 17]
1217 ) 1210 )
1218 { 1211 {
1219 my ($title, $x, $y, @bits) = @$_; 1212 my ($title, $x, $y, @bits) = @$_;
1220 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1213 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1221 1214
1222 for (@bits) { 1215 for (@bits) {
1223 ++$y; 1216 ++$y;
1224 1217
1225 my $mask = $_->[1]; 1218 my $mask = $_->[1];
1226 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1219 $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 1220 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1228 state => $::CFG->{pickup} & $mask, 1221 state => $::CFG->{pickup} & $mask,
1229 on_changed => sub { 1222 on_changed => sub {
1230 my ($box, $value) = @_; 1223 my ($box, $value) = @_;
1231 1224
1232 if ($value) { 1225 if ($value) {
… …
1243 1236
1244 ${$_->[2]} = $checkbox if $_->[2]; 1237 ${$_->[2]} = $checkbox if $_->[2];
1245 } 1238 }
1246 } 1239 }
1247 1240
1248 $table->add (2, 18, new CFClient::UI::ValSlider 1241 $table->add (2, 18, new CFPlus::UI::ValSlider
1249 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1242 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250 template => ">= 99", 1243 template => ">= 99",
1251 to_value => sub { ">= " . 5 * $_[0] }, 1244 to_value => sub { ">= " . 5 * $_[0] },
1252 on_changed => sub { 1245 on_changed => sub {
1253 my ($slider, $value) = @_; 1246 my ($slider, $value) = @_;
… …
1256 $::CFG->{pickup} |= int $value 1249 $::CFG->{pickup} |= int $value
1257 if $value; 1250 if $value;
1258 1; 1251 1;
1259 }); 1252 });
1260 1253
1261 $table->add (3, 18, new CFClient::UI::Button 1254 $table->add (3, 18, new CFPlus::UI::Button
1262 text => "set", 1255 text => "set",
1263 on_activate => sub { 1256 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1257 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1258 if defined $::CONN;
1266 0 1259 0
… …
1281 or $a->{type} <=> $b->{type} 1274 or $a->{type} <=> $b->{type}
1282 } @_ }, 1275 } @_ },
1283); 1276);
1284 1277
1285sub inventory_widget { 1278sub inventory_widget {
1286 my $hb = new CFClient::UI::HBox homogeneous => 1; 1279 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1287 1280
1288 $hb->add (my $vb1 = new CFClient::UI::VBox); 1281 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1289 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1282 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1290 1283
1291 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1284 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1292 1285
1293 use sort 'stable'; 1286 use sort 'stable';
1294 1287
1295 $hb1->add (new CFClient::UI::Selector 1288 $hb1->add (new CFPlus::UI::Selector
1296 value => $::CFG->{inv_sort}, 1289 value => $::CFG->{inv_sort},
1297 options => [ 1290 options => [
1298 [type => "Type/Name"], 1291 [type => "Type/Name"],
1299 [mtime => "Recent/Normal/Locked"], 1292 [mtime => "Recent/Normal/Locked"],
1300 [weight => "Weight/Type"], 1293 [weight => "Weight/Type"],
… …
1302 on_changed => sub { 1295 on_changed => sub {
1303 $::CFG->{inv_sort} = $_[1]; 1296 $::CFG->{inv_sort} = $_[1];
1304 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1297 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1305 }, 1298 },
1306 ); 1299 );
1307 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1300 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1308 #TODO# update to weigh/maxweight 1301 #TODO# update to weigh/maxweight
1309 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1310 1303
1311 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1312 $sw1->add ($INV = new CFClient::UI::Inventory); 1305 $sw1->add ($INV = new CFPlus::UI::Inventory);
1313 1306
1314 $hb->add (my $vb2 = new CFClient::UI::VBox); 1307 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1315 1308
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1317 1310
1318 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1311 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1319 $sw2->add ($INVR = new CFClient::UI::Inventory); 1312 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1320 1313
1321 # XXX: Call after $INVR = ... because set_opencont sets the items 1314 # XXX: Call after $INVR = ... because set_opencont sets the items
1322 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1315 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1323 1316
1324 $hb 1317 $hb
1325} 1318}
1326 1319
1327sub toggle_player_page { 1320sub toggle_player_page {
… …
1334 $PL_WINDOW->show; 1327 $PL_WINDOW->show;
1335 } 1328 }
1336} 1329}
1337 1330
1338sub player_window { 1331sub player_window {
1339 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1332 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1340 x => "center", 1333 x => "center",
1341 y => "center", 1334 y => "center",
1342 force_w => $WIDTH * 9/10, 1335 force_w => $WIDTH * 9/10,
1343 force_h => $HEIGHT * 9/10, 1336 force_h => $HEIGHT * 9/10,
1344 title => "Player", 1337 title => "Player",
… …
1346 has_close_button => 1 1339 has_close_button => 1
1347 ; 1340 ;
1348 1341
1349 my $ntb = 1342 my $ntb =
1350 $PL_NOTEBOOK = 1343 $PL_NOTEBOOK =
1351 new CFClient::UI::Notebook expand => 1, debug => 1; 1344 new CFPlus::UI::Notebook expand => 1, debug => 1;
1352 1345
1353 $ntb->add ( 1346 $ntb->add (
1354 "Statistics (F2)" => $STATS_PAGE = stats_window, 1347 "Statistics (F2)" => $STATS_PAGE = stats_window,
1355 "Shows statistics, where all your Stats and Resistances are shown." 1348 "Shows statistics, where all your Stats and Resistances are shown."
1356 ); 1349 );
1357 $ntb->add ( 1350 $ntb->add (
1358 "Skills (F3)" => $SKILL_PAGE = skill_window, 1351 "Skills (F3)" => $SKILL_PAGE = skill_window,
1359 "Shows all your Skills." 1352 "Shows all your Skills."
1360 ); 1353 );
1361 1354
1362 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1363 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1364 $ntb->add ( 1357 $ntb->add (
1365 "Spellbook (F4)" => $spellsw, 1358 "Spellbook (F4)" => $spellsw,
1366 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1359 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1367 ); 1360 );
1368 $ntb->add ( 1361 $ntb->add (
… …
1380sub update_bindings { 1373sub update_bindings {
1381 $BIND_UPD_CB->() if $BIND_UPD_CB; 1374 $BIND_UPD_CB->() if $BIND_UPD_CB;
1382} 1375}
1383 1376
1384sub keyboard_setup { 1377sub keyboard_setup {
1385 my $binding_list = new CFClient::UI::VBox; 1378 my $binding_list = new CFPlus::UI::VBox;
1386 1379
1387 my $refresh; 1380 my $refresh;
1388 $refresh = $BIND_UPD_CB = sub { 1381 $refresh = $BIND_UPD_CB = sub {
1389 $binding_list->clear (); 1382 $binding_list->clear ();
1390 1383
1384 return unless $PROFILE;
1385
1391 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1386 for my $mod (keys %{$PROFILE->{bindings}}) {
1392 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1387 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1393 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1388 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1394 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1389 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1395 1390
1396 my $lbl = join "; ", @$cmds; 1391 my $lbl = join "; ", @$cmds;
1397 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1392 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1398 $binding_list->add (my $hb = new CFClient::UI::HBox); 1393 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1399 $hb->add (new CFClient::UI::Button 1394 $hb->add (new CFPlus::UI::Button
1400 text => "delete", 1395 text => "delete",
1401 tooltip => "Deletes the binding", 1396 tooltip => "Deletes the binding",
1402 on_activate => sub { 1397 on_activate => sub {
1403 $binding_list->remove ($hb); 1398 $binding_list->remove ($hb);
1404 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1399 delete $PROFILE->{bindings}{$mod}{$sym};
1405 0 1400 0
1406 }); 1401 });
1407 1402
1408 $hb->add (new CFClient::UI::Button 1403 $hb->add (new CFPlus::UI::Button
1409 text => "edit", 1404 text => "edit",
1410 tooltip => "Edits the binding", 1405 tooltip => "Edits the binding",
1411 on_activate => sub { 1406 on_activate => sub {
1412 $::BIND_EDITOR->set_binding ( 1407 $::BIND_EDITOR->set_binding (
1413 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1408 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1414 sub { 1409 sub {
1415 my ($nmod, $nsym, $ncmds) = @_; 1410 my ($nmod, $nsym, $ncmds) = @_;
1416 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1411 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1417 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1412 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1418 $refresh->(); 1413 $refresh->();
… …
1426 $::BIND_EDITOR->show; 1421 $::BIND_EDITOR->show;
1427 $SETUP_DIALOG->hide; 1422 $SETUP_DIALOG->hide;
1428 0 1423 0
1429 }); 1424 });
1430 1425
1431 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1426 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1432 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1427 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1433 } 1428 }
1434 } 1429 }
1435 }; 1430 };
1436 1431
1437 my $vb = new CFClient::UI::VBox; 1432 my $vb = new CFPlus::UI::VBox;
1438 $vb->add (my $hb = new CFClient::UI::HBox); 1433 $vb->add (new CFPlus::UI::FancyFrame
1434 label => "Options",
1435 child => (my $hb = new CFPlus::UI::HBox),
1436 );
1439 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1437 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1440 $hb->add (new CFClient::UI::CheckBox 1438 $hb->add (new CFPlus::UI::CheckBox
1441 expand => 1, 1439 expand => 1,
1442 state => $CFG->{shift_fire_stop}, 1440 state => $CFG->{shift_fire_stop},
1443 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1441 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1444 on_changed => sub { 1442 on_changed => sub {
1445 my ($cbox, $value) = @_; 1443 my ($cbox, $value) = @_;
1446 $CFG->{shift_fire_stop} = $value; 1444 $CFG->{shift_fire_stop} = $value;
1447 0 1445 0
1448 }); 1446 });
1449 1447
1450 $vb->add ($binding_list); 1448 $vb->add (new CFPlus::UI::FancyFrame
1449 label => "Bindings",
1450 child => $binding_list);
1451 $vb->add (my $hb = new CFClient::UI::HBox); 1451 $vb->add (my $hb = new CFPlus::UI::HBox);
1452 1452
1453 $hb->add (new CFClient::UI::Button 1453 $hb->add (new CFPlus::UI::Button
1454 text => "record new", 1454 text => "record new",
1455 expand => 1, 1455 expand => 1,
1456 tooltip => "This button opens the binding editor with an empty binding.", 1456 tooltip => "This button opens the binding editor with an empty binding.",
1457 on_activate => sub { 1457 on_activate => sub {
1458 $::BIND_EDITOR->set_binding (undef, undef, [], 1458 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1472 $::BIND_EDITOR->show; 1472 $::BIND_EDITOR->show;
1473 0 1473 0
1474 }, 1474 },
1475 ); 1475 );
1476 1476
1477 $hb->add (new CFClient::UI::Button 1477 $hb->add (new CFPlus::UI::Button
1478 text => "close", 1478 text => "close",
1479 tooltip => "Closes the binding window", 1479 tooltip => "Closes the binding window",
1480 expand => 1, 1480 expand => 1,
1481 on_activate => sub { 1481 on_activate => sub {
1482 $SETUP_DIALOG->hide; 1482 $SETUP_DIALOG->hide;
… …
1488 1488
1489 $vb 1489 $vb
1490} 1490}
1491 1491
1492sub help_window { 1492sub help_window {
1493 my $win = new CFClient::UI::FancyFrame 1493 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1494 x => 'center',
1495 y => 'center', 1495 y => 'center',
1496 z => 2, 1496 z => 4,
1497 name => 'doc_browser', 1497 name => 'doc_browser',
1498 force_w => int $WIDTH * 7/8, 1498 force_w => int $WIDTH * 7/8,
1499 force_h => int $HEIGHT * 7/8, 1499 force_h => int $HEIGHT * 7/8,
1500 title => "Help Browser", 1500 title => "Help Browser",
1501 has_close_button => 1; 1501 has_close_button => 1;
1502 1502
1503 $win->add (my $vbox = new CFClient::UI::VBox); 1503 $win->add (my $vbox = new CFPlus::UI::VBox);
1504 1504
1505 $vbox->add (my $buttons = new CFClient::UI::HBox); 1505 $vbox->add (new CFPlus::UI::FancyFrame
1506 label => "Navigation",
1507 child => (my $buttons = new CFPlus::UI::HBox),
1508 );
1506 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1509 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1507 expand => 1, fontsize => 0.8, padding_x => 4); 1510 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1508 1511
1509 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1512 my @history;
1510 $buttons->add (my $combo = new CFClient::UI::Selector 1513 my @future;
1511 value => undef, 1514 my $curnode;
1512 options => [ 1515
1513 [intro => "Introduction"], 1516 my $load_node; $load_node = sub {
1514 [manual => "Main Manual"], 1517 my ($node, $para) = @_;
1515 [skill_help => "Skill Reference"], 1518
1516 [command_help => "Command Reference"], 1519 $buttons->clear;
1517 [dmcommand_help => "DM Commands"], 1520
1518 [COPYING => "License Terms"], 1521 $buttons->add (new CFPlus::UI::Button
1522 text => "⇤",
1523 tooltip => "back to the starting page",
1524 on_activate => sub {
1525 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1526 unshift @future, @history;
1527 @history = ();
1528 $load_node->(@{shift @future});
1529 },
1530 );
1531
1532 if (@history) {
1533 $buttons->add (new CFPlus::UI::Button
1534 text => "⋘",
1535 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1536 on_activate => sub {
1537 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1538 $load_node->(@{pop @history});
1539 },
1540 );
1519 ], 1541 }
1520 on_changed => sub {
1521 my ($self, $pod) = @_;
1522 1542
1543 if (@future) {
1544 $buttons->add (new CFPlus::UI::Button
1545 text => "⋙",
1546 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1547 on_activate => sub {
1548 push @history, [$curnode, $viewer->current_paragraph];
1549 $load_node->(@{shift @future});
1550 },
1551 );
1552 }
1553
1554 $buttons->add (new CFPlus::UI::Label text => " ");
1555
1556 my @path = CFPlus::Pod::full_path_of $node;
1557 pop @path; # drop current node
1558
1559 for my $node (@path) {
1560 $buttons->add (new CFPlus::UI::Button
1561 text => $node->{kw}[0],
1562 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1563 on_activate => sub {
1564 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1565 $load_node->($node);
1566 },
1567 );
1568 $buttons->add (new CFPlus::UI::Label text => "/");
1569 }
1570
1571 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1572
1573 $curnode = $node;
1574
1523 $viewer->clear; 1575 $viewer->clear;
1524 $viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod }); 1576 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1525 $viewer->set_offset (0); 1577 $viewer->scroll_to ($para);
1578 };
1526 1579
1580 $load_node->(CFPlus::Pod::find pod => "mainpage");
1581
1582 $CFPlus::Pod::goto_document = sub {
1583 my (@path) = @_;
1584
1585 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1586
1587 $load_node->((CFPlus::Pod::find @path)[0]);
1588 $win->show;
1589 };
1590
1591 $win
1592}
1593
1594sub open_string_query {
1595 my ($title, $cb, $txt, $tooltip) = @_;
1596 my $dialog = new CFPlus::UI::Toplevel
1597 x => "center",
1598 y => "center",
1599 z => 50,
1600 force_w => $WIDTH * 4/5,
1601 title => $title;
1602
1603 $dialog->add (
1604 my $e = new CFPlus::UI::Entry
1605 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1606 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1607 tooltip => $tooltip
1608 );
1609
1610 $e->grab_focus;
1611 $e->set_text ($txt) if $txt;
1612 $dialog->show;
1613}
1614
1615sub open_quit_dialog {
1616 unless ($QUIT_DIALOG) {
1617 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1618 x => "center",
1619 y => "center",
1620 z => 50,
1621 title => "Really Quit?",
1622 on_key_down => sub {
1623 my ($dialog, $ev) = @_;
1624 $ev->{sym} == 27 and $dialog->hide;
1527 0 1625 }
1626 ;
1627
1628 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1629
1630 $vb->add (new CFPlus::UI::Label
1631 text => "You should find a savebed and apply it first!",
1632 max_w => $WIDTH * 0.25,
1633 ellipsize => 0,
1634 );
1635 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1636 $hb->add (new CFPlus::UI::Button
1637 text => "Ok",
1638 expand => 1,
1639 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1640 );
1641 $hb->add (new CFPlus::UI::Button
1642 text => "Quit anyway",
1643 expand => 1,
1644 on_activate => sub { exit },
1645 );
1646 }
1647
1648 $QUIT_DIALOG->show;
1649 $QUIT_DIALOG->grab_focus;
1650}
1651
1652sub show_tip_of_the_day {
1653 # find all tips
1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1655
1656 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1657 $todindex = 0 if $todindex >= @tod;
1658 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1659
1660 # create dialog
1661 my $dialog;
1662
1663 my $close = sub {
1664 $dialog->destroy;
1665 };
1666
1667 $dialog = new CFPlus::UI::Toplevel
1668 x => "center",
1669 y => "center",
1670 z => 3,
1671 name => 'tip_of_the_day',
1672 force_w => int $WIDTH * 4/9,
1673 force_h => int $WIDTH * 2/9,
1674 title => "Tip of the day #" . (1 + $todindex),
1675 child => my $vbox = new CFPlus::UI::VBox,
1676 has_close_button => 1,
1677 on_delete => $close,
1678 ;
1679
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683
1684 $vbox->add (my $table = new CFPlus::UI::Table);
1685
1686 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close",
1688 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>.",
1689 on_activate => $close,
1690 );
1691
1692 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub {
1696 $close->();
1697 &show_tip_of_the_day;
1528 }, 1698 },
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 ); 1699 );
1537 1700
1538 $win 1701 $dialog->show;
1539} 1702}
1540 1703
1541sub sdl_init { 1704sub sdl_init {
1542 CFClient::SDL_Init 1705 CFPlus::SDL_Init
1543 and die "SDL::Init failed!\n"; 1706 and die "SDL::Init failed!\n";
1544} 1707}
1545 1708
1546sub video_init { 1709sub video_init {
1547 sdl_init; 1710 sdl_init;
… …
1552 1715
1553 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1716 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1554 $FULLSCREEN = $CFG->{fullscreen}; 1717 $FULLSCREEN = $CFG->{fullscreen};
1555 $FAST = $CFG->{fast}; 1718 $FAST = $CFG->{fast};
1556 1719
1557 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1720 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1558 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1721 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1559 1722
1560 $SDL_ACTIVE = 1; 1723 $SDL_ACTIVE = 1;
1561 $LAST_REFRESH = time - 0.01; 1724 $LAST_REFRESH = time - 0.01;
1562 1725
1563 CFClient::OpenGL::init; 1726 CFPlus::OpenGL::init;
1564 1727
1565 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1728 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1566 1729
1567 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1730 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1568 1731
1569 ############################################################################# 1732 #############################################################################
1570 1733
1571 if ($DEBUG_STATUS) { 1734 if ($DEBUG_STATUS) {
1572 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1735 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1573 } else { 1736 } else {
1574 # create the widgets 1737 # create the widgets
1575 1738
1576 $DEBUG_STATUS = new CFClient::UI::Label 1739 $DEBUG_STATUS = new CFPlus::UI::Label
1577 padding => 0, 1740 padding => 0,
1578 z => 100, 1741 z => 100,
1579 force_x => "max", 1742 force_x => "max",
1580 force_y => 0; 1743 force_y => 0;
1581 $DEBUG_STATUS->show; 1744 $DEBUG_STATUS->show;
1582 1745
1583 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1746 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1584 1747
1585 $STATUSBOX = new CFClient::UI::Statusbox; 1748 $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]); 1749 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1587 1750
1588 (new CFClient::UI::Frame 1751 (new CFPlus::UI::Frame
1589 bg => [0, 0, 0, 0.4], 1752 bg => [0, 0, 0, 0.4],
1590 force_x => 0, 1753 force_x => 0,
1591 force_y => "max", 1754 force_y => "max",
1592 child => $STATUSBOX, 1755 child => $STATUSBOX,
1593 )->show; 1756 )->show;
1594 1757
1595 CFClient::UI::FancyFrame->new ( 1758 CFPlus::UI::Toplevel->new (
1596 title => "Map", 1759 title => "Map",
1597 name => "mapmap", 1760 name => "mapmap",
1598 x => 0, 1761 x => 0,
1599 y => $FONTSIZE + 8, 1762 y => $FONTSIZE + 8,
1600 border_bg => [1, 1, 1, 192/255], 1763 border_bg => [1, 1, 1, 192/255],
1601 bg => [1, 1, 1, 0], 1764 bg => [1, 1, 1, 0],
1602 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1765 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.", 1766 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1604 ), 1767 ),
1605 )->show; 1768 )->show;
1606 1769
1607 $MAPWIDGET = new CFClient::MapWidget; 1770 $MAPWIDGET = new CFPlus::MapWidget;
1608 $MAPWIDGET->connect (activate_console => sub { 1771 $MAPWIDGET->connect (activate_console => sub {
1609 my ($mapwidget, $preset) = @_; 1772 my ($mapwidget, $preset) = @_;
1610 1773
1611 if ($CONSOLE) { 1774 if ($CONSOLE) {
1612 $CONSOLE->{input}->{auto_activated} = 1; 1775 $CONSOLE->{input}->{auto_activated} = 1;
… …
1618 } 1781 }
1619 }); 1782 });
1620 $MAPWIDGET->show; 1783 $MAPWIDGET->show;
1621 $MAPWIDGET->grab_focus; 1784 $MAPWIDGET->grab_focus;
1622 1785
1623 $LOGVIEW = new CFClient::UI::TextScroller 1786 $LOGVIEW = new CFPlus::UI::TextScroller
1624 expand => 1, 1787 expand => 1,
1625 font => $FONT_FIXED, 1788 font => $FONT_FIXED,
1626 fontsize => $::CFG->{log_fontsize}, 1789 fontsize => $::CFG->{log_fontsize},
1627 indent => -4, 1790 indent => -4,
1628 can_hover => 1, 1791 can_hover => 1,
1629 can_events => 1, 1792 can_events => 1,
1630 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1793 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1631 ; 1794 ;
1632 1795
1633 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1634 title => "Setup", 1797 title => "Setup",
1635 name => "setup_dialog", 1798 name => "setup_dialog",
1636 x => 'center', 1799 x => 'center',
1637 y => 'center', 1800 y => 'center',
1638 z => 2, 1801 z => 2,
… …
1641 has_close_button => 1, 1804 has_close_button => 1,
1642 ; 1805 ;
1643 1806
1644 $METASERVER = metaserver_dialog; 1807 $METASERVER = metaserver_dialog;
1645 1808
1646 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1647 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1648 1811
1649 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1650 "Configure the server to play on, your username, password and other server-related options."); 1813 "Configure the server to play on, your username, password and other server-related options.");
1651 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1814 $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."); 1815 "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 " 1825 . "After pressing the combo the binding will be saved automatically and the "
1663 . "binding editor closes"); 1826 . "binding editor closes");
1664 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1827 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1665 "Some debuggin' options. Do not ask."); 1828 "Some debuggin' options. Do not ask.");
1666 1829
1667 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1830 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1668 1831
1669 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1832 $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."); 1833 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1671 1834
1672 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1835 $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."); 1836 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1674 1837
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 1838 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 1839
1677 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1840 $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."); 1841 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1679 1842
1680 $BUTTONBAR->add (new CFClient::UI::Button 1843 $BUTTONBAR->add (new CFPlus::UI::Button
1681 text => "Save Config", 1844 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.", 1845 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 { 1846 on_activate => sub {
1684 $::CFG->{layout} = CFClient::UI::get_layout; 1847 $::CFG->{layout} = CFPlus::UI::get_layout;
1685 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1848 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1686 status "Configuration Saved"; 1849 status "Configuration Saved";
1687 0 1850 0
1688 }, 1851 },
1689 ); 1852 );
1690 1853
1691 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1692 tooltip => "View Documentation"); 1855 tooltip => "View Documentation");
1693 1856
1694 $BUTTONBAR->add (new CFClient::UI::Button 1857 $BUTTONBAR->add (new CFPlus::UI::Button
1695 text => "Quit", 1858 text => "Quit",
1696 tooltip => "Terminates the program", 1859 tooltip => "Terminates the program",
1697 on_activate => sub { 1860 on_activate => sub {
1698 if ($CONN) { 1861 if ($CONN) {
1699 open_quit_dialog; 1862 open_quit_dialog;
… …
1710 1873
1711 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1712} 1875}
1713 1876
1714sub video_shutdown { 1877sub video_shutdown {
1715 CFClient::OpenGL::shutdown; 1878 CFPlus::OpenGL::shutdown;
1716 1879
1717 undef $SDL_ACTIVE; 1880 undef $SDL_ACTIVE;
1718} 1881}
1719 1882
1720my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1883my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1728 1891
1729sub audio_music_finished { 1892sub audio_music_finished {
1730 return unless $CFG->{bgm_enable}; 1893 return unless $CFG->{bgm_enable};
1731 1894
1732 # TODO: hack, do play loop and mood music 1895 # TODO: hack, do play loop and mood music
1733 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1896 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1734 $bgmusic->play (0); 1897 $bgmusic->play (0);
1735 1898
1736 push @bgmusic, shift @bgmusic; 1899 push @bgmusic, shift @bgmusic;
1737} 1900}
1738 1901
1739sub audio_init { 1902sub audio_init {
1740 if ($CFG->{audio_enable}) { 1903 if ($CFG->{audio_enable}) {
1741 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1904 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1742 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1905 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1743 1906
1744 unless ($SDL_MIXER) { 1907 unless ($SDL_MIXER) {
1745 status "Unable to open sound device: there will be no sound"; 1908 status "Unable to open sound device: there will be no sound";
1746 return; 1909 return;
1747 } 1910 }
1748 1911
1749 CFClient::Mix_AllocateChannels 8; 1912 CFPlus::Mix_AllocateChannels 8;
1750 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1751 1914
1752 audio_music_finished; 1915 audio_music_finished;
1753 1916
1754 while (<$fh>) { 1917 while (<$fh>) {
1755 next if /^\s*#/; 1918 next if /^\s*#/;
… …
1758 my ($file, $volume, $event) = split /\s+/, $_, 3; 1921 my ($file, $volume, $event) = split /\s+/, $_, 3;
1759 1922
1760 push @SOUNDS, "$volume,$file"; 1923 push @SOUNDS, "$volume,$file";
1761 1924
1762 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1925 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1763 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1926 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1764 $chunk->volume ($volume * 128 / 100); 1927 $chunk->volume ($volume * 128 / 100);
1765 $chunk 1928 $chunk
1766 }; 1929 };
1767 } 1930 }
1768 } else { 1931 } else {
… …
1770 } 1933 }
1771 } 1934 }
1772} 1935}
1773 1936
1774sub audio_shutdown { 1937sub audio_shutdown {
1775 CFClient::Mix_CloseAudio if $SDL_MIXER; 1938 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1776 undef $SDL_MIXER; 1939 undef $SDL_MIXER;
1777 @SOUNDS = (); 1940 @SOUNDS = ();
1778 %AUDIO_CHUNKS = (); 1941 %AUDIO_CHUNKS = ();
1779} 1942}
1780 1943
… …
1787 1950
1788sub force_refresh { 1951sub force_refresh {
1789 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1952 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1790 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1953 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1791 1954
1792 $CFClient::UI::ROOT->draw; 1955 $CFPlus::UI::ROOT->draw;
1793 1956
1794 $WANT_REFRESH = 0; 1957 $WANT_REFRESH = 0;
1795 $CAN_REFRESH = 0; 1958 $CAN_REFRESH = 0;
1796 $LAST_REFRESH = $NOW; 1959 $LAST_REFRESH = $NOW;
1797 1960
1798 CFClient::SDL_GL_SwapBuffers; 1961 CFPlus::SDL_GL_SwapBuffers;
1799} 1962}
1800 1963
1801my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1964my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1802 $NOW = time; 1965 $NOW = time;
1803 1966
1804 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1967 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1805 for CFClient::SDL_PollEvent; 1968 for CFPlus::SDL_PollEvent;
1806 1969
1807 if (%animate_object) { 1970 if (%animate_object) {
1808 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1971 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1809 $WANT_REFRESH++; 1972 $WANT_REFRESH++;
1810 } 1973 }
… …
1834 $CONN->face_prefetch 1997 $CONN->face_prefetch
1835 if $CONN; 1998 if $CONN;
1836}); 1999});
1837 2000
1838%SDL_CB = ( 2001%SDL_CB = (
1839 CFClient::SDL_QUIT => sub { 2002 CFPlus::SDL_QUIT => sub {
1840 Event::unloop -1; 2003 Event::unloop -1;
1841 }, 2004 },
1842 CFClient::SDL_VIDEORESIZE => sub { 2005 CFPlus::SDL_VIDEORESIZE => sub {
1843 }, 2006 },
1844 CFClient::SDL_VIDEOEXPOSE => sub { 2007 CFPlus::SDL_VIDEOEXPOSE => sub {
1845 CFClient::UI::full_refresh; 2008 CFPlus::UI::full_refresh;
1846 }, 2009 },
1847 CFClient::SDL_ACTIVEEVENT => sub { 2010 CFPlus::SDL_ACTIVEEVENT => sub {
1848# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2011# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1849 }, 2012 },
1850 CFClient::SDL_KEYDOWN => sub { 2013 CFPlus::SDL_KEYDOWN => sub {
1851 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2014 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1852 # alt-enter 2015 # alt-enter
1853 $FULLSCREEN_ENABLE->toggle; 2016 $FULLSCREEN_ENABLE->toggle;
1854 video_shutdown; 2017 video_shutdown;
1855 video_init; 2018 video_init;
1856 } else { 2019 } else {
1857 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2020 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1858 } 2021 }
1859 }, 2022 },
1860 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2023 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1861 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2024 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1862 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2025 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1863 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2026 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1864 CFClient::SDL_USEREVENT => sub { 2027 CFPlus::SDL_USEREVENT => sub {
1865 if ($_[0]{code} == 1) { 2028 if ($_[0]{code} == 1) {
1866 audio_channel_finished $_[0]{data1}; 2029 audio_channel_finished $_[0]{data1};
1867 } elsif ($_[0]{code} == 0) { 2030 } elsif ($_[0]{code} == 0) {
1868 audio_music_finished; 2031 audio_music_finished;
1869 } 2032 }
… …
1873############################################################################# 2036#############################################################################
1874 2037
1875$SIG{INT} = $SIG{TERM} = sub { exit }; 2038$SIG{INT} = $SIG{TERM} = sub { exit };
1876 2039
1877{ 2040{
1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2041 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1879 CFClient::UI::set_layout ($::CFG->{layout}); 2042 CFPlus::UI::set_layout ($::CFG->{layout});
1880 2043
1881 my %DEF_CFG = ( 2044 my %DEF_CFG = (
1882 sdl_mode => 0, 2045 sdl_mode => 0,
1883 width => 640, 2046 width => 640,
1884 height => 480, 2047 height => 480,
… …
1902 output_sync => 1, 2065 output_sync => 1,
1903 output_count => 1, 2066 output_count => 1,
1904 pickup => 0, 2067 pickup => 0,
1905 inv_sort => "mtime", 2068 inv_sort => "mtime",
1906 default => "profile", # default profile 2069 default => "profile", # default profile
2070 show_tips => 1,
1907 ); 2071 );
1908 2072
1909 while (my ($k, $v) = each %DEF_CFG) { 2073 while (my ($k, $v) = each %DEF_CFG) {
1910 $CFG->{$k} = $v unless exists $CFG->{$k}; 2074 $CFG->{$k} = $v unless exists $CFG->{$k};
1911 } 2075 }
… …
1914 2078
1915 sdl_init; 2079 sdl_init;
1916 2080
1917 @SDL_MODES = reverse 2081 @SDL_MODES = reverse
1918 grep $_->[0] >= 640 && $_->[1] >= 480, 2082 grep $_->[0] >= 640 && $_->[1] >= 480,
1919 CFClient::SDL_ListModes; 2083 CFPlus::SDL_ListModes;
1920 2084
1921 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2085 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1922 2086
1923 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2087 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1924 2088
1925 { 2089 {
1926 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2090 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1927 DejaVuSans.ttf 2091 DejaVuSans.ttf
1928 DejaVuSansMono.ttf 2092 DejaVuSansMono.ttf
1929 DejaVuSans-Bold.ttf 2093 DejaVuSans-Bold.ttf
1930 DejaVuSansMono-Bold.ttf 2094 DejaVuSansMono-Bold.ttf
1931 DejaVuSans-Oblique.ttf 2095 DejaVuSans-Oblique.ttf
1932 DejaVuSansMono-Oblique.ttf 2096 DejaVuSansMono-Oblique.ttf
1933 DejaVuSans-BoldOblique.ttf 2097 DejaVuSans-BoldOblique.ttf
1934 DejaVuSansMono-BoldOblique.ttf 2098 DejaVuSansMono-BoldOblique.ttf
1935 ); 2099 );
1936 2100
1937 CFClient::add_font $_ for @fonts; 2101 CFPlus::add_font $_ for @fonts;
1938 2102
1939 CFClient::pango_init; 2103 CFPlus::pango_init;
1940 2104
1941 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2105 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1942 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2106 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1943 2107
1944 $FONT_PROP->make_default; 2108 $FONT_PROP->make_default;
1945 } 2109 }
1946 2110
1947# compare mono (ft) vs. rgba (cairo) 2111# compare mono (ft) vs. rgba (cairo)
1948# ft - 1.8s, cairo 3s, even in alpha-only mode 2112# ft - 1.8s, cairo 3s, even in alpha-only mode
1949# for my $rgba (0..1) { 2113# for my $rgba (0..1) {
1950# my $t1 = Time::HiRes::time; 2114# my $t1 = Time::HiRes::time;
1951# for (1..1000) { 2115# for (1..1000) {
1952# my $layout = CFClient::Layout->new ($rgba); 2116# my $layout = CFPlus::Layout->new ($rgba);
1953# $layout->set_text ("hallo" x 100); 2117# $layout->set_text ("hallo" x 100);
1954# $layout->render; 2118# $layout->render;
1955# } 2119# }
1956# my $t2 = Time::HiRes::time; 2120# my $t2 = Time::HiRes::time;
1957# warn $t2-$t1; 2121# warn $t2-$t1;
1958# } 2122# }
1959 2123
2124 $startup_done->();
2125
1960 video_init; 2126 video_init;
1961 audio_init; 2127 audio_init;
1962} 2128}
1963 2129
2130show_tip_of_the_day if $CFG->{show_tips};
2131
1964Event::loop; 2132Event::loop;
1965#CFClient::SDL_Quit; 2133#CFPlus::SDL_Quit;
1966#CFClient::_exit 0; 2134#CFPlus::_exit 0;
1967 2135
1968END { CFClient::SDL_Quit } 2136END { CFPlus::SDL_Quit }
1969 2137
1970=head1 NAME 2138=head1 NAME
1971 2139
1972cfplus - A Crossfire+ and Crossfire game client 2140cfplus - A Crossfire+ and Crossfire game client
1973 2141

Diff Legend

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