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

Diff Legend

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