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.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.150 by root, Mon Apr 16 21:06:37 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines