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.42 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.111 by root, Sun Aug 13 19:47:05 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines