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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.140 by elmex, Sat Dec 16 16:01:09 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::Combobox 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
693 717 $vb->add (new CFPlus::UI::FancyFrame
718 label => "Primary/Secondary Statistics",
694 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 719 child => (my $hb = new CFPlus::UI::HBox expand => 1),
720 );
695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 721 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696 722
697 my $color2 = [1, 1, 0]; 723 my $color2 = [1, 1, 0];
698 724
699 for ( 725 for (
700 [0, 0, st_str => "Str", 30], 726 [0, 0, st_str => "Str", 30],
712 [2, 4, st_spd => "Spd", 10.54], 738 [2, 4, st_spd => "Spd", 10.54],
713 [2, 5, st_wspd => "WSp", 10.54], 739 [2, 5, st_wspd => "WSp", 10.54],
714 ) { 740 ) {
715 my ($col, $row, $id, $label, $template) = @$_; 741 my ($col, $row, $id, $label, $template) = @$_;
716 742
717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 743 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 744 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 745 align => +1, template => $template, tooltip => "#stat_$label");
720 $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
721 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,
722 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 748 align => -1, text => $label, tooltip => "#stat_$label");
723 } 749 }
724 750
751 $vb->add (new CFPlus::UI::FancyFrame
752 label => "Resistancies",
725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 753 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
754 );
726 755
727 my $row = 0; 756 my $row = 0;
728 my $col = 0; 757 my $col = 0;
729 758
730 my %resist_names = ( 759 my %resist_names = (
769 drain acid pois para deat phys 798 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 799 blind fear tund elec cold ghit/)
771 { 800 {
772 $tbl2->add ($col, $row, 801 $tbl2->add ($col, $row,
773 $STATWIDS->{"res_$_"} = 802 $STATWIDS->{"res_$_"} =
774 new CFClient::UI::Label 803 new CFPlus::UI::Label
775 font => $FONT_FIXED, 804 font => $FONT_FIXED,
776 template => "-100%", 805 template => "-100%",
777 align => +1, 806 align => +1,
778 valign => 0, 807 valign => 0,
779 can_events => 1, 808 can_events => 1,
780 can_hover => 1, 809 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 810 tooltip => $resist_names{$_}->[1],
782 ); 811 );
783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 812 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 813 font => $FONT_FIXED,
785 can_hover => 1, 814 can_hover => 1,
786 can_events => 1, 815 can_events => 1,
787 path => "ui/resist/resist_$_.png", 816 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 817 tooltip => $resist_names{$_}->[1],
789 ); 818 );
790 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 819 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 820 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 821 font => $FONT_FIXED,
793 can_hover => 1, 822 can_hover => 1,
794 can_events => 1, 823 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 824 tooltip => $resist_names{$_}->[1],
806 835
807 $r 836 $r
808} 837}
809 838
810sub skill_window { 839sub skill_window {
811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 840 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812 $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]);
813 $sw 842 $sw
814} 843}
815 844
816sub formsep($) { 845sub formsep($) {
817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 846 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
828 return if $METASERVER_ATIME > time; 857 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 858 $METASERVER_ATIME = time + 60;
830 859
831 my $table = $METASERVER->{table}; 860 my $table = $METASERVER->{table};
832 $table->clear; 861 $table->clear;
833 $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...");
834 863
835 my $buf; 864 my $ok = 0;
836 865
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 866 CFPlus::background {
867 my $ua = CFPlus::lwp_useragent;
838 868
839 unless ($fh) { 869 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 870 } sub {
841 return; 871 my ($msg) = @_;
842 } 872 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 873 $table->clear;
857 874
858 my @tip = ( 875 my @tip = (
859 "The current number of users logged in on the server.", 876 "The current number of users logged in on the server.",
860 "The hostname of the server.", 877 "The hostname of the server.",
861 "The time this server has been running without being restarted.", 878 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 879 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 880 "Short information about this server provided by its admins.",
864 ); 881 );
865 my @col = qw(#Users Host Uptime Version Description); 882 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFClient::UI::Label 883 $table->add ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 884 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 885 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 886 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 887 for 0 .. $#col;
871 888
872 my @align = qw(1 0 1 1 -1); 889 my @align = qw(1 0 1 1 -1);
873 890
874 my $y = 0; 891 my $y = 0;
875 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 ) {
876 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)};
877 901
878 for ($desc) { 902 for ($desc) {
879 s/<br>/\n/gi; 903 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 904 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 905 s/<.*?>//sgi;
882 s/&/&amp;/g; 906 s/&amp;/&/g;
883 s/</&lt;/g; 907 s/&lt;/</g;
884 s/>/&gt;/g; 908 s/&gt;/>/g;
885 } 909 }
886 910
887 $uptime = sprintf "%dd %02d:%02d:%02d", 911 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 912 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 913 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 914 (int $uptime / 60) % 60,
891 $m->[8] % 60; 915 $uptime % 60;
892 916
893 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
894 918
895 $y++; 919 $y++;
896 920
897 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 921 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFClient::UI::Button 922 (new CFPlus::UI::Button
899 text => "Use", 923 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 924 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 925 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 926 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903 $METASERVER->hide; 927 $METASERVER->hide;
904 0 928 0
905 }, 929 },
906 ), 930 ),
907 (new CFClient::UI::Empty expand => 1), 931 (new CFPlus::UI::Empty expand => 1),
908 ]); 932 ]);
909 933
910 $table->add ($_, $y, new CFClient::UI::Label 934 $table->add ($_, $y, new CFPlus::UI::Label
935 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 936 ellipsise => 0,
912 align => $align[$_], 937 align => $align[$_],
913 text => $m->[$_], 938 text => $m->[$_],
914 tooltip => $tip[$_], 939 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 941 can_hover => 1,
916 can_events => 1, 942 can_events => 1,
917 fontsize => 0.8) 943 fontsize => 0.8)
918 for 0 .. $#$m; 944 for 0 .. $#$m;
919 } 945 }
946 } else {
947 $ok or $label->set_text ("error while contacting metaserver");
920 } 948 }
921 }); 949 };
950
922} 951}
923 952
924sub metaserver_dialog { 953sub metaserver_dialog {
925 my $vbox = new CFClient::UI::VBox; 954 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFClient::UI::Table; 955 my $table = new CFPlus::UI::Table;
927 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 956 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928 957
929 my $dialog = new CFClient::UI::FancyFrame 958 my $dialog = new CFPlus::UI::Toplevel
930 title => "Server List", 959 title => "Server List",
931 name => 'metaserver_dialog', 960 name => 'metaserver_dialog',
932 x => 'center', 961 x => 'center',
933 y => 'center', 962 y => 'center',
934 z => 3, 963 z => 3,
964 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 965 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 966 child => $vbox,
937 has_close_button => 1, 967 has_close_button => 1,
938 table => $table, 968 table => $table,
939 on_visibility_change => sub { 969 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 970 update_metaserver ($_[0]) if $_[1];
944 974
945 $dialog 975 $dialog
946} 976}
947 977
948sub server_setup { 978sub server_setup {
949 my $vbox = new CFClient::UI::VBox; 979 my $vbox = new CFPlus::UI::VBox;
950 980
981 $vbox->add (new CFPlus::UI::FancyFrame
982 label => "Connection Settings",
951 $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 );
952 $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");
953 986
954 { 987 {
955 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 988 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956 989
957 $vbox->add ( 990 $vbox->add (
958 $HOST_ENTRY = new CFClient::UI::Entry 991 $HOST_ENTRY = new CFPlus::UI::Entry
959 expand => 1, 992 expand => 1,
960 text => $CFG->{profile}{default}{host}, 993 text => $CFG->{profile}{default}{host},
961 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",
962 on_changed => sub { 995 on_changed => sub {
963 my ($self, $value) = @_; 996 my ($self, $value) = @_;
964 $CFG->{profile}{default}{host} = $value; 997 $CFG->{profile}{default}{host} = $value;
965 0 998 0
966 } 999 }
967 ); 1000 );
968 1001
969 $vbox->add (new CFClient::UI::Button 1002 $vbox->add (new CFPlus::UI::Button
970 expand => 1, 1003 expand => 1,
971 text => "Server List", 1004 text => "Server List",
972 other => $METASERVER, 1005 other => $METASERVER,
973 tooltip => "Show a list of available crossfire servers", 1006 tooltip => "Show a list of available crossfire servers",
974 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1007 on_activate => sub { $METASERVER->toggle_visibility; 0 },
975 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1008 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976 ); 1009 );
977 } 1010 }
978 1011
979 $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");
980 $table->add (1, 4, new CFClient::UI::Entry 1013 $table->add (1, 4, new CFPlus::UI::Entry
981 text => $CFG->{profile}{default}{user}, 1014 text => $CFG->{profile}{default}{user},
982 tooltip => "The name of your character on the server", 1015 tooltip => "The name of your character on the server",
983 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1016 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984 ); 1017 );
985 1018
986 $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");
987 $table->add (1, 5, new CFClient::UI::Entry 1020 $table->add (1, 5, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{password}, 1021 text => $CFG->{profile}{default}{password},
989 hidden => 1, 1022 hidden => 1,
990 tooltip => "The password for your character", 1023 tooltip => "The password for your character",
991 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1024 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992 ); 1025 );
993 1026
994 $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");
995 $table->add (1, 7, new CFClient::UI::Slider 1028 $table->add (1, 7, new CFPlus::UI::Slider
996 force_w => 100, 1029 force_w => 100,
997 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1030 range => [$CFG->{mapsize}, 10, 100, 0, 1],
998 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. "
999 . "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, "
1000 . "but you also increase bandwidth requirements and latency. " 1033 . "but you also increase bandwidth requirements and latency. "
1001 . "This option is only used once at log-in.", 1034 . "This option is only used once at log-in.",
1002 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 },
1003 ); 1036 );
1004 1037
1005 $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");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1039 $table->add (1, 8, new CFPlus::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1040 state => $CFG->{face_prefetch},
1008 tooltip => "<b>Background Image Prefetch</b>\n\n" 1041 tooltip => "<b>Background Image Prefetch</b>\n\n"
1009 . "If enabled, the client automatically pre-fetches images from the server. " 1042 . "If enabled, the client automatically pre-fetches images from the server. "
1010 . "This might increase or create lag, but increases the chances " 1043 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1044 . "of faces being ready for display when you encounter them. "
1013 . "so only set it if you really need to prefetch images. " 1046 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1047 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1048 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1049 );
1017 1050
1018 $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");
1019 $table->add (1, 9, new CFClient::UI::Entry 1052 $table->add (1, 9, new CFPlus::UI::Entry
1020 text => $CFG->{output_count}, 1053 text => $CFG->{output_count},
1021 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.",
1022 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1055 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1056 );
1024 1057
1025 $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");
1026 $table->add (1, 10, new CFClient::UI::Entry 1059 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_sync}, 1060 text => $CFG->{output_sync},
1028 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.",
1029 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1062 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1063 );
1031 1064
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1065 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033 expand => 1, 1066 expand => 1,
1034 align => 0, 1067 align => 0,
1035 text => "Login", 1068 text => "Login",
1036 on_activate => sub { 1069 on_activate => sub {
1037 $CONN ? stop_game 1070 $CONN ? stop_game
1038 : start_game; 1071 : start_game;
1039 0 1072 0
1040 }, 1073 },
1041 ); 1074 );
1042 1075
1043 $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");
1044 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1045 text => $CFG->{say_command}, 1078 text => $CFG->{say_command},
1046 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. "
1047 . "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. "
1048 . "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.",
1049 on_changed => sub { 1082 on_changed => sub {
1050 my ($self, $value) = @_; 1083 my ($self, $value) = @_;
1051 $CFG->{say_command} = $value; 1084 $CFG->{say_command} = $value;
1052 0 1085 0
1053 } 1086 }
1054 ); 1087 );
1055 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
1056 $vbox->add (new CFClient::UI::Label 1100 $vbox->add (new CFPlus::UI::FancyFrame
1057 text => "Server Info", 1101 label => "Server Info",
1058 fontsize => 1.2,
1059 padding_y => 8,
1060 fg => [1, 1, 0, 1],
1061 );
1062
1063 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1102 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1103 );
1064 1104
1065 $vbox 1105 $vbox
1066} 1106}
1067 1107
1068sub message_window { 1108sub message_window {
1069 my $window = new CFClient::UI::FancyFrame 1109 my $window = new CFPlus::UI::Toplevel
1070 name => "message_window", 1110 name => "message_window",
1071 title => "Messages", 1111 title => "Messages",
1072 border_bg => [1, 1, 1, 1], 1112 border_bg => [1, 1, 1, 1],
1073 x => "max", 1113 x => "max",
1074 y => 0, 1114 y => 0,
1075 force_w => $::WIDTH * 0.4, 1115 force_w => $::WIDTH * 0.4,
1076 force_h => $::HEIGHT * 0.5, 1116 force_h => $::HEIGHT * 0.5,
1077 child => (my $vbox = new CFClient::UI::VBox), 1117 child => (my $vbox = new CFPlus::UI::VBox),
1078 has_close_button => 1; 1118 has_close_button => 1;
1079 1119
1080 $vbox->add ($LOGVIEW); 1120 $vbox->add ($LOGVIEW);
1081 1121
1082 $vbox->add (my $input = new CFClient::UI::Entry 1122 $vbox->add (my $input = new CFPlus::UI::Entry
1083 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> "
1084 . "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>...). "
1085 . "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). "
1086 . "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.",
1087 on_focus_in => sub { 1127 on_focus_in => sub {
1126 }; 1166 };
1127 1167
1128 $window 1168 $window
1129} 1169}
1130 1170
1131sub open_quit_dialog {
1132 unless ($QUIT_DIALOG) {
1133 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1134 x => "center",
1135 y => "center",
1136 z => 50,
1137 title => "Really Quit?",
1138 ;
1139
1140 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1141
1142 $vb->add (new CFClient::UI::Label
1143 text => "You should find a savebed and apply it first!",
1144 max_w => $WIDTH * 0.25,
1145 ellipsize => 0,
1146 );
1147 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1148 $hb->add (new CFClient::UI::Button
1149 text => "Ok",
1150 expand => 1,
1151 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1152 );
1153 $hb->add (new CFClient::UI::Button
1154 text => "Quit anyway",
1155 expand => 1,
1156 on_activate => sub { exit },
1157 );
1158 }
1159
1160 $QUIT_DIALOG->show;
1161}
1162
1163sub autopickup_setup { 1171sub autopickup_setup {
1164 my $table = new CFClient::UI::Table; 1172 my $table = new CFPlus::UI::Table;
1165 1173
1166 for ( 1174 for (
1167 ["General", 0, 0, 1175 ["General", 0, 0,
1168 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1176 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1169 ["Inhibit autopickup" => PICKUP_INHIBIT], 1177 ["Inhibit autopickup" => PICKUP_INHIBIT],
1183 ["Boots" => PICKUP_BOOTS], 1191 ["Boots" => PICKUP_BOOTS],
1184 ["Gloves" => PICKUP_GLOVES], 1192 ["Gloves" => PICKUP_GLOVES],
1185 ["Cloaks" => PICKUP_CLOAK], 1193 ["Cloaks" => PICKUP_CLOAK],
1186 ], 1194 ],
1187 1195
1188 ["Readables", 2, 2, 1196 ["Readables", 2, 0,
1189 ["Spellbooks" => PICKUP_SPELLBOOK], 1197 ["Spellbooks" => PICKUP_SPELLBOOK],
1190 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1198 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1191 ["Normal Books/Scrolls" => PICKUP_READABLES], 1199 ["Normal Books/Scrolls" => PICKUP_READABLES],
1192 ], 1200 ],
1193 ["Misc", 2, 7, 1201 ["Misc", 2, 5,
1194 ["Food" => PICKUP_FOOD], 1202 ["Food" => PICKUP_FOOD],
1195 ["Drinks" => PICKUP_DRINK], 1203 ["Drinks" => PICKUP_DRINK],
1196 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1204 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1197 ["Keys" => PICKUP_KEY], 1205 ["Keys" => PICKUP_KEY],
1198 ["Magical Items" => PICKUP_MAGICAL], 1206 ["Magical Items" => PICKUP_MAGICAL],
1199 ["Potions" => PICKUP_POTION], 1207 ["Potions" => PICKUP_POTION],
1200 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1208 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1201 ["Ignore cursed" => PICKUP_NOT_CURSED], 1209 ["Ignore cursed" => PICKUP_NOT_CURSED],
1202 ["Jewelery" => PICKUP_JEWELS], 1210 ["Jewelery" => PICKUP_JEWELS],
1211 ["Flesh" => PICKUP_FLESH],
1203 ], 1212 ],
1204 ["Weight/Value ratio", 2, 17] 1213 ["Weight/Value ratio", 2, 17]
1205 ) 1214 )
1206 { 1215 {
1207 my ($title, $x, $y, @bits) = @$_; 1216 my ($title, $x, $y, @bits) = @$_;
1208 $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]);
1209 1218
1210 for (@bits) { 1219 for (@bits) {
1211 ++$y; 1220 ++$y;
1212 1221
1213 my $mask = $_->[1]; 1222 my $mask = $_->[1];
1214 $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);
1215 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1224 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1216 state => $::CFG->{pickup} & $mask, 1225 state => $::CFG->{pickup} & $mask,
1217 on_changed => sub { 1226 on_changed => sub {
1218 my ($box, $value) = @_; 1227 my ($box, $value) = @_;
1219 1228
1220 if ($value) { 1229 if ($value) {
1231 1240
1232 ${$_->[2]} = $checkbox if $_->[2]; 1241 ${$_->[2]} = $checkbox if $_->[2];
1233 } 1242 }
1234 } 1243 }
1235 1244
1236 $table->add (2, 18, new CFClient::UI::ValSlider 1245 $table->add (2, 18, new CFPlus::UI::ValSlider
1237 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1246 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238 template => ">= 99", 1247 template => ">= 99",
1239 to_value => sub { ">= " . 5 * $_[0] }, 1248 to_value => sub { ">= " . 5 * $_[0] },
1240 on_changed => sub { 1249 on_changed => sub {
1241 my ($slider, $value) = @_; 1250 my ($slider, $value) = @_;
1244 $::CFG->{pickup} |= int $value 1253 $::CFG->{pickup} |= int $value
1245 if $value; 1254 if $value;
1246 1; 1255 1;
1247 }); 1256 });
1248 1257
1249 $table->add (3, 18, new CFClient::UI::Button 1258 $table->add (3, 18, new CFPlus::UI::Button
1250 text => "set", 1259 text => "set",
1251 on_activate => sub { 1260 on_activate => sub {
1252 $::CONN->send_command ("pickup $::CFG->{pickup}") 1261 $::CONN->send_command ("pickup $::CFG->{pickup}")
1253 if defined $::CONN; 1262 if defined $::CONN;
1254 0 1263 0
1255 }); 1264 });
1256 1265
1257 $table 1266 $table
1258} 1267}
1259 1268
1269my %SORT_ORDER = (
1270 type => undef,
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
1277 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1278 or $btime <=> $atime
1279 or $a->{type} <=> $b->{type}
1280 } @_
1281 },
1282 weight => sub { sort {
1283 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1284 or $a->{type} <=> $b->{type}
1285 } @_ },
1286);
1287
1260sub inventory_widget { 1288sub inventory_widget {
1261 my $hb = new CFClient::UI::HBox homogeneous => 1; 1289 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1262 1290
1263 $hb->add (my $vb1 = new CFClient::UI::VBox); 1291 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1264 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1292 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1265 1293
1266 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1294 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1267 1295
1268 use sort 'stable'; 1296 use sort 'stable';
1269 1297
1270 $hb1->add (new CFClient::UI::Combobox 1298 $hb1->add (new CFPlus::UI::Selector
1271 value => undef, 1299 value => $::CFG->{inv_sort},
1272 options => [ 1300 options => [
1273 [undef, "Type/Name"], 1301 [type => "Type/Name"],
1274 [ 1302 [mtime => "Recent/Normal/Locked"],
1275 sub { sort {
1276 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 "Weight/Type", 1303 [weight => "Weight/Type"],
1280 ],
1281 [sub { } => "#TODO#"],
1282 ], 1304 ],
1283 on_changed => sub { 1305 on_changed => sub {
1306 $::CFG->{inv_sort} = $_[1];
1284 $INV->set_sort_order ($_[1]); 1307 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1285 }, 1308 },
1286 ); 1309 );
1287 $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);
1288 #TODO# update to weigh/maxweight 1311 #TODO# update to weigh/maxweight
1289 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1312 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1290 1313
1291 $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);
1292 $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}});
1293 1317
1294 $hb->add (my $vb2 = new CFClient::UI::VBox); 1318 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1295 1319
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1320 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297 1321
1298 $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);
1299 $sw2->add ($INVR = new CFClient::UI::Inventory); 1323 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1300 1324
1301 # XXX: Call after $INVR = ... because set_opencont sets the items 1325 # XXX: Call after $INVR = ... because set_opencont sets the items
1302 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1326 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1303 1327
1304 $hb 1328 $hb
1305} 1329}
1306 1330
1307sub toggle_player_page { 1331sub toggle_player_page {
1314 $PL_WINDOW->show; 1338 $PL_WINDOW->show;
1315 } 1339 }
1316} 1340}
1317 1341
1318sub player_window { 1342sub player_window {
1319 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1343 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1320 x => "center", 1344 x => "center",
1321 y => "center", 1345 y => "center",
1322 force_w => $WIDTH * 9/10, 1346 force_w => $WIDTH * 9/10,
1323 force_h => $HEIGHT * 9/10, 1347 force_h => $HEIGHT * 9/10,
1324 title => "Player", 1348 title => "Player",
1326 has_close_button => 1 1350 has_close_button => 1
1327 ; 1351 ;
1328 1352
1329 my $ntb = 1353 my $ntb =
1330 $PL_NOTEBOOK = 1354 $PL_NOTEBOOK =
1331 new CFClient::UI::Notebook expand => 1, debug => 1; 1355 new CFPlus::UI::Notebook expand => 1, debug => 1;
1332 1356
1333 $ntb->add ( 1357 $ntb->add (
1334 "Statistics (F2)" => $STATS_PAGE = stats_window, 1358 "Statistics (F2)" => $STATS_PAGE = stats_window,
1335 "Shows statistics, where all your Stats and Resistances are shown." 1359 "Shows statistics, where all your Stats and Resistances are shown."
1336 ); 1360 );
1337 $ntb->add ( 1361 $ntb->add (
1338 "Skills (F3)" => $SKILL_PAGE = skill_window, 1362 "Skills (F3)" => $SKILL_PAGE = skill_window,
1339 "Shows all your Skills." 1363 "Shows all your Skills."
1340 ); 1364 );
1341 1365
1342 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);
1343 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1367 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1344 $ntb->add ( 1368 $ntb->add (
1345 "Spellbook (F4)" => $spellsw, 1369 "Spellbook (F4)" => $spellsw,
1346 "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."
1347 ); 1371 );
1348 $ntb->add ( 1372 $ntb->add (
1355 1379
1356 $plwin->add ($ntb); 1380 $plwin->add ($ntb);
1357 $plwin 1381 $plwin
1358} 1382}
1359 1383
1360sub update_bindings {
1361 $BIND_UPD_CB->() if $BIND_UPD_CB;
1362}
1363
1364sub keyboard_setup { 1384sub keyboard_setup {
1365 my $binding_list = new CFClient::UI::VBox; 1385 CFPlus::Macro::keyboard_setup
1366
1367 my $refresh;
1368 $refresh = $BIND_UPD_CB = sub {
1369 $binding_list->clear ();
1370
1371 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1372 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1373 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1374 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1375
1376 my $lbl = join "; ", @$cmds;
1377 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1378 $binding_list->add (my $hb = new CFClient::UI::HBox);
1379 $hb->add (new CFClient::UI::Button
1380 text => "delete",
1381 tooltip => "Deletes the binding",
1382 on_activate => sub {
1383 $binding_list->remove ($hb);
1384 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1385 0
1386 });
1387
1388 $hb->add (new CFClient::UI::Button
1389 text => "edit",
1390 tooltip => "Edits the binding",
1391 on_activate => sub {
1392 $::BIND_EDITOR->set_binding (
1393 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1394 sub {
1395 my ($nmod, $nsym, $ncmds) = @_;
1396 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1397 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1398 $refresh->();
1399 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1400 $SETUP_DIALOG->show;
1401 },
1402 sub {
1403 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1404 $SETUP_DIALOG->show;
1405 });
1406 $::BIND_EDITOR->show;
1407 $SETUP_DIALOG->hide;
1408 0
1409 });
1410
1411 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1412 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1413 }
1414 }
1415 };
1416
1417 my $vb = new CFClient::UI::VBox;
1418 $vb->add (my $hb = new CFClient::UI::HBox);
1419 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1420 $hb->add (new CFClient::UI::CheckBox
1421 expand => 1,
1422 state => $CFG->{shift_fire_stop},
1423 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424 on_changed => sub {
1425 my ($cbox, $value) = @_;
1426 $CFG->{shift_fire_stop} = $value;
1427 0
1428 });
1429
1430 $vb->add ($binding_list);
1431 $vb->add (my $hb = new CFClient::UI::HBox);
1432
1433 $hb->add (new CFClient::UI::Button
1434 text => "record new",
1435 expand => 1,
1436 tooltip => "This button opens the binding editor with an empty binding.",
1437 on_activate => sub {
1438 $::BIND_EDITOR->set_binding (undef, undef, [],
1439 sub {
1440 my ($mod, $sym, $cmds) = @_;
1441 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1442 $refresh->();
1443 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1444 $SETUP_DIALOG->show;
1445 },
1446 sub {
1447 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1448 $SETUP_DIALOG->show;
1449 },
1450 );
1451 $SETUP_DIALOG->hide;
1452 $::BIND_EDITOR->show;
1453 0
1454 },
1455 );
1456
1457 $hb->add (new CFClient::UI::Button
1458 text => "close",
1459 tooltip => "Closes the binding window",
1460 expand => 1,
1461 on_activate => sub {
1462 $SETUP_DIALOG->hide;
1463 0
1464 }
1465 );
1466
1467 $refresh->();
1468
1469 $vb
1470}
1471
1472# just weirdness, pls. ignore
1473sub load_html_page {
1474 my ($viewer, $base) = @_;
1475
1476 $viewer->clear;
1477
1478 require LWP::Simple;
1479 require HTML::Parser;
1480 require URI;
1481
1482 my $page = LWP::Simple::get ($base)
1483 or return;
1484
1485 my @s = { };
1486 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488 my $parser = HTML::Parser->new (
1489 text_h => [sub {
1490 my ($text) = @_;
1491 $text =~ s/\s+/ /g;
1492 $s[-1]{text} .= CFClient::asxml $text;
1493 }, "dtext"],
1494 start_h => [sub {
1495 my ($tag, $attr) = @_;
1496 if ($passthrough{$tag}) {
1497 $s[-1]{text} .= "<$tag>";
1498 } elsif ($tag eq "h1") {
1499 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500 } elsif ($tag eq "h2") {
1501 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502 } elsif ($tag eq "h3") {
1503 push @s, { text => "<span size='large'>" };
1504 } elsif ($tag eq "a") {
1505 push @s, { text => "", url => $attr->{href} };
1506 } elsif ($tag eq "p") {
1507 push @s, { };
1508 } elsif ($tag eq "img") {
1509 eval {
1510 push @{$s[-1]{obj}}, new CFClient::UI::Image
1511 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512 $s[-1]{text} .= "\x{fffc}";
1513 };
1514 }
1515 }, "tagname, attr"],
1516 end_h => [sub {
1517 my ($tag) = @_;
1518 if ($passthrough{$tag}) {
1519 $s[-1]{text} .= "</$tag>";
1520 } elsif ($tag =~ /^h\d$/) {
1521 $s[-1]{text} .= "</span>";
1522 push @s, { };
1523 } elsif ($tag eq "a") {
1524 my $S = pop @s;
1525 $s[-1]{text} .= "\x{fffc}";
1526 push @{$s[-1]{obj}}, new CFClient::UI::Label
1527 fg => [0.8, 0.8, 1],
1528 markup => "<u>$S->{text}</u>",
1529 fontsize => 0.8,
1530 can_events => 1,
1531 can_focus => 1,
1532 on_button_up => sub {
1533 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534 },
1535 ;
1536 }
1537 }, "tagname"],
1538 );
1539
1540 $parser->parse ($page);
1541 $parser->eof;
1542
1543 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544 for @s;
1545
1546 $viewer->set_offset (0);
1547} 1386}
1548 1387
1549sub help_window { 1388sub help_window {
1550 my $win = new CFClient::UI::FancyFrame 1389 my $win = new CFPlus::UI::Toplevel
1551 x => 'center', 1390 x => 'center',
1552 y => 'center', 1391 y => 'center',
1553 z => 2, 1392 z => 4,
1554 name => 'doc_browser', 1393 name => 'doc_browser',
1555 force_w => int $WIDTH * 7/8, 1394 force_w => int $WIDTH * 7/8,
1556 force_h => int $HEIGHT * 7/8, 1395 force_h => int $HEIGHT * 7/8,
1557 title => "Help Browser", 1396 title => "Help Browser",
1558 has_close_button => 1; 1397 has_close_button => 1;
1559 1398
1560 $win->add (my $vbox = new CFClient::UI::VBox); 1399 $win->add (my $vbox = new CFPlus::UI::VBox);
1561 1400
1562 $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 );
1563 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1405 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1564 expand => 1, fontsize => 0.8, padding_x => 4); 1406 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1565 1407
1566 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1408 my @history;
1567 $buttons->add (my $combo = new CFClient::UI::Combobox 1409 my @future;
1568 value => undef, 1410 my $curnode;
1569 options => [ 1411
1570 [intro => "Introduction"], 1412 my $load_node; $load_node = sub {
1571 [manual => "Main Manual"], 1413 my ($node, $para) = @_;
1572 [skill_help => "Skill Reference"], 1414
1573 [command_help => "Command Reference"], 1415 $buttons->clear;
1574 [dmcommand_help => "DM Commands"], 1416
1575 [COPYING => "License Terms"], 1417 $buttons->add (new CFPlus::UI::Button
1576 [test => "test (do not select)"], #d#TODO 1418 text => "⇤",
1577 ], 1419 tooltip => "back to the starting page",
1578 on_changed => sub { 1420 on_activate => sub {
1579 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 );
1580 1427
1581 if ($pod eq "test") {#d#TODO 1428 if (@history) {
1582 eval { 1429 $buttons->add (new CFPlus::UI::Button
1583 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});
1584 }; 1435 },
1585 warn "$@" if $@; 1436 );
1586 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;
1587 } 1521 }
1588
1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1590 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591
1592 #use Data::Dumper; warn Dumper $pom;#d#
1593
1594 $viewer->clear;
1595
1596# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1597# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1598# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1599# ]);#d#
1600 1522 ;
1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1602 for @$pom;
1603 1523
1604 $viewer->set_offset (0); 1524 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1605 1525
1606 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;
1607 }, 1594 },
1608 on_visibility_change => sub {
1609 my ($self, $visible) = @_;
1610 return unless $visible;
1611 return if $self->{value};
1612 $self->set_value ("intro");
1613 0
1614 },
1615 ); 1595 );
1616 1596
1617 $win 1597 $dialog->show;
1618} 1598}
1619 1599
1620sub sdl_init { 1600sub sdl_init {
1621 CFClient::SDL_Init 1601 CFPlus::SDL_Init
1622 and die "SDL::Init failed!\n"; 1602 and die "SDL::Init failed!\n";
1623} 1603}
1624 1604
1625sub video_init { 1605sub video_init {
1626 sdl_init; 1606 sdl_init;
1631 1611
1632 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1612 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1633 $FULLSCREEN = $CFG->{fullscreen}; 1613 $FULLSCREEN = $CFG->{fullscreen};
1634 $FAST = $CFG->{fast}; 1614 $FAST = $CFG->{fast};
1635 1615
1636 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1616 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1637 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1617 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1638 1618
1639 $SDL_ACTIVE = 1; 1619 $SDL_ACTIVE = 1;
1640 $LAST_REFRESH = time - 0.01; 1620 $LAST_REFRESH = time - 0.01;
1641 1621
1642 CFClient::OpenGL::init; 1622 CFPlus::OpenGL::init;
1643 1623
1644 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1624 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1645 1625
1646 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1626 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1647 1627
1648 ############################################################################# 1628 #############################################################################
1649 1629
1650 if ($DEBUG_STATUS) { 1630 if ($DEBUG_STATUS) {
1651 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1631 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1652 } else { 1632 } else {
1653 # create the widgets 1633 # create the widgets
1654 1634
1655 $DEBUG_STATUS = new CFClient::UI::Label 1635 $DEBUG_STATUS = new CFPlus::UI::Label
1656 padding => 0, 1636 padding => 0,
1657 z => 100, 1637 z => 100,
1658 force_x => "max", 1638 force_x => "max",
1659 force_y => 0; 1639 force_y => 0;
1660 $DEBUG_STATUS->show; 1640 $DEBUG_STATUS->show;
1661 1641
1662 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1663
1664 $STATUSBOX = new CFClient::UI::Statusbox; 1642 $STATUSBOX = new CFPlus::UI::Statusbox;
1665 $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]);
1666 1644
1667 (new CFClient::UI::Frame 1645 (new CFPlus::UI::Frame
1668 bg => [0, 0, 0, 0.4], 1646 bg => [0, 0, 0, 0.4],
1669 force_x => 0, 1647 force_x => 0,
1670 force_y => "max", 1648 force_y => "max",
1671 child => $STATUSBOX, 1649 child => $STATUSBOX,
1672 )->show; 1650 )->show;
1673 1651
1674 CFClient::UI::FancyFrame->new ( 1652 CFPlus::UI::Toplevel->new (
1675 title => "Map", 1653 title => "Map",
1676 name => "mapmap", 1654 name => "mapmap",
1677 x => 0, 1655 x => 0,
1678 y => $FONTSIZE + 8, 1656 y => $FONTSIZE + 8,
1679 border_bg => [1, 1, 1, 192/255], 1657 border_bg => [1, 1, 1, 192/255],
1680 bg => [1, 1, 1, 0], 1658 bg => [1, 1, 1, 0],
1681 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1659 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1682 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.",
1683 ), 1661 ),
1684 )->show; 1662 )->show;
1685 1663
1686 $MAPWIDGET = new CFClient::MapWidget; 1664 $MAPWIDGET = new CFPlus::MapWidget;
1687 $MAPWIDGET->connect (activate_console => sub { 1665 $MAPWIDGET->connect (activate_console => sub {
1688 my ($mapwidget, $preset) = @_; 1666 my ($mapwidget, $preset) = @_;
1689 1667
1690 if ($CONSOLE) { 1668 if ($CONSOLE) {
1691 $CONSOLE->{input}->{auto_activated} = 1; 1669 $CONSOLE->{input}->{auto_activated} = 1;
1697 } 1675 }
1698 }); 1676 });
1699 $MAPWIDGET->show; 1677 $MAPWIDGET->show;
1700 $MAPWIDGET->grab_focus; 1678 $MAPWIDGET->grab_focus;
1701 1679
1702 $LOGVIEW = new CFClient::UI::TextScroller 1680 $LOGVIEW = new CFPlus::UI::TextScroller
1703 expand => 1, 1681 expand => 1,
1704 font => $FONT_FIXED, 1682 font => $FONT_FIXED,
1705 fontsize => $::CFG->{log_fontsize}, 1683 fontsize => $::CFG->{log_fontsize},
1706 indent => -4, 1684 indent => -4,
1707 can_hover => 1, 1685 can_hover => 1,
1708 can_events => 1, 1686 can_events => 1,
1709 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.",
1710 ; 1688 ;
1711 1689
1712 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1690 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1713 title => "Setup", 1691 title => "Setup",
1714 name => "setup_dialog", 1692 name => "setup_dialog",
1715 x => 'center', 1693 x => 'center',
1716 y => 'center', 1694 y => 'center',
1717 z => 2, 1695 z => 2,
1720 has_close_button => 1, 1698 has_close_button => 1,
1721 ; 1699 ;
1722 1700
1723 $METASERVER = metaserver_dialog; 1701 $METASERVER = metaserver_dialog;
1724 1702
1725 $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,
1726 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1704 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1727 1705
1728 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1706 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1729 "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.");
1730 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1708 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1731 "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.");
1741 . "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 "
1742 . "binding editor closes"); 1720 . "binding editor closes");
1743 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1721 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1744 "Some debuggin' options. Do not ask."); 1722 "Some debuggin' options. Do not ask.");
1745 1723
1746 $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
1747 1725
1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1726 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1749 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.");
1750 1728
1751 $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,
1752 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.");
1753 1731
1754 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
1755 1733
1756 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1734 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1757 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.");
1758 1736
1759 $BUTTONBAR->add (new CFClient::UI::Button 1737 $BUTTONBAR->add (new CFPlus::UI::Button
1760 text => "Save Config", 1738 text => "Save Config",
1761 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.",
1762 on_activate => sub { 1740 on_activate => sub {
1763 $::CFG->{layout} = CFClient::UI::get_layout; 1741 $::CFG->{layout} = CFPlus::UI::get_layout;
1764 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1742 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1765 status "Configuration Saved"; 1743 status "Configuration Saved";
1766 0 1744 0
1767 }, 1745 },
1768 ); 1746 );
1769 1747
1770 $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,
1771 tooltip => "View Documentation"); 1749 tooltip => "View Documentation");
1772 1750
1751
1773 $BUTTONBAR->add (new CFClient::UI::Button 1752 $BUTTONBAR->add (new CFPlus::UI::Button
1774 text => "Quit", 1753 text => "Quit",
1775 tooltip => "Terminates the program", 1754 tooltip => "Terminates the program",
1776 on_activate => sub { 1755 on_activate => sub {
1777 if ($CONN) { 1756 if ($CONN) {
1778 open_quit_dialog; 1757 open_quit_dialog;
1788 } 1767 }
1789 1768
1790 $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]);
1791} 1770}
1792 1771
1772sub setup_build_button {
1773 my ($enabled) = @_;
1774 if ($enabled) {
1775 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1776 $BUILD_BUTTON ||= new CFPlus::UI::Button
1777 text => "Build",
1778 tooltip => "Opens the ingame builder",
1779 on_activate => sub {
1780 if ($CONN) {
1781 $CONN->send_ext_req (builder_player_items => sub {
1782 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1783 });
1784 }
1785 0
1786 };
1787 $BUTTONBAR->add ($BUILD_BUTTON);
1788 } else {
1789 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1790 }
1791}
1792
1793sub open_ingame_editor {
1794 my ($msg) = @_;
1795
1796 my $win = new CFPlus::UI::Toplevel
1797 x => 0,
1798 y => 'center',
1799 z => 4,
1800 name => 'builder_window',
1801 force_w => int $WIDTH * 1/4,
1802 force_h => int $HEIGHT * 3/4,
1803 title => "In game builder",
1804 has_close_button => 1;
1805
1806 my $r = new CFPlus::UI::ScrolledWindow (
1807 expand => 1,
1808 scroll_y => 1
1809 );
1810 $r->add (my $vb = new CFPlus::UI::VBox);
1811 $win->add ($r);
1812
1813
1814 $vb->add (
1815 new CFPlus::UI::Button
1816 text => "Disable build mode",
1817 on_activate => sub { $::IN_BUILD_MODE = undef }
1818 );
1819 $vb->add (
1820 new CFPlus::UI::Button
1821 text => "ERASE",
1822 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1823 );
1824
1825 for my $itemarchname (
1826 sort {
1827 $msg->{items}->{$a}->{build_arch_name}
1828 cmp $msg->{items}->{$b}->{build_arch_name}
1829 } keys %{$msg->{items}}
1830 ) {
1831 my $info = $msg->{items}->{$itemarchname};
1832 $vb->add (
1833 new CFPlus::UI::Button text => $info->{build_arch_name},
1834 on_activate => sub {
1835 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1836
1837 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1838 build_mode_query_arch_info ();
1839 }
1840 }
1841 );
1842 }
1843
1844 $win->show;
1845}
1846
1847sub build_mode_query_arch_info {
1848 my ($iteminfo) = $::IN_BUILD_MODE;
1849 my $itemarchname = $iteminfo->{item};
1850 my $info = $iteminfo->{info};
1851
1852 my $dialog = new CFPlus::UI::Toplevel
1853 x => "center",
1854 y => "center",
1855 z => 50,
1856 force_w => int $WIDTH * 1/2,
1857 title => "Enter information for placement of '$itemarchname'",
1858 has_close_button => 1;
1859
1860 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1861
1862 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1863 my $row = 0;
1864 if ($info->{has_name}) {
1865 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1866 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1867 }
1868 if ($info->{has_text}) {
1869 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1870 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1871 }
1872 if ($info->{has_connection}) {
1873 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1874 $table->add (1, $row++,
1875 new CFPlus::UI::Entry
1876 expand => 1,
1877 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1878 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1879 );
1880 }
1881
1882 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1883 $hb->add (new CFPlus::UI::Button
1884 text => "Close",
1885 expand => 1,
1886 on_activate => sub { $dialog->hide; 0 },
1887 );
1888 $dialog->show;
1889}
1890
1793sub video_shutdown { 1891sub video_shutdown {
1794 CFClient::OpenGL::shutdown; 1892 CFPlus::OpenGL::shutdown;
1795 1893
1796 undef $SDL_ACTIVE; 1894 undef $SDL_ACTIVE;
1797} 1895}
1798 1896
1799my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1897my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1807 1905
1808sub audio_music_finished { 1906sub audio_music_finished {
1809 return unless $CFG->{bgm_enable}; 1907 return unless $CFG->{bgm_enable};
1810 1908
1811 # TODO: hack, do play loop and mood music 1909 # TODO: hack, do play loop and mood music
1812 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1910 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1813 $bgmusic->play (0); 1911 $bgmusic->play (0);
1814 1912
1815 push @bgmusic, shift @bgmusic; 1913 push @bgmusic, shift @bgmusic;
1816} 1914}
1817 1915
1818sub audio_init { 1916sub audio_init {
1819 if ($CFG->{audio_enable}) { 1917 if ($CFG->{audio_enable}) {
1820 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1918 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1821 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1919 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1822 1920
1823 unless ($SDL_MIXER) { 1921 unless ($SDL_MIXER) {
1824 status "Unable to open sound device: there will be no sound"; 1922 status "Unable to open sound device: there will be no sound";
1825 return; 1923 return;
1826 } 1924 }
1827 1925
1828 CFClient::Mix_AllocateChannels 8; 1926 CFPlus::Mix_AllocateChannels 8;
1829 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1927 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1830 1928
1831 audio_music_finished; 1929 audio_music_finished;
1832 1930
1931 local $_;
1833 while (<$fh>) { 1932 while (<$fh>) {
1834 next if /^\s*#/; 1933 next if /^\s*#/;
1835 next if /^\s*$/; 1934 next if /^\s*$/;
1836 1935
1837 my ($file, $volume, $event) = split /\s+/, $_, 3; 1936 my ($file, $volume, $event) = split /\s+/, $_, 3;
1838 1937
1839 push @SOUNDS, "$volume,$file"; 1938 push @SOUNDS, "$volume,$file";
1840 1939
1841 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1940 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1842 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1941 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1843 $chunk->volume ($volume * 128 / 100); 1942 $chunk->volume ($volume * 128 / 100);
1844 $chunk 1943 $chunk
1845 }; 1944 };
1846 } 1945 }
1847 } else { 1946 } else {
1849 } 1948 }
1850 } 1949 }
1851} 1950}
1852 1951
1853sub audio_shutdown { 1952sub audio_shutdown {
1854 CFClient::Mix_CloseAudio if $SDL_MIXER; 1953 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1855 undef $SDL_MIXER; 1954 undef $SDL_MIXER;
1856 @SOUNDS = (); 1955 @SOUNDS = ();
1857 %AUDIO_CHUNKS = (); 1956 %AUDIO_CHUNKS = ();
1858} 1957}
1859 1958
1866 1965
1867sub force_refresh { 1966sub force_refresh {
1868 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1967 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1869 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1968 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1870 1969
1871 $CFClient::UI::ROOT->draw; 1970 $CFPlus::UI::ROOT->draw;
1872 1971
1873 $WANT_REFRESH = 0; 1972 $WANT_REFRESH = 0;
1874 $CAN_REFRESH = 0; 1973 $CAN_REFRESH = 0;
1875 $LAST_REFRESH = $NOW; 1974 $LAST_REFRESH = $NOW;
1876 1975
1877 CFClient::SDL_GL_SwapBuffers; 1976 CFPlus::SDL_GL_SwapBuffers;
1878} 1977}
1879 1978
1880my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1979my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1881 $NOW = time; 1980 $NOW = time;
1882 1981
1883 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1982 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1884 for CFClient::SDL_PollEvent; 1983 for CFPlus::SDL_PollEvent;
1885 1984
1886 if (%animate_object) { 1985 if (%animate_object) {
1887 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1986 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1888 $WANT_REFRESH++; 1987 $WANT_REFRESH++;
1889 } 1988 }
1913 $CONN->face_prefetch 2012 $CONN->face_prefetch
1914 if $CONN; 2013 if $CONN;
1915}); 2014});
1916 2015
1917%SDL_CB = ( 2016%SDL_CB = (
1918 CFClient::SDL_QUIT => sub { 2017 CFPlus::SDL_QUIT => sub {
1919 Event::unloop -1; 2018 Event::unloop -1;
1920 }, 2019 },
1921 CFClient::SDL_VIDEORESIZE => sub { 2020 CFPlus::SDL_VIDEORESIZE => sub {
1922 }, 2021 },
1923 CFClient::SDL_VIDEOEXPOSE => sub { 2022 CFPlus::SDL_VIDEOEXPOSE => sub {
1924 CFClient::UI::full_refresh; 2023 CFPlus::UI::full_refresh;
1925 }, 2024 },
1926 CFClient::SDL_ACTIVEEVENT => sub { 2025 CFPlus::SDL_ACTIVEEVENT => sub {
1927# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2026# not useful, as APPACTIVE include sonly iconified state, not unmapped
2027# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2028# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2029# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2030# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1928 }, 2031 },
1929 CFClient::SDL_KEYDOWN => sub { 2032 CFPlus::SDL_KEYDOWN => sub {
1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2033 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1931 # alt-enter 2034 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle; 2035 $FULLSCREEN_ENABLE->toggle;
1933 video_shutdown; 2036 video_shutdown;
1934 video_init; 2037 video_init;
1935 } else { 2038 } else {
1936 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2039 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1937 } 2040 }
1938 }, 2041 },
1939 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2042 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1940 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2043 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1941 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2044 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1942 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2045 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1943 CFClient::SDL_USEREVENT => sub { 2046 CFPlus::SDL_USEREVENT => sub {
1944 if ($_[0]{code} == 1) { 2047 if ($_[0]{code} == 1) {
1945 audio_channel_finished $_[0]{data1}; 2048 audio_channel_finished $_[0]{data1};
1946 } elsif ($_[0]{code} == 0) { 2049 } elsif ($_[0]{code} == 0) {
1947 audio_music_finished; 2050 audio_music_finished;
1948 } 2051 }
1952############################################################################# 2055#############################################################################
1953 2056
1954$SIG{INT} = $SIG{TERM} = sub { exit }; 2057$SIG{INT} = $SIG{TERM} = sub { exit };
1955 2058
1956{ 2059{
1957 local $SIG{__DIE__} = sub {
1958 return unless defined $^S && !$^S;
1959 Carp::confess $_[0];#d#TODO: remove when stable
1960 CFClient::fatal $_[0];
1961 };
1962
1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2060 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1964 CFClient::UI::set_layout ($::CFG->{layout}); 2061 CFPlus::UI::set_layout ($::CFG->{layout});
1965 2062
1966 my %DEF_CFG = ( 2063 my %DEF_CFG = (
1967 sdl_mode => 0, 2064 sdl_mode => 0,
1968 width => 640, 2065 width => 640,
1969 height => 480, 2066 height => 480,
1977 log_fontsize => 0.7, 2074 log_fontsize => 0.7,
1978 gauge_fontsize => 1, 2075 gauge_fontsize => 1,
1979 gauge_size => 0.35, 2076 gauge_size => 0.35,
1980 stat_fontsize => 0.7, 2077 stat_fontsize => 0.7,
1981 mapsize => 100, 2078 mapsize => 100,
1982 say_command => 'say', 2079 say_command => 'chat',
1983 audio_enable => 1, 2080 audio_enable => 1,
1984 bgm_enable => 1, 2081 bgm_enable => 1,
1985 bgm_volume => 0.25, 2082 bgm_volume => 0.25,
1986 face_prefetch => 0, 2083 face_prefetch => 0,
1987 output_sync => 1, 2084 output_sync => 1,
1988 output_count => 1, 2085 output_count => 1,
1989 pickup => 0, 2086 pickup => 0,
2087 inv_sort => "mtime",
1990 default => "profile", # default profile 2088 default => "profile", # default profile
2089 show_tips => 1,
1991 ); 2090 );
1992 2091
1993 while (my ($k, $v) = each %DEF_CFG) { 2092 while (my ($k, $v) = each %DEF_CFG) {
1994 $CFG->{$k} = $v unless exists $CFG->{$k}; 2093 $CFG->{$k} = $v unless exists $CFG->{$k};
1995 } 2094 }
1996 2095
1997 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2096 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2097 $PROFILE = $CFG->{profile}{default};
2098
2099 # convert old bindings (only default profile matters)
2100 if (my $bindings = delete $PROFILE->{bindings}) {
2101 while (my ($mod, $syms) = each %$bindings) {
2102 while (my ($sym, $cmds) = each %$syms) {
2103 push @{ $PROFILE->{macro} }, {
2104 accelkey => [$mod*1, $sym*1],
2105 action => $cmds,
2106 };
2107 }
2108 }
2109 }
1998 2110
1999 sdl_init; 2111 sdl_init;
2000 2112
2001 @SDL_MODES = reverse 2113 @SDL_MODES = reverse
2002 grep $_->[0] >= 640 && $_->[1] >= 480, 2114 grep $_->[0] >= 640 && $_->[1] >= 480,
2003 CFClient::SDL_ListModes; 2115 CFPlus::SDL_ListModes;
2004 2116
2005 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2117 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2006 2118
2007 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2119 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2008 2120
2009 { 2121 {
2010 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2122 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2011 DejaVuSans.ttf 2123 DejaVuSans.ttf
2012 DejaVuSansMono.ttf 2124 DejaVuSansMono.ttf
2013 DejaVuSans-Bold.ttf 2125 DejaVuSans-Bold.ttf
2014 DejaVuSansMono-Bold.ttf 2126 DejaVuSansMono-Bold.ttf
2015 DejaVuSans-Oblique.ttf 2127 DejaVuSans-Oblique.ttf
2016 DejaVuSansMono-Oblique.ttf 2128 DejaVuSansMono-Oblique.ttf
2017 DejaVuSans-BoldOblique.ttf 2129 DejaVuSans-BoldOblique.ttf
2018 DejaVuSansMono-BoldOblique.ttf 2130 DejaVuSansMono-BoldOblique.ttf
2019 ); 2131 );
2020 2132
2021 CFClient::add_font $_ for @fonts; 2133 CFPlus::add_font $_ for @fonts;
2022 2134
2023 CFClient::pango_init; 2135 CFPlus::pango_init;
2024 2136
2025 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2137 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2026 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2138 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2027 2139
2028 $FONT_PROP->make_default; 2140 $FONT_PROP->make_default;
2029 } 2141 }
2030 2142
2031# compare mono (ft) vs. rgba (cairo) 2143# compare mono (ft) vs. rgba (cairo)
2032# ft - 1.8s, cairo 3s, even in alpha-only mode 2144# ft - 1.8s, cairo 3s, even in alpha-only mode
2033# for my $rgba (0..1) { 2145# for my $rgba (0..1) {
2034# my $t1 = Time::HiRes::time; 2146# my $t1 = Time::HiRes::time;
2035# for (1..1000) { 2147# for (1..1000) {
2036# my $layout = CFClient::Layout->new ($rgba); 2148# my $layout = CFPlus::Layout->new ($rgba);
2037# $layout->set_text ("hallo" x 100); 2149# $layout->set_text ("hallo" x 100);
2038# $layout->render; 2150# $layout->render;
2039# } 2151# }
2040# my $t2 = Time::HiRes::time; 2152# my $t2 = Time::HiRes::time;
2041# warn $t2-$t1; 2153# warn $t2-$t1;
2042# } 2154# }
2043 2155
2156 $startup_done->();
2157
2044 video_init; 2158 video_init;
2045 audio_init; 2159 audio_init;
2046} 2160}
2047 2161
2162show_tip_of_the_day if $CFG->{show_tips};
2163
2048Event::loop; 2164Event::loop;
2049#CFClient::SDL_Quit; 2165#CFPlus::SDL_Quit;
2050#CFClient::_exit 0; 2166#CFPlus::_exit 0;
2051 2167
2052END { CFClient::SDL_Quit } 2168END { CFPlus::SDL_Quit }
2053 2169
2054=head1 NAME 2170=head1 NAME
2055 2171
2056cfplus - A Crossfire+ and Crossfire game client 2172cfplus - A Crossfire+ and Crossfire game client
2057 2173

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines