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

Diff Legend

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