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.63 by root, Wed Jun 7 05:54:09 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines