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.70 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.150 by root, Mon Apr 16 21:06:37 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines