ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

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