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.95 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 2006 UTC

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

Diff Legend

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