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.62 by root, Tue Jun 6 08:35:22 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;
116our $SERVER_INFO;
89 117
90our $SETUP_DIALOG; 118our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 119our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 120our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 121our $SETUP_KEYBOARD;
94our $SETUP_SPELLS;
95 122
123our $PL_NOTEBOOK;
96our $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;
97our $MESSAGE_WINDOW; 133our $MESSAGE_WINDOW;
98our $FLOORBOX; 134our $FLOORBOX;
99our $GAUGES; 135our $GAUGES;
100our $STATWIDS; 136our $STATWIDS;
101 137
108 144
109our $ALT_ENTER_MESSAGE; 145our $ALT_ENTER_MESSAGE;
110our $STATUSBOX; 146our $STATUSBOX;
111our $DEBUG_STATUS; 147our $DEBUG_STATUS;
112 148
113our $INV_WINDOW;
114our $INV; 149our $INV;
115our $INVR; 150our $INVR;
116our $INV_RIGHT_HB; 151our $INV_RIGHT_HB;
117 152
118our $BIND_EDITOR;
119
120our $PICKUP_CFG; 153our $PICKUP_CFG;
121 154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157
122sub status { 158sub status {
123 $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]);
124} 160}
125 161
126sub debug { 162sub debug {
127 $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;
128} 175}
129 176
130sub destroy_query_dialog { 177sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
133} 180}
134 181
182# FIXME: a very ugly hack to wait for stat update look below! #d#
183our $QUERY_TIMER; #d#
184
135# server query dialog 185# server query dialog
136sub server_query { 186sub server_query {
137 my ($conn, $flags, $prompt) = @_; 187 my ($conn, $flags, $prompt) = @_;
138 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
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 204 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
140 x => "center", 205 x => "center",
141 y => "center", 206 y => "center",
142 title => "Server Query", 207 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox, 208 child => my $vbox = new CFPlus::UI::VBox,
144 ; 209 ;
145 210
146 my @dialog = my $label = new CFClient::UI::Label 211 my @dialog = my $label = new CFPlus::UI::Label
147 max_w => $::WIDTH * 0.4, 212 max_w => $::WIDTH * 0.8,
148 ellipsise => 0, 213 ellipsise => 0,
149 text => $prompt; 214 text => $prompt;
150 215
151 if ($flags & CS_QUERY_YESNO) { 216 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox; 217 push @dialog, my $hbox = new CFPlus::UI::HBox;
153 218
154 $hbox->add (new CFClient::UI::Button 219 $hbox->add (new CFPlus::UI::Button
155 text => "No", 220 text => "No",
156 on_activate => sub { 221 on_activate => sub {
157 $conn->send ("reply n"); 222 $conn->send ("reply n");
158 $dialog->destroy; 223 $dialog->destroy;
224 0
159 } 225 }
160 ); 226 );
161 $hbox->add (new CFClient::UI::Button 227 $hbox->add (new CFPlus::UI::Button
162 text => "Yes", 228 text => "Yes",
163 on_activate => sub { 229 on_activate => sub {
164 $conn->send ("reply y"); 230 $conn->send ("reply y");
165 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
232 0
166 }, 233 },
167 ); 234 );
168 235
169 $dialog->focus_in; 236 $dialog->grab_focus;
170 237
171 } elsif ($flags & CS_QUERY_SINGLECHAR) { 238 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 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) {
175 $MESSAGE_WINDOW->show; 240 $dialog->{tooltip} = "#charcreation_focus";
176 241
177 unshift @dialog, new CFClient::UI::Label 242 unshift @dialog, new CFPlus::UI::Label
178 max_w => $::WIDTH * 0.4, 243 max_w => $::WIDTH * 0.8,
179 ellipsise => 0, 244 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n"; 245 markup => "\nOr use your keyboard and the text entry below:\n";
181 246
182 unshift @dialog, my $table = new CFClient::UI::Table; 247 unshift @dialog, my $table = new CFPlus::UI::Table;
183 248
184 $table->add (0, 0, new CFClient::UI::Button 249 $table->add (0, 0, new CFPlus::UI::Button
185 text => "Next Race", 250 text => "Next Race",
186 on_activate => sub { 251 on_activate => sub {
187 $conn->send ("reply n"); 252 $conn->send ("reply n");
188 destroy_query_dialog $conn; 253 destroy_query_dialog $conn;
254 0
189 }, 255 },
190 ); 256 );
191 $table->add (2, 0, new CFClient::UI::Button 257 $table->add (2, 0, new CFPlus::UI::Button
192 text => "Accept", 258 text => "Accept",
193 on_activate => sub { 259 on_activate => sub {
194 $conn->send ("reply d"); 260 $conn->send ("reply d");
195 destroy_query_dialog $conn; 261 destroy_query_dialog $conn;
262 0
196 }, 263 },
197 ); 264 );
198 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
199 unshift @dialog, new CFClient::UI::Label 289 unshift @dialog, new CFPlus::UI::Label
200 max_w => $::WIDTH * 0.4, 290 max_w => $::WIDTH * 0.4,
201 ellipsise => 0, 291 ellipsise => 0,
202 markup => 292 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ; 293 ;
211 294
212 } elsif ($prompt =~ /roll new stats/) { 295 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) { 296 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat"); 297 $conn->send ("reply $stat");
215 destroy_query_dialog $conn; 298 destroy_query_dialog $conn;
216 return; 299 return;
217 } 300 }
218 301
219 $STATS_WINDOW->show; 302 $STATS_PAGE->show;
220 $MESSAGE_WINDOW->hide; 303 $MESSAGE_WINDOW->hide;
221 304
222 unshift @dialog, new CFClient::UI::Label 305 unshift @dialog, new CFPlus::UI::Label
223 max_w => $::WIDTH * 0.4, 306 max_w => $::WIDTH * 0.4,
224 ellipsise => 0, 307 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n"; 308 markup => "\nOr use your keyboard and the text entry below:\n";
226 309
227 unshift @dialog, my $table = new CFClient::UI::Table; 310 unshift @dialog, my $table = new CFPlus::UI::Table;
228 311
229 # left: re-roll 312 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button 313 $table->add (0, 0, new CFPlus::UI::Button
231 text => "Roll Again", 314 text => "Roll Again",
232 on_activate => sub { 315 on_activate => sub {
233 $conn->send ("reply y"); 316 $conn->send ("reply y");
234 destroy_query_dialog $conn; 317 destroy_query_dialog $conn;
318 0
235 }, 319 },
236 ); 320 );
237 321
238 # center: swap stats 322 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 323 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
324 expand => 1,
240 value => $_, 325 value => $_,
241 options => [ 326 options => [
242 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"], 327 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 328 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"], 329 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"], 330 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"], 331 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"], 332 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 333 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ], 334 ],
250 ), 1 .. 2; 335 ), 1 .. 2;
251 336
252 $table->add (2, 0, new CFClient::UI::Button 337 $table->add (2, 0, new CFPlus::UI::Button
253 text => "Swap Stats", 338 text => "Swap Stats",
254 on_activate => sub { 339 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value}; 340 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}"); 341 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
343 0
258 }, 344 },
259 ); 345 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 346 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
261 347
262 # right: accept 348 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button 349 $table->add (4, 0, new CFPlus::UI::Button
264 text => "Accept", 350 text => "Accept",
265 on_activate => sub { 351 on_activate => sub {
266 $conn->send ("reply n"); 352 $conn->send ("reply n");
267 $STATS_WINDOW->hide; 353 $STATS_PAGE->hide;
268 destroy_query_dialog $conn; 354 destroy_query_dialog $conn;
355 0
269 }, 356 },
270 ); 357 );
271 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
272 unshift @dialog, new CFClient::UI::Label 380 unshift @dialog, new CFPlus::UI::Label
273 max_w => $::WIDTH * 0.4, 381 max_w => $::WIDTH * 0.4,
274 ellipsise => 0, 382 ellipsise => 0,
275 markup => 383 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ; 384 ;
282 } 385 }
283 386
284 push @dialog, my $entry = new CFClient::UI::Entry 387 push @dialog, my $entry = new CFPlus::UI::Entry
285 on_changed => sub { 388 on_changed => sub {
286 $conn->send ("reply $_[1]"); 389 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn; 390 destroy_query_dialog $conn;
391 0
288 }, 392 },
289 ; 393 ;
290 394
291 $entry->focus_in; 395 $entry->grab_focus;
292 396
293 } else { 397 } else {
294 $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)";
295 399
296 push @dialog, my $entry = new CFClient::UI::Entry 400 push @dialog, my $entry = new CFPlus::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 401 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub { 402 on_activate => sub {
299 $conn->send ("reply $_[1]"); 403 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn; 404 destroy_query_dialog $conn;
405 0
301 }, 406 },
302 ; 407 ;
303 408
304 $entry->focus_in; 409 $entry->grab_focus;
305 } 410 }
306 411
307 $vbox->add (@dialog); 412 $vbox->add (@dialog);
308 $dialog->show; 413 $dialog->show;
309} 414}
314 $LOGIN_BUTTON->set_text ("Logout"); 419 $LOGIN_BUTTON->set_text ("Logout");
315 $SETUP_DIALOG->hide; 420 $SETUP_DIALOG->hide;
316 421
317 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;
318 423
319 my ($host, $port) = split /:/, $CFG->{host}; 424 my ($host, $port) = split /:/, $PROFILE->{host};
320 425
321 $MAP = new CFClient::Map $mapsize, $mapsize; 426 $MAP = new CFPlus::Map;
322 427
323 $CONN = eval { 428 $CONN = eval {
324 new CFClient::Protocol 429 new CFPlus::Protocol
325 host => $host, 430 host => $host,
326 port => $port || 13327, 431 port => $port || 13327,
327 user => $CFG->{user}, 432 user => $PROFILE->{user},
328 pass => $CFG->{password}, 433 pass => $PROFILE->{password},
329 mapw => $mapsize, 434 mapw => $mapsize,
330 maph => $mapsize, 435 maph => $mapsize,
436
437 client => "cfplus $CFPlus::VERSION $] $^O",
331 438
332 map_widget => $MAPWIDGET, 439 map_widget => $MAPWIDGET,
333 logview => $LOGVIEW, 440 logview => $LOGVIEW,
334 statusbox => $STATUSBOX, 441 statusbox => $STATUSBOX,
335 map => $MAP, 442 map => $MAP,
336 mapmap => $MAPMAP, 443 mapmap => $MAPMAP,
337 query => \&server_query, 444 query => \&server_query,
338 445
446 setup_req => {
447 smoothing => $CFG->{map_smoothing}*1,
448 },
449
339 sound_play => sub { 450 sound_play => sub {
340 my ($x, $y, $soundnum, $type) = @_; 451 my ($x, $y, $soundnum, $type) = @_;
341 452
342 $SDL_MIXER 453 $SDL_MIXER
343 or return; 454 or return;
348 $chunk->play; 459 $chunk->play;
349 }, 460 },
350 }; 461 };
351 462
352 if ($CONN) { 463 if ($CONN) {
353 CFClient::lowdelay fileno $CONN->{fh}; 464 CFPlus::lowdelay fileno $CONN->{fh};
354 465
355 status "login successful"; 466 status "login successful";
356 } else { 467 } else {
357 status "unable to connect"; 468 status "unable to connect";
358 stop_game(); 469 stop_game();
361 472
362sub stop_game { 473sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 474 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 475 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 476 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 477 $PL_WINDOW->hide;
478 $SPELL_LIST->clear_spells;
367 479
368 return unless $CONN; 480 return unless $CONN;
369 481
370 status "connection closed"; 482 status "connection closed";
371 483
372 destroy_query_dialog $CONN; 484 destroy_query_dialog $CONN;
373 $CONN->destroy; 485 $CONN->destroy;
374 $CONN = 0; # false, does not autovivify 486 $CONN = 0; # false, does not autovivify
487
488 undef $MAP;
375} 489}
376 490
377sub graphics_setup { 491sub graphics_setup {
378 my $vbox = new CFClient::UI::VBox; 492 my $vbox = new CFPlus::UI::VBox;
379 493
380 $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]);
381 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
382 $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");
383 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 504 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
384 505
385 $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]);
386 $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");
387 508
388 $mode_slider->connect (changed => sub { 509 $mode_slider->connect (changed => sub {
389 my ($self, $value) = @_; 510 my ($self, $value) = @_;
390 511
391 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 512 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
392 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 513 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
393 }); 514 });
394 $mode_slider->emit (changed => $mode_slider->{range}[0]); 515 $mode_slider->emit (changed => $mode_slider->{range}[0]);
395 516
396 my $row = 1;
397
398 $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");
399 $table->add (1, $row++, new CFClient::UI::CheckBox 518 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
400 state => $CFG->{fullscreen}, 519 state => $CFG->{fullscreen},
401 tooltip => "Bring the client into fullscreen mode.", 520 tooltip => "Bring the client into fullscreen mode.",
402 on_changed => sub { 521 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403 my ($self, $value) = @_;
404 $CFG->{fullscreen} = $value;
405 }
406 ); 522 );
407 523
408 $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");
409 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFPlus::UI::CheckBox
410 state => $CFG->{fast}, 526 state => $CFG->{fast},
411 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.",
412 on_changed => sub { 541 on_activate => sub {
413 my ($self, $value) = @_; 542 video_shutdown ();
414 $CFG->{fast} = $value; 543 video_init ();
544 0
415 } 545 }
416 ); 546 );
417 547
418 $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");
419 $table->add (1, $row++, new CFClient::UI::Slider 549 $table->add (1, $row++, new CFPlus::UI::Slider
420 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 550 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 551 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422 on_changed => sub { 552 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423 my ($self, $value) = @_;
424 $CFG->{map_scale} = 2 ** $value;
425 }
426 ); 553 );
427 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
428 $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");
429 $table->add (1, $row++, new CFClient::UI::CheckBox 565 $table->add (1, $row++, new CFPlus::UI::CheckBox
430 state => $CFG->{fow_enable}, 566 state => $CFG->{fow_enable},
431 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.",
432 on_changed => sub { 568 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433 my ($self, $value) = @_;
434 $CFG->{fow_enable} = $value;
435 }
436 ); 569 );
437 570
438 $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");
439 $table->add (1, $row++, new CFClient::UI::Slider 572 $table->add (1, $row++, new CFPlus::UI::Slider
440 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 573 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441 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.",
442 on_changed => sub { 575 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443 my ($self, $value) = @_;
444 $CFG->{fow_intensity} = $value;
445 }
446 ); 576 );
447 577
448 $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");
449 $table->add (1, $row++, new CFClient::UI::CheckBox 579 $table->add (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fow_smooth}, 580 state => $CFG->{fow_smooth},
451 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.",
452 on_changed => sub { 582 on_changed => sub {
453 my ($self, $value) = @_; 583 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value; 584 $CFG->{fow_smooth} = $value;
455 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
456 } 587 }
457 ); 588 );
458 589
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460 $table->add (1, $row++, new CFClient::UI::Slider
461 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
464 );
465
466 $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");
467 $table->add (1, $row++, new CFClient::UI::Slider 591 $table->add (1, $row++, new CFPlus::UI::Slider
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 592 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 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.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 594 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 595 );
472 596
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474
475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize;
481 }
482 );
483
484 $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");
485 $table->add (1, $row++, new CFClient::UI::Slider 598 $table->add (1, $row++, new CFPlus::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 599 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 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.",
488 on_changed => sub { 601 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 602 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 603 &set_gauge_window_fontsize;
604 0
491 } 605 }
492 ); 606 );
493 607
494 $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");
495 $table->add (1, $row++, new CFClient::UI::Slider 609 $table->add (1, $row++, new CFPlus::UI::Slider
496 range => [$CFG->{gauge_size}, 0.2, 0.8], 610 range => [$CFG->{gauge_size}, 0.2, 0.8],
497 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.",
498 on_changed => sub { 612 on_changed => sub {
499 $CFG->{gauge_size} = $_[1]; 613 $CFG->{gauge_size} = $_[1];
500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 614 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501 } 615 0
502 );
503
504 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings",
507 on_activate => sub {
508 video_shutdown ();
509 video_init ();
510 } 616 }
511 ); 617 );
512 618
513 $vbox 619 $vbox
514} 620}
515 621
516sub audio_setup { 622sub audio_setup {
517 my $vbox = new CFClient::UI::VBox; 623 my $vbox = new CFPlus::UI::VBox;
518 624
519 $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]);
520 626
521 my $row = 0; 627 my $row = 0;
522 628
523 $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");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 630 $table->add (1, $row++, new CFPlus::UI::CheckBox
525 state => $CFG->{audio_enable}, 631 state => $CFG->{audio_enable},
526 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.",
527 on_changed => sub { 633 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 $CFG->{audio_enable} = $_[1];
529 }
530 ); 634 );
531# $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");
532# $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 {
533# $CFG->{effects_volume} = $_[1]; 637# $CFG->{effects_volume} = $_[1];
534# }); 638# });
535 $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");
536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 640 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
537 $hbox->add (new CFClient::UI::CheckBox 641 $hbox->add (new CFPlus::UI::CheckBox
538 expand => 1, state => $CFG->{bgm_enable}, 642 expand => 1, state => $CFG->{bgm_enable},
539 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.",
540 on_changed => sub { 644 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541 $CFG->{bgm_enable} = $_[1];
542 }
543 ); 645 );
544 $hbox->add (new CFClient::UI::Slider 646 $hbox->add (new CFPlus::UI::Slider
545 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 647 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546 tooltip => "The volume of the background music. Changes are instant.", 648 tooltip => "The volume of the background music. Changes are instant.",
547 on_changed => sub { 649 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
548 $CFG->{bgm_volume} = $_[1];
549 CFClient::MixMusic::volume $_[1] * 128;
550 }
551 ); 650 );
552 651
553 $table->add (1, $row++, new CFClient::UI::Button 652 $table->add (1, $row++, new CFPlus::UI::Button
554 expand => 1, align => 0, text => "Apply", 653 expand => 1, align => 0, text => "Apply",
555 tooltip => "Apply the audio settings", 654 tooltip => "Apply the audio settings",
556 on_activate => sub { 655 on_activate => sub {
557 audio_shutdown (); 656 audio_shutdown ();
558 audio_init (); 657 audio_init ();
658 0
559 } 659 }
560 ); 660 );
561 661
562 $vbox 662 $vbox
563}
564
565sub set_stats_window_fontsize {
566 for (values %{$STATWIDS}) {
567 $_->set_fontsize ($::CFG->{stat_fontsize});
568 }
569} 663}
570 664
571sub set_gauge_window_fontsize { 665sub set_gauge_window_fontsize {
572 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 666 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
573 $_->set_fontsize ($::CFG->{gauge_fontsize}); 667 $_->set_fontsize ($::CFG->{gauge_fontsize});
575} 669}
576 670
577sub make_gauge_window { 671sub make_gauge_window {
578 my $gh = int $HEIGHT * $CFG->{gauge_size}; 672 my $gh = int $HEIGHT * $CFG->{gauge_size};
579 673
580 my $win = new CFClient::UI::Frame ( 674 my $win = new CFPlus::UI::Frame (
581 force_x => 0, 675 force_x => 0,
582 force_y => "max", 676 force_y => "max",
583 force_w => $WIDTH, 677 force_w => $WIDTH,
584 force_h => $gh, 678 force_h => $gh,
585 ); 679 );
586 680
587 $win->add (my $hbox = new CFClient::UI::HBox 681 $win->add (my $hbox = new CFPlus::UI::HBox
588 children => [ 682 children => [
589 (new CFClient::UI::HBox expand => 1), 683 (new CFPlus::UI::HBox expand => 1),
590 (new CFClient::UI::VBox children => [ 684 (new CFPlus::UI::VBox children => [
591 (new CFClient::UI::Empty expand => 1), 685 (new CFPlus::UI::Empty expand => 1),
592 (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)),
593 ]), 687 ]),
594 (my $vbox = new CFClient::UI::VBox), 688 (my $vbox = new CFPlus::UI::VBox),
595 ], 689 ],
596 ); 690 );
597 691
598 $vbox->add (new CFClient::UI::HBox 692 $vbox->add (new CFPlus::UI::HBox
599 expand => 1, 693 expand => 1,
600 children => [ 694 children => [
601 (new CFClient::UI::Empty expand => 1), 695 (new CFPlus::UI::Empty expand => 1),
602 (my $hb = new CFClient::UI::HBox), 696 (my $hb = new CFPlus::UI::HBox),
603 ], 697 ],
604 ); 698 );
605 699
606 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 700 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
607 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.");
608 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 701 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
609 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.");
610 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 702 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
611 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.");
612 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 703 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
613 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.");
614 704
615 $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");
616 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.");
617 $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");
618 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
619 707
620 $GAUGES = { 708 $GAUGES = {
621 exp => $exp, win => $win, range => $rng, 709 exp => $exp, win => $win, range => $rng,
622 food => $fg, mana => $mg, hp => $hg, grace => $gg 710 food => $fg, mana => $mg, hp => $hg, grace => $gg
623 }; 711 };
625 &set_gauge_window_fontsize; 713 &set_gauge_window_fontsize;
626 714
627 $win 715 $win
628} 716}
629 717
718sub debug_setup {
719 my $table = new CFPlus::UI::Table;
720
721 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
722 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
723 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
724 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
725 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
726 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
727 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
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" } );
730
731 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
732
733 for my $x (0..2) {
734 for my $y (0 .. 2) {
735 $table->add ($x + 3, $y,
736 new CFPlus::UI::Entry
737 text => $default_smooth[$x * 3 + $y],
738 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
739 );
740 }
741 }
742
743 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
744
745 $table
746}
630 747
631sub stats_window { 748sub stats_window {
632 my $tgw = new CFClient::UI::FancyFrame 749 my $r = new CFPlus::UI::ScrolledWindow (
633 y => $HEIGHT * (2/8), 750 expand => 1,
634 x => "max", 751 scroll_y => 1
635 title => "Stats", 752 );
636 name => "stats_window"; 753 $r->add (my $vb = new CFPlus::UI::VBox);
637 754
638 $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
639 $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,
640 can_hover => 1, can_events => 1, 761 can_hover => 1, can_events => 1,
641 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.");
642 $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,
643 can_hover => 1, can_events => 1, 764 can_hover => 1, can_events => 1,
644 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).");
645 766
646 $vb->add (my $hb0 = new CFClient::UI::HBox); 767 $pi->add (my $hb0 = new CFPlus::UI::HBox);
647 $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,
648 can_hover => 1, can_events => 1, 769 can_hover => 1, can_events => 1,
649 tooltip => "The weight of the player including all inventory items."); 770 tooltip => "The weight of the player including all inventory items.");
650 $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,
651 can_hover => 1, can_events => 1, 772 can_hover => 1, can_events => 1,
652 tooltip => "The weight limit: you cannot carry more than this."); 773 tooltip => "The weight limit: you cannot carry more than this.");
653 774
654 775 $vb->add (new CFPlus::UI::FancyFrame
776 label => "Primary/Secondary Statistics",
655 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 777 child => (my $hb = new CFPlus::UI::HBox expand => 1),
778 );
656 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 779 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
657 780
658 my $color2 = [1, 1, 0]; 781 my $color2 = [1, 1, 0];
659 782
660 for ( 783 for (
661 [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],
662 [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],
663 [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],
664 [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],
665 [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],
666 [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],
667 [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],
668 791
669 [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],
670 [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],
671 [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],
672 [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],
673 [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],
674 [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],
675 ) { 798 ) {
676 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 799 my ($col, $row, $id, $label, $template) = @$_;
677 800
678 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 801 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
679 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");
680 $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
681 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");
682 } 807 }
683 808
809 $vb->add (new CFPlus::UI::FancyFrame
810 label => "Resistancies",
684 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 811 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
812 );
685 813
686 my $row = 0; 814 my $row = 0;
687 my $col = 0; 815 my $col = 0;
688 816
689 my %resist_names = ( 817 my %resist_names = (
818 slow => ["Slow",
690 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",
691 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",
692 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",
693 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",
694 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",
695 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",
696 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",
697 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",
698 pois => "<b>Poison</b> (resistance to getting poisoned)", 835 "<b>Poison</b> (resistance to getting poisoned)"],
836 para => ["Paralysation",
699 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",
700 deat => "<b>Death</b> (resistance against death spells)", 839 "<b>Death</b> (resistance against death spells)"],
701 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",
702 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",
703 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",
704 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",
705 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",
706 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",
707 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)"],
708 ); 854 );
709 for (qw/slow holyw conf fire depl magic 855 for (qw/slow holyw conf fire depl magic
710 drain acid pois para deat phys 856 drain acid pois para deat phys
711 blind fear tund elec cold ghit/) 857 blind fear tund elec cold ghit/)
712 { 858 {
713 $tbl2->add ($col, $row, 859 $tbl2->add ($col, $row,
714 $STATWIDS->{"res_$_"} = 860 $STATWIDS->{"res_$_"} =
715 new CFClient::UI::Label 861 new CFPlus::UI::Label
716 font => $FONT_FIXED, 862 font => $FONT_FIXED,
717 template => "-100%", 863 template => "-100%",
718 align => +1, 864 align => +1,
719 valign => 0, 865 valign => 0,
720 can_events => 1, 866 can_events => 1,
721 can_hover => 1, 867 can_hover => 1,
722 tooltip => $resist_names{$_}, 868 tooltip => $resist_names{$_}->[1],
723 ); 869 );
724 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 870 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
725 font => $FONT_FIXED, 871 font => $FONT_FIXED,
726 can_hover => 1, 872 can_hover => 1,
727 can_events => 1, 873 can_events => 1,
728 image => "ui/resist/resist_$_.png", 874 path => "ui/resist/resist_$_.png",
729 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],
730 ); 883 );
731 884
732 $row++; 885 $row++;
733 if ($row % 6 == 0) { 886 if ($row % 6 == 0) {
734 $col += 2; 887 $col += 3;
735 $row = 0; 888 $row = 0;
736 } 889 }
737 } 890 }
738 891
739 &set_stats_window_fontsize;
740 update_stats_window ({}); 892 #update_stats_window ({});
741 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]);
742 $tgw 900 $sw
743} 901}
744 902
745sub formsep($) { 903sub formsep($) {
746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 904 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
747} 905}
748 906
749sub update_stats_window {
750 my ($stats) = @_;
751
752 # I love text protocols...
753
754 my $hp = $stats->{+CS_STAT_HP} * 1;
755 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
756 my $sp = $stats->{+CS_STAT_SP} * 1;
757 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
758 my $fo = $stats->{+CS_STAT_FOOD} * 1;
759 my $fo_m = 999;
760 my $gr = $stats->{+CS_STAT_GRACE} * 1;
761 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
762
763 $GAUGES->{hp} ->set_value ($hp, $hp_m);
764 $GAUGES->{mana} ->set_value ($sp, $sp_m);
765 $GAUGES->{food} ->set_value ($fo, $fo_m);
766 $GAUGES->{grace} ->set_value ($gr, $gr_m);
767 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
768 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
769 my $rng = $stats->{+CS_STAT_RANGE};
770 $rng =~ s/^Range: //; # thank you so much dear server
771 $GAUGES->{range} ->set_text ("Rng: " . $rng);
772 my $title = $stats->{+CS_STAT_TITLE};
773 $title =~ s/^Player: //;
774 $STATWIDS->{title} ->set_text ("Title: " . $title);
775
776 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
777 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
778 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
779 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
780 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
781 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
782 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
783 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
784 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
785 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
786 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
787 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789
790 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791
792 # TODO: replace by CS_STAT_RES_xxx constants
793 my %tbl = (
794 phys => 100,
795 magic => 101,
796 fire => 102,
797 elec => 103,
798 cold => 104,
799 conf => 105,
800 acid => 106,
801 drain => 107,
802 ghit => 108,
803 pois => 109,
804 slow => 110,
805 para => 111,
806 tund => 112,
807 fear => 113,
808 depl => 113,
809 deat => 115,
810 holyw => 116,
811 blind => 117,
812 );
813
814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815 for keys %tbl;
816}
817
818my $METASERVER_ATIME; 907my $METASERVER_ATIME;
819 908
820sub update_metaserver { 909sub update_metaserver {
910 my ($metaserver_dialog) = @_;
911
912 $METASERVER = $metaserver_dialog
913 if defined $metaserver_dialog;
914
821 return if $METASERVER_ATIME > time; 915 return if $METASERVER_ATIME > time;
822 $METASERVER_ATIME = time + 60; 916 $METASERVER_ATIME = time + 60;
823 917
824 my $table = $METASERVER->{table}; 918 my $table = $METASERVER->{table};
825 $table->clear; 919 $table->clear;
826 $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...");
827 921
828 my $buf; 922 my $ok = 0;
829 923
830 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 924 CFPlus::background {
925 my $ua = CFPlus::lwp_useragent;
831 926
832 unless ($fh) { 927 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
833 $label->set_text ("unable to contact metaserver: $!"); 928 } sub {
834 return; 929 my ($msg) = @_;
835 } 930 if ($msg) {
836
837 Event->io (fd => $fh, poll => 'r', cb => sub {
838 my $res = sysread $fh, $buf, 8192, length $buf;
839
840 if (!defined $res) {
841 $_[0]->w->cancel;
842 $label->set_text ("error while retrieving server list: $!");
843 } elsif ($res == 0) {
844 $_[0]->w->cancel;
845 status "server list retrieved";
846
847 utf8::decode $buf if utf8::valid $buf;
848
849 $table->clear; 931 $table->clear;
850 932
851 my @tip = ( 933 my @tip = (
852 "The current number of users logged in on the server.", 934 "The current number of users logged in on the server.",
853 "The hostname of the server.", 935 "The hostname of the server.",
854 "The time this server has been running without being restarted.", 936 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.", 937 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.", 938 "Short information about this server provided by its admins.",
857 ); 939 );
858 my @col = qw(#Users Host Uptime Version Description); 940 my @col = qw(#Users Host Uptime Version Description);
859 $table->add ($_, 0, new CFClient::UI::Label 941 $table->add ($_, 0, new CFPlus::UI::Label
860 can_hover => 1, can_events => 1, 942 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0], 943 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_]) 944 text => $col[$_], tooltip => $tip[$_])
863 for 0 .. $#col; 945 for 0 .. $#col;
864 946
865 my @align = qw(1 0 1 1 -1); 947 my @align = qw(1 0 1 1 -1);
866 948
867 my $y = 0; 949 my $y = 0;
868 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 950 for my $m (@{ $msg->{servers} }) {
869 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)};
870 953
871 for ($desc) { 954 for ($desc) {
872 s/<br>/\n/gi; 955 s/<br>/\n/gi;
873 s/<li>/\n· /gi; 956 s/<li>/\n· /gi;
874 s/<.*?>//sgi; 957 s/<.*?>//sgi;
875 s/&/&amp;/g; 958 s/&amp;/&/g;
876 s/</&lt;/g; 959 s/&lt;/</g;
877 s/>/&gt;/g; 960 s/&gt;/>/g;
878 } 961 }
879 962
880 $uptime = sprintf "%dd %02d:%02d:%02d", 963 $uptime = sprintf "%dd %02d:%02d:%02d",
881 (int $m->[8] / 86400), 964 (int $uptime / 86400),
882 (int $m->[8] / 3600) % 24, 965 (int $uptime / 3600) % 24,
883 (int $m->[8] / 60) % 60, 966 (int $uptime / 60) % 60,
884 $m->[8] % 60; 967 $uptime % 60;
885 968
886 $m = [$users, $host, $uptime, $version, $desc]; 969 $m = [$users, $host, $uptime, $version, $desc];
887 970
888 $y++; 971 $y++;
889 972
890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 973 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
891 (new CFClient::UI::Button 974 (new CFPlus::UI::Button
892 text => "Use", 975 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field", 976 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub { 977 on_activate => sub {
895 $HOST_ENTRY->set_text ($CFG->{host} = $host); 978 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
896 $METASERVER->hide; 979 $METASERVER->hide;
980 0
897 }, 981 },
898 ), 982 ),
899 (new CFClient::UI::Empty expand => 1), 983 (new CFPlus::UI::Empty expand => 1),
900 ]); 984 ]);
901 985
902 $table->add ($_, $y, new CFClient::UI::Label 986 $table->add ($_, $y, new CFPlus::UI::Label
987 max_w => $::WIDTH * 0.4,
903 ellipsise => 0, 988 ellipsise => 0,
904 align => $align[$_], 989 align => $align[$_],
905 text => $m->[$_], 990 text => $m->[$_],
906 tooltip => $tip[$_], 991 tooltip => $tip[$_],
992 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
907 can_hover => 1, 993 can_hover => 1,
908 can_events => 1, 994 can_events => 1,
909 fontsize => 0.8) 995 fontsize => 0.8)
910 for 0 .. $#$m; 996 for 0 .. $#$m;
911 } 997 }
998 } else {
999 $ok or $label->set_text ("error while contacting metaserver");
912 } 1000 }
913 }); 1001 };
1002
914} 1003}
915 1004
916sub metaserver_dialog { 1005sub metaserver_dialog {
917 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
918 title => "Server List", 1011 title => "Server List",
919 name => 'metaserver_dialog', 1012 name => 'metaserver_dialog',
920 x => 'center', 1013 x => 'center',
921 y => 'center', 1014 y => 'center',
922 z => 3, 1015 z => 3,
1016 force_w => $::WIDTH * 0.9,
923 force_h => $::HEIGHT * 0.4, 1017 force_h => $::HEIGHT * 0.7,
924 child => (my $vbox = new CFClient::UI::VBox), 1018 child => $vbox,
1019 has_close_button => 1,
1020 table => $table,
925 on_visibility_change => sub { 1021 on_visibility_change => sub {
926 update_metaserver if $_[1]; 1022 update_metaserver ($_[0]) if $_[1];
1023 0
927 }, 1024 },
928 ; 1025 ;
929 1026
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933
934 $dialog 1027 $dialog
935} 1028}
936 1029
937sub server_setup { 1030sub server_setup {
938 my $vbox = new CFClient::UI::VBox; 1031 my $vbox = new CFPlus::UI::VBox;
939 1032
1033 $vbox->add (new CFPlus::UI::FancyFrame
1034 label => "Connection Settings",
940 $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 );
941 $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");
942 1038
943 { 1039 {
944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1040 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1041
946 $vbox->add ( 1042 $vbox->add (
947 $HOST_ENTRY = new CFClient::UI::Entry 1043 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 1044 expand => 1,
949 text => $CFG->{host}, 1045 text => $CFG->{profile}{default}{host},
950 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",
951 on_changed => sub { 1047 on_changed => sub {
952 my ($self, $value) = @_; 1048 my ($self, $value) = @_;
953 $CFG->{host} = $value; 1049 $CFG->{profile}{default}{host} = $value;
1050 0
954 } 1051 }
955 ); 1052 );
956 1053
957 $METASERVER = metaserver_dialog;
958
959 $vbox->add (new CFClient::UI::Button 1054 $vbox->add (new CFPlus::UI::Button
960 expand => 1, 1055 expand => 1,
961 text => "Server List", 1056 text => "Server List",
962 other => $METASERVER, 1057 other => $METASERVER,
963 tooltip => "Show a list of available crossfire servers", 1058 tooltip => "Show a list of available crossfire servers",
964 on_activate => sub { $METASERVER->toggle_visibility }, 1059 on_activate => sub { $METASERVER->toggle_visibility; 0 },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1060 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
966 ); 1061 );
967 } 1062 }
968 1063
969 $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");
970 $table->add (1, 4, new CFClient::UI::Entry 1065 $table->add (1, 4, new CFPlus::UI::Entry
971 text => $CFG->{user}, 1066 text => $CFG->{profile}{default}{user},
972 tooltip => "The name of your character on the server", 1067 tooltip => "The name of your character on the server",
973 on_changed => sub { 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
974 my ($self, $value) = @_;
975 $CFG->{user} = $value;
976 }
977 ); 1069 );
978 1070
979 $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");
980 $table->add (1, 5, new CFClient::UI::Entry 1072 $table->add (1, 5, new CFPlus::UI::Entry
981 text => $CFG->{password}, 1073 text => $CFG->{profile}{default}{password},
982 hidden => 1, 1074 hidden => 1,
983 tooltip => "The password for your character", 1075 tooltip => "The password for your character",
984 on_changed => sub { 1076 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
985 my ($self, $value) = @_;
986 $CFG->{password} = $value;
987 }
988 ); 1077 );
989 1078
990 $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");
991 $table->add (1, 7, new CFClient::UI::Slider 1080 $table->add (1, 7, new CFPlus::UI::Slider
992 force_w => 100, 1081 force_w => 100,
993 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1082 range => [$CFG->{mapsize}, 10, 100, 0, 1],
994 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. "
995 . "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, "
996 . "but you also increase bandwidth requirements and latency. " 1085 . "but you also increase bandwidth requirements and latency. "
997 . "This option is only used once at log-in.", 1086 . "This option is only used once at log-in.",
998 on_changed => sub { 1087 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
999 my ($self, $value) = @_;
1000
1001 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1002 },
1003 ); 1088 );
1004 1089
1005 $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");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1091 $table->add (1, 8, new CFPlus::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1092 state => $CFG->{face_prefetch},
1008 tooltip => "<b>Background Image Prefetch</b>\n\n" 1093 tooltip => "<b>Background Image Prefetch</b>\n\n"
1009 . "If enabled, the client automatically pre-fetches images from the server. " 1094 . "If enabled, the client automatically pre-fetches images from the server. "
1010 . "This might increase or create lag, but increases the chances " 1095 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1096 . "of faces being ready for display when you encounter them. "
1012 . "It also uses up server bandwidth on every connect, " 1097 . "It also uses up server bandwidth on every connect, "
1013 . "so only set it if you really need to prefetch images. " 1098 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1099 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1100 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1101 );
1017 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
1018 $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");
1019 $table->add (1, 9, new CFClient::UI::Entry 1113 $table->add (1, 10, new CFPlus::UI::Entry
1020 text => $CFG->{output_count}, 1114 text => $CFG->{output_count},
1021 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1115 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022 on_changed => sub { $CFG->{output_count} = $_[1] }, 1116 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1117 );
1024 1118
1025 $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");
1026 $table->add (1, 10, new CFClient::UI::Entry 1120 $table->add (1, 11, new CFPlus::UI::Entry
1027 text => $CFG->{output_sync}, 1121 text => $CFG->{output_sync},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1122 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1123 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1124 );
1031 1125
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1126 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1033 expand => 1, 1127 expand => 1,
1034 align => 0, 1128 align => 0,
1035 text => "Login", 1129 text => "Login",
1036 on_activate => sub { 1130 on_activate => sub {
1037 $CONN ? stop_game 1131 $CONN ? stop_game
1038 : start_game; 1132 : start_game;
1133 0
1039 }, 1134 },
1040 ); 1135 );
1041 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
1042 $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");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1151 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1044 text => $CFG->{say_command}, 1152 text => $CFG->{say_command},
1045 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 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. "
1046 . "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. "
1047 . "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.",
1048 on_changed => sub { 1156 on_changed => sub {
1049 my ($self, $value) = @_; 1157 my ($self, $value) = @_;
1050 $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
1051 } 1184 },
1052 ); 1185 );
1053 1186
1054 $vbox 1187 $table
1055} 1188}
1056 1189
1057sub message_window { 1190sub message_window {
1058 my $window = new CFClient::UI::FancyFrame 1191 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1192 name => "message_window",
1060 title => "Messages", 1193 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1194 border_bg => [1, 1, 1, 1],
1062 bg => [0, 0, 0, 0.75],
1063 x => "max", 1195 x => "max",
1064 y => 0, 1196 y => 0,
1065 force_w => $::WIDTH * 0.4, 1197 force_w => $::WIDTH * 0.4,
1066 force_h => $::HEIGHT * 0.5, 1198 force_h => $::HEIGHT * 0.5,
1067 child => (my $vbox = new CFClient::UI::VBox); 1199 child => (my $vbox = new CFPlus::UI::VBox),
1200 has_close_button => 1;
1068 1201
1069 $vbox->add ($LOGVIEW); 1202 $vbox->add ($LOGVIEW);
1070 1203
1071 $vbox->add (my $input = new CFClient::UI::Entry 1204 $vbox->add (my $input = new CFPlus::UI::Entry
1072 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> "
1073 . "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>...). "
1074 . "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). "
1075 . "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.",
1076 on_focus_in => sub { 1209 on_focus_in => sub {
1080 1213
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1214 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1; 1215 $input->{refocus_map} = 1;
1083 } 1216 }
1084 delete $input->{auto_activated}; 1217 delete $input->{auto_activated};
1218
1219 0
1085 }, 1220 },
1086 on_activate => sub { 1221 on_activate => sub {
1087 my ($input, $text) = @_; 1222 my ($input, $text) = @_;
1088 $input->set_text (''); 1223 $input->set_text ('');
1089 1224
1095 } 1230 }
1096 if ($input->{refocus_map}) { 1231 if ($input->{refocus_map}) {
1097 delete $input->{refocus_map}; 1232 delete $input->{refocus_map};
1098 $MAPWIDGET->focus_in 1233 $MAPWIDGET->focus_in
1099 } 1234 }
1235
1236 0
1100 }, 1237 },
1101 on_escape => sub { 1238 on_escape => sub {
1102 $MAPWIDGET->focus_in 1239 $MAPWIDGET->grab_focus;
1240
1241 0
1103 }, 1242 },
1104 ); 1243 );
1105 1244
1106 $CONSOLE = { 1245 $CONSOLE = {
1107 window => $window, 1246 window => $window,
1109 }; 1248 };
1110 1249
1111 $window 1250 $window
1112} 1251}
1113 1252
1114sub open_quit_dialog {
1115 unless ($QUIT_DIALOG) {
1116 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1117 x => "center",
1118 y => "center",
1119 z => 50,
1120 title => "Really Quit?",
1121 ;
1122
1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1124
1125 $vb->add (new CFClient::UI::Label
1126 text => "You should find a savebed and apply it first!",
1127 max_w => $WIDTH * 0.25,
1128 ellipsize => 0,
1129 );
1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1131 $hb->add (new CFClient::UI::Button
1132 text => "Ok",
1133 expand => 1,
1134 on_activate => sub { $QUIT_DIALOG->hide },
1135 );
1136 $hb->add (new CFClient::UI::Button
1137 text => "Quit anyway",
1138 expand => 1,
1139 on_activate => sub { exit },
1140 );
1141 }
1142
1143 $QUIT_DIALOG->show;
1144}
1145
1146sub autopickup_setup { 1253sub autopickup_setup {
1147 my $table = new CFClient::UI::Table; 1254 my $table = new CFPlus::UI::Table;
1148 1255
1149 for ( 1256 for (
1150 ["General", 0, 0, 1257 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE], 1258 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT], 1259 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP], 1260 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG], 1261 ["Debug autopickup" => PICKUP_DEBUG],
1155 ], 1262 ],
1156 ["Weapons", 0, 6, 1263 ["Weapons", 0, 6,
1166 ["Boots" => PICKUP_BOOTS], 1273 ["Boots" => PICKUP_BOOTS],
1167 ["Gloves" => PICKUP_GLOVES], 1274 ["Gloves" => PICKUP_GLOVES],
1168 ["Cloaks" => PICKUP_CLOAK], 1275 ["Cloaks" => PICKUP_CLOAK],
1169 ], 1276 ],
1170 1277
1171 ["Readables", 2, 2, 1278 ["Readables", 2, 0,
1172 ["Spellbooks" => PICKUP_SPELLBOOK], 1279 ["Spellbooks" => PICKUP_SPELLBOOK],
1173 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1280 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1174 ["Normal Books/Scrolls" => PICKUP_READABLES], 1281 ["Normal Books/Scrolls" => PICKUP_READABLES],
1175 ], 1282 ],
1176 ["Misc", 2, 7, 1283 ["Misc", 2, 5,
1177 ["Food" => PICKUP_FOOD], 1284 ["Food" => PICKUP_FOOD],
1178 ["Drinks" => PICKUP_DRINK], 1285 ["Drinks" => PICKUP_DRINK],
1179 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1286 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1180 ["Keys" => PICKUP_KEY], 1287 ["Keys" => PICKUP_KEY],
1181 ["Magical Items" => PICKUP_MAGICAL], 1288 ["Magical Items" => PICKUP_MAGICAL],
1182 ["Potions" => PICKUP_POTION], 1289 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1290 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED], 1291 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS], 1292 ["Jewelery" => PICKUP_JEWELS],
1293 ["Flesh" => PICKUP_FLESH],
1186 ], 1294 ],
1295 ["Weight/Value ratio", 2, 17]
1187 ) 1296 )
1188 { 1297 {
1189 my ($title, $x, $y, @bits) = @$_; 1298 my ($title, $x, $y, @bits) = @$_;
1190 $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]);
1191 1300
1192 for (@bits) { 1301 for (@bits) {
1193 ++$y; 1302 ++$y;
1194 1303
1195 my $mask = $_->[1]; 1304 my $mask = $_->[1];
1196 $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);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1306 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1198 state => $CFG->{pickup} & $mask, 1307 state => $::CFG->{pickup} & $mask,
1199 on_changed => sub { 1308 on_changed => sub {
1200 my ($box, $value) = @_; 1309 my ($box, $value) = @_;
1310
1201 if ($value) { 1311 if ($value) {
1202 $::CFG->{pickup} |= $mask; 1312 $::CFG->{pickup} |= $mask;
1203 } else { 1313 } else {
1204 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1314 $::CFG->{pickup} &= ~$mask;
1205 } 1315 }
1316
1206 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1317 $::CONN->send_command ("pickup $::CFG->{pickup}")
1207 if defined $::CONN; 1318 if defined $::CONN;
1319
1320 0
1208 }); 1321 });
1322
1323 ${$_->[2]} = $checkbox if $_->[2];
1209 } 1324 }
1210 } 1325 }
1211 1326
1327 $table->add (2, 18, new CFPlus::UI::ValSlider
1328 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1329 template => ">= 99",
1330 to_value => sub { ">= " . 5 * $_[0] },
1331 on_changed => sub {
1332 my ($slider, $value) = @_;
1333
1334 $::CFG->{pickup} &= ~0xF;
1335 $::CFG->{pickup} |= int $value
1336 if $value;
1337 1;
1338 });
1339
1340 $table->add (3, 18, new CFPlus::UI::Button
1341 text => "set",
1342 on_activate => sub {
1343 $::CONN->send_command ("pickup $::CFG->{pickup}")
1344 if defined $::CONN;
1345 0
1346 });
1347
1212 $table 1348 $table
1213} 1349}
1214 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
1215sub inventory_window { 1370sub inventory_widget {
1216 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
1217 x => "center", 1426 x => "center",
1218 y => "center", 1427 y => "center",
1219 force_w => $WIDTH * 9/10, 1428 force_w => $WIDTH * 9/10,
1220 force_h => $HEIGHT * 9/10, 1429 force_h => $HEIGHT * 9/10,
1221 title => "Inventory", 1430 title => "Player",
1431 name => "playerbook",
1432 has_close_button => 1
1222 ; 1433 ;
1223 1434
1224 $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;
1225 1438
1226 $hb->add (my $vb1 = new CFClient::UI::VBox); 1439 $ntb->add (
1227 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1440 "Statistics (F2)" => $STATS_PAGE = stats_window,
1228 $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 );
1229 1447
1230 $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 );
1231 1459
1232 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1460 $ntb->set_current_page ($INVENTORY_PAGE);
1233 1461
1234 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1462 $plwin->add ($ntb);
1235 1463 $plwin
1236 # XXX: Call after $INVR = ... because set_opencont sets the items
1237 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1238
1239 $invwin
1240}
1241
1242sub spell_setup {
1243 new CFClient::UI::SpellList
1244} 1464}
1245 1465
1246sub keyboard_setup { 1466sub keyboard_setup {
1247 my $binding_list = new CFClient::UI::VBox; 1467 CFPlus::Macro::keyboard_setup
1248
1249 my $refresh;
1250 $refresh = sub {
1251 $binding_list->clear ();
1252
1253 for my $mod (keys %{$::CFG->{bindings}}) {
1254 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1255 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1256 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1257
1258 my $lbl = join "; ", @$cmds;
1259 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1260 $binding_list->add (my $hb = new CFClient::UI::HBox);
1261 $hb->add (new CFClient::UI::Button
1262 text => "delete",
1263 tooltip => "Deletes the binding",
1264 on_activate => sub {
1265 $binding_list->remove ($hb);
1266 delete $::CFG->{bindings}->{$mod}->{$sym};
1267 });
1268
1269 $hb->add (new CFClient::UI::Button
1270 text => "edit",
1271 tooltip => "Edits the binding",
1272 on_activate => sub {
1273 $::BIND_EDITOR->set_binding (
1274 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1275 sub {
1276 my ($nmod, $nsym, $ncmds) = @_;
1277 delete $::CFG->{bindings}->{$mod}->{$sym};
1278 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1279 $refresh->();
1280 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1281 $SETUP_DIALOG->show;
1282 },
1283 sub {
1284 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1285 $SETUP_DIALOG->show;
1286 });
1287 $::BIND_EDITOR->show;
1288 $SETUP_DIALOG->hide;
1289 });
1290
1291 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1292 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1293 }
1294 }
1295 };
1296
1297 my $vb = new CFClient::UI::VBox;
1298 $vb->add ($binding_list);
1299 $vb->add (my $hb = new CFClient::UI::HBox);
1300
1301 $hb->add (new CFClient::UI::Button
1302 text => "record new",
1303 expand => 1,
1304 tooltip => "This button opens the binding editor with an empty binding.",
1305 on_activate => sub {
1306 $::BIND_EDITOR->set_binding (undef, undef, [],
1307 sub {
1308 my ($mod, $sym, $cmds) = @_;
1309 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1310 $refresh->();
1311 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1312 $SETUP_DIALOG->show;
1313 },
1314 sub {
1315 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1316 $SETUP_DIALOG->show;
1317 },
1318 );
1319 $SETUP_DIALOG->hide;
1320 $::BIND_EDITOR->show;
1321 },
1322 );
1323
1324 $hb->add (new CFClient::UI::Button
1325 text => "close",
1326 tooltip => "Closes the binding window",
1327 expand => 1,
1328 on_activate => sub {
1329 $SETUP_DIALOG->hide;
1330 }
1331 );
1332
1333 $refresh->();
1334
1335 $vb
1336} 1468}
1337 1469
1338sub make_help_window { 1470sub help_window {
1339 my $win = new CFClient::UI::FancyFrame 1471 my $win = new CFPlus::UI::Toplevel
1340 x => 'center', 1472 x => 'center',
1341 y => 'center', 1473 y => 'center',
1342 z => 2, 1474 z => 4,
1343 name => 'doc_browser', 1475 name => 'doc_browser',
1344 force_w => int $WIDTH * 7/8, 1476 force_w => int $WIDTH * 7/8,
1345 force_h => int $HEIGHT * 7/8, 1477 force_h => int $HEIGHT * 7/8,
1346 title => "Documentation"; 1478 title => "Help Browser",
1479 has_close_button => 1;
1347 1480
1348 $win->add (my $vbox = new CFClient::UI::VBox); 1481 $win->add (my $vbox = new CFPlus::UI::VBox);
1349 1482
1350 $vbox->add (my $buttons = new CFClient::UI::HBox); 1483 $vbox->add (new CFPlus::UI::FancyFrame
1351 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1484 label => "Navigation",
1485 child => (my $buttons = new CFPlus::UI::HBox),
1486 );
1487 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1488 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1352 1489
1353 for ( 1490 my @history;
1354 [intro => "Introduction"], 1491 my @future;
1355 [manual => "Manual"], 1492 my $curnode;
1356 [command_help => "Commands"], 1493
1357 [skill_help => "Skills"], 1494 my $load_node; $load_node = sub {
1358 ) {
1359 my ($pod, $label) = @$_; 1495 my ($node, $para) = @_;
1360 1496
1497 $buttons->clear;
1498
1361 $buttons->add (new CFClient::UI::Button 1499 $buttons->add (new CFPlus::UI::Button
1362 text => $label, 1500 text => "⇤",
1501 tooltip => "back to the starting page",
1363 on_activate => sub { 1502 on_activate => sub {
1364 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1503 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1365 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1504 unshift @future, @history;
1366 1505 @history = ();
1367 $viewer->clear; 1506 $load_node->(@{shift @future});
1368
1369 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1370 for @$pom;
1371
1372 $viewer->set_offset (0);
1373 }, 1507 },
1374 ); 1508 );
1509
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 );
1519 }
1520
1521 if (@future) {
1522 $buttons->add (new CFPlus::UI::Button
1523 text => "â‹™",
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 );
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);
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 };
1568
1569 $win
1570}
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 );
1375 } 1624 }
1376 1625
1377 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>"); 1626 $QUIT_DIALOG->show;
1627 $QUIT_DIALOG->grab_focus;
1628}
1378 1629
1379 $win 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 };
1380} 1682}
1381 1683
1382sub sdl_init { 1684sub sdl_init {
1383 CFClient::SDL_Init 1685 CFPlus::SDL_Init
1384 and die "SDL::Init failed!\n"; 1686 and die "SDL::Init failed!\n";
1385} 1687}
1386 1688
1387sub video_init { 1689sub video_init {
1388 sdl_init; 1690 sdl_init;
1393 1695
1394 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1696 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1395 $FULLSCREEN = $CFG->{fullscreen}; 1697 $FULLSCREEN = $CFG->{fullscreen};
1396 $FAST = $CFG->{fast}; 1698 $FAST = $CFG->{fast};
1397 1699
1398 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1700 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1399 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1701 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1400 1702
1401 $SDL_ACTIVE = 1; 1703 $SDL_ACTIVE = 1;
1402 $LAST_REFRESH = time - 0.01; 1704 $LAST_REFRESH = time - 0.01;
1403 1705
1404 CFClient::OpenGL::init; 1706 CFPlus::OpenGL::init;
1405 1707
1406 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1708 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1407 1709
1408 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1710 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1409 1711
1410 ############################################################################# 1712 #############################################################################
1411 1713
1412 if ($DEBUG_STATUS) { 1714 if ($DEBUG_STATUS) {
1413 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1715 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1414 } else { 1716 } else {
1415 # create the widgets 1717 # create the widgets
1416 1718
1417 $DEBUG_STATUS = new CFClient::UI::Label 1719 $DEBUG_STATUS = new CFPlus::UI::Label
1418 padding => 0, 1720 padding => 0,
1419 z => 100, 1721 z => 100,
1420 force_x => "max", 1722 force_x => "max",
1421 force_y => 0; 1723 force_y => 0;
1422 $DEBUG_STATUS->show; 1724 $DEBUG_STATUS->show;
1423 1725
1424 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1425
1426 $STATUSBOX = new CFClient::UI::Statusbox; 1726 $STATUSBOX = new CFPlus::UI::Statusbox;
1427 $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]);
1428 1728
1429 (new CFClient::UI::Frame 1729 (new CFPlus::UI::Frame
1430 bg => [0, 0, 0, 0.4], 1730 bg => [0, 0, 0, 0.4],
1431 force_x => 0, 1731 force_x => 0,
1432 force_y => "max", 1732 force_y => "max",
1433 child => $STATUSBOX, 1733 child => $STATUSBOX,
1434 )->show; 1734 )->show;
1435 1735
1436 CFClient::UI::FancyFrame->new ( 1736 CFPlus::UI::Toplevel->new (
1437 title => "Map", 1737 title => "Map",
1438 name => "mapmap", 1738 name => "mapmap",
1439 x => 0, 1739 x => 0,
1440 y => $FONTSIZE + 8, 1740 y => $FONTSIZE + 8,
1441 border_bg => [1, 1, 1, 192/255], 1741 border_bg => [1, 1, 1, 192/255],
1442 bg => [1, 1, 1, 0], 1742 bg => [1, 1, 1, 0],
1443 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1743 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1444 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.",
1445 ), 1745 ),
1446 )->show; 1746 )->show;
1447 1747
1448 $MAPWIDGET = new CFClient::MapWidget; 1748 $MAPWIDGET = new CFPlus::MapWidget;
1449 $MAPWIDGET->connect (activate_console => sub { 1749 $MAPWIDGET->connect (activate_console => sub {
1450 my ($mapwidget, $preset) = @_; 1750 my ($mapwidget, $preset) = @_;
1451 1751
1452 if ($CONSOLE) { 1752 if ($CONSOLE) {
1453 $CONSOLE->{input}->{auto_activated} = 1; 1753 $CONSOLE->{input}->{auto_activated} = 1;
1454 $CONSOLE->{input}->focus_in; 1754 $CONSOLE->{input}->grab_focus;
1455 1755
1456 if ($preset && $CONSOLE->{input}->get_text eq '') { 1756 if ($preset && $CONSOLE->{input}->get_text eq '') {
1457 $CONSOLE->{input}->set_text ($preset); 1757 $CONSOLE->{input}->set_text ($preset);
1458 } 1758 }
1459 } 1759 }
1460 }); 1760 });
1461 $MAPWIDGET->show; 1761 $MAPWIDGET->show;
1462 $MAPWIDGET->focus_in; 1762 $MAPWIDGET->grab_focus;
1463 1763
1464 $LOGVIEW = new CFClient::UI::TextView 1764 $LOGVIEW = new CFPlus::UI::TextScroller
1465 expand => 1, 1765 expand => 1,
1466 font => $FONT_FIXED, 1766 font => $FONT_FIXED,
1467 fontsize => $::CFG->{log_fontsize}, 1767 fontsize => $::CFG->{log_fontsize},
1468 indent => -4, 1768 indent => -4,
1469 can_hover => 1, 1769 can_hover => 1,
1470 can_events => 1, 1770 can_events => 1,
1771 max_par => $CFG->{logview_max_par},
1471 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.",
1472 ; 1773 ;
1473 1774
1474 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1775 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1475 title => "Setup", 1776 title => "Setup",
1476 name => "setup_dialog", 1777 name => "setup_dialog",
1477 x => 'center', 1778 x => 'center',
1478 y => 'center', 1779 y => 'center',
1479 z => 2, 1780 z => 2,
1480 force_w => $::WIDTH * 0.6, 1781 force_w => $::WIDTH * 0.6,
1481 force_h => $::HEIGHT * 0.6, 1782 force_h => $::HEIGHT * 0.6,
1783 has_close_button => 1,
1482 ; 1784 ;
1483 1785
1786 $METASERVER = metaserver_dialog;
1787
1484 $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,
1485 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1789 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1486 1790
1487 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1791 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1488 "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.");
1489 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1795 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1490 "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.");
1491 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1797 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1492 "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.");
1493 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1799 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1494 "Configure the use of audio, sound effects and background music."); 1800 "Configure the use of audio, sound effects and background music.");
1495 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1801 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1496 "Lets you define, edit and delete bindings." 1802 "Lets you define, edit and delete key bindings."
1497 . "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 "
1498 . "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 "
1499 . "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. "
1500 . "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 "
1501 . "binding editor closes"); 1807 . "binding editor closes");
1502 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1808 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1503 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1809 "Some debuggin' options. Do not ask.");
1504 1810
1505 $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
1506 1812
1507 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1813 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1508 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.");
1509 1815
1510 $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,
1511 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.");
1512 1818
1513 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
1514 1820
1515 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1516 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1517 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1821 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1518 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.");
1519 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1520 1823
1521 $BUTTONBAR->add (new CFClient::UI::Button 1824 $BUTTONBAR->add (new CFPlus::UI::Button
1522 text => "Save Config", 1825 text => "Save Config",
1523 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.",
1524 on_activate => sub { 1827 on_activate => sub {
1525 $::CFG->{layout} = CFClient::UI::get_layout; 1828 $::CFG->{layout} = CFPlus::UI::get_layout;
1526 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1829 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1527 status "Configuration Saved"; 1830 status "Configuration Saved";
1831 0
1528 }, 1832 },
1529 ); 1833 );
1530 1834
1531 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1835 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1532 tooltip => "View Documentation"); 1836 tooltip => "View Documentation");
1533 1837
1838
1534 $BUTTONBAR->add (new CFClient::UI::Button 1839 $BUTTONBAR->add (new CFPlus::UI::Button
1535 text => "Quit", 1840 text => "Quit",
1536 tooltip => "Terminates the program", 1841 tooltip => "Terminates the program",
1537 on_activate => sub { 1842 on_activate => sub {
1538 if ($CONN) { 1843 if ($CONN) {
1539 open_quit_dialog; 1844 open_quit_dialog;
1540 } else { 1845 } else {
1541 exit; 1846 exit;
1542 } 1847 }
1848 0
1543 }, 1849 },
1544 ); 1850 );
1545 1851
1546 $BUTTONBAR->show; 1852 $BUTTONBAR->show;
1547 $SETUP_DIALOG->show; 1853 $SETUP_DIALOG->show;
1548 } 1854 }
1549 1855
1550 $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]);
1551} 1857}
1552 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
1553sub video_shutdown { 1978sub video_shutdown {
1979 CFPlus::OpenGL::shutdown;
1980
1554 undef $SDL_ACTIVE; 1981 undef $SDL_ACTIVE;
1555} 1982}
1556 1983
1557my @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#
1558my $bgmusic;#TODO#hack#d# 1985my $bgmusic;#TODO#hack#d#
1565 1992
1566sub audio_music_finished { 1993sub audio_music_finished {
1567 return unless $CFG->{bgm_enable}; 1994 return unless $CFG->{bgm_enable};
1568 1995
1569 # TODO: hack, do play loop and mood music 1996 # TODO: hack, do play loop and mood music
1570 $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]";
1571 $bgmusic->play (0); 1998 $bgmusic->play (0);
1572 1999
1573 push @bgmusic, shift @bgmusic; 2000 push @bgmusic, shift @bgmusic;
1574} 2001}
1575 2002
1576sub audio_init { 2003sub audio_init {
1577 if ($CFG->{audio_enable}) { 2004 if ($CFG->{audio_enable}) {
1578 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2005 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1579 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2006 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1580 2007
1581 unless ($SDL_MIXER) { 2008 unless ($SDL_MIXER) {
1582 status "Unable to open sound device: there will be no sound"; 2009 status "Unable to open sound device: there will be no sound";
1583 return; 2010 return;
1584 } 2011 }
1585 2012
1586 CFClient::Mix_AllocateChannels 8; 2013 CFPlus::Mix_AllocateChannels 8;
1587 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2014 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1588 2015
1589 audio_music_finished; 2016 audio_music_finished;
1590 2017
2018 local $_;
1591 while (<$fh>) { 2019 while (<$fh>) {
1592 next if /^\s*#/; 2020 next if /^\s*#/;
1593 next if /^\s*$/; 2021 next if /^\s*$/;
1594 2022
1595 my ($file, $volume, $event) = split /\s+/, $_, 3; 2023 my ($file, $volume, $event) = split /\s+/, $_, 3;
1596 2024
1597 push @SOUNDS, "$volume,$file"; 2025 push @SOUNDS, "$volume,$file";
1598 2026
1599 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2027 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1600 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";
1601 $chunk->volume ($volume * 128 / 100); 2029 $chunk->volume ($volume * 128 / 100);
1602 $chunk 2030 $chunk
1603 }; 2031 };
1604 } 2032 }
1605 } else { 2033 } else {
1607 } 2035 }
1608 } 2036 }
1609} 2037}
1610 2038
1611sub audio_shutdown { 2039sub audio_shutdown {
1612 CFClient::Mix_CloseAudio if $SDL_MIXER; 2040 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1613 undef $SDL_MIXER; 2041 undef $SDL_MIXER;
1614 @SOUNDS = (); 2042 @SOUNDS = ();
1615 %AUDIO_CHUNKS = (); 2043 %AUDIO_CHUNKS = ();
1616} 2044}
1617 2045
1624 2052
1625sub force_refresh { 2053sub force_refresh {
1626 $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;
1627 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2055 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1628 2056
1629 $CFClient::UI::ROOT->draw; 2057 $CFPlus::UI::ROOT->draw;
1630 2058
1631 $WANT_REFRESH = 0; 2059 $WANT_REFRESH = 0;
1632 $CAN_REFRESH = 0; 2060 $CAN_REFRESH = 0;
1633 $LAST_REFRESH = $NOW; 2061 $LAST_REFRESH = $NOW;
1634 2062
16350 && do {
1636 # some weird model-drawing code, just a joke right now
1637 use CFClient::OpenGL;
1638
1639 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1640 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1641 $demo{r} ||= do {
1642 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1643 $mod->{v} = pack "f*", @{$mod->{v}};
1644 $_ = [scalar @$_, pack "S!*", @$_]
1645 for values %{$mod->{g}};
1646 $mod
1647 };
1648
1649 my $r = $demo{r} or die;
1650
1651 glDepthMask 1;
1652 glClear GL_DEPTH_BUFFER_BIT;
1653 glEnable GL_TEXTURE_2D;
1654 glEnable GL_DEPTH_TEST;
1655 glEnable GL_CULL_FACE;
1656 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1657
1658 glMatrixMode GL_PROJECTION;
1659 glLoadIdentity;
1660 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1661 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1662 glMatrixMode GL_MODELVIEW;
1663 glLoadIdentity;
1664
1665 glPushMatrix;
1666 glTranslate 0, 0, -800;
1667 glScale 1, -1, 1;
1668 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1669 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1670 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1671 glScale 50, 50, 50;
1672
1673 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1674 while (my ($k, $v) = each %{$r->{g}}) {
1675 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1676 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1677 }
1678
1679 glPopMatrix;
1680
1681 glShadeModel GL_FLAT;
1682 glDisable GL_DEPTH_TEST;
1683 glDisable GL_TEXTURE_2D;
1684 glDepthMask 0;
1685
1686 $WANT_REFRESH++;
1687};
1688
1689 CFClient::SDL_GL_SwapBuffers; 2063 CFPlus::SDL_GL_SwapBuffers;
1690} 2064}
1691 2065
1692my $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 {
1693 $NOW = time; 2067 $NOW = time;
1694 2068
1695 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2069 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1696 for CFClient::SDL_PollEvent; 2070 for CFPlus::SDL_PollEvent;
1697 2071
1698 if (%animate_object) { 2072 if (%animate_object) {
1699 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2073 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1700 $WANT_REFRESH++; 2074 $WANT_REFRESH++;
1701 } 2075 }
1725 $CONN->face_prefetch 2099 $CONN->face_prefetch
1726 if $CONN; 2100 if $CONN;
1727}); 2101});
1728 2102
1729%SDL_CB = ( 2103%SDL_CB = (
1730 CFClient::SDL_QUIT => sub { 2104 CFPlus::SDL_QUIT => sub {
1731 Event::unloop -1; 2105 exit;
1732 }, 2106 },
1733 CFClient::SDL_VIDEORESIZE => sub { 2107 CFPlus::SDL_VIDEORESIZE => sub {
1734 }, 2108 },
1735 CFClient::SDL_VIDEOEXPOSE => sub { 2109 CFPlus::SDL_VIDEOEXPOSE => sub {
1736 CFClient::UI::full_refresh; 2110 CFPlus::UI::full_refresh;
1737 }, 2111 },
1738 CFClient::SDL_ACTIVEEVENT => sub { 2112 CFPlus::SDL_ACTIVEEVENT => sub {
1739# 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;
1740 }, 2118 },
1741 CFClient::SDL_KEYDOWN => sub { 2119 CFPlus::SDL_KEYDOWN => sub {
1742 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2120 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1743 # alt-enter 2121 # alt-enter
2122 $FULLSCREEN_ENABLE->toggle;
1744 video_shutdown; 2123 video_shutdown;
1745 $CFG->{fullscreen} = !$CFG->{fullscreen};
1746 video_init; 2124 video_init;
1747 } else { 2125 } else {
1748 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2126 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1749 } 2127 }
1750 }, 2128 },
1751 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2129 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1752 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2130 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1753 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2131 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1754 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2132 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1755 CFClient::SDL_USEREVENT => sub { 2133 CFPlus::SDL_USEREVENT => sub {
1756 if ($_[0]{code} == 1) { 2134 if ($_[0]{code} == 1) {
1757 audio_channel_finished $_[0]{data1}; 2135 audio_channel_finished $_[0]{data1};
1758 } elsif ($_[0]{code} == 0) { 2136 } elsif ($_[0]{code} == 0) {
1759 audio_music_finished; 2137 audio_music_finished;
1760 } 2138 }
1764############################################################################# 2142#############################################################################
1765 2143
1766$SIG{INT} = $SIG{TERM} = sub { exit }; 2144$SIG{INT} = $SIG{TERM} = sub { exit };
1767 2145
1768{ 2146{
1769 local $SIG{__DIE__} = sub {
1770 return unless defined $^S && !$^S;
1771 Carp::confess $_[1];#d#TODO: remove when stable
1772 CFClient::fatal $_[0];
1773 };
1774
1775 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2147 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2148 CFPlus::DB::Server::run;
2149
1776 CFClient::UI::set_layout ($::CFG->{layout}); 2150 CFPlus::UI::set_layout ($::CFG->{layout});
1777 2151
1778 my %DEF_CFG = ( 2152 my %DEF_CFG = (
1779 sdl_mode => 0, 2153 sdl_mode => 0,
1780 width => 640, 2154 width => 640,
1781 height => 480, 2155 height => 480,
1782 fullscreen => 0, 2156 fullscreen => 0,
1783 fast => 0, 2157 fast => 0,
1784 map_scale => 1, 2158 map_scale => 1,
1785 fow_enable => 1, 2159 fow_enable => 1,
1786 fow_intensity => 0.45, 2160 fow_intensity => 0.45,
1787 fow_smooth => 0, 2161 fow_smooth => 0,
2162 map_smoothing => 1,
1788 gui_fontsize => 1, 2163 gui_fontsize => 1,
1789 log_fontsize => 0.7, 2164 log_fontsize => 0.7,
1790 gauge_fontsize=> 1, 2165 gauge_fontsize => 1,
1791 gauge_size => 0.35, 2166 gauge_size => 0.35,
1792 stat_fontsize => 0.7, 2167 stat_fontsize => 0.7,
1793 mapsize => 100, 2168 mapsize => 100,
1794 host => "crossfire.schmorp.de",
1795 say_command => 'say', 2169 say_command => 'chat',
1796 audio_enable => 1, 2170 audio_enable => 1,
1797 bgm_enable => 1, 2171 bgm_enable => 1,
1798 bgm_volume => 0.25, 2172 bgm_volume => 0.25,
1799 face_prefetch => 0, 2173 face_prefetch => 0,
1800 output_sync => 1, 2174 output_sync => 1,
1801 output_count => 1, 2175 output_count => 1,
2176 output_rate => "",
2177 pickup => 0,
2178 inv_sort => "mtime",
2179 default => "profile", # default profile
2180 show_tips => 1,
2181 logview_max_par => 1000,
2182 );
1802 ); 2183
1803
1804 while (my ($k, $v) = each %DEF_CFG) { 2184 while (my ($k, $v) = each %DEF_CFG) {
1805 $CFG->{$k} = $v unless exists $CFG->{$k}; 2185 $CFG->{$k} = $v unless exists $CFG->{$k};
1806 } 2186 }
1807 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
1808 sdl_init; 2203 sdl_init;
1809 2204
1810 @SDL_MODES = reverse 2205 @SDL_MODES = reverse
1811 grep $_->[0] >= 640 && $_->[1] >= 480, 2206 grep $_->[0] >= 640 && $_->[1] >= 480,
1812 CFClient::SDL_ListModes; 2207 CFPlus::SDL_ListModes;
1813 2208
1814 @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)";
1815 2210
1816 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2211 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1817 2212
1818 { 2213 {
1819 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2214 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1820 DejaVuSans.ttf 2215 DejaVuSans.ttf
1821 DejaVuSansMono.ttf 2216 DejaVuSansMono.ttf
1822 DejaVuSans-Bold.ttf 2217 DejaVuSans-Bold.ttf
1823 DejaVuSansMono-Bold.ttf 2218 DejaVuSansMono-Bold.ttf
1824 DejaVuSans-Oblique.ttf 2219 DejaVuSans-Oblique.ttf
1825 DejaVuSansMono-Oblique.ttf 2220 DejaVuSansMono-Oblique.ttf
1826 DejaVuSans-BoldOblique.ttf 2221 DejaVuSans-BoldOblique.ttf
1827 DejaVuSansMono-BoldOblique.ttf 2222 DejaVuSansMono-BoldOblique.ttf
1828 ); 2223 );
1829 2224
1830 CFClient::add_font $_ for @fonts; 2225 CFPlus::add_font $_ for @fonts;
1831 2226
1832 CFClient::pango_init; 2227 CFPlus::pango_init;
1833 2228
1834 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2229 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1835 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2230 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1836 2231
1837 $FONT_PROP->make_default; 2232 $FONT_PROP->make_default;
1838 } 2233 }
1839 2234
1840# compare mono (ft) vs. rgba (cairo) 2235# compare mono (ft) vs. rgba (cairo)
1841# ft - 1.8s, cairo 3s, even in alpha-only mode 2236# ft - 1.8s, cairo 3s, even in alpha-only mode
1842# for my $rgba (0..1) { 2237# for my $rgba (0..1) {
1843# my $t1 = Time::HiRes::time; 2238# my $t1 = Time::HiRes::time;
1844# for (1..1000) { 2239# for (1..1000) {
1845# my $layout = CFClient::Layout->new ($rgba); 2240# my $layout = CFPlus::Layout->new ($rgba);
1846# $layout->set_text ("hallo" x 100); 2241# $layout->set_text ("hallo" x 100);
1847# $layout->render; 2242# $layout->render;
1848# } 2243# }
1849# my $t2 = Time::HiRes::time; 2244# my $t2 = Time::HiRes::time;
1850# warn $t2-$t1; 2245# warn $t2-$t1;
1851# } 2246# }
1852 2247
2248 $startup_done->();
2249
1853 video_init; 2250 video_init;
1854 audio_init; 2251 audio_init;
1855} 2252}
1856 2253
2254show_tip_of_the_day if $CFG->{show_tips};
2255
1857Event::loop; 2256Event::loop;
2257#CFPlus::SDL_Quit;
2258#CFPlus::_exit 0;
1858 2259
1859END { CFClient::SDL_Quit } 2260END {
2261 CFPlus::SDL_Quit;
2262 CFPlus::DB::Server::stop;
2263}
1860 2264
1861=head1 NAME 2265=head1 NAME
1862 2266
1863cfplus - A Crossfire+ and Crossfire game client 2267cfplus - A Crossfire+ and Crossfire game client
1864 2268

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines