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

Diff Legend

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