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.60 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.142 by root, Mon Mar 12 22:23:09 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines