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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines