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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines