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

Diff Legend

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