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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines