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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines