ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.70 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.148 by root, Mon Apr 9 04:39:11 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines