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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.133 by root, Sun Dec 3 01:03:49 2006 UTC

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

Diff Legend

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