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.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
32use Crossfire; 55use Crossfire;
33use Crossfire::Protocol::Constants; 56use Crossfire::Protocol::Constants;
34 57
35use Compress::LZF; 58use Compress::LZF;
36 59
37use CFClient; 60use CFPlus;
38use CFClient::OpenGL (); 61use CFPlus::OpenGL ();
39use CFClient::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
40use CFClient::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
67use CFPlus::Pod;
41use CFClient::MapWidget; 68use CFPlus::MapWidget;
69use CFPlus::Macro;
42 70
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 71$SIG{QUIT} = sub { Carp::cluck "QUIT" };
72$SIG{PIPE} = 'IGNORE';
44 73
74$Event::Eval = 1;
45$Event::DIED = sub { 75$Event::DIED = sub {
46 # TODO: display dialog box or so 76 CFPlus::fatal Carp::longmess $_[1]
47 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1];
49}; 77};
50
51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
52
53our $VERSION = '0.1';
54 78
55my $MAX_FPS = 60; 79my $MAX_FPS = 60;
56my $MIN_FPS = 5; # unused as of yet 80my $MIN_FPS = 5; # unused as of yet
57 81
58our $META_SERVER = "crossfire.real-time.com:13326"; 82our $META_SERVER = "http://metaserver.schmorp.de/current.json";
59 83
60our $LAST_REFRESH; 84our $LAST_REFRESH;
61our $NOW; 85our $NOW;
62 86
63our $CFG; 87our $CFG;
64our $CONN; 88our $CONN;
89our $PROFILE; # current profile
65our $FAST; # fast, low-quality mode, possibly useful for software-rendering 90our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66 91
67our $WANT_REFRESH; 92our $WANT_REFRESH;
68our $CAN_REFRESH; 93our $CAN_REFRESH;
69 94
84our $CONSOLE; 109our $CONSOLE;
85our $METASERVER; 110our $METASERVER;
86our $LOGIN_BUTTON; 111our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 112our $QUIT_DIALOG;
88our $HOST_ENTRY; 113our $HOST_ENTRY;
114our $FULLSCREEN_ENABLE;
115our $PICKUP_ENABLE;
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 [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"], 306 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 307 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"], 308 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"], 309 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"], 310 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"], 311 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [Cha => 7, "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 };
625 &set_gauge_window_fontsize; 679 &set_gauge_window_fontsize;
626 680
627 $win 681 $win
628} 682}
629 683
684sub debug_setup {
685 my $table = new CFPlus::UI::Table;
686
687 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
688 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
689 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
690 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
691 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
692 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
693 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
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" } );
696
697 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
698
699 for my $x (0..2) {
700 for my $y (0 .. 2) {
701 $table->add ($x + 3, $y,
702 new CFPlus::UI::Entry
703 text => $default_smooth[$x * 3 + $y],
704 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
705 );
706 }
707 }
708
709 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
710
711 $table
712}
630 713
631sub stats_window { 714sub stats_window {
632 my $tgw = new CFClient::UI::FancyFrame 715 my $r = new CFPlus::UI::ScrolledWindow (
633 y => $HEIGHT * (2/8), 716 expand => 1,
634 x => "max", 717 scroll_y => 1
635 title => "Stats", 718 );
636 name => "stats_window"; 719 $r->add (my $vb = new CFPlus::UI::VBox);
637 720
638 $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
639 $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,
640 can_hover => 1, can_events => 1, 727 can_hover => 1, can_events => 1,
641 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.");
642 $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,
643 can_hover => 1, can_events => 1, 730 can_hover => 1, can_events => 1,
644 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).");
645 732
646 $vb->add (my $hb0 = new CFClient::UI::HBox); 733 $pi->add (my $hb0 = new CFPlus::UI::HBox);
647 $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,
648 can_hover => 1, can_events => 1, 735 can_hover => 1, can_events => 1,
649 tooltip => "The weight of the player including all inventory items."); 736 tooltip => "The weight of the player including all inventory items.");
650 $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,
651 can_hover => 1, can_events => 1, 738 can_hover => 1, can_events => 1,
652 tooltip => "The weight limit: you cannot carry more than this."); 739 tooltip => "The weight limit: you cannot carry more than this.");
653 740
654 741 $vb->add (new CFPlus::UI::FancyFrame
742 label => "Primary/Secondary Statistics",
655 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 743 child => (my $hb = new CFPlus::UI::HBox expand => 1),
744 );
656 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 745 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
657 746
658 my $color2 = [1, 1, 0]; 747 my $color2 = [1, 1, 0];
659 748
660 for ( 749 for (
661 [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],
662 [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],
663 [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],
664 [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],
665 [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],
666 [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],
667 [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],
668 757
669 [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],
670 [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],
671 [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],
672 [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],
673 [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],
674 [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],
675 ) { 764 ) {
676 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 765 my ($col, $row, $id, $label, $template) = @$_;
677 766
678 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 767 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
679 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");
680 $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
681 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");
682 } 773 }
683 774
775 $vb->add (new CFPlus::UI::FancyFrame
776 label => "Resistancies",
684 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 777 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
778 );
685 779
686 my $row = 0; 780 my $row = 0;
687 my $col = 0; 781 my $col = 0;
688 782
689 my %resist_names = ( 783 my %resist_names = (
784 slow => ["Slow",
690 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",
691 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",
692 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",
693 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",
694 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",
695 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",
696 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",
697 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",
698 pois => "<b>Poison</b> (resistance to getting poisoned)", 801 "<b>Poison</b> (resistance to getting poisoned)"],
802 para => ["Paralysation",
699 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",
700 deat => "<b>Death</b> (resistance against death spells)", 805 "<b>Death</b> (resistance against death spells)"],
701 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",
702 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",
703 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",
704 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",
705 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",
706 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",
707 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)"],
708 ); 820 );
709 for (qw/slow holyw conf fire depl magic 821 for (qw/slow holyw conf fire depl magic
710 drain acid pois para deat phys 822 drain acid pois para deat phys
711 blind fear tund elec cold ghit/) 823 blind fear tund elec cold ghit/)
712 { 824 {
713 $tbl2->add ($col, $row, 825 $tbl2->add ($col, $row,
714 $STATWIDS->{"res_$_"} = 826 $STATWIDS->{"res_$_"} =
715 new CFClient::UI::Label 827 new CFPlus::UI::Label
716 font => $FONT_FIXED, 828 font => $FONT_FIXED,
717 template => "-100%", 829 template => "-100%",
718 align => +1, 830 align => +1,
719 valign => 0, 831 valign => 0,
720 can_events => 1, 832 can_events => 1,
721 can_hover => 1, 833 can_hover => 1,
722 tooltip => $resist_names{$_}, 834 tooltip => $resist_names{$_}->[1],
723 ); 835 );
724 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 836 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
725 font => $FONT_FIXED, 837 font => $FONT_FIXED,
726 can_hover => 1, 838 can_hover => 1,
727 can_events => 1, 839 can_events => 1,
728 image => "ui/resist/resist_$_.png", 840 path => "ui/resist/resist_$_.png",
729 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],
730 ); 849 );
731 850
732 $row++; 851 $row++;
733 if ($row % 6 == 0) { 852 if ($row % 6 == 0) {
734 $col += 2; 853 $col += 3;
735 $row = 0; 854 $row = 0;
736 } 855 }
737 } 856 }
738 857
739 &set_stats_window_fontsize;
740 update_stats_window ({}); 858 #update_stats_window ({});
741 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]);
742 $tgw 866 $sw
743} 867}
744 868
745sub formsep($) { 869sub formsep($) {
746 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 870 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
747} 871}
748 872
749sub update_stats_window {
750 my ($stats) = @_;
751
752 # I love text protocols...
753
754 my $hp = $stats->{+CS_STAT_HP} * 1;
755 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
756 my $sp = $stats->{+CS_STAT_SP} * 1;
757 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
758 my $fo = $stats->{+CS_STAT_FOOD} * 1;
759 my $fo_m = 999;
760 my $gr = $stats->{+CS_STAT_GRACE} * 1;
761 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
762
763 $GAUGES->{hp} ->set_value ($hp, $hp_m);
764 $GAUGES->{mana} ->set_value ($sp, $sp_m);
765 $GAUGES->{food} ->set_value ($fo, $fo_m);
766 $GAUGES->{grace} ->set_value ($gr, $gr_m);
767 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
768 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
769 my $rng = $stats->{+CS_STAT_RANGE};
770 $rng =~ s/^Range: //; # thank you so much dear server
771 $GAUGES->{range} ->set_text ("Rng: " . $rng);
772 my $title = $stats->{+CS_STAT_TITLE};
773 $title =~ s/^Player: //;
774 $STATWIDS->{title} ->set_text ("Title: " . $title);
775
776 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
777 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
778 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
779 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
780 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
781 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
782 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
783 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
784 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
785 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
786 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
787 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789
790 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791
792 # TODO: replace by CS_STAT_RES_xxx constants
793 my %tbl = (
794 phys => 100,
795 magic => 101,
796 fire => 102,
797 elec => 103,
798 cold => 104,
799 conf => 105,
800 acid => 106,
801 drain => 107,
802 ghit => 108,
803 pois => 109,
804 slow => 110,
805 para => 111,
806 tund => 112,
807 fear => 113,
808 depl => 113,
809 deat => 115,
810 holyw => 116,
811 blind => 117,
812 );
813
814 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815 for keys %tbl;
816}
817
818my $METASERVER_ATIME; 873my $METASERVER_ATIME;
819 874
820sub update_metaserver { 875sub update_metaserver {
876 my ($metaserver_dialog) = @_;
877
878 $METASERVER = $metaserver_dialog
879 if defined $metaserver_dialog;
880
821 return if $METASERVER_ATIME > time; 881 return if $METASERVER_ATIME > time;
822 $METASERVER_ATIME = time + 60; 882 $METASERVER_ATIME = time + 60;
823 883
824 my $table = $METASERVER->{table}; 884 my $table = $METASERVER->{table};
825 $table->clear; 885 $table->clear;
826 $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...");
827 887
828 my $buf; 888 my $ok = 0;
829 889
830 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 890 CFPlus::background {
891 my $ua = CFPlus::lwp_useragent;
831 892
832 unless ($fh) { 893 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
833 $label->set_text ("unable to contact metaserver: $!"); 894 } sub {
834 return; 895 my ($msg) = @_;
835 } 896 if ($msg) {
836
837 Event->io (fd => $fh, poll => 'r', cb => sub {
838 my $res = sysread $fh, $buf, 8192, length $buf;
839
840 if (!defined $res) {
841 $_[0]->w->cancel;
842 $label->set_text ("error while retrieving server list: $!");
843 } elsif ($res == 0) {
844 $_[0]->w->cancel;
845 status "server list retrieved";
846
847 utf8::decode $buf if utf8::valid $buf;
848
849 $table->clear; 897 $table->clear;
850 898
899 my @tip = (
900 "The current number of users logged in on the server.",
901 "The hostname of the server.",
902 "The time this server has been running without being restarted.",
903 "The server software version - a '+' indicates a Crossfire+ server.",
904 "Short information about this server provided by its admins.",
905 );
851 my @col = qw(Use #Users Host Uptime Version Description); 906 my @col = qw(#Users Host Uptime Version Description);
852 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 907 $table->add ($_, 0, new CFPlus::UI::Label
908 can_hover => 1, can_events => 1,
909 align => 0, fg => [1, 1, 0],
910 text => $col[$_], tooltip => $tip[$_])
853 for 0 .. $#col; 911 for 0 .. $#col;
854 912
855 my @align = qw(1 0 1 1 -1); 913 my @align = qw(1 0 1 1 -1);
856 914
857 my $y = 0; 915 my $y = 0;
858 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 916 for my $m (@{ $msg->{servers} }) {
859 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)};
860 919
861 for ($desc) { 920 for ($desc) {
862 s/<br>/\n/gi; 921 s/<br>/\n/gi;
863 s/<li>/\n· /gi; 922 s/<li>/\n· /gi;
864 s/<.*?>//sgi; 923 s/<.*?>//sgi;
865 s/&/&amp;/g; 924 s/&amp;/&/g;
866 s/</&lt;/g; 925 s/&lt;/</g;
867 s/>/&gt;/g; 926 s/&gt;/>/g;
868 } 927 }
869 928
870 $uptime = sprintf "%dd %02d:%02d:%02d", 929 $uptime = sprintf "%dd %02d:%02d:%02d",
871 (int $m->[8] / 86400), 930 (int $uptime / 86400),
872 (int $m->[8] / 3600) % 24, 931 (int $uptime / 3600) % 24,
873 (int $m->[8] / 60) % 60, 932 (int $uptime / 60) % 60,
874 $m->[8] % 60; 933 $uptime % 60;
875 934
876 $m = [$users, $host, $uptime, $version, $desc]; 935 $m = [$users, $host, $uptime, $version, $desc];
877 936
878 $y++; 937 $y++;
879 938
880 $table->add (0, $y, new CFClient::UI::VBox children => [ 939 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
881 (new CFClient::UI::Button text => "Use", on_activate => sub { 940 (new CFPlus::UI::Button
941 text => "Use",
942 tooltip => "Put this server into the <b>Host:Port</b> field",
943 on_activate => sub {
882 $HOST_ENTRY->set_text ($CFG->{host} = $host); 944 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
883 $METASERVER->toggle_visibility; 945 $METASERVER->hide;
946 0
947 },
884 }), 948 ),
885 (new CFClient::UI::Empty expand => 1), 949 (new CFPlus::UI::Empty expand => 1),
886 ]); 950 ]);
887 951
888 $table->add ($_ + 1, $y, new CFClient::UI::Label 952 $table->add ($_, $y, new CFPlus::UI::Label
889 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 953 max_w => $::WIDTH * 0.4,
954 ellipsise => 0,
955 align => $align[$_],
956 text => $m->[$_],
957 tooltip => $tip[$_],
958 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
959 can_hover => 1,
960 can_events => 1,
961 fontsize => 0.8)
890 for 0 .. $#$m; 962 for 0 .. $#$m;
891 } 963 }
964 } else {
965 $ok or $label->set_text ("error while contacting metaserver");
892 } 966 }
893 }); 967 };
968
894} 969}
895 970
896sub metaserver_dialog { 971sub metaserver_dialog {
897 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
898 title => "Server List", 977 title => "Server List",
899 name => 'metaserver_dialog', 978 name => 'metaserver_dialog',
900 x => 'center', 979 x => 'center',
901 y => 'center', 980 y => 'center',
902 z => 3, 981 z => 3,
903 child => (my $vbox = new CFClient::UI::VBox), 982 force_w => $::WIDTH * 0.9,
983 force_h => $::HEIGHT * 0.7,
984 child => $vbox,
985 has_close_button => 1,
986 table => $table,
904 on_visibility_change => sub { 987 on_visibility_change => sub {
905 update_metaserver if $_[1]; 988 update_metaserver ($_[0]) if $_[1];
989 0
906 }, 990 },
907 ; 991 ;
908 992
909 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
910
911 $dialog 993 $dialog
912} 994}
913 995
914sub server_setup { 996sub server_setup {
915 my $vbox = new CFClient::UI::VBox; 997 my $vbox = new CFPlus::UI::VBox;
916 998
999 $vbox->add (new CFPlus::UI::FancyFrame
1000 label => "Connection Settings",
917 $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 );
918 $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");
919 1004
920 { 1005 {
921 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1006 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
922 1007
923 $vbox->add ( 1008 $vbox->add (
924 $HOST_ENTRY = new CFClient::UI::Entry 1009 $HOST_ENTRY = new CFPlus::UI::Entry
925 expand => 1, 1010 expand => 1,
926 text => $CFG->{host}, 1011 text => $CFG->{profile}{default}{host},
927 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",
928 on_changed => sub { 1013 on_changed => sub {
929 my ($self, $value) = @_; 1014 my ($self, $value) = @_;
930 $CFG->{host} = $value; 1015 $CFG->{profile}{default}{host} = $value;
1016 0
931 } 1017 }
932 ); 1018 );
933 1019
934 $METASERVER = metaserver_dialog;
935
936 $vbox->add (new CFClient::UI::Button 1020 $vbox->add (new CFPlus::UI::Button
937 expand => 1, 1021 expand => 1,
938 text => "Server List", 1022 text => "Server List",
939 other => $METASERVER, 1023 other => $METASERVER,
940 tooltip => "Show a list of available crossfire servers", 1024 tooltip => "Show a list of available crossfire servers",
941 on_activate => sub { $METASERVER->toggle_visibility }, 1025 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1026 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
942 ); 1027 );
943 } 1028 }
944 1029
945 $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");
946 $table->add (1, 4, new CFClient::UI::Entry 1031 $table->add (1, 4, new CFPlus::UI::Entry
947 text => $CFG->{user}, 1032 text => $CFG->{profile}{default}{user},
948 tooltip => "The name of your character on the server", 1033 tooltip => "The name of your character on the server",
949 on_changed => sub { 1034 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
950 my ($self, $value) = @_;
951 $CFG->{user} = $value;
952 }
953 ); 1035 );
954 1036
955 $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");
956 $table->add (1, 5, new CFClient::UI::Entry 1038 $table->add (1, 5, new CFPlus::UI::Entry
957 text => $CFG->{password}, 1039 text => $CFG->{profile}{default}{password},
958 hidden => 1, 1040 hidden => 1,
959 tooltip => "The password for your character", 1041 tooltip => "The password for your character",
960 on_changed => sub { 1042 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961 my ($self, $value) = @_;
962 $CFG->{password} = $value;
963 }
964 ); 1043 );
965 1044
966 $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");
967 $table->add (1, 7, new CFClient::UI::Slider 1046 $table->add (1, 7, new CFPlus::UI::Slider
968 force_w => 100, 1047 force_w => 100,
969 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1048 range => [$CFG->{mapsize}, 10, 100, 0, 1],
970 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. "
971 . "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, "
972 . "but you also increase bandwidth requirements and latency. " 1051 . "but you also increase bandwidth requirements and latency. "
973 . "This option is only used once at log-in.", 1052 . "This option is only used once at log-in.",
974 on_changed => sub { 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
975 my ($self, $value) = @_;
976
977 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
978 },
979 ); 1054 );
980 1055
981 $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");
982 $table->add (1, 8, new CFClient::UI::CheckBox 1057 $table->add (1, 8, new CFPlus::UI::CheckBox
983 state => $CFG->{face_prefetch}, 1058 state => $CFG->{face_prefetch},
984 tooltip => "<b>Background Image Prefetch</b>\n\n" 1059 tooltip => "<b>Background Image Prefetch</b>\n\n"
985 . "If enabled, the client automatically pre-fetches images from the server. " 1060 . "If enabled, the client automatically pre-fetches images from the server. "
986 . "This might increase or create lag, but increases the chances " 1061 . "This might increase or create lag, but increases the chances "
987 . "of faces being ready for display when you encounter them. " 1062 . "of faces being ready for display when you encounter them. "
988 . "It also uses up server bandwidth on every connect, " 1063 . "It also uses up server bandwidth on every connect, "
989 . "so only set it if you really need to prefetch images. " 1064 . "so only set it if you really need to prefetch images. "
990 . "This option can be set and unset any time.", 1065 . "This option can be set and unset any time.",
991 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
992 ); 1067 );
993 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
994 $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");
995 $table->add (1, 9, new CFClient::UI::Entry 1079 $table->add (1, 10, new CFPlus::UI::Entry
996 text => $CFG->{output_count}, 1080 text => $CFG->{output_count},
997 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.",
998 on_changed => sub { $CFG->{output_count} = $_[1] }, 1082 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
999 ); 1083 );
1000 1084
1001 $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");
1002 $table->add (1, 10, new CFClient::UI::Entry 1086 $table->add (1, 11, new CFPlus::UI::Entry
1003 text => $CFG->{output_sync}, 1087 text => $CFG->{output_sync},
1004 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.",
1005 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1089 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1006 ); 1090 );
1007 1091
1008 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1092 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1009 expand => 1, 1093 expand => 1,
1010 align => 0, 1094 align => 0,
1011 text => "Login", 1095 text => "Login",
1012 on_activate => sub { 1096 on_activate => sub {
1013 $CONN ? stop_game 1097 $CONN ? stop_game
1014 : start_game; 1098 : start_game;
1099 0
1015 }, 1100 },
1016 ); 1101 );
1017 1102
1018 $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");
1019 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1020 text => $CFG->{say_command}, 1105 text => $CFG->{say_command},
1021 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. "
1022 . "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. "
1023 . "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.",
1024 on_changed => sub { 1109 on_changed => sub {
1025 my ($self, $value) = @_; 1110 my ($self, $value) = @_;
1026 $CFG->{say_command} = $value; 1111 $CFG->{say_command} = $value;
1112 0
1027 } 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),
1028 ); 1130 );
1029 1131
1030 $vbox 1132 $vbox
1031} 1133}
1032 1134
1033sub message_window { 1135sub message_window {
1034 my $window = new CFClient::UI::FancyFrame 1136 my $window = new CFPlus::UI::Toplevel
1035 name => "message_window", 1137 name => "message_window",
1036 title => "Messages", 1138 title => "Messages",
1037 border_bg => [1, 1, 1, 1], 1139 border_bg => [1, 1, 1, 1],
1038 bg => [0, 0, 0, 0.75],
1039 x => "max", 1140 x => "max",
1040 y => 0, 1141 y => 0,
1041 force_w => $::WIDTH * 0.4, 1142 force_w => $::WIDTH * 0.4,
1042 force_h => $::HEIGHT * 0.5, 1143 force_h => $::HEIGHT * 0.5,
1043 child => (my $vbox = new CFClient::UI::VBox); 1144 child => (my $vbox = new CFPlus::UI::VBox),
1145 has_close_button => 1;
1044 1146
1045 $vbox->add ($LOGVIEW); 1147 $vbox->add ($LOGVIEW);
1046 1148
1047 $vbox->add (my $input = new CFClient::UI::Entry 1149 $vbox->add (my $input = new CFPlus::UI::Entry
1048 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> "
1049 . "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>...). "
1050 . "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). "
1051 . "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.",
1052 on_focus_in => sub { 1154 on_focus_in => sub {
1056 1158
1057 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1159 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1058 $input->{refocus_map} = 1; 1160 $input->{refocus_map} = 1;
1059 } 1161 }
1060 delete $input->{auto_activated}; 1162 delete $input->{auto_activated};
1163
1164 0
1061 }, 1165 },
1062 on_activate => sub { 1166 on_activate => sub {
1063 my ($input, $text) = @_; 1167 my ($input, $text) = @_;
1064 $input->set_text (''); 1168 $input->set_text ('');
1065 1169
1071 } 1175 }
1072 if ($input->{refocus_map}) { 1176 if ($input->{refocus_map}) {
1073 delete $input->{refocus_map}; 1177 delete $input->{refocus_map};
1074 $MAPWIDGET->focus_in 1178 $MAPWIDGET->focus_in
1075 } 1179 }
1180
1181 0
1076 }, 1182 },
1077 on_escape => sub { 1183 on_escape => sub {
1078 $MAPWIDGET->focus_in 1184 $MAPWIDGET->grab_focus;
1185
1186 0
1079 }, 1187 },
1080 ); 1188 );
1081 1189
1082 $CONSOLE = { 1190 $CONSOLE = {
1083 window => $window, 1191 window => $window,
1085 }; 1193 };
1086 1194
1087 $window 1195 $window
1088} 1196}
1089 1197
1090sub open_quit_dialog {
1091 unless ($QUIT_DIALOG) {
1092 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1093 x => "center",
1094 y => "center",
1095 z => 50,
1096 title => "Really Quit?",
1097 ;
1098
1099 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1100
1101 $vb->add (new CFClient::UI::Label
1102 text => "You should find a savebed and apply it first!",
1103 max_w => $WIDTH * 0.25,
1104 ellipsize => 0,
1105 );
1106 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1107 $hb->add (new CFClient::UI::Button
1108 text => "Ok",
1109 expand => 1,
1110 on_activate => sub { $QUIT_DIALOG->hide },
1111 );
1112 $hb->add (new CFClient::UI::Button
1113 text => "Quit anyway",
1114 expand => 1,
1115 on_activate => sub { exit },
1116 );
1117 }
1118
1119 $QUIT_DIALOG->show;
1120}
1121
1122sub autopickup_setup { 1198sub autopickup_setup {
1123 my $table = new CFClient::UI::Table; 1199 my $table = new CFPlus::UI::Table;
1124 1200
1125 for ( 1201 for (
1126 ["General", 0, 0, 1202 ["General", 0, 0,
1127 ["Enable autopickup" => PICKUP_NEWMODE], 1203 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1128 ["Inhibit autopickup" => PICKUP_INHIBIT], 1204 ["Inhibit autopickup" => PICKUP_INHIBIT],
1129 ["Stop before pickup" => PICKUP_STOP], 1205 ["Stop before pickup" => PICKUP_STOP],
1130 ["Debug autopickup" => PICKUP_DEBUG], 1206 ["Debug autopickup" => PICKUP_DEBUG],
1131 ], 1207 ],
1132 ["Weapons", 0, 6, 1208 ["Weapons", 0, 6,
1142 ["Boots" => PICKUP_BOOTS], 1218 ["Boots" => PICKUP_BOOTS],
1143 ["Gloves" => PICKUP_GLOVES], 1219 ["Gloves" => PICKUP_GLOVES],
1144 ["Cloaks" => PICKUP_CLOAK], 1220 ["Cloaks" => PICKUP_CLOAK],
1145 ], 1221 ],
1146 1222
1147 ["Readables", 2, 2, 1223 ["Readables", 2, 0,
1148 ["Spellbooks" => PICKUP_SPELLBOOK], 1224 ["Spellbooks" => PICKUP_SPELLBOOK],
1149 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1225 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1150 ["Normal Books/Scrolls" => PICKUP_READABLES], 1226 ["Normal Books/Scrolls" => PICKUP_READABLES],
1151 ], 1227 ],
1152 ["Misc", 2, 7, 1228 ["Misc", 2, 5,
1153 ["Food" => PICKUP_FOOD], 1229 ["Food" => PICKUP_FOOD],
1154 ["Drinks" => PICKUP_DRINK], 1230 ["Drinks" => PICKUP_DRINK],
1155 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1231 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1156 ["Keys" => PICKUP_KEY], 1232 ["Keys" => PICKUP_KEY],
1157 ["Magical Items" => PICKUP_MAGICAL], 1233 ["Magical Items" => PICKUP_MAGICAL],
1158 ["Potions" => PICKUP_POTION], 1234 ["Potions" => PICKUP_POTION],
1159 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1235 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160 ["Ignore cursed" => PICKUP_NOT_CURSED], 1236 ["Ignore cursed" => PICKUP_NOT_CURSED],
1161 ["Jewelery" => PICKUP_JEWELS], 1237 ["Jewelery" => PICKUP_JEWELS],
1238 ["Flesh" => PICKUP_FLESH],
1162 ], 1239 ],
1240 ["Weight/Value ratio", 2, 17]
1163 ) 1241 )
1164 { 1242 {
1165 my ($title, $x, $y, @bits) = @$_; 1243 my ($title, $x, $y, @bits) = @$_;
1166 $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]);
1167 1245
1168 for (@bits) { 1246 for (@bits) {
1169 ++$y; 1247 ++$y;
1170 1248
1171 my $mask = $_->[1]; 1249 my $mask = $_->[1];
1172 $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);
1173 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1251 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1174 state => $CFG->{pickup} & $mask, 1252 state => $::CFG->{pickup} & $mask,
1175 on_changed => sub { 1253 on_changed => sub {
1176 my ($box, $value) = @_; 1254 my ($box, $value) = @_;
1255
1177 if ($value) { 1256 if ($value) {
1178 $::CFG->{pickup} |= $mask; 1257 $::CFG->{pickup} |= $mask;
1179 } else { 1258 } else {
1180 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1259 $::CFG->{pickup} &= ~$mask;
1181 } 1260 }
1261
1182 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1262 $::CONN->send_command ("pickup $::CFG->{pickup}")
1183 if defined $::CONN; 1263 if defined $::CONN;
1264
1265 0
1184 }); 1266 });
1267
1268 ${$_->[2]} = $checkbox if $_->[2];
1185 } 1269 }
1186 } 1270 }
1187 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
1188 $table 1293 $table
1189} 1294}
1190 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
1191sub inventory_window { 1315sub inventory_widget {
1192 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
1193 x => "center", 1371 x => "center",
1194 y => "center", 1372 y => "center",
1195 force_w => $WIDTH * 9/10, 1373 force_w => $WIDTH * 9/10,
1196 force_h => $HEIGHT * 9/10, 1374 force_h => $HEIGHT * 9/10,
1197 title => "Inventory", 1375 title => "Player",
1376 name => "playerbook",
1377 has_close_button => 1
1198 ; 1378 ;
1199 1379
1200 $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;
1201 1383
1202 $hb->add (my $vb1 = new CFClient::UI::VBox); 1384 $ntb->add (
1203 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1385 "Statistics (F2)" => $STATS_PAGE = stats_window,
1204 $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 );
1205 1392
1206 $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 );
1207 1404
1208 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1405 $ntb->set_current_page ($INVENTORY_PAGE);
1209 1406
1210 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1407 $plwin->add ($ntb);
1211 1408 $plwin
1212 # XXX: Call after $INVR = ... because set_opencont sets the items
1213 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
1215 $invwin
1216}
1217
1218sub spell_setup {
1219 new CFClient::UI::SpellList
1220} 1409}
1221 1410
1222sub keyboard_setup { 1411sub keyboard_setup {
1223 my $binding_list = new CFClient::UI::VBox; 1412 CFPlus::Macro::keyboard_setup
1224
1225 my $refresh;
1226 $refresh = sub {
1227 $binding_list->clear ();
1228
1229 for my $mod (keys %{$::CFG->{bindings}}) {
1230 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1231 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1232 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233
1234 my $lbl = join "; ", @$cmds;
1235 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1236 $binding_list->add (my $hb = new CFClient::UI::HBox);
1237 $hb->add (new CFClient::UI::Button
1238 text => "delete",
1239 tooltip => "Deletes the binding",
1240 on_activate => sub {
1241 $binding_list->remove ($hb);
1242 delete $::CFG->{bindings}->{$mod}->{$sym};
1243 });
1244
1245 $hb->add (new CFClient::UI::Button
1246 text => "edit",
1247 tooltip => "Edits the binding",
1248 on_activate => sub {
1249 $::BIND_EDITOR->set_binding (
1250 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1251 sub {
1252 my ($nmod, $nsym, $ncmds) = @_;
1253 delete $::CFG->{bindings}->{$mod}->{$sym};
1254 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1255 $refresh->();
1256 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257 $SETUP_DIALOG->show;
1258 },
1259 sub {
1260 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261 $SETUP_DIALOG->show;
1262 });
1263 $::BIND_EDITOR->show;
1264 $SETUP_DIALOG->hide;
1265 });
1266
1267 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269 }
1270 }
1271 };
1272
1273 my $vb = new CFClient::UI::VBox;
1274 $vb->add ($binding_list);
1275 $vb->add (my $hb = new CFClient::UI::HBox);
1276
1277 $hb->add (new CFClient::UI::Button
1278 text => "record new",
1279 expand => 1,
1280 tooltip => "This button opens the binding editor with an empty binding.",
1281 on_activate => sub {
1282 $::BIND_EDITOR->set_binding (undef, undef, [],
1283 sub {
1284 my ($mod, $sym, $cmds) = @_;
1285 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1286 $refresh->();
1287 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288 $SETUP_DIALOG->show;
1289 },
1290 sub {
1291 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1292 $SETUP_DIALOG->show;
1293 },
1294 );
1295 $SETUP_DIALOG->hide;
1296 $::BIND_EDITOR->show;
1297 },
1298 );
1299
1300 $hb->add (new CFClient::UI::Button
1301 text => "close",
1302 tooltip => "Closes the binding window",
1303 expand => 1,
1304 on_activate => sub {
1305 $SETUP_DIALOG->hide;
1306 }
1307 );
1308
1309 $refresh->();
1310
1311 $vb
1312} 1413}
1313 1414
1314sub make_help_window { 1415sub help_window {
1315 my $win = new CFClient::UI::FancyFrame 1416 my $win = new CFPlus::UI::Toplevel
1316 x => 'center', 1417 x => 'center',
1317 y => 'center', 1418 y => 'center',
1318 z => 2, 1419 z => 4,
1319 name => 'doc_browser', 1420 name => 'doc_browser',
1320 force_w => int $WIDTH * 7/8, 1421 force_w => int $WIDTH * 7/8,
1321 force_h => int $HEIGHT * 7/8, 1422 force_h => int $HEIGHT * 7/8,
1322 title => "Documentation"; 1423 title => "Help Browser",
1424 has_close_button => 1;
1323 1425
1324 $win->add (my $vbox = new CFClient::UI::VBox); 1426 $win->add (my $vbox = new CFPlus::UI::VBox);
1325 1427
1326 $vbox->add (my $buttons = new CFClient::UI::HBox); 1428 $vbox->add (new CFPlus::UI::FancyFrame
1327 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1429 label => "Navigation",
1430 child => (my $buttons = new CFPlus::UI::HBox),
1431 );
1432 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1433 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1328 1434
1329 for ( 1435 my @history;
1330 [intro => "Introduction"], 1436 my @future;
1331 [manual => "Manual"], 1437 my $curnode;
1332 [command_help => "Commands"], 1438
1333 [skill_help => "Skills"], 1439 my $load_node; $load_node = sub {
1334 ) {
1335 my ($pod, $label) = @$_; 1440 my ($node, $para) = @_;
1336 1441
1442 $buttons->clear;
1443
1337 $buttons->add (new CFClient::UI::Button 1444 $buttons->add (new CFPlus::UI::Button
1338 text => $label, 1445 text => "⇤",
1446 tooltip => "back to the starting page",
1339 on_activate => sub { 1447 on_activate => sub {
1340 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1448 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1341 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1449 unshift @future, @history;
1342 1450 @history = ();
1343 $viewer->clear; 1451 $load_node->(@{shift @future});
1344
1345 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1346 for @$pom;
1347
1348 $viewer->set_offset (0);
1349 }, 1452 },
1350 ); 1453 );
1454
1455 if (@history) {
1456 $buttons->add (new CFPlus::UI::Button
1457 text => "⋘",
1458 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1459 on_activate => sub {
1460 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1461 $load_node->(@{pop @history});
1462 },
1463 );
1464 }
1465
1466 if (@future) {
1467 $buttons->add (new CFPlus::UI::Button
1468 text => "â‹™",
1469 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1470 on_activate => sub {
1471 push @history, [$curnode, $viewer->current_paragraph];
1472 $load_node->(@{shift @future});
1473 },
1474 );
1475 }
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);
1501 };
1502
1503 $load_node->(CFPlus::Pod::find pod => "mainpage");
1504
1505 $CFPlus::Pod::goto_document = sub {
1506 my (@path) = @_;
1507
1508 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1509
1510 $load_node->((CFPlus::Pod::find @path)[0]);
1511 $win->show;
1512 };
1513
1514 $win
1515}
1516
1517sub open_string_query {
1518 my ($title, $cb, $txt, $tooltip) = @_;
1519 my $dialog = new CFPlus::UI::Toplevel
1520 x => "center",
1521 y => "center",
1522 z => 50,
1523 force_w => $WIDTH * 4/5,
1524 title => $title;
1525
1526 $dialog->add (
1527 my $e = new CFPlus::UI::Entry
1528 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1529 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1530 tooltip => $tooltip
1531 );
1532
1533 $e->grab_focus;
1534 $e->set_text ($txt) if $txt;
1535 $dialog->show;
1536}
1537
1538sub open_quit_dialog {
1539 unless ($QUIT_DIALOG) {
1540 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1541 x => "center",
1542 y => "center",
1543 z => 50,
1544 title => "Really Quit?",
1545 on_key_down => sub {
1546 my ($dialog, $ev) = @_;
1547 $ev->{sym} == 27 and $dialog->hide;
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 );
1351 } 1569 }
1352 1570
1353 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>"); 1571 $QUIT_DIALOG->show;
1572 $QUIT_DIALOG->grab_focus;
1573}
1354 1574
1355 $win 1575sub show_tip_of_the_day {
1576 # find all tips
1577 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1578
1579 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1580 $todindex = 0 if $todindex >= @tod;
1581 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1582
1583 # create dialog
1584 my $dialog;
1585
1586 my $close = sub {
1587 $dialog->destroy;
1588 };
1589
1590 $dialog = new CFPlus::UI::Toplevel
1591 x => "center",
1592 y => "center",
1593 z => 3,
1594 name => 'tip_of_the_day',
1595 force_w => int $WIDTH * 4/9,
1596 force_h => int $WIDTH * 2/9,
1597 title => "Tip of the day #" . (1 + $todindex),
1598 child => my $vbox = new CFPlus::UI::VBox,
1599 has_close_button => 1,
1600 on_delete => $close,
1601 ;
1602
1603 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1604 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1605 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1606
1607 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1608
1609 $table->add (0, 0, new CFPlus::UI::Button
1610 text => "Close",
1611 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1612 on_activate => $close,
1613 );
1614
1615 $table->add (2, 0, new CFPlus::UI::Button
1616 text => "Next",
1617 tooltip => "Show the next <b>Tip of the day</b>.",
1618 on_activate => sub {
1619 $close->();
1620 &show_tip_of_the_day;
1621 },
1622 );
1623
1624 $dialog->show;
1356} 1625}
1357 1626
1358sub sdl_init { 1627sub sdl_init {
1359 CFClient::SDL_Init 1628 CFPlus::SDL_Init
1360 and die "SDL::Init failed!\n"; 1629 and die "SDL::Init failed!\n";
1361} 1630}
1362 1631
1363sub video_init { 1632sub video_init {
1364 sdl_init; 1633 sdl_init;
1369 1638
1370 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1639 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1371 $FULLSCREEN = $CFG->{fullscreen}; 1640 $FULLSCREEN = $CFG->{fullscreen};
1372 $FAST = $CFG->{fast}; 1641 $FAST = $CFG->{fast};
1373 1642
1374 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1643 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1375 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1644 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1376 1645
1377 $SDL_ACTIVE = 1; 1646 $SDL_ACTIVE = 1;
1378 $LAST_REFRESH = time - 0.01; 1647 $LAST_REFRESH = time - 0.01;
1379 1648
1380 CFClient::OpenGL::init; 1649 CFPlus::OpenGL::init;
1381 1650
1382 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1651 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1383 1652
1384 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1653 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1385 1654
1386 ############################################################################# 1655 #############################################################################
1387 1656
1388 if ($DEBUG_STATUS) { 1657 if ($DEBUG_STATUS) {
1389 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1658 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1390 } else { 1659 } else {
1391 # create the widgets 1660 # create the widgets
1392 1661
1393 $DEBUG_STATUS = new CFClient::UI::Label 1662 $DEBUG_STATUS = new CFPlus::UI::Label
1394 padding => 0, 1663 padding => 0,
1395 z => 100, 1664 z => 100,
1396 force_x => "max", 1665 force_x => "max",
1397 force_y => 0; 1666 force_y => 0;
1398 $DEBUG_STATUS->show; 1667 $DEBUG_STATUS->show;
1399 1668
1400 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1401
1402 $STATUSBOX = new CFClient::UI::Statusbox; 1669 $STATUSBOX = new CFPlus::UI::Statusbox;
1403 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1670 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1404 1671
1405 (new CFClient::UI::Frame 1672 (new CFPlus::UI::Frame
1406 bg => [0, 0, 0, 0.4], 1673 bg => [0, 0, 0, 0.4],
1407 force_x => 0, 1674 force_x => 0,
1408 force_y => "max", 1675 force_y => "max",
1409 child => $STATUSBOX, 1676 child => $STATUSBOX,
1410 )->show; 1677 )->show;
1411 1678
1412 CFClient::UI::FancyFrame->new ( 1679 CFPlus::UI::Toplevel->new (
1413 title => "Map", 1680 title => "Map",
1414 name => "mapmap", 1681 name => "mapmap",
1415 x => 0, 1682 x => 0,
1416 y => $FONTSIZE + 8, 1683 y => $FONTSIZE + 8,
1417 border_bg => [1, 1, 1, 192/255], 1684 border_bg => [1, 1, 1, 192/255],
1418 bg => [1, 1, 1, 0], 1685 bg => [1, 1, 1, 0],
1419 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1686 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1420 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1687 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1421 ), 1688 ),
1422 )->show; 1689 )->show;
1423 1690
1424 $MAPWIDGET = new CFClient::MapWidget; 1691 $MAPWIDGET = new CFPlus::MapWidget;
1425 $MAPWIDGET->connect (activate_console => sub { 1692 $MAPWIDGET->connect (activate_console => sub {
1426 my ($mapwidget, $preset) = @_; 1693 my ($mapwidget, $preset) = @_;
1427 1694
1428 if ($CONSOLE) { 1695 if ($CONSOLE) {
1429 $CONSOLE->{input}->{auto_activated} = 1; 1696 $CONSOLE->{input}->{auto_activated} = 1;
1430 $CONSOLE->{input}->focus_in; 1697 $CONSOLE->{input}->grab_focus;
1431 1698
1432 if ($preset && $CONSOLE->{input}->get_text eq '') { 1699 if ($preset && $CONSOLE->{input}->get_text eq '') {
1433 $CONSOLE->{input}->set_text ($preset); 1700 $CONSOLE->{input}->set_text ($preset);
1434 } 1701 }
1435 } 1702 }
1436 }); 1703 });
1437 $MAPWIDGET->show; 1704 $MAPWIDGET->show;
1438 $MAPWIDGET->focus_in; 1705 $MAPWIDGET->grab_focus;
1439 1706
1440 $LOGVIEW = new CFClient::UI::TextView 1707 $LOGVIEW = new CFPlus::UI::TextScroller
1441 expand => 1, 1708 expand => 1,
1442 font => $FONT_FIXED, 1709 font => $FONT_FIXED,
1443 fontsize => $::CFG->{log_fontsize}, 1710 fontsize => $::CFG->{log_fontsize},
1444 indent => -4, 1711 indent => -4,
1445 can_hover => 1, 1712 can_hover => 1,
1446 can_events => 1, 1713 can_events => 1,
1447 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1714 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1448 ; 1715 ;
1449 1716
1450 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1717 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1451 title => "Setup", 1718 title => "Setup",
1452 name => "setup_dialog", 1719 name => "setup_dialog",
1453 x => 'center', 1720 x => 'center',
1454 y => 'center', 1721 y => 'center',
1455 z => 2, 1722 z => 2,
1456 force_w => $::WIDTH * 0.6, 1723 force_w => $::WIDTH * 0.6,
1457 force_h => $::HEIGHT * 0.6, 1724 force_h => $::HEIGHT * 0.6,
1725 has_close_button => 1,
1458 ; 1726 ;
1459 1727
1728 $METASERVER = metaserver_dialog;
1729
1460 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1730 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1461 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1731 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1462 1732
1463 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1733 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1464 "Configure the server to play on, your username, password and other server-related options."); 1734 "Configure the server to play on, your username, password and other server-related options.");
1465 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1735 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1466 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1736 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1467 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1737 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1468 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1738 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1469 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1739 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1470 "Configure the use of audio, sound effects and background music."); 1740 "Configure the use of audio, sound effects and background music.");
1471 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1741 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1472 "Lets you define, edit and delete bindings." 1742 "Lets you define, edit and delete key bindings."
1473 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1743 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1474 . "with nothing set and the recording started. After doing the actions you " 1744 . "with nothing set and the recording started. After doing the actions you "
1475 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1745 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1476 . "After pressing the combo the binding will be saved automatically and the " 1746 . "After pressing the combo the binding will be saved automatically and the "
1477 . "binding editor closes"); 1747 . "binding editor closes");
1478 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1748 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1479 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1749 "Some debuggin' options. Do not ask.");
1480 1750
1481 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1751 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1482 1752
1483 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1753 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1484 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1754 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1485 1755
1486 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1756 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1487 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1757 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1488 1758
1489 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1759 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1490 1760
1491 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1492 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1493 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1761 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1494 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1762 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1496 1763
1497 $BUTTONBAR->add (new CFClient::UI::Button 1764 $BUTTONBAR->add (new CFPlus::UI::Button
1498 text => "Save Config", 1765 text => "Save Config",
1499 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1766 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1500 on_activate => sub { 1767 on_activate => sub {
1501 $::CFG->{layout} = CFClient::UI::get_layout; 1768 $::CFG->{layout} = CFPlus::UI::get_layout;
1502 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1769 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1503 status "Configuration Saved"; 1770 status "Configuration Saved";
1771 0
1504 }, 1772 },
1505 ); 1773 );
1506 1774
1507 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1775 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1508 tooltip => "View Documentation"); 1776 tooltip => "View Documentation");
1509 1777
1778
1510 $BUTTONBAR->add (new CFClient::UI::Button 1779 $BUTTONBAR->add (new CFPlus::UI::Button
1511 text => "Quit", 1780 text => "Quit",
1512 tooltip => "Terminates the program", 1781 tooltip => "Terminates the program",
1513 on_activate => sub { 1782 on_activate => sub {
1514 if ($CONN) { 1783 if ($CONN) {
1515 open_quit_dialog; 1784 open_quit_dialog;
1516 } else { 1785 } else {
1517 exit; 1786 exit;
1518 } 1787 }
1788 0
1519 }, 1789 },
1520 ); 1790 );
1521 1791
1522 $BUTTONBAR->show; 1792 $BUTTONBAR->show;
1523 $SETUP_DIALOG->show; 1793 $SETUP_DIALOG->show;
1524 } 1794 }
1525 1795
1526 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1796 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1527} 1797}
1528 1798
1799sub setup_build_button {
1800 my ($enabled) = @_;
1801 if ($enabled) {
1802 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1803 $BUILD_BUTTON ||= new CFPlus::UI::Button
1804 text => "Build",
1805 tooltip => "Opens the ingame builder",
1806 on_activate => sub {
1807 if ($CONN) {
1808 $CONN->send_ext_req (builder_player_items => sub {
1809 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1810 });
1811 }
1812 0
1813 };
1814 $BUTTONBAR->add ($BUILD_BUTTON);
1815 } else {
1816 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1817 }
1818}
1819
1820sub open_ingame_editor {
1821 my ($msg) = @_;
1822
1823 my $win = new CFPlus::UI::Toplevel
1824 x => 0,
1825 y => 'center',
1826 z => 4,
1827 name => 'builder_window',
1828 force_w => int $WIDTH * 1/4,
1829 force_h => int $HEIGHT * 3/4,
1830 title => "In game builder",
1831 has_close_button => 1;
1832
1833 my $r = new CFPlus::UI::ScrolledWindow (
1834 expand => 1,
1835 scroll_y => 1
1836 );
1837 $r->add (my $vb = new CFPlus::UI::VBox);
1838 $win->add ($r);
1839
1840
1841 $vb->add (
1842 new CFPlus::UI::Button
1843 text => "Disable build mode",
1844 on_activate => sub { $::IN_BUILD_MODE = undef }
1845 );
1846 $vb->add (
1847 new CFPlus::UI::Button
1848 text => "ERASE",
1849 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1850 );
1851
1852 for my $itemarchname (
1853 sort {
1854 $msg->{items}->{$a}->{build_arch_name}
1855 cmp $msg->{items}->{$b}->{build_arch_name}
1856 } keys %{$msg->{items}}
1857 ) {
1858 my $info = $msg->{items}->{$itemarchname};
1859 $vb->add (
1860 new CFPlus::UI::Button text => $info->{build_arch_name},
1861 on_activate => sub {
1862 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1863
1864 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1865 build_mode_query_arch_info ();
1866 }
1867 }
1868 );
1869 }
1870
1871 $win->show;
1872}
1873
1874sub build_mode_query_arch_info {
1875 my ($iteminfo) = $::IN_BUILD_MODE;
1876 my $itemarchname = $iteminfo->{item};
1877 my $info = $iteminfo->{info};
1878
1879 my $dialog = new CFPlus::UI::Toplevel
1880 x => "center",
1881 y => "center",
1882 z => 50,
1883 force_w => int $WIDTH * 1/2,
1884 title => "Enter information for placement of '$itemarchname'",
1885 has_close_button => 1;
1886
1887 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1888
1889 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1890 my $row = 0;
1891 if ($info->{has_name}) {
1892 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1893 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1894 }
1895 if ($info->{has_text}) {
1896 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1897 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1898 }
1899 if ($info->{has_connection}) {
1900 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1901 $table->add (1, $row++,
1902 new CFPlus::UI::Entry
1903 expand => 1,
1904 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1905 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1906 );
1907 }
1908
1909 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1910 $hb->add (new CFPlus::UI::Button
1911 text => "Close",
1912 expand => 1,
1913 on_activate => sub { $dialog->hide; 0 },
1914 );
1915 $dialog->show;
1916}
1917
1529sub video_shutdown { 1918sub video_shutdown {
1919 CFPlus::OpenGL::shutdown;
1920
1530 undef $SDL_ACTIVE; 1921 undef $SDL_ACTIVE;
1531} 1922}
1532 1923
1533my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1924my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1534my $bgmusic;#TODO#hack#d# 1925my $bgmusic;#TODO#hack#d#
1541 1932
1542sub audio_music_finished { 1933sub audio_music_finished {
1543 return unless $CFG->{bgm_enable}; 1934 return unless $CFG->{bgm_enable};
1544 1935
1545 # TODO: hack, do play loop and mood music 1936 # TODO: hack, do play loop and mood music
1546 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1937 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1547 $bgmusic->play (0); 1938 $bgmusic->play (0);
1548 1939
1549 push @bgmusic, shift @bgmusic; 1940 push @bgmusic, shift @bgmusic;
1550} 1941}
1551 1942
1552sub audio_init { 1943sub audio_init {
1553 if ($CFG->{audio_enable}) { 1944 if ($CFG->{audio_enable}) {
1554 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1945 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1555 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1946 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1556 1947
1557 unless ($SDL_MIXER) { 1948 unless ($SDL_MIXER) {
1558 status "Unable to open sound device: there will be no sound"; 1949 status "Unable to open sound device: there will be no sound";
1559 return; 1950 return;
1560 } 1951 }
1561 1952
1562 CFClient::Mix_AllocateChannels 8; 1953 CFPlus::Mix_AllocateChannels 8;
1563 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1954 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1564 1955
1565 audio_music_finished; 1956 audio_music_finished;
1566 1957
1958 local $_;
1567 while (<$fh>) { 1959 while (<$fh>) {
1568 next if /^\s*#/; 1960 next if /^\s*#/;
1569 next if /^\s*$/; 1961 next if /^\s*$/;
1570 1962
1571 my ($file, $volume, $event) = split /\s+/, $_, 3; 1963 my ($file, $volume, $event) = split /\s+/, $_, 3;
1572 1964
1573 push @SOUNDS, "$volume,$file"; 1965 push @SOUNDS, "$volume,$file";
1574 1966
1575 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1967 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1576 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1968 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1577 $chunk->volume ($volume * 128 / 100); 1969 $chunk->volume ($volume * 128 / 100);
1578 $chunk 1970 $chunk
1579 }; 1971 };
1580 } 1972 }
1581 } else { 1973 } else {
1583 } 1975 }
1584 } 1976 }
1585} 1977}
1586 1978
1587sub audio_shutdown { 1979sub audio_shutdown {
1588 CFClient::Mix_CloseAudio if $SDL_MIXER; 1980 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1589 undef $SDL_MIXER; 1981 undef $SDL_MIXER;
1590 @SOUNDS = (); 1982 @SOUNDS = ();
1591 %AUDIO_CHUNKS = (); 1983 %AUDIO_CHUNKS = ();
1592} 1984}
1593 1985
1600 1992
1601sub force_refresh { 1993sub force_refresh {
1602 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1994 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1603 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1995 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1604 1996
1605 $CFClient::UI::ROOT->draw; 1997 $CFPlus::UI::ROOT->draw;
1606 1998
1607 $WANT_REFRESH = 0; 1999 $WANT_REFRESH = 0;
1608 $CAN_REFRESH = 0; 2000 $CAN_REFRESH = 0;
1609 $LAST_REFRESH = $NOW; 2001 $LAST_REFRESH = $NOW;
1610 2002
16110 && do {
1612 # some weird model-drawing code, just a joke right now
1613 use CFClient::OpenGL;
1614
1615 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1616 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1617 $demo{r} ||= do {
1618 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1619 $mod->{v} = pack "f*", @{$mod->{v}};
1620 $_ = [scalar @$_, pack "S!*", @$_]
1621 for values %{$mod->{g}};
1622 $mod
1623 };
1624
1625 my $r = $demo{r} or die;
1626
1627 glDepthMask 1;
1628 glClear GL_DEPTH_BUFFER_BIT;
1629 glEnable GL_TEXTURE_2D;
1630 glEnable GL_DEPTH_TEST;
1631 glEnable GL_CULL_FACE;
1632 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1633
1634 glMatrixMode GL_PROJECTION;
1635 glLoadIdentity;
1636 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1637 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1638 glMatrixMode GL_MODELVIEW;
1639 glLoadIdentity;
1640
1641 glPushMatrix;
1642 glTranslate 0, 0, -800;
1643 glScale 1, -1, 1;
1644 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1645 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1646 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1647 glScale 50, 50, 50;
1648
1649 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1650 while (my ($k, $v) = each %{$r->{g}}) {
1651 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1652 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1653 }
1654
1655 glPopMatrix;
1656
1657 glShadeModel GL_FLAT;
1658 glDisable GL_DEPTH_TEST;
1659 glDisable GL_TEXTURE_2D;
1660 glDepthMask 0;
1661
1662 $WANT_REFRESH++;
1663};
1664
1665 CFClient::SDL_GL_SwapBuffers; 2003 CFPlus::SDL_GL_SwapBuffers;
1666} 2004}
1667 2005
1668my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2006my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1669 $NOW = time; 2007 $NOW = time;
1670 2008
1671 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2009 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1672 for CFClient::SDL_PollEvent; 2010 for CFPlus::SDL_PollEvent;
1673 2011
1674 if (%animate_object) { 2012 if (%animate_object) {
1675 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2013 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1676 $WANT_REFRESH++; 2014 $WANT_REFRESH++;
1677 } 2015 }
1701 $CONN->face_prefetch 2039 $CONN->face_prefetch
1702 if $CONN; 2040 if $CONN;
1703}); 2041});
1704 2042
1705%SDL_CB = ( 2043%SDL_CB = (
1706 CFClient::SDL_QUIT => sub { 2044 CFPlus::SDL_QUIT => sub {
1707 Event::unloop -1; 2045 Event::unloop -1;
1708 }, 2046 },
1709 CFClient::SDL_VIDEORESIZE => sub { 2047 CFPlus::SDL_VIDEORESIZE => sub {
1710 }, 2048 },
1711 CFClient::SDL_VIDEOEXPOSE => sub { 2049 CFPlus::SDL_VIDEOEXPOSE => sub {
1712 CFClient::UI::full_refresh; 2050 CFPlus::UI::full_refresh;
1713 }, 2051 },
1714 CFClient::SDL_ACTIVEEVENT => sub { 2052 CFPlus::SDL_ACTIVEEVENT => sub {
1715# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2053# not useful, as APPACTIVE include sonly iconified state, not unmapped
2054# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2055# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2056# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2057# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1716 }, 2058 },
1717 CFClient::SDL_KEYDOWN => sub { 2059 CFPlus::SDL_KEYDOWN => sub {
1718 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2060 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1719 # alt-enter 2061 # alt-enter
2062 $FULLSCREEN_ENABLE->toggle;
1720 video_shutdown; 2063 video_shutdown;
1721 $CFG->{fullscreen} = !$CFG->{fullscreen};
1722 video_init; 2064 video_init;
1723 } else { 2065 } else {
1724 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2066 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1725 } 2067 }
1726 }, 2068 },
1727 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2069 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1728 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2070 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1729 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2071 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1730 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2072 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1731 CFClient::SDL_USEREVENT => sub { 2073 CFPlus::SDL_USEREVENT => sub {
1732 if ($_[0]{code} == 1) { 2074 if ($_[0]{code} == 1) {
1733 audio_channel_finished $_[0]{data1}; 2075 audio_channel_finished $_[0]{data1};
1734 } elsif ($_[0]{code} == 0) { 2076 } elsif ($_[0]{code} == 0) {
1735 audio_music_finished; 2077 audio_music_finished;
1736 } 2078 }
1740############################################################################# 2082#############################################################################
1741 2083
1742$SIG{INT} = $SIG{TERM} = sub { exit }; 2084$SIG{INT} = $SIG{TERM} = sub { exit };
1743 2085
1744{ 2086{
1745 local $SIG{__DIE__} = sub {
1746 return unless defined $^S && !$^S;
1747 Carp::confess $_[1];#d#TODO: remove when stable
1748 CFClient::fatal $_[0];
1749 };
1750
1751 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2087 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2088 CFPlus::DB::Server::run;
2089
1752 CFClient::UI::set_layout ($::CFG->{layout}); 2090 CFPlus::UI::set_layout ($::CFG->{layout});
1753 2091
1754 my %DEF_CFG = ( 2092 my %DEF_CFG = (
1755 sdl_mode => 0, 2093 sdl_mode => 0,
1756 width => 640, 2094 width => 640,
1757 height => 480, 2095 height => 480,
1758 fullscreen => 0, 2096 fullscreen => 0,
1759 fast => 0, 2097 fast => 0,
1760 map_scale => 1, 2098 map_scale => 1,
1761 fow_enable => 1, 2099 fow_enable => 1,
1762 fow_intensity => 0.45, 2100 fow_intensity => 0.45,
1763 fow_smooth => 0, 2101 fow_smooth => 0,
1764 gui_fontsize => 1, 2102 gui_fontsize => 1,
1765 log_fontsize => 0.7, 2103 log_fontsize => 0.7,
1766 gauge_fontsize=> 1, 2104 gauge_fontsize => 1,
1767 gauge_size => 0.35, 2105 gauge_size => 0.35,
1768 stat_fontsize => 0.7, 2106 stat_fontsize => 0.7,
1769 mapsize => 100, 2107 mapsize => 100,
1770 host => "crossfire.schmorp.de",
1771 say_command => 'say', 2108 say_command => 'chat',
1772 audio_enable => 1, 2109 audio_enable => 1,
1773 bgm_enable => 1, 2110 bgm_enable => 1,
1774 bgm_volume => 0.25, 2111 bgm_volume => 0.25,
1775 face_prefetch => 0, 2112 face_prefetch => 0,
1776 output_sync => 1, 2113 output_sync => 1,
1777 output_count => 1, 2114 output_count => 1,
2115 output_rate => "",
2116 pickup => 0,
2117 inv_sort => "mtime",
2118 default => "profile", # default profile
2119 show_tips => 1,
2120 );
1778 ); 2121
1779
1780 while (my ($k, $v) = each %DEF_CFG) { 2122 while (my ($k, $v) = each %DEF_CFG) {
1781 $CFG->{$k} = $v unless exists $CFG->{$k}; 2123 $CFG->{$k} = $v unless exists $CFG->{$k};
1782 } 2124 }
1783 2125
2126 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2127 $PROFILE = $CFG->{profile}{default};
2128
2129 # convert old bindings (only default profile matters)
2130 if (my $bindings = delete $PROFILE->{bindings}) {
2131 while (my ($mod, $syms) = each %$bindings) {
2132 while (my ($sym, $cmds) = each %$syms) {
2133 push @{ $PROFILE->{macro} }, {
2134 accelkey => [$mod*1, $sym*1],
2135 action => $cmds,
2136 };
2137 }
2138 }
2139 }
2140
1784 sdl_init; 2141 sdl_init;
1785 2142
1786 @SDL_MODES = reverse 2143 @SDL_MODES = reverse
1787 grep $_->[0] >= 640 && $_->[1] >= 480, 2144 grep $_->[0] >= 640 && $_->[1] >= 480,
1788 CFClient::SDL_ListModes; 2145 CFPlus::SDL_ListModes;
1789 2146
1790 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2147 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1791 2148
1792 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2149 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1793 2150
1794 { 2151 {
1795 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2152 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1796 DejaVuSans.ttf 2153 DejaVuSans.ttf
1797 DejaVuSansMono.ttf 2154 DejaVuSansMono.ttf
1798 DejaVuSans-Bold.ttf 2155 DejaVuSans-Bold.ttf
1799 DejaVuSansMono-Bold.ttf 2156 DejaVuSansMono-Bold.ttf
1800 DejaVuSans-Oblique.ttf 2157 DejaVuSans-Oblique.ttf
1801 DejaVuSansMono-Oblique.ttf 2158 DejaVuSansMono-Oblique.ttf
1802 DejaVuSans-BoldOblique.ttf 2159 DejaVuSans-BoldOblique.ttf
1803 DejaVuSansMono-BoldOblique.ttf 2160 DejaVuSansMono-BoldOblique.ttf
1804 ); 2161 );
1805 2162
1806 CFClient::add_font $_ for @fonts; 2163 CFPlus::add_font $_ for @fonts;
1807 2164
1808 CFClient::pango_init; 2165 CFPlus::pango_init;
1809 2166
1810 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2167 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1811 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2168 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1812 2169
1813 $FONT_PROP->make_default; 2170 $FONT_PROP->make_default;
1814 } 2171 }
1815 2172
1816# compare mono (ft) vs. rgba (cairo) 2173# compare mono (ft) vs. rgba (cairo)
1817# ft - 1.8s, cairo 3s, even in alpha-only mode 2174# ft - 1.8s, cairo 3s, even in alpha-only mode
1818# for my $rgba (0..1) { 2175# for my $rgba (0..1) {
1819# my $t1 = Time::HiRes::time; 2176# my $t1 = Time::HiRes::time;
1820# for (1..1000) { 2177# for (1..1000) {
1821# my $layout = CFClient::Layout->new ($rgba); 2178# my $layout = CFPlus::Layout->new ($rgba);
1822# $layout->set_text ("hallo" x 100); 2179# $layout->set_text ("hallo" x 100);
1823# $layout->render; 2180# $layout->render;
1824# } 2181# }
1825# my $t2 = Time::HiRes::time; 2182# my $t2 = Time::HiRes::time;
1826# warn $t2-$t1; 2183# warn $t2-$t1;
1827# } 2184# }
1828 2185
2186 $startup_done->();
2187
1829 video_init; 2188 video_init;
1830 audio_init; 2189 audio_init;
1831} 2190}
1832 2191
2192show_tip_of_the_day if $CFG->{show_tips};
2193
1833Event::loop; 2194Event::loop;
2195#CFPlus::SDL_Quit;
2196#CFPlus::_exit 0;
1834 2197
1835END { CFClient::SDL_Quit } 2198END { CFPlus::SDL_Quit }
1836 2199
1837=head1 NAME 2200=head1 NAME
1838 2201
1839cfplus - A Crossfire+ and Crossfire game client 2202cfplus - A Crossfire+ and Crossfire game client
1840 2203

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines