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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.148 by root, Mon Apr 9 04:39:11 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines