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.36 by elmex, Tue May 30 14:59:26 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

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

Diff Legend

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