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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines