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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines