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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines