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.73 by root, Sat Jun 17 15:07:54 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines