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.64 by root, Wed Jun 7 06:28:30 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

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