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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines