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.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.151 by root, Mon Apr 16 21:12:51 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
32use Crossfire; 55use Crossfire;
33use Crossfire::Protocol::Constants; 56use Crossfire::Protocol::Constants;
34 57
35use Compress::LZF; 58use Compress::LZF;
36 59
37use CFClient; 60use CFPlus;
38use CFClient::OpenGL (); 61use CFPlus::OpenGL ();
39use CFClient::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
40use CFClient::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
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;
457 $SPELL_LIST->clear_spells;
368 458
369 return unless $CONN; 459 return unless $CONN;
370 460
371 status "connection closed"; 461 status "connection closed";
372 462
373 destroy_query_dialog $CONN; 463 destroy_query_dialog $CONN;
374 $CONN->destroy; 464 $CONN->destroy;
375 $CONN = 0; # false, does not autovivify 465 $CONN = 0; # false, does not autovivify
466
467 undef $MAP;
376} 468}
377 469
378sub graphics_setup { 470sub graphics_setup {
379 my $vbox = new CFClient::UI::VBox; 471 my $vbox = new CFPlus::UI::VBox;
380 472
381 $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]);
382 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
383 $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");
384 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 483 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
385 484
386 $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]);
387 $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");
388 487
389 $mode_slider->connect (changed => sub { 488 $mode_slider->connect (changed => sub {
390 my ($self, $value) = @_; 489 my ($self, $value) = @_;
391 490
392 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 491 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
393 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 492 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
394 }); 493 });
395 $mode_slider->emit (changed => $mode_slider->{range}[0]); 494 $mode_slider->emit (changed => $mode_slider->{range}[0]);
396 495
397 my $row = 1;
398
399 $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");
400 $table->add (1, $row++, new CFClient::UI::CheckBox 497 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
401 state => $CFG->{fullscreen}, 498 state => $CFG->{fullscreen},
402 tooltip => "Bring the client into fullscreen mode.", 499 tooltip => "Bring the client into fullscreen mode.",
403 on_changed => sub { 500 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
404 my ($self, $value) = @_;
405 $CFG->{fullscreen} = $value;
406 }
407 ); 501 );
408 502
409 $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");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 504 $table->add (1, $row++, new CFPlus::UI::CheckBox
411 state => $CFG->{fast}, 505 state => $CFG->{fast},
412 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.",
413 on_changed => sub { 520 on_activate => sub {
414 my ($self, $value) = @_; 521 video_shutdown ();
415 $CFG->{fast} = $value; 522 video_init ();
523 0
416 } 524 }
417 ); 525 );
418 526
419 $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");
420 $table->add (1, $row++, new CFClient::UI::Slider 528 $table->add (1, $row++, new CFPlus::UI::Slider
421 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 529 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
422 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 530 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
423 on_changed => sub { 531 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
424 my ($self, $value) = @_;
425 $CFG->{map_scale} = 2 ** $value;
426 }
427 ); 532 );
428 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
429 $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");
430 $table->add (1, $row++, new CFClient::UI::CheckBox 544 $table->add (1, $row++, new CFPlus::UI::CheckBox
431 state => $CFG->{fow_enable}, 545 state => $CFG->{fow_enable},
432 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.",
433 on_changed => sub { 547 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
434 my ($self, $value) = @_;
435 $CFG->{fow_enable} = $value;
436 }
437 ); 548 );
438 549
439 $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");
440 $table->add (1, $row++, new CFClient::UI::Slider 551 $table->add (1, $row++, new CFPlus::UI::Slider
441 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 552 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
442 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.",
443 on_changed => sub { 554 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
444 my ($self, $value) = @_;
445 $CFG->{fow_intensity} = $value;
446 }
447 ); 555 );
448 556
449 $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");
450 $table->add (1, $row++, new CFClient::UI::CheckBox 558 $table->add (1, $row++, new CFPlus::UI::CheckBox
451 state => $CFG->{fow_smooth}, 559 state => $CFG->{fow_smooth},
452 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.",
453 on_changed => sub { 561 on_changed => sub {
454 my ($self, $value) = @_; 562 my ($self, $value) = @_;
455 $CFG->{fow_smooth} = $value; 563 $CFG->{fow_smooth} = $value;
456 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
457 } 566 }
458 ); 567 );
459 568
460 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
461 $table->add (1, $row++, new CFClient::UI::Slider
462 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
463 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
464 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
465 );
466
467 $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");
468 $table->add (1, $row++, new CFClient::UI::Slider 570 $table->add (1, $row++, new CFPlus::UI::Slider
469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 571 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
470 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.",
471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 573 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
472 ); 574 );
473 575
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
475
476 $table->add (1, $row++, new CFClient::UI::Slider
477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
479 on_changed => sub {
480 $CFG->{stat_fontsize} = $_[1];
481 &set_stats_window_fontsize;
482 }
483 );
484
485 $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");
486 $table->add (1, $row++, new CFClient::UI::Slider 577 $table->add (1, $row++, new CFPlus::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 578 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
488 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.",
489 on_changed => sub { 580 on_changed => sub {
490 $CFG->{gauge_fontsize} = $_[1]; 581 $CFG->{gauge_fontsize} = $_[1];
491 &set_gauge_window_fontsize; 582 &set_gauge_window_fontsize;
583 0
492 } 584 }
493 ); 585 );
494 586
495 $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");
496 $table->add (1, $row++, new CFClient::UI::Slider 588 $table->add (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{gauge_size}, 0.2, 0.8], 589 range => [$CFG->{gauge_size}, 0.2, 0.8],
498 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.",
499 on_changed => sub { 591 on_changed => sub {
500 $CFG->{gauge_size} = $_[1]; 592 $CFG->{gauge_size} = $_[1];
501 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 593 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
502 } 594 0
503 );
504
505 $table->add (1, $row++, new CFClient::UI::Button
506 expand => 1, align => 0, text => "Apply",
507 tooltip => "Apply the video settings",
508 on_activate => sub {
509 video_shutdown ();
510 video_init ();
511 } 595 }
512 ); 596 );
513 597
514 $vbox 598 $vbox
515} 599}
516 600
517sub audio_setup { 601sub audio_setup {
518 my $vbox = new CFClient::UI::VBox; 602 my $vbox = new CFPlus::UI::VBox;
519 603
520 $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]);
521 605
522 my $row = 0; 606 my $row = 0;
523 607
524 $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");
525 $table->add (1, $row++, new CFClient::UI::CheckBox 609 $table->add (1, $row++, new CFPlus::UI::CheckBox
526 state => $CFG->{audio_enable}, 610 state => $CFG->{audio_enable},
527 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.",
528 on_changed => sub { 612 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
529 $CFG->{audio_enable} = $_[1];
530 }
531 ); 613 );
532# $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");
533# $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 {
534# $CFG->{effects_volume} = $_[1]; 616# $CFG->{effects_volume} = $_[1];
535# }); 617# });
536 $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");
537 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 619 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
538 $hbox->add (new CFClient::UI::CheckBox 620 $hbox->add (new CFPlus::UI::CheckBox
539 expand => 1, state => $CFG->{bgm_enable}, 621 expand => 1, state => $CFG->{bgm_enable},
540 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.",
541 on_changed => sub { 623 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
542 $CFG->{bgm_enable} = $_[1];
543 }
544 ); 624 );
545 $hbox->add (new CFClient::UI::Slider 625 $hbox->add (new CFPlus::UI::Slider
546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 626 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
547 tooltip => "The volume of the background music. Changes are instant.", 627 tooltip => "The volume of the background music. Changes are instant.",
548 on_changed => sub { 628 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
549 $CFG->{bgm_volume} = $_[1];
550 CFClient::MixMusic::volume $_[1] * 128;
551 }
552 ); 629 );
553 630
554 $table->add (1, $row++, new CFClient::UI::Button 631 $table->add (1, $row++, new CFPlus::UI::Button
555 expand => 1, align => 0, text => "Apply", 632 expand => 1, align => 0, text => "Apply",
556 tooltip => "Apply the audio settings", 633 tooltip => "Apply the audio settings",
557 on_activate => sub { 634 on_activate => sub {
558 audio_shutdown (); 635 audio_shutdown ();
559 audio_init (); 636 audio_init ();
637 0
560 } 638 }
561 ); 639 );
562 640
563 $vbox 641 $vbox
564}
565
566sub set_stats_window_fontsize {
567 for (values %{$STATWIDS}) {
568 $_->set_fontsize ($::CFG->{stat_fontsize});
569 }
570} 642}
571 643
572sub set_gauge_window_fontsize { 644sub set_gauge_window_fontsize {
573 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 645 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
574 $_->set_fontsize ($::CFG->{gauge_fontsize}); 646 $_->set_fontsize ($::CFG->{gauge_fontsize});
576} 648}
577 649
578sub make_gauge_window { 650sub make_gauge_window {
579 my $gh = int $HEIGHT * $CFG->{gauge_size}; 651 my $gh = int $HEIGHT * $CFG->{gauge_size};
580 652
581 my $win = new CFClient::UI::Frame ( 653 my $win = new CFPlus::UI::Frame (
582 force_x => 0, 654 force_x => 0,
583 force_y => "max", 655 force_y => "max",
584 force_w => $WIDTH, 656 force_w => $WIDTH,
585 force_h => $gh, 657 force_h => $gh,
586 ); 658 );
587 659
588 $win->add (my $hbox = new CFClient::UI::HBox 660 $win->add (my $hbox = new CFPlus::UI::HBox
589 children => [ 661 children => [
590 (new CFClient::UI::HBox expand => 1), 662 (new CFPlus::UI::HBox expand => 1),
591 (new CFClient::UI::VBox children => [ 663 (new CFPlus::UI::VBox children => [
592 (new CFClient::UI::Empty expand => 1), 664 (new CFPlus::UI::Empty expand => 1),
593 (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)),
594 ]), 666 ]),
595 (my $vbox = new CFClient::UI::VBox), 667 (my $vbox = new CFPlus::UI::VBox),
596 ], 668 ],
597 ); 669 );
598 670
599 $vbox->add (new CFClient::UI::HBox 671 $vbox->add (new CFPlus::UI::HBox
600 expand => 1, 672 expand => 1,
601 children => [ 673 children => [
602 (new CFClient::UI::Empty expand => 1), 674 (new CFPlus::UI::Empty expand => 1),
603 (my $hb = new CFClient::UI::HBox), 675 (my $hb = new CFPlus::UI::HBox),
604 ], 676 ],
605 ); 677 );
606 678
607 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 679 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
608 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.");
609 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 680 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
610 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.");
611 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 681 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
612 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.");
613 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 682 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
614 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.");
615 683
616 $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");
617 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.");
618 $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");
619 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
620 686
621 $GAUGES = { 687 $GAUGES = {
622 exp => $exp, win => $win, range => $rng, 688 exp => $exp, win => $win, range => $rng,
623 food => $fg, mana => $mg, hp => $hg, grace => $gg 689 food => $fg, mana => $mg, hp => $hg, grace => $gg
624 }; 690 };
627 693
628 $win 694 $win
629} 695}
630 696
631sub debug_setup { 697sub debug_setup {
632 my $table = new CFClient::UI::Table; 698 my $table = new CFPlus::UI::Table;
633 699
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 700 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
635 $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 });
636 $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");
637 $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 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 704 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
639 $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 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 706 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
641 $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" } );
642 709
643 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);
644 711
645 for my $x (0..2) { 712 for my $x (0..2) {
646 for my $y (0 .. 2) { 713 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y, 714 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry 715 new CFPlus::UI::Entry
649 text => $default_smooth[$x * 3 + $y], 716 text => $default_smooth[$x * 3 + $y],
650 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 },
651 ); 718 );
652 } 719 }
653 } 720 }
654 721
722 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
655 723
656 $table 724 $table
657} 725}
658 726
659sub stats_window { 727sub stats_window {
660 my $tgw = new CFClient::UI::FancyFrame 728 my $r = new CFPlus::UI::ScrolledWindow (
661 y => $HEIGHT * (2/8), 729 expand => 1,
662 x => "max", 730 scroll_y => 1
663 title => "Stats", 731 );
664 name => "stats_window"; 732 $r->add (my $vb = new CFPlus::UI::VBox);
665 733
666 $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
667 $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,
668 can_hover => 1, can_events => 1, 740 can_hover => 1, can_events => 1,
669 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.");
670 $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,
671 can_hover => 1, can_events => 1, 743 can_hover => 1, can_events => 1,
672 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).");
673 745
674 $vb->add (my $hb0 = new CFClient::UI::HBox); 746 $pi->add (my $hb0 = new CFPlus::UI::HBox);
675 $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,
676 can_hover => 1, can_events => 1, 748 can_hover => 1, can_events => 1,
677 tooltip => "The weight of the player including all inventory items."); 749 tooltip => "The weight of the player including all inventory items.");
678 $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,
679 can_hover => 1, can_events => 1, 751 can_hover => 1, can_events => 1,
680 tooltip => "The weight limit: you cannot carry more than this."); 752 tooltip => "The weight limit: you cannot carry more than this.");
681 753
682 754 $vb->add (new CFPlus::UI::FancyFrame
755 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 756 child => (my $hb = new CFPlus::UI::HBox expand => 1),
757 );
684 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 758 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 759
686 my $color2 = [1, 1, 0]; 760 my $color2 = [1, 1, 0];
687 761
688 for ( 762 for (
689 [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],
690 [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],
691 [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],
692 [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],
693 [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],
694 [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],
695 [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],
696 770
697 [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],
698 [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],
699 [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],
700 [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],
701 [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],
702 [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],
703 ) { 777 ) {
704 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 778 my ($col, $row, $id, $label, $template) = @$_;
705 779
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 780 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
707 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");
708 $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
709 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");
710 } 786 }
711 787
788 $vb->add (new CFPlus::UI::FancyFrame
789 label => "Resistancies",
712 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 790 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
791 );
713 792
714 my $row = 0; 793 my $row = 0;
715 my $col = 0; 794 my $col = 0;
716 795
717 my %resist_names = ( 796 my %resist_names = (
797 slow => ["Slow",
718 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",
719 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",
720 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",
721 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",
722 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",
723 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",
724 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",
725 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",
726 pois => "<b>Poison</b> (resistance to getting poisoned)", 814 "<b>Poison</b> (resistance to getting poisoned)"],
815 para => ["Paralysation",
727 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",
728 deat => "<b>Death</b> (resistance against death spells)", 818 "<b>Death</b> (resistance against death spells)"],
729 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",
730 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",
731 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",
732 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",
733 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",
734 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",
735 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)"],
736 ); 833 );
737 for (qw/slow holyw conf fire depl magic 834 for (qw/slow holyw conf fire depl magic
738 drain acid pois para deat phys 835 drain acid pois para deat phys
739 blind fear tund elec cold ghit/) 836 blind fear tund elec cold ghit/)
740 { 837 {
741 $tbl2->add ($col, $row, 838 $tbl2->add ($col, $row,
742 $STATWIDS->{"res_$_"} = 839 $STATWIDS->{"res_$_"} =
743 new CFClient::UI::Label 840 new CFPlus::UI::Label
744 font => $FONT_FIXED, 841 font => $FONT_FIXED,
745 template => "-100%", 842 template => "-100%",
746 align => +1, 843 align => +1,
747 valign => 0, 844 valign => 0,
748 can_events => 1, 845 can_events => 1,
749 can_hover => 1, 846 can_hover => 1,
750 tooltip => $resist_names{$_}, 847 tooltip => $resist_names{$_}->[1],
751 ); 848 );
752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 849 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
753 font => $FONT_FIXED, 850 font => $FONT_FIXED,
754 can_hover => 1, 851 can_hover => 1,
755 can_events => 1, 852 can_events => 1,
756 image => "ui/resist/resist_$_.png", 853 path => "ui/resist/resist_$_.png",
757 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],
758 ); 862 );
759 863
760 $row++; 864 $row++;
761 if ($row % 6 == 0) { 865 if ($row % 6 == 0) {
762 $col += 2; 866 $col += 3;
763 $row = 0; 867 $row = 0;
764 } 868 }
765 } 869 }
766 870
767 &set_stats_window_fontsize;
768 update_stats_window ({}); 871 #update_stats_window ({});
769 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]);
770 $tgw 879 $sw
771} 880}
772 881
773sub formsep($) { 882sub formsep($) {
774 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 883 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
775} 884}
776 885
777sub update_stats_window {
778 my ($stats) = @_;
779
780 # I love text protocols...
781
782 my $hp = $stats->{+CS_STAT_HP} * 1;
783 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
784 my $sp = $stats->{+CS_STAT_SP} * 1;
785 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
786 my $fo = $stats->{+CS_STAT_FOOD} * 1;
787 my $fo_m = 999;
788 my $gr = $stats->{+CS_STAT_GRACE} * 1;
789 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
790
791 $GAUGES->{hp} ->set_value ($hp, $hp_m);
792 $GAUGES->{mana} ->set_value ($sp, $sp_m);
793 $GAUGES->{food} ->set_value ($fo, $fo_m);
794 $GAUGES->{grace} ->set_value ($gr, $gr_m);
795 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
796 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
797 my $rng = $stats->{+CS_STAT_RANGE};
798 $rng =~ s/^Range: //; # thank you so much dear server
799 $GAUGES->{range} ->set_text ("Rng: " . $rng);
800 my $title = $stats->{+CS_STAT_TITLE};
801 $title =~ s/^Player: //;
802 $STATWIDS->{title} ->set_text ("Title: " . $title);
803
804 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
805 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
806 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
807 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
808 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
809 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
810 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
811 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
812 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
813 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
814 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
815 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
816 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
817
818 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
819
820 # TODO: replace by CS_STAT_RES_xxx constants
821 my %tbl = (
822 phys => 100,
823 magic => 101,
824 fire => 102,
825 elec => 103,
826 cold => 104,
827 conf => 105,
828 acid => 106,
829 drain => 107,
830 ghit => 108,
831 pois => 109,
832 slow => 110,
833 para => 111,
834 tund => 112,
835 fear => 113,
836 depl => 113,
837 deat => 115,
838 holyw => 116,
839 blind => 117,
840 );
841
842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843 for keys %tbl;
844}
845
846my $METASERVER_ATIME; 886my $METASERVER_ATIME;
847 887
848sub update_metaserver { 888sub update_metaserver {
889 my ($metaserver_dialog) = @_;
890
891 $METASERVER = $metaserver_dialog
892 if defined $metaserver_dialog;
893
849 return if $METASERVER_ATIME > time; 894 return if $METASERVER_ATIME > time;
850 $METASERVER_ATIME = time + 60; 895 $METASERVER_ATIME = time + 60;
851 896
852 my $table = $METASERVER->{table}; 897 my $table = $METASERVER->{table};
853 $table->clear; 898 $table->clear;
854 $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...");
855 900
856 my $buf; 901 my $ok = 0;
857 902
858 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 903 CFPlus::background {
904 my $ua = CFPlus::lwp_useragent;
859 905
860 unless ($fh) { 906 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
861 $label->set_text ("unable to contact metaserver: $!"); 907 } sub {
862 return; 908 my ($msg) = @_;
863 } 909 if ($msg) {
864
865 Event->io (fd => $fh, poll => 'r', cb => sub {
866 my $res = sysread $fh, $buf, 8192, length $buf;
867
868 if (!defined $res) {
869 $_[0]->w->cancel;
870 $label->set_text ("error while retrieving server list: $!");
871 } elsif ($res == 0) {
872 $_[0]->w->cancel;
873 status "server list retrieved";
874
875 utf8::decode $buf if utf8::valid $buf;
876
877 $table->clear; 910 $table->clear;
878 911
879 my @tip = ( 912 my @tip = (
880 "The current number of users logged in on the server.", 913 "The current number of users logged in on the server.",
881 "The hostname of the server.", 914 "The hostname of the server.",
882 "The time this server has been running without being restarted.", 915 "The time this server has been running without being restarted.",
883 "The server software version - a '+' indicates a Crossfire+ server.", 916 "The server software version - a '+' indicates a Crossfire+ server.",
884 "Short information about this server provided by its admins.", 917 "Short information about this server provided by its admins.",
885 ); 918 );
886 my @col = qw(#Users Host Uptime Version Description); 919 my @col = qw(#Users Host Uptime Version Description);
887 $table->add ($_, 0, new CFClient::UI::Label 920 $table->add ($_, 0, new CFPlus::UI::Label
888 can_hover => 1, can_events => 1, 921 can_hover => 1, can_events => 1,
889 align => 0, fg => [1, 1, 0], 922 align => 0, fg => [1, 1, 0],
890 text => $col[$_], tooltip => $tip[$_]) 923 text => $col[$_], tooltip => $tip[$_])
891 for 0 .. $#col; 924 for 0 .. $#col;
892 925
893 my @align = qw(1 0 1 1 -1); 926 my @align = qw(1 0 1 1 -1);
894 927
895 my $y = 0; 928 my $y = 0;
896 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 929 for my $m (@{ $msg->{servers} }) {
897 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)};
898 932
899 for ($desc) { 933 for ($desc) {
900 s/<br>/\n/gi; 934 s/<br>/\n/gi;
901 s/<li>/\n· /gi; 935 s/<li>/\n· /gi;
902 s/<.*?>//sgi; 936 s/<.*?>//sgi;
903 s/&/&amp;/g; 937 s/&amp;/&/g;
904 s/</&lt;/g; 938 s/&lt;/</g;
905 s/>/&gt;/g; 939 s/&gt;/>/g;
906 } 940 }
907 941
908 $uptime = sprintf "%dd %02d:%02d:%02d", 942 $uptime = sprintf "%dd %02d:%02d:%02d",
909 (int $m->[8] / 86400), 943 (int $uptime / 86400),
910 (int $m->[8] / 3600) % 24, 944 (int $uptime / 3600) % 24,
911 (int $m->[8] / 60) % 60, 945 (int $uptime / 60) % 60,
912 $m->[8] % 60; 946 $uptime % 60;
913 947
914 $m = [$users, $host, $uptime, $version, $desc]; 948 $m = [$users, $host, $uptime, $version, $desc];
915 949
916 $y++; 950 $y++;
917 951
918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 952 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
919 (new CFClient::UI::Button 953 (new CFPlus::UI::Button
920 text => "Use", 954 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field", 955 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub { 956 on_activate => sub {
923 $HOST_ENTRY->set_text ($CFG->{host} = $host); 957 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924 $METASERVER->hide; 958 $METASERVER->hide;
959 0
925 }, 960 },
926 ), 961 ),
927 (new CFClient::UI::Empty expand => 1), 962 (new CFPlus::UI::Empty expand => 1),
928 ]); 963 ]);
929 964
930 $table->add ($_, $y, new CFClient::UI::Label 965 $table->add ($_, $y, new CFPlus::UI::Label
966 max_w => $::WIDTH * 0.4,
931 ellipsise => 0, 967 ellipsise => 0,
932 align => $align[$_], 968 align => $align[$_],
933 text => $m->[$_], 969 text => $m->[$_],
934 tooltip => $tip[$_], 970 tooltip => $tip[$_],
971 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
935 can_hover => 1, 972 can_hover => 1,
936 can_events => 1, 973 can_events => 1,
937 fontsize => 0.8) 974 fontsize => 0.8)
938 for 0 .. $#$m; 975 for 0 .. $#$m;
939 } 976 }
977 } else {
978 $ok or $label->set_text ("error while contacting metaserver");
940 } 979 }
941 }); 980 };
981
942} 982}
943 983
944sub metaserver_dialog { 984sub metaserver_dialog {
945 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
946 title => "Server List", 990 title => "Server List",
947 name => 'metaserver_dialog', 991 name => 'metaserver_dialog',
948 x => 'center', 992 x => 'center',
949 y => 'center', 993 y => 'center',
950 z => 3, 994 z => 3,
995 force_w => $::WIDTH * 0.9,
951 force_h => $::HEIGHT * 0.4, 996 force_h => $::HEIGHT * 0.7,
952 child => (my $vbox = new CFClient::UI::VBox), 997 child => $vbox,
998 has_close_button => 1,
999 table => $table,
953 on_visibility_change => sub { 1000 on_visibility_change => sub {
954 update_metaserver if $_[1]; 1001 update_metaserver ($_[0]) if $_[1];
1002 0
955 }, 1003 },
956 ; 1004 ;
957 1005
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961
962 $dialog 1006 $dialog
963} 1007}
964 1008
965sub server_setup { 1009sub server_setup {
966 my $vbox = new CFClient::UI::VBox; 1010 my $vbox = new CFPlus::UI::VBox;
967 1011
1012 $vbox->add (new CFPlus::UI::FancyFrame
1013 label => "Connection Settings",
968 $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 );
969 $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");
970 1017
971 { 1018 {
972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1019 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
973 1020
974 $vbox->add ( 1021 $vbox->add (
975 $HOST_ENTRY = new CFClient::UI::Entry 1022 $HOST_ENTRY = new CFPlus::UI::Entry
976 expand => 1, 1023 expand => 1,
977 text => $CFG->{host}, 1024 text => $CFG->{profile}{default}{host},
978 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",
979 on_changed => sub { 1026 on_changed => sub {
980 my ($self, $value) = @_; 1027 my ($self, $value) = @_;
981 $CFG->{host} = $value; 1028 $CFG->{profile}{default}{host} = $value;
1029 0
982 } 1030 }
983 ); 1031 );
984 1032
985 $METASERVER = metaserver_dialog;
986
987 $vbox->add (new CFClient::UI::Button 1033 $vbox->add (new CFPlus::UI::Button
988 expand => 1, 1034 expand => 1,
989 text => "Server List", 1035 text => "Server List",
990 other => $METASERVER, 1036 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 1037 tooltip => "Show a list of available crossfire servers",
992 on_activate => sub { $METASERVER->toggle_visibility }, 1038 on_activate => sub { $METASERVER->toggle_visibility; 0 },
993 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 1039 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994 ); 1040 );
995 } 1041 }
996 1042
997 $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");
998 $table->add (1, 4, new CFClient::UI::Entry 1044 $table->add (1, 4, new CFPlus::UI::Entry
999 text => $CFG->{user}, 1045 text => $CFG->{profile}{default}{user},
1000 tooltip => "The name of your character on the server", 1046 tooltip => "The name of your character on the server",
1001 on_changed => sub { 1047 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002 my ($self, $value) = @_;
1003 $CFG->{user} = $value;
1004 }
1005 ); 1048 );
1006 1049
1007 $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");
1008 $table->add (1, 5, new CFClient::UI::Entry 1051 $table->add (1, 5, new CFPlus::UI::Entry
1009 text => $CFG->{password}, 1052 text => $CFG->{profile}{default}{password},
1010 hidden => 1, 1053 hidden => 1,
1011 tooltip => "The password for your character", 1054 tooltip => "The password for your character",
1012 on_changed => sub { 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013 my ($self, $value) = @_;
1014 $CFG->{password} = $value;
1015 }
1016 ); 1056 );
1017 1057
1018 $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");
1019 $table->add (1, 7, new CFClient::UI::Slider 1059 $table->add (1, 7, new CFPlus::UI::Slider
1020 force_w => 100, 1060 force_w => 100,
1021 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1061 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022 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. "
1023 . "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, "
1024 . "but you also increase bandwidth requirements and latency. " 1064 . "but you also increase bandwidth requirements and latency. "
1025 . "This option is only used once at log-in.", 1065 . "This option is only used once at log-in.",
1026 on_changed => sub { 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1027 my ($self, $value) = @_;
1028
1029 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1030 },
1031 ); 1067 );
1032 1068
1033 $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");
1034 $table->add (1, 8, new CFClient::UI::CheckBox 1070 $table->add (1, 8, new CFPlus::UI::CheckBox
1035 state => $CFG->{face_prefetch}, 1071 state => $CFG->{face_prefetch},
1036 tooltip => "<b>Background Image Prefetch</b>\n\n" 1072 tooltip => "<b>Background Image Prefetch</b>\n\n"
1037 . "If enabled, the client automatically pre-fetches images from the server. " 1073 . "If enabled, the client automatically pre-fetches images from the server. "
1038 . "This might increase or create lag, but increases the chances " 1074 . "This might increase or create lag, but increases the chances "
1039 . "of faces being ready for display when you encounter them. " 1075 . "of faces being ready for display when you encounter them. "
1040 . "It also uses up server bandwidth on every connect, " 1076 . "It also uses up server bandwidth on every connect, "
1041 . "so only set it if you really need to prefetch images. " 1077 . "so only set it if you really need to prefetch images. "
1042 . "This option can be set and unset any time.", 1078 . "This option can be set and unset any time.",
1043 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1079 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044 ); 1080 );
1045 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
1046 $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");
1047 $table->add (1, 9, new CFClient::UI::Entry 1092 $table->add (1, 10, new CFPlus::UI::Entry
1048 text => $CFG->{output_count}, 1093 text => $CFG->{output_count},
1049 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1094 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1050 on_changed => sub { $CFG->{output_count} = $_[1] }, 1095 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051 ); 1096 );
1052 1097
1053 $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");
1054 $table->add (1, 10, new CFClient::UI::Entry 1099 $table->add (1, 11, new CFPlus::UI::Entry
1055 text => $CFG->{output_sync}, 1100 text => $CFG->{output_sync},
1056 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1101 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1057 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1102 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058 ); 1103 );
1059 1104
1060 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1105 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1061 expand => 1, 1106 expand => 1,
1062 align => 0, 1107 align => 0,
1063 text => "Login", 1108 text => "Login",
1064 on_activate => sub { 1109 on_activate => sub {
1065 $CONN ? stop_game 1110 $CONN ? stop_game
1066 : start_game; 1111 : start_game;
1112 0
1067 }, 1113 },
1068 ); 1114 );
1069 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
1070 $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");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1130 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1072 text => $CFG->{say_command}, 1131 text => $CFG->{say_command},
1073 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 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. "
1074 . "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. "
1075 . "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.",
1076 on_changed => sub { 1135 on_changed => sub {
1077 my ($self, $value) = @_; 1136 my ($self, $value) = @_;
1078 $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
1079 } 1163 },
1080 ); 1164 );
1081 1165
1082 $vbox->add (new CFClient::UI::Label 1166 $table
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
1091 $vbox
1092} 1167}
1093 1168
1094sub message_window { 1169sub message_window {
1095 my $window = new CFClient::UI::FancyFrame 1170 my $window = new CFPlus::UI::Toplevel
1096 name => "message_window", 1171 name => "message_window",
1097 title => "Messages", 1172 title => "Messages",
1098 border_bg => [1, 1, 1, 1], 1173 border_bg => [1, 1, 1, 1],
1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1174 x => "max",
1101 y => 0, 1175 y => 0,
1102 force_w => $::WIDTH * 0.4, 1176 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1177 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox); 1178 child => (my $vbox = new CFPlus::UI::VBox),
1179 has_close_button => 1;
1105 1180
1106 $vbox->add ($LOGVIEW); 1181 $vbox->add ($LOGVIEW);
1107 1182
1108 $vbox->add (my $input = new CFClient::UI::Entry 1183 $vbox->add (my $input = new CFPlus::UI::Entry
1109 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1184 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1110 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1185 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1111 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1186 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1112 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1187 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1113 on_focus_in => sub { 1188 on_focus_in => sub {
1117 1192
1118 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1193 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119 $input->{refocus_map} = 1; 1194 $input->{refocus_map} = 1;
1120 } 1195 }
1121 delete $input->{auto_activated}; 1196 delete $input->{auto_activated};
1197
1198 0
1122 }, 1199 },
1123 on_activate => sub { 1200 on_activate => sub {
1124 my ($input, $text) = @_; 1201 my ($input, $text) = @_;
1125 $input->set_text (''); 1202 $input->set_text ('');
1126 1203
1132 } 1209 }
1133 if ($input->{refocus_map}) { 1210 if ($input->{refocus_map}) {
1134 delete $input->{refocus_map}; 1211 delete $input->{refocus_map};
1135 $MAPWIDGET->focus_in 1212 $MAPWIDGET->focus_in
1136 } 1213 }
1214
1215 0
1137 }, 1216 },
1138 on_escape => sub { 1217 on_escape => sub {
1139 $MAPWIDGET->focus_in 1218 $MAPWIDGET->grab_focus;
1219
1220 0
1140 }, 1221 },
1141 ); 1222 );
1142 1223
1143 $CONSOLE = { 1224 $CONSOLE = {
1144 window => $window, 1225 window => $window,
1146 }; 1227 };
1147 1228
1148 $window 1229 $window
1149} 1230}
1150 1231
1151sub open_quit_dialog {
1152 unless ($QUIT_DIALOG) {
1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1154 x => "center",
1155 y => "center",
1156 z => 50,
1157 title => "Really Quit?",
1158 ;
1159
1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1161
1162 $vb->add (new CFClient::UI::Label
1163 text => "You should find a savebed and apply it first!",
1164 max_w => $WIDTH * 0.25,
1165 ellipsize => 0,
1166 );
1167 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1168 $hb->add (new CFClient::UI::Button
1169 text => "Ok",
1170 expand => 1,
1171 on_activate => sub { $QUIT_DIALOG->hide },
1172 );
1173 $hb->add (new CFClient::UI::Button
1174 text => "Quit anyway",
1175 expand => 1,
1176 on_activate => sub { exit },
1177 );
1178 }
1179
1180 $QUIT_DIALOG->show;
1181}
1182
1183sub autopickup_setup { 1232sub autopickup_setup {
1184 my $table = new CFClient::UI::Table; 1233 my $table = new CFPlus::UI::Table;
1185 1234
1186 for ( 1235 for (
1187 ["General", 0, 0, 1236 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE], 1237 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1238 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP], 1239 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG], 1240 ["Debug autopickup" => PICKUP_DEBUG],
1192 ], 1241 ],
1193 ["Weapons", 0, 6, 1242 ["Weapons", 0, 6,
1203 ["Boots" => PICKUP_BOOTS], 1252 ["Boots" => PICKUP_BOOTS],
1204 ["Gloves" => PICKUP_GLOVES], 1253 ["Gloves" => PICKUP_GLOVES],
1205 ["Cloaks" => PICKUP_CLOAK], 1254 ["Cloaks" => PICKUP_CLOAK],
1206 ], 1255 ],
1207 1256
1208 ["Readables", 2, 2, 1257 ["Readables", 2, 0,
1209 ["Spellbooks" => PICKUP_SPELLBOOK], 1258 ["Spellbooks" => PICKUP_SPELLBOOK],
1210 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1259 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1211 ["Normal Books/Scrolls" => PICKUP_READABLES], 1260 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ], 1261 ],
1213 ["Misc", 2, 7, 1262 ["Misc", 2, 5,
1214 ["Food" => PICKUP_FOOD], 1263 ["Food" => PICKUP_FOOD],
1215 ["Drinks" => PICKUP_DRINK], 1264 ["Drinks" => PICKUP_DRINK],
1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1265 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1217 ["Keys" => PICKUP_KEY], 1266 ["Keys" => PICKUP_KEY],
1218 ["Magical Items" => PICKUP_MAGICAL], 1267 ["Magical Items" => PICKUP_MAGICAL],
1219 ["Potions" => PICKUP_POTION], 1268 ["Potions" => PICKUP_POTION],
1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1269 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1221 ["Ignore cursed" => PICKUP_NOT_CURSED], 1270 ["Ignore cursed" => PICKUP_NOT_CURSED],
1222 ["Jewelery" => PICKUP_JEWELS], 1271 ["Jewelery" => PICKUP_JEWELS],
1272 ["Flesh" => PICKUP_FLESH],
1223 ], 1273 ],
1224 ["Weight/Value ratio", 2, 17] 1274 ["Weight/Value ratio", 2, 17]
1225 ) 1275 )
1226 { 1276 {
1227 my ($title, $x, $y, @bits) = @$_; 1277 my ($title, $x, $y, @bits) = @$_;
1228 $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]);
1229 1279
1230 for (@bits) { 1280 for (@bits) {
1231 ++$y; 1281 ++$y;
1232 1282
1233 my $mask = $_->[1]; 1283 my $mask = $_->[1];
1234 $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);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1285 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1236 state => $CFG->{pickup} & $mask, 1286 state => $::CFG->{pickup} & $mask,
1237 on_changed => sub { 1287 on_changed => sub {
1238 my ($box, $value) = @_; 1288 my ($box, $value) = @_;
1239 1289
1240 if ($value) { 1290 if ($value) {
1241 $::CFG->{pickup} |= $mask; 1291 $::CFG->{pickup} |= $mask;
1243 $::CFG->{pickup} &= ~$mask; 1293 $::CFG->{pickup} &= ~$mask;
1244 } 1294 }
1245 1295
1246 $::CONN->send_command ("pickup $::CFG->{pickup}") 1296 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN; 1297 if defined $::CONN;
1298
1299 0
1248 }); 1300 });
1301
1302 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1303 }
1250 } 1304 }
1251 1305
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1306 $table->add (2, 18, new CFPlus::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1307 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1309 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1310 on_changed => sub {
1256 my ($slider, $value) = @_; 1311 my ($slider, $value) = @_;
1257 1312
1258 $::CFG->{pickup} &= ~0x7; 1313 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1314 $::CFG->{pickup} |= int $value
1260 if $value; 1315 if $value;
1261 1; 1316 1;
1262 }); 1317 });
1318
1263 $table->add (3, 18, new CFClient::UI::Button 1319 $table->add (3, 18, new CFPlus::UI::Button
1264 text => "set", 1320 text => "set",
1265 on_activate => sub { 1321 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1322 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1323 if defined $::CONN;
1268 1; 1324 0
1269 }); 1325 });
1270 1326
1271 $table 1327 $table
1272} 1328}
1273 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
1274sub inventory_window { 1349sub inventory_widget {
1275 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
1276 x => "center", 1405 x => "center",
1277 y => "center", 1406 y => "center",
1278 force_w => $WIDTH * 9/10, 1407 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1408 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1409 title => "Player",
1410 name => "playerbook",
1411 has_close_button => 1
1281 ; 1412 ;
1282 1413
1283 $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;
1284 1417
1285 $hb->add (my $vb1 = new CFClient::UI::VBox); 1418 $ntb->add (
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1419 "Statistics (F2)" => $STATS_PAGE = stats_window,
1287 $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 );
1288 1426
1289 $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 );
1290 1438
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1439 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1440
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1441 $plwin->add ($ntb);
1294 1442 $plwin
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299}
1300
1301sub spell_setup {
1302 new CFClient::UI::SpellList
1303} 1443}
1304 1444
1305sub keyboard_setup { 1445sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox; 1446 CFPlus::Macro::keyboard_setup
1307
1308 my $refresh;
1309 $refresh = sub {
1310 $binding_list->clear ();
1311
1312 for my $mod (keys %{$::CFG->{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316
1317 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button
1321 text => "delete",
1322 tooltip => "Deletes the binding",
1323 on_activate => sub {
1324 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym};
1326 });
1327
1328 $hb->add (new CFClient::UI::Button
1329 text => "edit",
1330 tooltip => "Edits the binding",
1331 on_activate => sub {
1332 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1334 sub {
1335 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym};
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show;
1341 },
1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show;
1345 });
1346 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide;
1348 });
1349
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 }
1353 }
1354 };
1355
1356 my $vb = new CFClient::UI::VBox;
1357 $vb->add ($binding_list);
1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359
1360 $hb->add (new CFClient::UI::Button
1361 text => "record new",
1362 expand => 1,
1363 tooltip => "This button opens the binding editor with an empty binding.",
1364 on_activate => sub {
1365 $::BIND_EDITOR->set_binding (undef, undef, [],
1366 sub {
1367 my ($mod, $sym, $cmds) = @_;
1368 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1369 $refresh->();
1370 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1371 $SETUP_DIALOG->show;
1372 },
1373 sub {
1374 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1375 $SETUP_DIALOG->show;
1376 },
1377 );
1378 $SETUP_DIALOG->hide;
1379 $::BIND_EDITOR->show;
1380 },
1381 );
1382
1383 $hb->add (new CFClient::UI::Button
1384 text => "close",
1385 tooltip => "Closes the binding window",
1386 expand => 1,
1387 on_activate => sub {
1388 $SETUP_DIALOG->hide;
1389 }
1390 );
1391
1392 $refresh->();
1393
1394 $vb
1395} 1447}
1396 1448
1397sub help_window { 1449sub help_window {
1398 my $win = new CFClient::UI::FancyFrame 1450 my $win = new CFPlus::UI::Toplevel
1399 x => 'center', 1451 x => 'center',
1400 y => 'center', 1452 y => 'center',
1401 z => 2, 1453 z => 4,
1402 name => 'doc_browser', 1454 name => 'doc_browser',
1403 force_w => int $WIDTH * 7/8, 1455 force_w => int $WIDTH * 7/8,
1404 force_h => int $HEIGHT * 7/8, 1456 force_h => int $HEIGHT * 7/8,
1405 title => "Documentation"; 1457 title => "Help Browser",
1458 has_close_button => 1;
1406 1459
1407 $win->add (my $vbox = new CFClient::UI::VBox); 1460 $win->add (my $vbox = new CFPlus::UI::VBox);
1408 1461
1409 $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 );
1410 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1466 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1411 expand => 1, fontsize => 0.8, padding_x => 4); 1467 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1412 1468
1413 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1469 my @history;
1414 $buttons->add (my $combo = new CFClient::UI::Combobox 1470 my @future;
1415 value => undef, 1471 my $curnode;
1416 options => [ 1472
1417 [intro => "Introduction"], 1473 my $load_node; $load_node = sub {
1418 [manual => "Manual"], 1474 my ($node, $para) = @_;
1419 [skill_help => "Skills"], 1475
1420 [command_help => "Commands"], 1476 $buttons->clear;
1421 [dmcommand_help => "DM Commands"], 1477
1422 [COPYING => "License Terms"], 1478 $buttons->add (new CFPlus::UI::Button
1423 ], 1479 text => "⇤",
1480 tooltip => "back to the starting page",
1424 on_changed => sub { 1481 on_activate => sub {
1425 my ($self, $pod) = @_; 1482 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1426 1483 unshift @future, @history;
1427 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1484 @history = ();
1428 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1485 $load_node->(@{shift @future});
1429
1430 $viewer->clear;
1431 1486 },
1432 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1487 );
1433 for @$pom;
1434 1488
1435 $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 );
1436 }, 1498 }
1437 on_visibility_change => sub { 1499
1438 my ($self, $visible) = @_; 1500 if (@future) {
1439 return unless $visible; 1501 $buttons->add (new CFPlus::UI::Button
1440 return if $self->{value}; 1502 text => "â‹™",
1441 $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 );
1442 }, 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);
1443 ); 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 };
1444 1547
1445 $win 1548 $win
1446} 1549}
1447 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
1448sub sdl_init { 1663sub sdl_init {
1449 CFClient::SDL_Init 1664 CFPlus::SDL_Init
1450 and die "SDL::Init failed!\n"; 1665 and die "SDL::Init failed!\n";
1451} 1666}
1452 1667
1453sub video_init { 1668sub video_init {
1454 sdl_init; 1669 sdl_init;
1459 1674
1460 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1675 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1461 $FULLSCREEN = $CFG->{fullscreen}; 1676 $FULLSCREEN = $CFG->{fullscreen};
1462 $FAST = $CFG->{fast}; 1677 $FAST = $CFG->{fast};
1463 1678
1464 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1679 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1465 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1680 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1466 1681
1467 $SDL_ACTIVE = 1; 1682 $SDL_ACTIVE = 1;
1468 $LAST_REFRESH = time - 0.01; 1683 $LAST_REFRESH = time - 0.01;
1469 1684
1470 CFClient::OpenGL::init; 1685 CFPlus::OpenGL::init;
1471 1686
1472 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1687 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1473 1688
1474 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1689 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1475 1690
1476 ############################################################################# 1691 #############################################################################
1477 1692
1478 if ($DEBUG_STATUS) { 1693 if ($DEBUG_STATUS) {
1479 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1694 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1480 } else { 1695 } else {
1481 # create the widgets 1696 # create the widgets
1482 1697
1483 $DEBUG_STATUS = new CFClient::UI::Label 1698 $DEBUG_STATUS = new CFPlus::UI::Label
1484 padding => 0, 1699 padding => 0,
1485 z => 100, 1700 z => 100,
1486 force_x => "max", 1701 force_x => "max",
1487 force_y => 0; 1702 force_y => 0;
1488 $DEBUG_STATUS->show; 1703 $DEBUG_STATUS->show;
1489 1704
1490 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1491
1492 $STATUSBOX = new CFClient::UI::Statusbox; 1705 $STATUSBOX = new CFPlus::UI::Statusbox;
1493 $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]);
1494 1707
1495 (new CFClient::UI::Frame 1708 (new CFPlus::UI::Frame
1496 bg => [0, 0, 0, 0.4], 1709 bg => [0, 0, 0, 0.4],
1497 force_x => 0, 1710 force_x => 0,
1498 force_y => "max", 1711 force_y => "max",
1499 child => $STATUSBOX, 1712 child => $STATUSBOX,
1500 )->show; 1713 )->show;
1501 1714
1502 CFClient::UI::FancyFrame->new ( 1715 CFPlus::UI::Toplevel->new (
1503 title => "Map", 1716 title => "Map",
1504 name => "mapmap", 1717 name => "mapmap",
1505 x => 0, 1718 x => 0,
1506 y => $FONTSIZE + 8, 1719 y => $FONTSIZE + 8,
1507 border_bg => [1, 1, 1, 192/255], 1720 border_bg => [1, 1, 1, 192/255],
1508 bg => [1, 1, 1, 0], 1721 bg => [1, 1, 1, 0],
1509 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1722 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1510 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.",
1511 ), 1724 ),
1512 )->show; 1725 )->show;
1513 1726
1514 $MAPWIDGET = new CFClient::MapWidget; 1727 $MAPWIDGET = new CFPlus::MapWidget;
1515 $MAPWIDGET->connect (activate_console => sub { 1728 $MAPWIDGET->connect (activate_console => sub {
1516 my ($mapwidget, $preset) = @_; 1729 my ($mapwidget, $preset) = @_;
1517 1730
1518 if ($CONSOLE) { 1731 if ($CONSOLE) {
1519 $CONSOLE->{input}->{auto_activated} = 1; 1732 $CONSOLE->{input}->{auto_activated} = 1;
1520 $CONSOLE->{input}->focus_in; 1733 $CONSOLE->{input}->grab_focus;
1521 1734
1522 if ($preset && $CONSOLE->{input}->get_text eq '') { 1735 if ($preset && $CONSOLE->{input}->get_text eq '') {
1523 $CONSOLE->{input}->set_text ($preset); 1736 $CONSOLE->{input}->set_text ($preset);
1524 } 1737 }
1525 } 1738 }
1526 }); 1739 });
1527 $MAPWIDGET->show; 1740 $MAPWIDGET->show;
1528 $MAPWIDGET->focus_in; 1741 $MAPWIDGET->grab_focus;
1529 1742
1530 $LOGVIEW = new CFClient::UI::TextScroller 1743 $LOGVIEW = new CFPlus::UI::TextScroller
1531 expand => 1, 1744 expand => 1,
1532 font => $FONT_FIXED, 1745 font => $FONT_FIXED,
1533 fontsize => $::CFG->{log_fontsize}, 1746 fontsize => $::CFG->{log_fontsize},
1534 indent => -4, 1747 indent => -4,
1535 can_hover => 1, 1748 can_hover => 1,
1536 can_events => 1, 1749 can_events => 1,
1750 max_par => $CFG->{logview_max_par},
1537 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.",
1538 ; 1752 ;
1539 1753
1540 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1754 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1541 title => "Setup", 1755 title => "Setup",
1542 name => "setup_dialog", 1756 name => "setup_dialog",
1543 x => 'center', 1757 x => 'center',
1544 y => 'center', 1758 y => 'center',
1545 z => 2, 1759 z => 2,
1546 force_w => $::WIDTH * 0.6, 1760 force_w => $::WIDTH * 0.6,
1547 force_h => $::HEIGHT * 0.6, 1761 force_h => $::HEIGHT * 0.6,
1762 has_close_button => 1,
1548 ; 1763 ;
1549 1764
1765 $METASERVER = metaserver_dialog;
1766
1550 $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,
1551 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1768 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1552 1769
1553 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1770 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1554 "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.");
1555 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1774 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1556 "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.");
1557 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1776 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1558 "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.");
1559 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1778 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1560 "Configure the use of audio, sound effects and background music."); 1779 "Configure the use of audio, sound effects and background music.");
1561 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1780 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1562 "Lets you define, edit and delete bindings." 1781 "Lets you define, edit and delete key bindings."
1563 . "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 "
1564 . "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 "
1565 . "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. "
1566 . "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 "
1567 . "binding editor closes"); 1786 . "binding editor closes");
1568 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1569 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1570 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1787 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1571 "Some debuggign options. Do not ask."); 1788 "Some debuggin' options. Do not ask.");
1572 1789
1573 $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
1574 1791
1575 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1792 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1576 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.");
1577 1794
1578 $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,
1579 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.");
1580 1797
1581 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
1582 1799
1583 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1584 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1585 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1586 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.");
1587 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1588 1802
1589 $BUTTONBAR->add (new CFClient::UI::Button 1803 $BUTTONBAR->add (new CFPlus::UI::Button
1590 text => "Save Config", 1804 text => "Save Config",
1591 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.",
1592 on_activate => sub { 1806 on_activate => sub {
1593 $::CFG->{layout} = CFClient::UI::get_layout; 1807 $::CFG->{layout} = CFPlus::UI::get_layout;
1594 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1808 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1595 status "Configuration Saved"; 1809 status "Configuration Saved";
1810 0
1596 }, 1811 },
1597 ); 1812 );
1598 1813
1599 $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,
1600 tooltip => "View Documentation"); 1815 tooltip => "View Documentation");
1601 1816
1817
1602 $BUTTONBAR->add (new CFClient::UI::Button 1818 $BUTTONBAR->add (new CFPlus::UI::Button
1603 text => "Quit", 1819 text => "Quit",
1604 tooltip => "Terminates the program", 1820 tooltip => "Terminates the program",
1605 on_activate => sub { 1821 on_activate => sub {
1606 if ($CONN) { 1822 if ($CONN) {
1607 open_quit_dialog; 1823 open_quit_dialog;
1608 } else { 1824 } else {
1609 exit; 1825 exit;
1610 } 1826 }
1827 0
1611 }, 1828 },
1612 ); 1829 );
1613 1830
1614 $BUTTONBAR->show; 1831 $BUTTONBAR->show;
1615 $SETUP_DIALOG->show; 1832 $SETUP_DIALOG->show;
1616 } 1833 }
1617 1834
1618 $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]);
1619} 1836}
1620 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
1621sub video_shutdown { 1957sub video_shutdown {
1958 CFPlus::OpenGL::shutdown;
1959
1622 undef $SDL_ACTIVE; 1960 undef $SDL_ACTIVE;
1623} 1961}
1624 1962
1625my @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#
1626my $bgmusic;#TODO#hack#d# 1964my $bgmusic;#TODO#hack#d#
1633 1971
1634sub audio_music_finished { 1972sub audio_music_finished {
1635 return unless $CFG->{bgm_enable}; 1973 return unless $CFG->{bgm_enable};
1636 1974
1637 # TODO: hack, do play loop and mood music 1975 # TODO: hack, do play loop and mood music
1638 $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]";
1639 $bgmusic->play (0); 1977 $bgmusic->play (0);
1640 1978
1641 push @bgmusic, shift @bgmusic; 1979 push @bgmusic, shift @bgmusic;
1642} 1980}
1643 1981
1644sub audio_init { 1982sub audio_init {
1645 if ($CFG->{audio_enable}) { 1983 if ($CFG->{audio_enable}) {
1646 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1984 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1647 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1985 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1648 1986
1649 unless ($SDL_MIXER) { 1987 unless ($SDL_MIXER) {
1650 status "Unable to open sound device: there will be no sound"; 1988 status "Unable to open sound device: there will be no sound";
1651 return; 1989 return;
1652 } 1990 }
1653 1991
1654 CFClient::Mix_AllocateChannels 8; 1992 CFPlus::Mix_AllocateChannels 8;
1655 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1993 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1656 1994
1657 audio_music_finished; 1995 audio_music_finished;
1658 1996
1997 local $_;
1659 while (<$fh>) { 1998 while (<$fh>) {
1660 next if /^\s*#/; 1999 next if /^\s*#/;
1661 next if /^\s*$/; 2000 next if /^\s*$/;
1662 2001
1663 my ($file, $volume, $event) = split /\s+/, $_, 3; 2002 my ($file, $volume, $event) = split /\s+/, $_, 3;
1664 2003
1665 push @SOUNDS, "$volume,$file"; 2004 push @SOUNDS, "$volume,$file";
1666 2005
1667 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2006 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1668 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";
1669 $chunk->volume ($volume * 128 / 100); 2008 $chunk->volume ($volume * 128 / 100);
1670 $chunk 2009 $chunk
1671 }; 2010 };
1672 } 2011 }
1673 } else { 2012 } else {
1675 } 2014 }
1676 } 2015 }
1677} 2016}
1678 2017
1679sub audio_shutdown { 2018sub audio_shutdown {
1680 CFClient::Mix_CloseAudio if $SDL_MIXER; 2019 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1681 undef $SDL_MIXER; 2020 undef $SDL_MIXER;
1682 @SOUNDS = (); 2021 @SOUNDS = ();
1683 %AUDIO_CHUNKS = (); 2022 %AUDIO_CHUNKS = ();
1684} 2023}
1685 2024
1692 2031
1693sub force_refresh { 2032sub force_refresh {
1694 $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;
1695 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2034 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1696 2035
1697 $CFClient::UI::ROOT->draw; 2036 $CFPlus::UI::ROOT->draw;
1698 2037
1699 $WANT_REFRESH = 0; 2038 $WANT_REFRESH = 0;
1700 $CAN_REFRESH = 0; 2039 $CAN_REFRESH = 0;
1701 $LAST_REFRESH = $NOW; 2040 $LAST_REFRESH = $NOW;
1702 2041
17030 && do {
1704 # some weird model-drawing code, just a joke right now
1705 use CFClient::OpenGL;
1706
1707 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1708 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1709 $demo{r} ||= do {
1710 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1711 $mod->{v} = pack "f*", @{$mod->{v}};
1712 $_ = [scalar @$_, pack "S!*", @$_]
1713 for values %{$mod->{g}};
1714 $mod
1715 };
1716
1717 my $r = $demo{r} or die;
1718
1719 glDepthMask 1;
1720 glClear GL_DEPTH_BUFFER_BIT;
1721 glEnable GL_TEXTURE_2D;
1722 glEnable GL_DEPTH_TEST;
1723 glEnable GL_CULL_FACE;
1724 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1725
1726 glMatrixMode GL_PROJECTION;
1727 glLoadIdentity;
1728 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1729 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1730 glMatrixMode GL_MODELVIEW;
1731 glLoadIdentity;
1732
1733 glPushMatrix;
1734 glTranslate 0, 0, -800;
1735 glScale 1, -1, 1;
1736 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1737 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1738 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1739 glScale 50, 50, 50;
1740
1741 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1742 while (my ($k, $v) = each %{$r->{g}}) {
1743 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1744 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1745 }
1746
1747 glPopMatrix;
1748
1749 glShadeModel GL_FLAT;
1750 glDisable GL_DEPTH_TEST;
1751 glDisable GL_TEXTURE_2D;
1752 glDepthMask 0;
1753
1754 $WANT_REFRESH++;
1755};
1756
1757 CFClient::SDL_GL_SwapBuffers; 2042 CFPlus::SDL_GL_SwapBuffers;
1758} 2043}
1759 2044
1760my $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 {
1761 $NOW = time; 2046 $NOW = time;
1762 2047
1763 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2048 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1764 for CFClient::SDL_PollEvent; 2049 for CFPlus::SDL_PollEvent;
1765 2050
1766 if (%animate_object) { 2051 if (%animate_object) {
1767 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2052 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1768 $WANT_REFRESH++; 2053 $WANT_REFRESH++;
1769 } 2054 }
1793 $CONN->face_prefetch 2078 $CONN->face_prefetch
1794 if $CONN; 2079 if $CONN;
1795}); 2080});
1796 2081
1797%SDL_CB = ( 2082%SDL_CB = (
1798 CFClient::SDL_QUIT => sub { 2083 CFPlus::SDL_QUIT => sub {
1799 Event::unloop -1; 2084 exit;
1800 }, 2085 },
1801 CFClient::SDL_VIDEORESIZE => sub { 2086 CFPlus::SDL_VIDEORESIZE => sub {
1802 }, 2087 },
1803 CFClient::SDL_VIDEOEXPOSE => sub { 2088 CFPlus::SDL_VIDEOEXPOSE => sub {
1804 CFClient::UI::full_refresh; 2089 CFPlus::UI::full_refresh;
1805 }, 2090 },
1806 CFClient::SDL_ACTIVEEVENT => sub { 2091 CFPlus::SDL_ACTIVEEVENT => sub {
1807# 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;
1808 }, 2097 },
1809 CFClient::SDL_KEYDOWN => sub { 2098 CFPlus::SDL_KEYDOWN => sub {
1810 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2099 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1811 # alt-enter 2100 # alt-enter
2101 $FULLSCREEN_ENABLE->toggle;
1812 video_shutdown; 2102 video_shutdown;
1813 $CFG->{fullscreen} = !$CFG->{fullscreen};
1814 video_init; 2103 video_init;
1815 } else { 2104 } else {
1816 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2105 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1817 } 2106 }
1818 }, 2107 },
1819 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2108 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1820 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2109 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1821 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2110 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1822 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2111 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1823 CFClient::SDL_USEREVENT => sub { 2112 CFPlus::SDL_USEREVENT => sub {
1824 if ($_[0]{code} == 1) { 2113 if ($_[0]{code} == 1) {
1825 audio_channel_finished $_[0]{data1}; 2114 audio_channel_finished $_[0]{data1};
1826 } elsif ($_[0]{code} == 0) { 2115 } elsif ($_[0]{code} == 0) {
1827 audio_music_finished; 2116 audio_music_finished;
1828 } 2117 }
1832############################################################################# 2121#############################################################################
1833 2122
1834$SIG{INT} = $SIG{TERM} = sub { exit }; 2123$SIG{INT} = $SIG{TERM} = sub { exit };
1835 2124
1836{ 2125{
1837 local $SIG{__DIE__} = sub {
1838 return unless defined $^S && !$^S;
1839 Carp::confess $_[1];#d#TODO: remove when stable
1840 CFClient::fatal $_[0];
1841 };
1842
1843 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2126 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2127 CFPlus::DB::Server::run;
2128
1844 CFClient::UI::set_layout ($::CFG->{layout}); 2129 CFPlus::UI::set_layout ($::CFG->{layout});
1845 2130
1846 my %DEF_CFG = ( 2131 my %DEF_CFG = (
1847 sdl_mode => 0, 2132 sdl_mode => 0,
1848 width => 640, 2133 width => 640,
1849 height => 480, 2134 height => 480,
1850 fullscreen => 0, 2135 fullscreen => 0,
1851 fast => 0, 2136 fast => 0,
1852 map_scale => 1, 2137 map_scale => 1,
1853 fow_enable => 1, 2138 fow_enable => 1,
1854 fow_intensity => 0.45, 2139 fow_intensity => 0.45,
1855 fow_smooth => 0, 2140 fow_smooth => 0,
2141 map_smoothing => 1,
1856 gui_fontsize => 1, 2142 gui_fontsize => 1,
1857 log_fontsize => 0.7, 2143 log_fontsize => 0.7,
1858 gauge_fontsize=> 1, 2144 gauge_fontsize => 1,
1859 gauge_size => 0.35, 2145 gauge_size => 0.35,
1860 stat_fontsize => 0.7, 2146 stat_fontsize => 0.7,
1861 mapsize => 100, 2147 mapsize => 100,
1862 host => "crossfire.schmorp.de",
1863 say_command => 'say', 2148 say_command => 'chat',
1864 audio_enable => 1, 2149 audio_enable => 1,
1865 bgm_enable => 1, 2150 bgm_enable => 1,
1866 bgm_volume => 0.25, 2151 bgm_volume => 0.25,
1867 face_prefetch => 0, 2152 face_prefetch => 0,
1868 output_sync => 1, 2153 output_sync => 1,
1869 output_count => 1, 2154 output_count => 1,
2155 output_rate => "",
1870 pickup => 0, 2156 pickup => 0,
2157 inv_sort => "mtime",
2158 default => "profile", # default profile
2159 show_tips => 1,
2160 logview_max_par => 1000,
2161 );
1871 ); 2162
1872
1873 while (my ($k, $v) = each %DEF_CFG) { 2163 while (my ($k, $v) = each %DEF_CFG) {
1874 $CFG->{$k} = $v unless exists $CFG->{$k}; 2164 $CFG->{$k} = $v unless exists $CFG->{$k};
1875 } 2165 }
1876 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
1877 sdl_init; 2182 sdl_init;
1878 2183
1879 @SDL_MODES = reverse 2184 @SDL_MODES = reverse
1880 grep $_->[0] >= 640 && $_->[1] >= 480, 2185 grep $_->[0] >= 640 && $_->[1] >= 480,
1881 CFClient::SDL_ListModes; 2186 CFPlus::SDL_ListModes;
1882 2187
1883 @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)";
1884 2189
1885 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2190 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1886 2191
1887 { 2192 {
1888 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2193 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1889 DejaVuSans.ttf 2194 DejaVuSans.ttf
1890 DejaVuSansMono.ttf 2195 DejaVuSansMono.ttf
1891 DejaVuSans-Bold.ttf 2196 DejaVuSans-Bold.ttf
1892 DejaVuSansMono-Bold.ttf 2197 DejaVuSansMono-Bold.ttf
1893 DejaVuSans-Oblique.ttf 2198 DejaVuSans-Oblique.ttf
1894 DejaVuSansMono-Oblique.ttf 2199 DejaVuSansMono-Oblique.ttf
1895 DejaVuSans-BoldOblique.ttf 2200 DejaVuSans-BoldOblique.ttf
1896 DejaVuSansMono-BoldOblique.ttf 2201 DejaVuSansMono-BoldOblique.ttf
1897 ); 2202 );
1898 2203
1899 CFClient::add_font $_ for @fonts; 2204 CFPlus::add_font $_ for @fonts;
1900 2205
1901 CFClient::pango_init; 2206 CFPlus::pango_init;
1902 2207
1903 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2208 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1904 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2209 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1905 2210
1906 $FONT_PROP->make_default; 2211 $FONT_PROP->make_default;
1907 } 2212 }
1908 2213
1909# compare mono (ft) vs. rgba (cairo) 2214# compare mono (ft) vs. rgba (cairo)
1910# ft - 1.8s, cairo 3s, even in alpha-only mode 2215# ft - 1.8s, cairo 3s, even in alpha-only mode
1911# for my $rgba (0..1) { 2216# for my $rgba (0..1) {
1912# my $t1 = Time::HiRes::time; 2217# my $t1 = Time::HiRes::time;
1913# for (1..1000) { 2218# for (1..1000) {
1914# my $layout = CFClient::Layout->new ($rgba); 2219# my $layout = CFPlus::Layout->new ($rgba);
1915# $layout->set_text ("hallo" x 100); 2220# $layout->set_text ("hallo" x 100);
1916# $layout->render; 2221# $layout->render;
1917# } 2222# }
1918# my $t2 = Time::HiRes::time; 2223# my $t2 = Time::HiRes::time;
1919# warn $t2-$t1; 2224# warn $t2-$t1;
1920# } 2225# }
1921 2226
2227 $startup_done->();
2228
1922 video_init; 2229 video_init;
1923 audio_init; 2230 audio_init;
1924} 2231}
1925 2232
2233show_tip_of_the_day if $CFG->{show_tips};
2234
1926Event::loop; 2235Event::loop;
2236#CFPlus::SDL_Quit;
2237#CFPlus::_exit 0;
1927 2238
1928END { CFClient::SDL_Quit } 2239END {
2240 CFPlus::SDL_Quit;
2241 CFPlus::DB::Server::stop;
2242}
1929 2243
1930=head1 NAME 2244=head1 NAME
1931 2245
1932cfplus - A Crossfire+ and Crossfire game client 2246cfplus - A Crossfire+ and Crossfire game client
1933 2247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines