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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines