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

Diff Legend

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