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.46 by elmex, Fri Jun 2 18:46:16 2006 UTC vs.
Revision 1.110 by root, Sun Aug 13 18:48:57 2006 UTC

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

Diff Legend

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