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.50 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 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::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43 45
44$Event::DIED = sub { 46$Event::DIED = sub {
45 # TODO: display dialog box or so 47 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable 48 Carp::confess $_[1];#d#TODO: remove when stable
47 CFClient::error $_[1]; 49 CFClient::error $_[1];
… …
83our $CONSOLE; 85our $CONSOLE;
84our $METASERVER; 86our $METASERVER;
85our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
86our $QUIT_DIALOG; 88our $QUIT_DIALOG;
87our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $SERVER_INFO;
88 91
89our $SETUP_DIALOG; 92our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK; 93our $SETUP_NOTEBOOK;
91our $SETUP_SERVER; 94our $SETUP_SERVER;
92our $SETUP_KEYBOARD; 95our $SETUP_KEYBOARD;
93our $SETUP_SPELLS; 96our $SETUP_SPELLS;
94 97
98our $STATS_WINDOW;
99our $MESSAGE_WINDOW;
95our $FLOORBOX; 100our $FLOORBOX;
96our $GAUGES; 101our $GAUGES;
97our $STATWIDS; 102our $STATWIDS;
98 103
99our $SDL_ACTIVE; 104our $SDL_ACTIVE;
… …
105 110
106our $ALT_ENTER_MESSAGE; 111our $ALT_ENTER_MESSAGE;
107our $STATUSBOX; 112our $STATUSBOX;
108our $DEBUG_STATUS; 113our $DEBUG_STATUS;
109 114
110our $INV_WINDOW;
111our $INV; 115our $INV;
112our $INVR; 116our $INVR;
113our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
114 118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121
115our $BIND_EDITOR; 122our $BIND_EDITOR;
123our $BIND_UPD_CB;
116 124
117our $PICKUP_CFG; 125our $PICKUP_CFG;
118 126
119sub status { 127sub status {
120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 128 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
122 130
123sub debug { 131sub debug {
124 $DEBUG_STATUS->set_text ($_[0]); 132 $DEBUG_STATUS->set_text ($_[0]);
125} 133}
126 134
135sub destroy_query_dialog {
136 (delete $_[0]{query_dialog})->destroy
137 if $_[0]{query_dialog};
138}
139
140# server query dialog
141sub server_query {
142 my ($conn, $flags, $prompt) = @_;
143
144 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
145 x => "center",
146 y => "center",
147 title => "Server Query",
148 child => my $vbox = new CFClient::UI::VBox,
149 ;
150
151 my @dialog = my $label = new CFClient::UI::Label
152 max_w => $::WIDTH * 0.4,
153 ellipsise => 0,
154 text => $prompt;
155
156 if ($flags & CS_QUERY_YESNO) {
157 push @dialog, my $hbox = new CFClient::UI::HBox;
158
159 $hbox->add (new CFClient::UI::Button
160 text => "No",
161 on_activate => sub {
162 $conn->send ("reply n");
163 $dialog->destroy;
164 0
165 }
166 );
167 $hbox->add (new CFClient::UI::Button
168 text => "Yes",
169 on_activate => sub {
170 $conn->send ("reply y");
171 destroy_query_dialog $conn;
172 0
173 },
174 );
175
176 $dialog->grab_focus;
177
178 } elsif ($flags & CS_QUERY_SINGLECHAR) {
179 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
180
181 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
182 $MESSAGE_WINDOW->show;
183
184 unshift @dialog, new CFClient::UI::Label
185 max_w => $::WIDTH * 0.4,
186 ellipsise => 0,
187 markup => "\nOr use your keyboard:\n";
188
189 unshift @dialog, my $table = new CFClient::UI::Table;
190
191 $table->add (0, 0, new CFClient::UI::Button
192 text => "Next Race",
193 on_activate => sub {
194 $conn->send ("reply n");
195 destroy_query_dialog $conn;
196 0
197 },
198 );
199 $table->add (2, 0, new CFClient::UI::Button
200 text => "Accept",
201 on_activate => sub {
202 $conn->send ("reply d");
203 destroy_query_dialog $conn;
204 0
205 },
206 );
207
208 unshift @dialog, new CFClient::UI::Label
209 max_w => $::WIDTH * 0.4,
210 ellipsise => 0,
211 markup =>
212 "<big><b>Character Creation: Race</b></big>\n\n"
213 . "Look at the <b>Messages</b> window to see a description of this race "
214 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
215 . "and the center of the screen to see how this race looks like "
216 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
217 . "You can look at another race, or accept this race (you will come back to this race eventually, "
218 . "so you can take your time making this important choice."
219 ;
220
221 } elsif ($prompt =~ /roll new stats/) {
222 if (my $stat = delete $conn->{stat_change_with}) {
223 $conn->send ("reply $stat");
224 destroy_query_dialog $conn;
225 return;
226 }
227
228 $STATS_WINDOW->show;
229 $MESSAGE_WINDOW->hide;
230
231 unshift @dialog, new CFClient::UI::Label
232 max_w => $::WIDTH * 0.4,
233 ellipsise => 0,
234 markup => "\nOr use your keyboard:\n";
235
236 unshift @dialog, my $table = new CFClient::UI::Table;
237
238 # left: re-roll
239 $table->add (0, 0, new CFClient::UI::Button
240 text => "Roll Again",
241 on_activate => sub {
242 $conn->send ("reply y");
243 destroy_query_dialog $conn;
244 0
245 },
246 );
247
248 # center: swap stats
249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
250 value => $_,
251 options => [
252 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
253 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
254 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
255 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
256 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
257 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
258 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
259 ],
260 ), 1 .. 2;
261
262 $table->add (2, 0, new CFClient::UI::Button
263 text => "Swap Stats",
264 on_activate => sub {
265 $conn->{stat_change_with} = $sw2->{value};
266 $conn->send ("reply $sw1->{value}");
267 destroy_query_dialog $conn;
268 0
269 },
270 );
271 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
272
273 # right: accept
274 $table->add (4, 0, new CFClient::UI::Button
275 text => "Accept",
276 on_activate => sub {
277 $conn->send ("reply n");
278 $STATS_WINDOW->hide;
279 destroy_query_dialog $conn;
280 0
281 },
282 );
283
284 unshift @dialog, new CFClient::UI::Label
285 max_w => $::WIDTH * 0.4,
286 ellipsise => 0,
287 markup =>
288 "<big><b>Character Creation: Stats</b></big>\n\n"
289 . "Look at the <b>Stats</b> window to see your basic stats "
290 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
291 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
292 . "Race selection will influence those values later on."
293 ;
294 }
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 on_changed => sub {
298 $conn->send ("reply $_[1]");
299 destroy_query_dialog $conn;
300 0
301 },
302 ;
303
304 $entry->grab_focus;
305
306 } else {
307 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
308
309 push @dialog, my $entry = new CFClient::UI::Entry
310 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
311 on_activate => sub {
312 $conn->send ("reply $_[1]");
313 destroy_query_dialog $conn;
314 0
315 },
316 ;
317
318 $entry->grab_focus;
319 }
320
321 $vbox->add (@dialog);
322 $dialog->show;
323}
324
127sub start_game { 325sub start_game {
128 status "logging in..."; 326 status "logging in...";
129 327
130 $LOGIN_BUTTON->set_text ("Logout"); 328 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide; 329 $SETUP_DIALOG->hide;
132 330
133 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 331 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
134 332
135 my ($host, $port) = split /:/, $CFG->{host}; 333 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
136 334
137 $MAP = new CFClient::Map $mapsize, $mapsize; 335 $MAP = new CFClient::Map $mapsize, $mapsize;
138 336
139 $CONN = eval { 337 $CONN = eval {
140 new CFClient::Protocol 338 new CFClient::Protocol
141 host => $host, 339 host => $host,
142 port => $port || 13327, 340 port => $port || 13327,
143 user => $CFG->{user}, 341 user => $CFG->{profile}{default}{user},
144 pass => $CFG->{password}, 342 pass => $CFG->{profile}{default}{password},
145 mapw => $mapsize, 343 mapw => $mapsize,
146 maph => $mapsize, 344 maph => $mapsize,
147 345
148 map_widget => $MAPWIDGET, 346 map_widget => $MAPWIDGET,
149 logview => $LOGVIEW, 347 logview => $LOGVIEW,
150 statusbox => $STATUSBOX, 348 statusbox => $STATUSBOX,
151 map => $MAP, 349 map => $MAP,
152 mapmap => $MAPMAP, 350 mapmap => $MAPMAP,
351 query => \&server_query,
153 352
154 sound_play => sub { 353 sound_play => sub {
155 my ($x, $y, $soundnum, $type) = @_; 354 my ($x, $y, $soundnum, $type) = @_;
156 355
157 $SDL_MIXER 356 $SDL_MIXER
… …
174 } 373 }
175} 374}
176 375
177sub stop_game { 376sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 377 $LOGIN_BUTTON->set_text ("Login");
378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 379 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 380 $PL_WINDOW->hide;
181 $LOGVIEW->hide; 381 $SETUP_SPELLS->clear_spells;
182 382
183 return unless $CONN; 383 return unless $CONN;
184 384
185 status "connection closed"; 385 status "connection closed";
186 386
387 destroy_query_dialog $CONN;
187 $CONN->destroy; 388 $CONN->destroy;
188 $CONN = 0; # false, does not autovivify 389 $CONN = 0; # false, does not autovivify
390
391 undef $MAP;
189} 392}
190 393
191sub graphics_setup { 394sub graphics_setup {
192 my $vbox = new CFClient::UI::VBox; 395 my $vbox = new CFClient::UI::VBox;
193 396
… …
211 414
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 415 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 416 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fullscreen}, 417 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 418 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 420 );
221 421
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fast}, 424 state => $CFG->{fast},
225 tooltip => "Lower the visual quality considerably to speed up rendering.", 425 tooltip => "Lower the visual quality considerably to speed up rendering.",
226 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
227 my ($self, $value) = @_;
228 $CFG->{fast} = $value;
229 }
230 ); 427 );
231 428
232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 429 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
233 $table->add (1, $row++, new CFClient::UI::Slider 430 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 431 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 432 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 434 );
241 435
242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 436 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 437 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_enable}, 438 state => $CFG->{fow_enable},
245 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 439 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
246 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 441 );
251 442
252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 443 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
253 $table->add (1, $row++, new CFClient::UI::Slider 444 $table->add (1, $row++, new CFClient::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 445 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 446 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 448 );
261 449
262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
263 $table->add (1, $row++, new CFClient::UI::CheckBox 451 $table->add (1, $row++, new CFClient::UI::CheckBox
264 state => $CFG->{fow_smooth}, 452 state => $CFG->{fow_smooth},
265 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 453 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
266 on_changed => sub { 454 on_changed => sub {
267 my ($self, $value) = @_; 455 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value; 456 $CFG->{fow_smooth} = $value;
269 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
458 0
270 } 459 }
271 ); 460 );
272 461
273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 462 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
274 $table->add (1, $row++, new CFClient::UI::Slider 463 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 464 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 465 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 466 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
278 ); 467 );
279 468
280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 469 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
281 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 472 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 ); 474 );
286 475
287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288 477
289 $table->add (1, $row++, new CFClient::UI::Slider 478 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub { 481 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1]; 482 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize; 483 &set_stats_window_fontsize;
484 0
295 } 485 }
296 ); 486 );
297 487
298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
299 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 491 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302 on_changed => sub { 492 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 493 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 494 &set_gauge_window_fontsize;
495 0
305 } 496 }
306 ); 497 );
307 498
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
309 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 501 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 502 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
312 on_changed => sub { 503 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 504 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 505 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
506 0
315 } 507 }
316 ); 508 );
317 509
318 $table->add (1, $row++, new CFClient::UI::Button 510 $table->add (1, $row++, new CFClient::UI::Button
319 expand => 1, align => 0, text => "Apply", 511 expand => 1, align => 0, text => "Apply",
320 tooltip => "Apply the video settings", 512 tooltip => "Apply the video settings",
321 on_activate => sub { 513 on_activate => sub {
322 video_shutdown (); 514 video_shutdown ();
323 video_init (); 515 video_init ();
516 0
324 } 517 }
325 ); 518 );
326 519
327 $vbox 520 $vbox
328} 521}
… …
336 529
337 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 530 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
338 $table->add (1, $row++, new CFClient::UI::CheckBox 531 $table->add (1, $row++, new CFClient::UI::CheckBox
339 state => $CFG->{audio_enable}, 532 state => $CFG->{audio_enable},
340 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 533 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
341 on_changed => sub { 534 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
342 $CFG->{audio_enable} = $_[1];
343 }
344 ); 535 );
345# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 536# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
346# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 537# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
347# $CFG->{effects_volume} = $_[1]; 538# $CFG->{effects_volume} = $_[1];
348# }); 539# });
349 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 540 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
350 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 541 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
351 $hbox->add (new CFClient::UI::CheckBox 542 $hbox->add (new CFClient::UI::CheckBox
352 expand => 1, state => $CFG->{bgm_enable}, 543 expand => 1, state => $CFG->{bgm_enable},
353 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 544 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
354 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
355 $CFG->{bgm_enable} = $_[1];
356 }
357 ); 546 );
358 $hbox->add (new CFClient::UI::Slider 547 $hbox->add (new CFClient::UI::Slider
359 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 548 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
360 tooltip => "The volume of the background music. Changes are instant.", 549 tooltip => "The volume of the background music. Changes are instant.",
361 on_changed => sub { 550 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
362 $CFG->{bgm_volume} = $_[1];
363 CFClient::MixMusic::volume $_[1] * 128;
364 }
365 ); 551 );
366 552
367 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
368 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
369 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
370 on_activate => sub { 556 on_activate => sub {
371 audio_shutdown (); 557 audio_shutdown ();
372 audio_init (); 558 audio_init ();
559 0
373 } 560 }
374 ); 561 );
375 562
376 $vbox 563 $vbox
377} 564}
… …
439 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
440 627
441 $win 628 $win
442} 629}
443 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
444 633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
445sub make_stats_window { 659sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw =
447 y => $HEIGHT * (2/8), 661 new CFClient::UI::Window
448 x => "max", 662 child => my $vb = new CFClient::UI::VBox;
449 title => "Stats",
450 name => "stats_window";
451 663
452 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
453 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
454 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
455 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
456 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
457 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
… …
481 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
482 693
483 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 694 [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."],
484 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 695 [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."],
485 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 696 [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."],
486 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 697 [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. This is the same as the physical resistance."],
487 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 698 [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."],
488 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 699 [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."],
489 ) { 700 ) {
490 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
491 702
… …
510 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
511 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
512 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
513 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
514 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
515 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 726 phys => "<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.)",
516 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
517 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 728 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)",
518 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
519 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
520 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
537 ); 748 );
538 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
539 font => $FONT_FIXED, 750 font => $FONT_FIXED,
540 can_hover => 1, 751 can_hover => 1,
541 can_events => 1, 752 can_events => 1,
542 image => "ui/resist/resist_$_.png", 753 path => "ui/resist/resist_$_.png",
543 tooltip => $resist_names{$_}, 754 tooltip => $resist_names{$_},
544 ); 755 );
545 756
546 $row++; 757 $row++;
547 if ($row % 6 == 0) { 758 if ($row % 6 == 0) {
… …
595 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
596 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
597 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
598 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
599 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
600 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
601 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
602 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
603 814
604 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
605 816
606 # TODO: replace by CS_STAT_RES_xxx constants
607 my %tbl = ( 817 my %tbl = (
608 phys => 100, 818 phys => CS_STAT_RES_PHYS,
609 magic => 101, 819 magic => CS_STAT_RES_MAG,
610 fire => 102, 820 fire => CS_STAT_RES_FIRE,
611 elec => 103, 821 elec => CS_STAT_RES_ELEC,
612 cold => 104, 822 cold => CS_STAT_RES_COLD,
613 conf => 105, 823 conf => CS_STAT_RES_CONF,
614 acid => 106, 824 acid => CS_STAT_RES_ACID,
615 drain => 107, 825 drain => CS_STAT_RES_DRAIN,
616 ghit => 108, 826 ghit => CS_STAT_RES_GHOSTHIT,
617 pois => 109, 827 pois => CS_STAT_RES_POISON,
618 slow => 110, 828 slow => CS_STAT_RES_SLOW,
619 para => 111, 829 para => CS_STAT_RES_PARA,
620 tund => 112, 830 tund => CS_STAT_TURN_UNDEAD,
621 fear => 113, 831 fear => CS_STAT_RES_FEAR,
622 depl => 113, 832 depl => CS_STAT_RES_DEPLETE,
623 deat => 115, 833 deat => CS_STAT_RES_DEATH,
624 holyw => 116, 834 holyw => CS_STAT_RES_HOLYWORD,
625 blind => 117, 835 blind => CS_STAT_RES_BLIND,
626 ); 836 );
627 837
628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
629 for keys %tbl; 839 for keys %tbl;
630} 840}
631 841
632my $METASERVER_ATIME; 842my $METASERVER_ATIME;
633 843
634sub update_metaserver { 844sub update_metaserver {
845 my ($metaserver_dialog) = @_;
846
847 $METASERVER = $metaserver_dialog
848 if defined $metaserver_dialog;
849
635 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
636 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
637 852
638 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
639 $table->clear; 854 $table->clear;
… …
660 875
661 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
662 877
663 $table->clear; 878 $table->clear;
664 879
880 my @tip = (
881 "The current number of users logged in on the server.",
882 "The hostname of the server.",
883 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.",
886 );
665 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 888 $table->add ($_, 0, new CFClient::UI::Label
889 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 892 for 0 .. $#col;
668 893
669 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
670 895
671 my $y = 0; 896 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
689 914
690 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
691 916
692 $y++; 917 $y++;
693 918
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 920 (new CFClient::UI::Button
921 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
697 $METASERVER->toggle_visibility; 925 $METASERVER->hide;
926 0
927 },
698 }), 928 ),
699 (new CFClient::UI::Empty expand => 1), 929 (new CFClient::UI::Empty expand => 1),
700 ]); 930 ]);
701 931
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 932 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 933 ellipsise => 0,
934 align => $align[$_],
935 text => $m->[$_],
936 tooltip => $tip[$_],
937 can_hover => 1,
938 can_events => 1,
939 fontsize => 0.8)
704 for 0 .. $#$m; 940 for 0 .. $#$m;
705 } 941 }
706 } 942 }
707 }); 943 });
708} 944}
709 945
710sub metaserver_dialog { 946sub metaserver_dialog {
947 my $vbox = new CFClient::UI::VBox;
948 my $table = new CFClient::UI::Table;
949 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
950
711 my $dialog = new CFClient::UI::FancyFrame 951 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 952 title => "Server List",
713 name => 'metaserver_dialog', 953 name => 'metaserver_dialog',
714 x => 'center', 954 x => 'center',
715 y => 'center', 955 y => 'center',
716 child => (my $vbox = new CFClient::UI::VBox), 956 z => 3,
957 force_h => $::HEIGHT * 0.4,
958 child => $vbox,
959 has_close_button => 1,
960 table => $table,
717 on_visibility_change => sub { 961 on_visibility_change => sub {
718 update_metaserver if $_[1]; 962 update_metaserver ($_[0]) if $_[1];
963 0
719 }, 964 },
720 ; 965 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723 966
724 $dialog 967 $dialog
725} 968}
726 969
727sub server_setup { 970sub server_setup {
… …
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 977 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 978
736 $vbox->add ( 979 $vbox->add (
737 $HOST_ENTRY = new CFClient::UI::Entry 980 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 981 expand => 1,
739 text => $CFG->{host}, 982 text => $CFG->{profile}{default}{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 983 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 984 on_changed => sub {
742 my ($self, $value) = @_; 985 my ($self, $value) = @_;
743 $CFG->{host} = $value; 986 $CFG->{profile}{default}{host} = $value;
987 0
744 } 988 }
745 ); 989 );
746
747 $METASERVER = metaserver_dialog;
748 990
749 $vbox->add (new CFClient::UI::Button 991 $vbox->add (new CFClient::UI::Button
750 expand => 1, 992 expand => 1,
751 text => "Server List", 993 text => "Server List",
752 other => $METASERVER, 994 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 995 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 996 on_activate => sub { $METASERVER->toggle_visibility; 0 },
997 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 ); 998 );
756 } 999 }
757 1000
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1001 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 1002 $table->add (1, 4, new CFClient::UI::Entry
760 text => $CFG->{user}, 1003 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 1004 tooltip => "The name of your character on the server",
762 on_changed => sub { 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 1006 );
767 1007
768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1008 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769 $table->add (1, 5, new CFClient::UI::Entry 1009 $table->add (1, 5, new CFClient::UI::Entry
770 text => $CFG->{password}, 1010 text => $CFG->{profile}{default}{password},
771 hidden => 1, 1011 hidden => 1,
772 tooltip => "The password for your character", 1012 tooltip => "The password for your character",
773 on_changed => sub { 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1014 );
778 1015
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1016 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 1017 $table->add (1, 7, new CFClient::UI::Slider
781 force_w => 100, 1018 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1019 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 1020 tooltip => "This is the size of the portion of the map update the server sends you. "
784 . "If you set this to a high value you will be able to see further, " 1021 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 1022 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1023 . "This option is only used once at log-in.",
787 on_changed => sub { 1024 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788 my ($self, $value) = @_;
789
790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791 },
792 ); 1025 );
793 1026
794 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1027 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1028 $table->add (1, 8, new CFClient::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1029 state => $CFG->{face_prefetch},
… …
799 . "This might increase or create lag, but increases the chances " 1032 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1033 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1034 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1035 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1036 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1037 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1038 );
806 1039
807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1040 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808 $table->add (1, 9, new CFClient::UI::Entry 1041 $table->add (1, 9, new CFClient::UI::Entry
809 text => $CFG->{output_count}, 1042 text => $CFG->{output_count},
810 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1043 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
811 on_changed => sub { $CFG->{output_count} = $_[1] }, 1044 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1045 );
813 1046
814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1047 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815 $table->add (1, 10, new CFClient::UI::Entry 1048 $table->add (1, 10, new CFClient::UI::Entry
816 text => $CFG->{output_sync}, 1049 text => $CFG->{output_sync},
817 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1050 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
818 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1051 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1052 );
820 1053
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1054 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822 expand => 1, 1055 expand => 1,
823 align => 0, 1056 align => 0,
824 text => "Login", 1057 text => "Login",
825 on_activate => sub { 1058 on_activate => sub {
826 $CONN ? stop_game 1059 $CONN ? stop_game
827 : start_game; 1060 : start_game;
1061 0
828 }, 1062 },
829 ); 1063 );
830 1064
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1065 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1066 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1069 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1070 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1071 on_changed => sub {
838 my ($self, $value) = @_; 1072 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1073 $CFG->{say_command} = $value;
1074 0
840 } 1075 }
841 ); 1076 );
1077
1078 $vbox->add (new CFClient::UI::Label
1079 text => "Server Info",
1080 fontsize => 1.2,
1081 padding_y => 8,
1082 fg => [1, 1, 0, 1],
1083 );
1084
1085 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842 1086
843 $vbox 1087 $vbox
844} 1088}
845 1089
846sub message_window { 1090sub message_window {
… …
849 title => "Messages", 1093 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1095 bg => [0, 0, 0, 0.75],
852 x => "max", 1096 x => "max",
853 y => 0, 1097 y => 0,
854 force_w => $::WIDTH / 3, 1098 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1099 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1100 child => (my $vbox = new CFClient::UI::VBox),
1101 has_close_button => 1;
857 1102
858 $vbox->add ($LOGVIEW); 1103 $vbox->add ($LOGVIEW);
859 1104
860 $vbox->add (my $input = new CFClient::UI::Entry 1105 $vbox->add (my $input = new CFClient::UI::Entry
861 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1106 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
869 1114
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1115 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1116 $input->{refocus_map} = 1;
872 } 1117 }
873 delete $input->{auto_activated}; 1118 delete $input->{auto_activated};
1119
1120 0
874 }, 1121 },
875 on_activate => sub { 1122 on_activate => sub {
876 my ($input, $text) = @_; 1123 my ($input, $text) = @_;
877 $input->set_text (''); 1124 $input->set_text ('');
878 1125
… …
884 } 1131 }
885 if ($input->{refocus_map}) { 1132 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1133 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1134 $MAPWIDGET->focus_in
888 } 1135 }
1136
1137 0
889 }, 1138 },
890 on_escape => sub { 1139 on_escape => sub {
891 $MAPWIDGET->focus_in 1140 $MAPWIDGET->grab_focus;
1141
1142 0
892 }, 1143 },
893 ); 1144 );
894 1145
895 $CONSOLE = { 1146 $CONSOLE = {
896 window => $window, 1147 window => $window,
… …
903sub open_quit_dialog { 1154sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1155 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1156 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1157 x => "center",
907 y => "center", 1158 y => "center",
1159 z => 50,
908 title => "Really Quit?", 1160 title => "Really Quit?",
909 ; 1161 ;
910 1162
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1163 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1164
… …
917 ); 1169 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1170 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
920 text => "Ok", 1172 text => "Ok",
921 expand => 1, 1173 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1174 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1175 );
924 $hb->add (new CFClient::UI::Button 1176 $hb->add (new CFClient::UI::Button
925 text => "Quit anyway", 1177 text => "Quit anyway",
926 expand => 1, 1178 expand => 1,
927 on_activate => sub { exit }, 1179 on_activate => sub { exit },
… …
930 1182
931 $QUIT_DIALOG->show; 1183 $QUIT_DIALOG->show;
932} 1184}
933 1185
934sub autopickup_setup { 1186sub autopickup_setup {
935 my $vb = new CFClient::UI::VBox; 1187 my $table = new CFClient::UI::Table;
936
937 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942 my $tbl = 0;
943 my $tblrow = 0;
944 1188
945 for ( 1189 for (
946 ["General", $gen_tbl], 1190 ["General", 0, 0,
947 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1191 ["Enable autopickup" => PICKUP_NEWMODE],
948 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
949 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1193 ["Stop before pickup" => PICKUP_STOP],
950 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1194 ["Debug autopickup" => PICKUP_DEBUG],
1195 ],
951 ["Weapons", $ltbl], 1196 ["Weapons", 0, 6,
952 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1197 ["All weapons" => PICKUP_ALLWEAPON],
953 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1198 ["Missile weapons" => PICKUP_MISSILEWEAPON],
954 ["Bows" => CFClient::Pickup::PU_BOW], 1199 ["Bows" => PICKUP_BOW],
955 ["Arrows" => CFClient::Pickup::PU_ARROW], 1200 ["Arrows" => PICKUP_ARROW],
1201 ],
956 ["Armour"], 1202 ["Armour", 0, 12,
957 ["Helmets" => CFClient::Pickup::PU_HELMET], 1203 ["Helmets" => PICKUP_HELMET],
958 ["Shields" => CFClient::Pickup::PU_SHIELD], 1204 ["Shields" => PICKUP_SHIELD],
959 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1205 ["Body Armour" => PICKUP_ARMOUR],
960 ["Boots" => CFClient::Pickup::PU_BOOTS], 1206 ["Boots" => PICKUP_BOOTS],
961 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1207 ["Gloves" => PICKUP_GLOVES],
962 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1208 ["Cloaks" => PICKUP_CLOAK],
1209 ],
1210
963 ["Readables", $rtbl], 1211 ["Readables", 2, 2,
964 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1212 ["Spellbooks" => PICKUP_SPELLBOOK],
965 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1213 ["Skillscrolls" => PICKUP_SKILLSCROLL],
966 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1214 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ],
967 ["Misc"], 1216 ["Misc", 2, 7,
968 ["Food" => CFClient::Pickup::PU_FOOD], 1217 ["Food" => PICKUP_FOOD],
969 ["Drinks" => CFClient::Pickup::PU_DRINK], 1218 ["Drinks" => PICKUP_DRINK],
970 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971 ["Keys" => CFClient::Pickup::PU_KEY], 1220 ["Keys" => PICKUP_KEY],
972 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1221 ["Magical Items" => PICKUP_MAGICAL],
973 ["Potions" => CFClient::Pickup::PU_POTION], 1222 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1224 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1225 ["Jewelery" => PICKUP_JEWELS],
1226 ],
1227 ["Weight/Value ratio", 2, 17]
977 ) 1228 )
978 { 1229 {
979 if (ref $_->[1]) { 1230 my ($title, $x, $y, @bits) = @$_;
980 $tbl = $_->[1];
981 $tblrow = 0;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1231 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983 } elsif (not defined $_->[1]) { 1232
984 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1233 for (@bits) {
985 } else { 1234 ++$y;
1235
986 my $mask = $_->[1]; 1236 my $mask = $_->[1];
987 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
990 on_changed => sub { 1240 on_changed => sub {
991 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1242
992 if ($value) { 1243 if ($value) {
993 $::CFG->{pickup} |= $mask; 1244 $::CFG->{pickup} |= $mask;
994 } else { 1245 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1246 $::CFG->{pickup} &= ~$mask;
996 } 1247 }
1248
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1249 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1250 if defined $::CONN;
1251
1252 0
999 }); 1253 });
1000 } 1254 }
1001 } 1255 }
1002 1256
1257 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub {
1262 my ($slider, $value) = @_;
1263
1264 $::CFG->{pickup} &= ~0xF;
1265 $::CFG->{pickup} |= int $value
1266 if $value;
1267 1;
1268 });
1269
1270 $table->add (3, 18, new CFClient::UI::Button
1271 text => "set",
1272 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN;
1275 0
1276 });
1277
1278 $table
1279}
1280
1281sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283
1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1286 $vb1->add ($INV = new CFClient::UI::Inventory);
1287
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1003 $vb 1297 $hb
1004} 1298}
1005 1299
1006sub make_inventory_window { 1300sub player_window {
1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center", 1302 x => "center",
1009 y => "center", 1303 y => "center",
1010 force_w => $WIDTH * 9/10, 1304 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1305 force_h => $HEIGHT * 9/10,
1012 title => "Inventory", 1306 title => "Player",
1307 has_close_button => 1
1013 ; 1308 ;
1014 1309
1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook
1313 expand => 1,
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add (
1318 Inventory => inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 );
1016 1322
1017 $hb->add (my $vb1 = new CFClient::UI::VBox); 1323 $ntb->add (
1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1324 Stats => $STATS_WINDOW = stats_window,
1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1020 1331
1021 $hb->add (my $vb2 = new CFClient::UI::VBox); 1332 $plwin->add ($ntb);
1022 1333 $plwin
1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1024
1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1026
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
1030 $invwin
1031} 1334}
1032 1335
1033sub spell_setup { 1336sub update_bindings {
1034 new CFClient::UI::SpellList 1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1035} 1338}
1036 1339
1037sub keyboard_setup { 1340sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox; 1341 my $binding_list = new CFClient::UI::VBox;
1039 1342
1040 my $refresh; 1343 my $refresh;
1041 $refresh = sub { 1344 $refresh = $BIND_UPD_CB = sub {
1042 $binding_list->clear (); 1345 $binding_list->clear ();
1043 1346
1044 for my $mod (keys %{$::CFG->{bindings}}) { 1347 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048 1351
1049 my $lbl = join "; ", @$cmds; 1352 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox); 1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button 1355 $hb->add (new CFClient::UI::Button
1053 text => "delete", 1356 text => "delete",
1054 tooltip => "Deletes the binding", 1357 tooltip => "Deletes the binding",
1055 on_activate => sub { 1358 on_activate => sub {
1056 $binding_list->remove ($hb); 1359 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym}; 1360 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1361 0
1058 }); 1362 });
1059 1363
1060 $hb->add (new CFClient::UI::Button 1364 $hb->add (new CFClient::UI::Button
1061 text => "edit", 1365 text => "edit",
1062 tooltip => "Edits the binding", 1366 tooltip => "Edits the binding",
1063 on_activate => sub { 1367 on_activate => sub {
1064 $::BIND_EDITOR->set_binding ( 1368 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1369 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1066 sub { 1370 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1371 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1372 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1373 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1070 $refresh->(); 1374 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show; 1376 $SETUP_DIALOG->show;
1073 }, 1377 },
1074 sub { 1378 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1379 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show; 1380 $SETUP_DIALOG->show;
1077 }); 1381 });
1078 $::BIND_EDITOR->show; 1382 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide; 1383 $SETUP_DIALOG->hide;
1384 0
1080 }); 1385 });
1081 1386
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1387 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1388 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084 } 1389 }
1085 } 1390 }
1086 }; 1391 };
1087 1392
1088 my $vb = new CFClient::UI::VBox; 1393 my $vb = new CFClient::UI::VBox;
1394 $vb->add (my $hb = new CFClient::UI::HBox);
1395 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1396 $hb->add (new CFClient::UI::CheckBox
1397 expand => 1,
1398 state => $CFG->{shift_fire_stop},
1399 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1400 on_changed => sub {
1401 my ($cbox, $value) = @_;
1402 $CFG->{shift_fire_stop} = $value;
1403 0
1404 });
1405
1089 $vb->add ($binding_list); 1406 $vb->add ($binding_list);
1090 $vb->add (my $hb = new CFClient::UI::HBox); 1407 $vb->add (my $hb = new CFClient::UI::HBox);
1091 1408
1092 $hb->add (new CFClient::UI::Button 1409 $hb->add (new CFClient::UI::Button
1093 text => "record new", 1410 text => "record new",
… …
1095 tooltip => "This button opens the binding editor with an empty binding.", 1412 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub { 1413 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [], 1414 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub { 1415 sub {
1099 my ($mod, $sym, $cmds) = @_; 1416 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1417 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1101 $refresh->(); 1418 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show; 1420 $SETUP_DIALOG->show;
1104 }, 1421 },
1105 sub { 1422 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show; 1424 $SETUP_DIALOG->show;
1108 }); 1425 },
1426 );
1109 $SETUP_DIALOG->hide; 1427 $SETUP_DIALOG->hide;
1110 $::BIND_EDITOR->show; 1428 $::BIND_EDITOR->show;
1429 0
1111 }, 1430 },
1112 ); 1431 );
1113 1432
1114 $hb->add (new CFClient::UI::Button 1433 $hb->add (new CFClient::UI::Button
1115 text => "close", 1434 text => "close",
1116 tooltip => "Closes the binding window", 1435 tooltip => "Closes the binding window",
1117 expand => 1, 1436 expand => 1,
1118 on_activate => sub { 1437 on_activate => sub {
1119 $SETUP_DIALOG->hide; 1438 $SETUP_DIALOG->hide;
1439 0
1120 } 1440 }
1121 ); 1441 );
1122 1442
1123 $refresh->(); 1443 $refresh->();
1124 1444
1125 $vb 1445 $vb
1126} 1446}
1127 1447
1128sub make_help_window { 1448sub help_window {
1129 my $win = new CFClient::UI::FancyFrame 1449 my $win = new CFClient::UI::FancyFrame
1130 x => 'center', 1450 x => 'center',
1131 y => 'center', 1451 y => 'center',
1452 z => 2,
1132 name => 'doc_browser', 1453 name => 'doc_browser',
1133 force_w => int $WIDTH * 7/8, 1454 force_w => int $WIDTH * 7/8,
1134 force_h => int $HEIGHT * 7/8, 1455 force_h => int $HEIGHT * 7/8,
1135 title => "Documentation"; 1456 title => "Documentation";
1136 1457
1137 $win->add (my $vbox = new CFClient::UI::VBox); 1458 $win->add (my $vbox = new CFClient::UI::VBox);
1138 1459
1139 $vbox->add (my $buttons = new CFClient::UI::HBox); 1460 $vbox->add (my $buttons = new CFClient::UI::HBox);
1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1461 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1462 expand => 1, fontsize => 0.8, padding_x => 4);
1141 1463
1142 for ( 1464 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1465 $buttons->add (my $combo = new CFClient::UI::Combobox
1466 value => undef,
1467 options => [
1143 [intro => "Introduction"], 1468 [intro => "Introduction"],
1144 [manual => "Manual"], 1469 [manual => "Main Manual"],
1470 [skill_help => "Skill Reference"],
1471 [command_help => "Command Reference"],
1145 [command_help => "Commands"], 1472 [dmcommand_help => "DM Commands"],
1146 [skill_help => "Skills"], 1473 [COPYING => "License Terms"],
1147 ) { 1474 ],
1148 my ($pod, $label) = @$_; 1475 on_changed => sub {
1476 my ($self, $pod) = @_;
1149 1477
1150 $buttons->add (new CFClient::UI::Button 1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1151 text => $label, 1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1152 on_activate => sub {
1153 my $parser = new Pod::POM;
1154 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1155 1480
1156 $viewer->clear; 1481 $viewer->clear;
1482
1483# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1484# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1485# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1486# ]);#d#
1157 1487
1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159 for @{ CFClient::pod_to_pango_list $pom }; 1489 for @$pom;
1160 1490
1161 $viewer->set_offset (0); 1491 $viewer->set_offset (0);
1492
1162 }, 1493 0
1494 },
1495 on_visibility_change => sub {
1496 my ($self, $visible) = @_;
1497 return unless $visible;
1498 return if $self->{value};
1499 $self->set_value ("intro");
1500 0
1501 },
1163 ); 1502 );
1164 }
1165
1166 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167 1503
1168 $win 1504 $win
1169} 1505}
1170 1506
1171sub sdl_init { 1507sub sdl_init {
… …
1208 z => 100, 1544 z => 100,
1209 force_x => "max", 1545 force_x => "max",
1210 force_y => 0; 1546 force_y => 0;
1211 $DEBUG_STATUS->show; 1547 $DEBUG_STATUS->show;
1212 1548
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1549 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1214 1550
1215 $STATUSBOX = new CFClient::UI::Statusbox; 1551 $STATUSBOX = new CFClient::UI::Statusbox;
1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1552 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217 1553
1218 (new CFClient::UI::Frame 1554 (new CFClient::UI::Frame
1219 bg => [0, 0, 0, 0.4], 1555 bg => [0, 0, 0, 0.4],
1220 force_x => 0, 1556 force_x => 0,
1221 force_y => "max", 1557 force_y => "max",
… …
1238 $MAPWIDGET->connect (activate_console => sub { 1574 $MAPWIDGET->connect (activate_console => sub {
1239 my ($mapwidget, $preset) = @_; 1575 my ($mapwidget, $preset) = @_;
1240 1576
1241 if ($CONSOLE) { 1577 if ($CONSOLE) {
1242 $CONSOLE->{input}->{auto_activated} = 1; 1578 $CONSOLE->{input}->{auto_activated} = 1;
1243 $CONSOLE->{input}->focus_in; 1579 $CONSOLE->{input}->grab_focus;
1244 1580
1245 if ($preset && $CONSOLE->{input}->get_text eq '') { 1581 if ($preset && $CONSOLE->{input}->get_text eq '') {
1246 $CONSOLE->{input}->set_text ($preset); 1582 $CONSOLE->{input}->set_text ($preset);
1247 } 1583 }
1248 } 1584 }
1249 }); 1585 });
1250 $MAPWIDGET->show; 1586 $MAPWIDGET->show;
1251 $MAPWIDGET->focus_in; 1587 $MAPWIDGET->grab_focus;
1252 1588
1253 $LOGVIEW = new CFClient::UI::TextView 1589 $LOGVIEW = new CFClient::UI::TextScroller
1254 expand => 1, 1590 expand => 1,
1255 font => $FONT_FIXED, 1591 font => $FONT_FIXED,
1256 fontsize => $::CFG->{log_fontsize}, 1592 fontsize => $::CFG->{log_fontsize},
1593 indent => -4,
1257 can_hover => 1, 1594 can_hover => 1,
1258 can_events => 1, 1595 can_events => 1,
1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1596 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260 ; 1597 ;
1261 1598
1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1599 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup", 1600 title => "Setup",
1264 name => "setup_dialog", 1601 name => "setup_dialog",
1265 x => 'center', 1602 x => 'center',
1266 y => 'center', 1603 y => 'center',
1604 z => 2,
1267 force_w => $::WIDTH * 0.6, 1605 force_w => $::WIDTH * 0.6,
1268 force_h => $::HEIGHT * 0.6, 1606 force_h => $::HEIGHT * 0.6,
1607 has_close_button => 1,
1269 ; 1608 ;
1270 1609
1610 $METASERVER = metaserver_dialog;
1611
1271 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1612 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1272 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1613 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273 1614
1274 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1615 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1275 "Configure the server to play on, your username, password and other server-related options."); 1616 "Configure the server to play on, your username, password and other server-related options.");
1276 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1617 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1277 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1618 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1278 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1619 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1279 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1620 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1280 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1621 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1281 "Configure the use of audio, sound effects and background music."); 1622 "Configure the use of audio, sound effects and background music.");
1282 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1623 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1283 "Lets you define, edit and delete bindings." 1624 "Lets you define, edit and delete key bindings."
1284 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1625 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1285 . "with nothing set and the recording started. After doing the actions you " 1626 . "with nothing set and the recording started. After doing the actions you "
1286 . "want to record press Insert and you will be asked to press a key-combo." 1627 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1287 . "After pressing the combo the binding will be saved automatically and the " 1628 . "After pressing the combo the binding will be saved automatically and the "
1288 . "binding editor closes"); 1629 . "binding editor closes");
1289 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1290 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1631 "Some debuggin' options. Do not ask.");
1291 1632
1292 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1633 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1293 1634
1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1635 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1295 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1636 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1296 1637
1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1298 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1299 1640
1300 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 1641 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
1301 1642
1302 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1303 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1304 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1305 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1306 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1307 1645
1308 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1309 text => "Save Config", 1647 text => "Save Config",
1310 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1648 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1311 on_activate => sub { 1649 on_activate => sub {
1312 $::CFG->{layout} = CFClient::UI::get_layout; 1650 $::CFG->{layout} = CFClient::UI::get_layout;
1313 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1651 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1314 status "Configuration Saved"; 1652 status "Configuration Saved";
1653 0
1315 }, 1654 },
1316 ); 1655 );
1317 1656
1318 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1319 tooltip => "View Documentation"); 1658 tooltip => "View Documentation");
1320 1659
1321 $BUTTONBAR->add (new CFClient::UI::Button 1660 $BUTTONBAR->add (new CFClient::UI::Button
1322 text => "Quit", 1661 text => "Quit",
1323 tooltip => "Terminates the program", 1662 tooltip => "Terminates the program",
… …
1325 if ($CONN) { 1664 if ($CONN) {
1326 open_quit_dialog; 1665 open_quit_dialog;
1327 } else { 1666 } else {
1328 exit; 1667 exit;
1329 } 1668 }
1669 0
1330 }, 1670 },
1331 ); 1671 );
1332 1672
1333 $BUTTONBAR->show; 1673 $BUTTONBAR->show;
1334 $SETUP_DIALOG->show; 1674 $SETUP_DIALOG->show;
… …
1336 1676
1337 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1677 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1338} 1678}
1339 1679
1340sub video_shutdown { 1680sub video_shutdown {
1681 CFClient::OpenGL::shutdown;
1682
1341 undef $SDL_ACTIVE; 1683 undef $SDL_ACTIVE;
1342} 1684}
1343 1685
1344my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1686my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1345my $bgmusic;#TODO#hack#d# 1687my $bgmusic;#TODO#hack#d#
… …
1561 1903
1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1563 CFClient::UI::set_layout ($::CFG->{layout}); 1905 CFClient::UI::set_layout ($::CFG->{layout});
1564 1906
1565 my %DEF_CFG = ( 1907 my %DEF_CFG = (
1566 sdl_mode => 0, 1908 sdl_mode => 0,
1567 width => 640, 1909 width => 640,
1568 height => 480, 1910 height => 480,
1569 fullscreen => 0, 1911 fullscreen => 0,
1570 fast => 0, 1912 fast => 0,
1571 map_scale => 1, 1913 map_scale => 1,
1572 fow_enable => 1, 1914 fow_enable => 1,
1573 fow_intensity => 0.45, 1915 fow_intensity => 0.45,
1574 fow_smooth => 0, 1916 fow_smooth => 0,
1575 gui_fontsize => 1, 1917 gui_fontsize => 1,
1576 log_fontsize => 1, 1918 log_fontsize => 0.7,
1577 gauge_fontsize=> 1, 1919 gauge_fontsize => 1,
1578 gauge_size => 0.35, 1920 gauge_size => 0.35,
1579 stat_fontsize => 1, 1921 stat_fontsize => 0.7,
1580 mapsize => 100, 1922 mapsize => 100,
1581 host => "crossfire.schmorp.de",
1582 say_command => 'say', 1923 say_command => 'say',
1583 audio_enable => 1, 1924 audio_enable => 1,
1584 bgm_enable => 1, 1925 bgm_enable => 1,
1585 bgm_volume => 0.25, 1926 bgm_volume => 0.25,
1586 face_prefetch => 0, 1927 face_prefetch => 0,
1587 output_sync => 1, 1928 output_sync => 1,
1588 output_count => 1, 1929 output_count => 1,
1930 pickup => 0,
1931 default => "profile", # default profile
1932 );
1589 ); 1933
1590
1591 while (my ($k, $v) = each %DEF_CFG) { 1934 while (my ($k, $v) = each %DEF_CFG) {
1592 $CFG->{$k} = $v unless exists $CFG->{$k}; 1935 $CFG->{$k} = $v unless exists $CFG->{$k};
1593 } 1936 }
1937
1938 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1594 1939
1595 sdl_init; 1940 sdl_init;
1596 1941
1597 @SDL_MODES = reverse 1942 @SDL_MODES = reverse
1598 grep $_->[0] >= 640 && $_->[1] >= 480, 1943 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1640 video_init; 1985 video_init;
1641 audio_init; 1986 audio_init;
1642} 1987}
1643 1988
1644Event::loop; 1989Event::loop;
1990#CFClient::SDL_Quit;
1991#CFClient::_exit 0;
1645 1992
1646END { CFClient::SDL_Quit } 1993END { CFClient::SDL_Quit }
1647 1994
1648=head1 NAME 1995=head1 NAME
1649 1996

Diff Legend

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