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

Diff Legend

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