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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines