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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines