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.23 by root, Sun May 28 02:31:04 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
… …
81our $LOGVIEW; 84our $LOGVIEW;
82our $CONSOLE; 85our $CONSOLE;
83our $METASERVER; 86our $METASERVER;
84our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 88our $QUIT_DIALOG;
86our $SERVER_SETUP; 89our $HOST_ENTRY;
90our $SERVER_INFO;
87 91
92our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK;
94our $SETUP_SERVER;
95our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97
98our $STATS_WINDOW;
99our $MESSAGE_WINDOW;
88our $FLOORBOX; 100our $FLOORBOX;
89our $GAUGES; 101our $GAUGES;
90our $STATWIDS; 102our $STATWIDS;
91 103
92our $SDL_ACTIVE; 104our $SDL_ACTIVE;
… …
101our $DEBUG_STATUS; 113our $DEBUG_STATUS;
102 114
103our $INV_WINDOW; 115our $INV_WINDOW;
104our $INV; 116our $INV;
105our $INVR; 117our $INVR;
106our $INVR_LBL; 118our $INV_RIGHT_HB;
119
120our $BIND_EDITOR;
121our $BIND_UPD_CB;
122
123our $PICKUP_CFG;
107 124
108sub status { 125sub status {
109 $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]);
110} 127}
111 128
112sub debug { 129sub debug {
113 $DEBUG_STATUS->set_text ($_[0]); 130 $DEBUG_STATUS->set_text ($_[0]);
114 my ($w, $h) = $DEBUG_STATUS->size_request; 131}
115 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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;
116} 321}
117 322
118sub start_game { 323sub start_game {
119 status "logging in..."; 324 status "logging in...";
120 325
121 $LOGIN_BUTTON->set_text ("Logout"); 326 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide; 327 $SETUP_DIALOG->hide;
123 328
124 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;
125 330
126 my ($host, $port) = split /:/, $CFG->{host}; 331 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
127 332
128 $MAP = new CFClient::Map $mapsize, $mapsize; 333 $MAP = new CFClient::Map $mapsize, $mapsize;
129 334
130 $CONN = eval { 335 $CONN = eval {
131 new CFClient::Protocol 336 new CFClient::Protocol
132 host => $host, 337 host => $host,
133 port => $port || 13327, 338 port => $port || 13327,
134 user => $CFG->{user}, 339 user => $CFG->{profile}{default}{user},
135 pass => $CFG->{password}, 340 pass => $CFG->{profile}{default}{password},
136 mapw => $mapsize, 341 mapw => $mapsize,
137 maph => $mapsize, 342 maph => $mapsize,
138 343
139 map_widget => $MAPWIDGET, 344 map_widget => $MAPWIDGET,
140 logview => $LOGVIEW, 345 logview => $LOGVIEW,
141 statusbox => $STATUSBOX, 346 statusbox => $STATUSBOX,
142 map => $MAP, 347 map => $MAP,
143 mapmap => $MAPMAP, 348 mapmap => $MAPMAP,
349 query => \&server_query,
144 350
145 sound_play => sub { 351 sound_play => sub {
146 my ($x, $y, $soundnum, $type) = @_; 352 my ($x, $y, $soundnum, $type) = @_;
147 353
148 $SDL_MIXER 354 $SDL_MIXER
… …
165 } 371 }
166} 372}
167 373
168sub stop_game { 374sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login"); 375 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show; 376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
377 $SETUP_DIALOG->show;
171 $INV_WINDOW->hide; 378 $INV_WINDOW->hide;
172 $LOGVIEW->hide; 379 $SETUP_SPELLS->clear_spells;
173 380
174 return unless $CONN; 381 return unless $CONN;
175 382
176 status "connection closed"; 383 status "connection closed";
177 384
385 destroy_query_dialog $CONN;
178 $CONN->destroy; 386 $CONN->destroy;
179 $CONN = 0; # false, does not autovivify 387 $CONN = 0; # false, does not autovivify
180}
181 388
182sub client_setup { 389 undef $MAP;
183 my $dialog = new CFClient::UI::FancyFrame 390}
184 req_x => 1, 391
185 req_y => $HEIGHT * (1/8), 392sub graphics_setup {
186 name => "client_setup",
187 title => "Client Setup",
188 child => (my $vbox = new CFClient::UI::VBox); 393 my $vbox = new CFClient::UI::VBox;
394
189 $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]);
190 396
191 $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");
192 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 398 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193 399
194 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 400 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
195 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 401 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
196 402
197 $mode_slider->connect (changed => sub { 403 $mode_slider->connect (changed => sub {
198 my ($self, $value) = @_; 404 my ($self, $value) = @_;
199 405
… …
206 412
207 $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");
208 $table->add (1, $row++, new CFClient::UI::CheckBox 414 $table->add (1, $row++, new CFClient::UI::CheckBox
209 state => $CFG->{fullscreen}, 415 state => $CFG->{fullscreen},
210 tooltip => "Bring the client into fullscreen mode.", 416 tooltip => "Bring the client into fullscreen mode.",
211 on_changed => sub { 417 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
212 my ($self, $value) = @_;
213 $CFG->{fullscreen} = $value;
214 }
215 ); 418 );
216 419
217 $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");
218 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
219 state => $CFG->{fast}, 422 state => $CFG->{fast},
220 tooltip => "Lower the visual quality considerably to speed up rendering.", 423 tooltip => "Lower the visual quality considerably to speed up rendering.",
221 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
222 my ($self, $value) = @_;
223 $CFG->{fast} = $value;
224 }
225 ); 425 );
226 426
227 $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");
228 $table->add (1, $row++, new CFClient::UI::Slider 428 $table->add (1, $row++, new CFClient::UI::Slider
229 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 429 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
230 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 430 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
231 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
232 my ($self, $value) = @_;
233 $CFG->{map_scale} = 2 ** $value;
234 }
235 ); 432 );
236 433
237 $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");
238 $table->add (1, $row++, new CFClient::UI::CheckBox 435 $table->add (1, $row++, new CFClient::UI::CheckBox
239 state => $CFG->{fow_enable}, 436 state => $CFG->{fow_enable},
240 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.",
241 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
242 my ($self, $value) = @_;
243 $CFG->{fow_enable} = $value;
244 }
245 ); 439 );
246 440
247 $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");
248 $table->add (1, $row++, new CFClient::UI::Slider 442 $table->add (1, $row++, new CFClient::UI::Slider
249 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 443 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
250 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.",
251 on_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
252 my ($self, $value) = @_;
253 $CFG->{fow_intensity} = $value;
254 }
255 ); 446 );
256 447
257 $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");
258 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFClient::UI::CheckBox
259 state => $CFG->{fow_smooth}, 450 state => $CFG->{fow_smooth},
260 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.",
261 on_changed => sub { 452 on_changed => sub {
262 my ($self, $value) = @_; 453 my ($self, $value) = @_;
263 $CFG->{fow_smooth} = $value; 454 $CFG->{fow_smooth} = $value;
264 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
265 } 457 }
266 ); 458 );
267 459
268 $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");
269 $table->add (1, $row++, new CFClient::UI::Slider 461 $table->add (1, $row++, new CFClient::UI::Slider
270 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 462 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
271 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.",
272 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 464 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
273 ); 465 );
274 466
275 $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");
276 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
277 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
278 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.",
279 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
280 ); 472 );
281 473
282 $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");
283 475
284 $table->add (1, $row++, new CFClient::UI::Slider 476 $table->add (1, $row++, new CFClient::UI::Slider
285 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
286 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.",
287 on_changed => sub { 479 on_changed => sub {
288 $CFG->{stat_fontsize} = $_[1]; 480 $CFG->{stat_fontsize} = $_[1];
289 &set_stats_window_fontsize; 481 &set_stats_window_fontsize;
482 0
290 } 483 }
291 ); 484 );
292 485
293 $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");
294 $table->add (1, $row++, new CFClient::UI::Slider 487 $table->add (1, $row++, new CFClient::UI::Slider
295 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
296 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.",
297 on_changed => sub { 490 on_changed => sub {
298 $CFG->{gauge_fontsize} = $_[1]; 491 $CFG->{gauge_fontsize} = $_[1];
299 &set_gauge_window_fontsize; 492 &set_gauge_window_fontsize;
493 0
300 } 494 }
301 ); 495 );
302 496
303 $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");
304 $table->add (1, $row++, new CFClient::UI::Slider 498 $table->add (1, $row++, new CFClient::UI::Slider
305 range => [$CFG->{gauge_size}, 0.2, 0.8], 499 range => [$CFG->{gauge_size}, 0.2, 0.8],
306 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.",
307 on_changed => sub { 501 on_changed => sub {
308 $CFG->{gauge_size} = $_[1]; 502 $CFG->{gauge_size} = $_[1];
309 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 503 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
504 0
310 } 505 }
311 ); 506 );
312 507
313 $table->add (1, $row++, new CFClient::UI::Button 508 $table->add (1, $row++, new CFClient::UI::Button
314 expand => 1, align => 0, text => "Apply", 509 expand => 1, align => 0, text => "Apply",
315 tooltip => "Apply the video settings", 510 tooltip => "Apply the video settings",
316 on_activate => sub { 511 on_activate => sub {
317 video_shutdown (); 512 video_shutdown ();
318 video_init (); 513 video_init ();
514 0
319 } 515 }
320 ); 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;
321 527
322 $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");
323 $table->add (1, $row++, new CFClient::UI::CheckBox 529 $table->add (1, $row++, new CFClient::UI::CheckBox
324 state => $CFG->{audio_enable}, 530 state => $CFG->{audio_enable},
325 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.",
326 on_changed => sub { 532 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
327 $CFG->{audio_enable} = $_[1];
328 }
329 ); 533 );
330# $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");
331# $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 {
332# $CFG->{effects_volume} = $_[1]; 536# $CFG->{effects_volume} = $_[1];
333# }); 537# });
334 $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");
335 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
336 $hbox->add (new CFClient::UI::CheckBox 540 $hbox->add (new CFClient::UI::CheckBox
337 expand => 1, state => $CFG->{bgm_enable}, 541 expand => 1, state => $CFG->{bgm_enable},
338 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.",
339 on_changed => sub { 543 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
340 $CFG->{bgm_enable} = $_[1];
341 }
342 ); 544 );
343 $hbox->add (new CFClient::UI::Slider 545 $hbox->add (new CFClient::UI::Slider
344 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
345 tooltip => "The volume of the background music. Changes are instant.", 547 tooltip => "The volume of the background music. Changes are instant.",
346 on_changed => sub { 548 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
347 $CFG->{bgm_volume} = $_[1];
348 CFClient::MixMusic::volume $_[1] * 128;
349 }
350 ); 549 );
351 550
352 $table->add (1, $row++, new CFClient::UI::Button 551 $table->add (1, $row++, new CFClient::UI::Button
353 expand => 1, align => 0, text => "Apply", 552 expand => 1, align => 0, text => "Apply",
354 tooltip => "Apply the audio settings", 553 tooltip => "Apply the audio settings",
355 on_activate => sub { 554 on_activate => sub {
356 audio_shutdown (); 555 audio_shutdown ();
357 audio_init (); 556 audio_init ();
557 0
358 } 558 }
359 ); 559 );
360 560
361 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 561 $vbox
362 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
363 text => $CFG->{say_command},
364 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. "
365 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
366 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
367 on_changed => sub {
368 my ($self, $value) = @_;
369 $CFG->{say_command} = $value;
370 }
371 );
372
373 $dialog
374} 562}
375 563
376sub set_stats_window_fontsize { 564sub set_stats_window_fontsize {
377 for (values %{$STATWIDS}) { 565 for (values %{$STATWIDS}) {
378 $_->set_fontsize ($::CFG->{stat_fontsize}); 566 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
387 575
388sub make_gauge_window { 576sub make_gauge_window {
389 my $gh = int $HEIGHT * $CFG->{gauge_size}; 577 my $gh = int $HEIGHT * $CFG->{gauge_size};
390 578
391 my $win = new CFClient::UI::Frame ( 579 my $win = new CFClient::UI::Frame (
392 req_x => 0, 580 force_x => 0,
393 req_y => -1, 581 force_y => "max",
394 def_w => $WIDTH, 582 force_w => $WIDTH,
395 def_h => $gh, 583 force_h => $gh,
396 ); 584 );
397 585
398 $win->add (my $hbox = new CFClient::UI::HBox 586 $win->add (my $hbox = new CFClient::UI::HBox
399 children => [ 587 children => [
400 (new CFClient::UI::HBox expand => 1), 588 (new CFClient::UI::HBox expand => 1),
… …
436 &set_gauge_window_fontsize; 624 &set_gauge_window_fontsize;
437 625
438 $win 626 $win
439} 627}
440 628
629sub debug_setup {
630 my $table = new CFClient::UI::Table;
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
441sub make_stats_window { 657sub stats_window {
442 my $tgw = new CFClient::UI::FancyFrame 658 my $tgw = new CFClient::UI::FancyFrame
443 req_y => $HEIGHT * (2/8), 659 y => $HEIGHT * (2/8),
444 req_x => -1, 660 x => "max",
445 title => "Stats", 661 title => "Stats",
446 name => "stats_window"; 662 name => "stats_window",
663 has_close_button => 1;
447 664
448 $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);
449 $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,
450 can_hover => 1, can_events => 1, 667 can_hover => 1, can_events => 1,
451 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.");
… …
477 [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."],
478 695
479 [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."],
480 [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."],
481 [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."],
482 [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."],
483 [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."],
484 [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."],
485 ) { 702 ) {
486 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 703 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
487 704
… …
506 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)",
507 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)",
508 pois => "<b>Poison</b> (resistance to getting poisoned)", 725 pois => "<b>Poison</b> (resistance to getting poisoned)",
509 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)",
510 deat => "<b>Death</b> (resistance against death spells)", 727 deat => "<b>Death</b> (resistance against death spells)",
511 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.)",
512 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)",
513 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)",
514 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...",
515 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, ...)",
516 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, ...)",
… …
533 ); 750 );
534 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
535 font => $FONT_FIXED, 752 font => $FONT_FIXED,
536 can_hover => 1, 753 can_hover => 1,
537 can_events => 1, 754 can_events => 1,
538 image => "ui/resist/resist_$_.png", 755 path => "ui/resist/resist_$_.png",
539 tooltip => $resist_names{$_}, 756 tooltip => $resist_names{$_},
540 ); 757 );
541 758
542 $row++; 759 $row++;
543 if ($row % 6 == 0) { 760 if ($row % 6 == 0) {
… …
550 update_stats_window ({}); 767 update_stats_window ({});
551 768
552 $tgw 769 $tgw
553} 770}
554 771
555sub formsep { 772sub formsep($) {
556 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
557} 774}
558 775
559sub update_stats_window { 776sub update_stats_window {
560 my ($stats) = @_; 777 my ($stats) = @_;
561 778
… …
591 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
592 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
593 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
594 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
595 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
596 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
597 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
598 $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});
599 816
600 $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);
601 818
602 # TODO: replace by CS_STAT_RES_xxx constants
603 my %tbl = ( 819 my %tbl = (
604 phys => 100, 820 phys => CS_STAT_RES_PHYS,
605 magic => 101, 821 magic => CS_STAT_RES_MAG,
606 fire => 102, 822 fire => CS_STAT_RES_FIRE,
607 elec => 103, 823 elec => CS_STAT_RES_ELEC,
608 cold => 104, 824 cold => CS_STAT_RES_COLD,
609 conf => 105, 825 conf => CS_STAT_RES_CONF,
610 acid => 106, 826 acid => CS_STAT_RES_ACID,
611 drain => 107, 827 drain => CS_STAT_RES_DRAIN,
612 ghit => 108, 828 ghit => CS_STAT_RES_GHOSTHIT,
613 pois => 109, 829 pois => CS_STAT_RES_POISON,
614 slow => 110, 830 slow => CS_STAT_RES_SLOW,
615 para => 111, 831 para => CS_STAT_RES_PARA,
616 tund => 112, 832 tund => CS_STAT_TURN_UNDEAD,
617 fear => 113, 833 fear => CS_STAT_RES_FEAR,
618 depl => 113, 834 depl => CS_STAT_RES_DEPLETE,
619 deat => 115, 835 deat => CS_STAT_RES_DEATH,
620 holyw => 116, 836 holyw => CS_STAT_RES_HOLYWORD,
621 blind => 117, 837 blind => CS_STAT_RES_BLIND,
622 ); 838 );
623 839
624 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 840 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625 for keys %tbl; 841 for keys %tbl;
626} 842}
627 843
628sub metaserver_dialog {
629 my $dialog = new CFClient::UI::FancyFrame
630 title => "Server List",
631 child => (my $vbox = new CFClient::UI::VBox);
632
633 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
634
635 $dialog
636}
637
638my $METASERVER_ATIME; 844my $METASERVER_ATIME;
639 845
640sub update_metaserver { 846sub update_metaserver {
641 my ($HOST) = @_; 847 my ($metaserver_dialog) = @_;
848
849 $METASERVER = $metaserver_dialog
850 if defined $metaserver_dialog;
642 851
643 return if $METASERVER_ATIME > time; 852 return if $METASERVER_ATIME > time;
644 $METASERVER_ATIME = time + 60; 853 $METASERVER_ATIME = time + 60;
645 854
646 my $table = $METASERVER->{table}; 855 my $table = $METASERVER->{table};
… …
668 877
669 utf8::decode $buf if utf8::valid $buf; 878 utf8::decode $buf if utf8::valid $buf;
670 879
671 $table->clear; 880 $table->clear;
672 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 );
673 my @col = qw(Use #Users Host Uptime Version Description); 889 my @col = qw(#Users Host Uptime Version Description);
674 $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[$_])
675 for 0 .. $#col; 894 for 0 .. $#col;
676 895
677 my @align = qw(1 0 1 1 -1); 896 my @align = qw(1 0 1 1 -1);
678 897
679 my $y = 0; 898 my $y = 0;
680 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) {
… …
697 916
698 $m = [$users, $host, $uptime, $version, $desc]; 917 $m = [$users, $host, $uptime, $version, $desc];
699 918
700 $y++; 919 $y++;
701 920
702 $table->add (0, $y, new CFClient::UI::VBox children => [ 921 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
703 (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 {
704 $HOST->set_text ($CFG->{host} = $host); 926 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
927 $METASERVER->hide;
928 0
929 },
705 }), 930 ),
706 (new CFClient::UI::Empty expand => 1), 931 (new CFClient::UI::Empty expand => 1),
707 ]); 932 ]);
708 933
709 $table->add ($_ + 1, $y, new CFClient::UI::Label 934 $table->add ($_, $y, new CFClient::UI::Label
710 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)
711 for 0 .. $#$m; 942 for 0 .. $#$m;
712 } 943 }
713 } 944 }
714 }); 945 });
715} 946}
716 947
717sub server_setup { 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
718 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 953 my $dialog = new CFClient::UI::FancyFrame
719 x => $WIDTH * (1/3), 954 title => "Server List",
720 y => $HEIGHT * (1/8), 955 name => 'metaserver_dialog',
721 name => "server_setup", 956 x => 'center',
722 title => "Server Setup", 957 y => 'center',
723 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,
724 on_visibility_change => sub { 963 on_visibility_change => sub {
725 my ($self, $visible) = @_; 964 update_metaserver ($_[0]) if $_[1];
726 $self->center if $visible; 965 0
727 }, 966 },
728 ; 967 ;
729 968
969 $dialog
970}
971
972sub server_setup {
973 my $vbox = new CFClient::UI::VBox;
974
730 $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]);
731 $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");
732 977
733 { 978 {
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 979 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 980
736 $vbox->add ( 981 $vbox->add (
737 my $HOST = new CFClient::UI::Entry 982 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 983 expand => 1,
739 text => $CFG->{host}, 984 text => $CFG->{profile}{default}{host},
740 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",
741 on_changed => sub { 986 on_changed => sub {
742 my ($self, $value) = @_; 987 my ($self, $value) = @_;
743 $CFG->{host} = $value; 988 $CFG->{profile}{default}{host} = $value;
989 0
744 } 990 }
745 ); 991 );
746 992
747 $METASERVER = metaserver_dialog;
748
749 $vbox->add (new CFClient::UI::Flopper 993 $vbox->add (new CFClient::UI::Button
750 expand => 1, 994 expand => 1,
751 text => "Server List", 995 text => "Server List",
752 other => $METASERVER, 996 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 997 tooltip => "Show a list of available crossfire servers",
754 on_open => sub { 998 on_activate => sub { $METASERVER->toggle_visibility; 0 },
755 update_metaserver $HOST; 999 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
756 }
757 ); 1000 );
758 } 1001 }
759 1002
760 $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");
761 $table->add (1, 4, new CFClient::UI::Entry 1004 $table->add (1, 4, new CFClient::UI::Entry
762 text => $CFG->{user}, 1005 text => $CFG->{profile}{default}{user},
763 tooltip => "The name of your character on the server", 1006 tooltip => "The name of your character on the server",
764 on_changed => sub { 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
765 my ($self, $value) = @_;
766 $CFG->{user} = $value;
767 }
768 ); 1008 );
769 1009
770 $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");
771 $table->add (1, 5, new CFClient::UI::Entry 1011 $table->add (1, 5, new CFClient::UI::Entry
772 text => $CFG->{password}, 1012 text => $CFG->{profile}{default}{password},
773 hidden => 1, 1013 hidden => 1,
774 tooltip => "The password for your character", 1014 tooltip => "The password for your character",
775 on_changed => sub { 1015 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
776 my ($self, $value) = @_;
777 $CFG->{password} = $value;
778 }
779 ); 1016 );
780 1017
781 $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");
782 $table->add (1, 7, new CFClient::UI::Slider 1019 $table->add (1, 7, new CFClient::UI::Slider
783 req_w => 100, 1020 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1021 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 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. "
786 . "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, "
787 . "but you also increase bandwidth requirements and latency. " 1024 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 1025 . "This option is only used once at log-in.",
789 on_changed => sub { 1026 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
790 my ($self, $value) = @_;
791
792 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
793 },
794 ); 1027 );
795 1028
796 $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");
797 $table->add (1, 8, new CFClient::UI::CheckBox 1030 $table->add (1, 8, new CFClient::UI::CheckBox
798 state => $CFG->{face_prefetch}, 1031 state => $CFG->{face_prefetch},
… …
801 . "This might increase or create lag, but increases the chances " 1034 . "This might increase or create lag, but increases the chances "
802 . "of faces being ready for display when you encounter them. " 1035 . "of faces being ready for display when you encounter them. "
803 . "It also uses up server bandwidth on every connect, " 1036 . "It also uses up server bandwidth on every connect, "
804 . "so only set it if you really need to prefetch images. " 1037 . "so only set it if you really need to prefetch images. "
805 . "This option can be set and unset any time.", 1038 . "This option can be set and unset any time.",
806 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1039 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
807 ); 1040 );
808 1041
809 $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");
810 $table->add (1, 9, new CFClient::UI::Entry 1043 $table->add (1, 9, new CFClient::UI::Entry
811 text => $CFG->{output_count}, 1044 text => $CFG->{output_count},
812 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.",
813 on_changed => sub { $CFG->{output_count} = $_[1] }, 1046 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
814 ); 1047 );
815 1048
816 $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");
817 $table->add (1, 10, new CFClient::UI::Entry 1050 $table->add (1, 10, new CFClient::UI::Entry
818 text => $CFG->{output_sync}, 1051 text => $CFG->{output_sync},
819 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.",
820 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1053 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
821 ); 1054 );
822 1055
823 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1056 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
824 expand => 1, 1057 expand => 1,
825 align => 0, 1058 align => 0,
826 text => "Login", 1059 text => "Login",
827 on_activate => sub { 1060 on_activate => sub {
828 $CONN ? stop_game 1061 $CONN ? stop_game
829 : start_game; 1062 : start_game;
1063 0
830 }, 1064 },
831 ); 1065 );
832 1066
833 $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
834} 1090}
835 1091
836sub message_window { 1092sub message_window {
837 my $window = new CFClient::UI::FancyFrame 1093 my $window = new CFClient::UI::FancyFrame
838 name => "message_window", 1094 name => "message_window",
839 title => "Messages", 1095 title => "Messages",
840 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
841 bg => [0, 0, 0, 0.75], 1097 bg => [0, 0, 0, 0.75],
842 req_x => -1, 1098 x => "max",
843 req_y => 0, 1099 y => 0,
844 def_w => int $::WIDTH / 3, 1100 force_w => $::WIDTH * 0.4,
845 def_h => int $::HEIGHT / 5, 1101 force_h => $::HEIGHT * 0.5,
846 child => (my $vbox = new CFClient::UI::VBox); 1102 child => (my $vbox = new CFClient::UI::VBox),
1103 has_close_button => 1;
847 1104
848 $vbox->add ($LOGVIEW); 1105 $vbox->add ($LOGVIEW);
849 1106
850 $vbox->add (my $input = new CFClient::UI::Entry 1107 $vbox->add (my $input = new CFClient::UI::Entry
851 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> "
… …
859 1116
860 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1117 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
861 $input->{refocus_map} = 1; 1118 $input->{refocus_map} = 1;
862 } 1119 }
863 delete $input->{auto_activated}; 1120 delete $input->{auto_activated};
1121
1122 0
864 }, 1123 },
865 on_activate => sub { 1124 on_activate => sub {
866 my ($input, $text) = @_; 1125 my ($input, $text) = @_;
867 $input->set_text (''); 1126 $input->set_text ('');
868 1127
… …
874 } 1133 }
875 if ($input->{refocus_map}) { 1134 if ($input->{refocus_map}) {
876 delete $input->{refocus_map}; 1135 delete $input->{refocus_map};
877 $MAPWIDGET->focus_in 1136 $MAPWIDGET->focus_in
878 } 1137 }
1138
1139 0
879 }, 1140 },
880 on_escape => sub { 1141 on_escape => sub {
881 $MAPWIDGET->focus_in 1142 $MAPWIDGET->grab_focus;
1143
1144 0
882 }, 1145 },
883 ); 1146 );
884 1147
885 $CONSOLE = { 1148 $CONSOLE = {
886 window => $window, 1149 window => $window,
887 input => $input 1150 input => $input,
888 }; 1151 };
889 1152
890 $window 1153 $window
891} 1154}
892 1155
893sub open_quit_dialog { 1156sub open_quit_dialog {
894 unless ($QUIT_DIALOG) { 1157 unless ($QUIT_DIALOG) {
895 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1158 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1159 x => "center",
1160 y => "center",
1161 z => 50,
1162 title => "Really Quit?",
1163 ;
896 1164
897 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1165 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898 1166
899 $vb->add (new CFClient::UI::Label 1167 $vb->add (new CFClient::UI::Label
900 text => "You should find a savebed and apply it first!", 1168 text => "You should find a savebed and apply it first!",
… …
903 ); 1171 );
904 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1172 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
905 $hb->add (new CFClient::UI::Button 1173 $hb->add (new CFClient::UI::Button
906 text => "Ok", 1174 text => "Ok",
907 expand => 1, 1175 expand => 1,
908 on_activate => sub { $QUIT_DIALOG->hide }, 1176 on_activate => sub { $QUIT_DIALOG->hide; 0 },
909 ); 1177 );
910 $hb->add (new CFClient::UI::Button 1178 $hb->add (new CFClient::UI::Button
911 text => "Quit anyway", 1179 text => "Quit anyway",
912 expand => 1, 1180 expand => 1,
913 on_activate => sub { exit }, 1181 on_activate => sub { exit },
914 ); 1182 );
915 } 1183 }
916 1184
917 $QUIT_DIALOG->show; 1185 $QUIT_DIALOG->show;
918 $QUIT_DIALOG->center;
919} 1186}
920 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
921sub make_inventory_window { 1283sub inventory_window {
922 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1284 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1285 x => "center",
1286 y => "center",
923 def_w => $WIDTH * 7/8, 1287 force_w => $WIDTH * 9/10,
924 def_h => $HEIGHT * 7/8, 1288 force_h => $HEIGHT * 9/10,
925 title => "Inventory", 1289 title => "Inventory",
926 name => "inventory_window", 1290 name => "inventory_window",
927 on_visibility_change => sub { 1291 has_close_button => 1,
928 my ($self, $visible) = @_;
929 $self->center if $visible;
930 },
931 ; 1292 ;
932 1293
933 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1294 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934 1295
935 $hb->add (my $vb1 = new CFClient::UI::VBox); 1296 $hb->add (my $vb1 = new CFClient::UI::VBox);
936 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1297 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1298 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938 1299
939 $hb->add (my $vb2 = new CFClient::UI::VBox); 1300 $hb->add (my $vb2 = new CFClient::UI::VBox);
940 1301
1302 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1303
1304 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1305
1306 # XXX: Call after $INVR = ... because set_opencont sets the items
1307 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1308
1309 $invwin
1310}
1311
1312sub spell_setup {
1313 new CFClient::UI::SpellList
1314}
1315
1316sub update_bindings {
1317 $BIND_UPD_CB->() if $BIND_UPD_CB;
1318}
1319
1320sub keyboard_setup {
1321 my $binding_list = new CFClient::UI::VBox;
1322
1323 my $refresh;
1324 $refresh = $BIND_UPD_CB = sub {
1325 $binding_list->clear ();
1326
1327 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1328 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1329 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1330 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1331
1332 my $lbl = join "; ", @$cmds;
1333 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1334 $binding_list->add (my $hb = new CFClient::UI::HBox);
1335 $hb->add (new CFClient::UI::Button
1336 text => "delete",
1337 tooltip => "Deletes the binding",
1338 on_activate => sub {
1339 $binding_list->remove ($hb);
1340 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1341 0
1342 });
1343
1344 $hb->add (new CFClient::UI::Button
1345 text => "edit",
1346 tooltip => "Edits the binding",
1347 on_activate => sub {
1348 $::BIND_EDITOR->set_binding (
1349 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1350 sub {
1351 my ($nmod, $nsym, $ncmds) = @_;
1352 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1353 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1354 $refresh->();
1355 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1356 $SETUP_DIALOG->show;
1357 },
1358 sub {
1359 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1360 $SETUP_DIALOG->show;
1361 });
1362 $::BIND_EDITOR->show;
1363 $SETUP_DIALOG->hide;
1364 0
1365 });
1366
1367 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1368 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1369 }
1370 }
1371 };
1372
1373 my $vb = new CFClient::UI::VBox;
941 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1374 $vb->add (my $hb = new CFClient::UI::HBox);
942 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor"); 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
1386 $vb->add ($binding_list);
1387 $vb->add (my $hb = new CFClient::UI::HBox);
1388
943 $hb2->add (new CFClient::UI::Button 1389 $hb->add (new CFClient::UI::Button
944 text => "Close", 1390 text => "record new",
945 tooltip => "Close the currently open container (if one is open)", 1391 expand => 1,
1392 tooltip => "This button opens the binding editor with an empty binding.",
946 on_activate => sub { 1393 on_activate => sub {
947 $CONN->send ("apply $CONN->{open_container}") 1394 $::BIND_EDITOR->set_binding (undef, undef, [],
948 if $CONN->{open_container} != 0; 1395 sub {
1396 my ($mod, $sym, $cmds) = @_;
1397 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1398 $refresh->();
1399 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1400 $SETUP_DIALOG->show;
1401 },
1402 sub {
1403 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1404 $SETUP_DIALOG->show;
1405 },
1406 );
1407 $SETUP_DIALOG->hide;
1408 $::BIND_EDITOR->show;
1409 0
949 }, 1410 },
950 ); 1411 );
951 1412
952 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1413 $hb->add (new CFClient::UI::Button
1414 text => "close",
1415 tooltip => "Closes the binding window",
1416 expand => 1,
1417 on_activate => sub {
1418 $SETUP_DIALOG->hide;
1419 0
1420 }
1421 );
953 1422
954 $invwin 1423 $refresh->();
955}
956 1424
1425 $vb
1426}
1427
957sub make_help_window { 1428sub help_window {
958 my $win = new CFClient::UI::FancyFrame 1429 my $win = new CFClient::UI::FancyFrame
1430 x => 'center',
1431 y => 'center',
1432 z => 2,
1433 name => 'doc_browser',
959 def_w => int $WIDTH * 7/8, 1434 force_w => int $WIDTH * 7/8,
960 def_h => int $HEIGHT * 7/8, 1435 force_h => int $HEIGHT * 7/8,
961 title => "Documentation"; 1436 title => "Documentation";
962 1437
963 $win->add (my $vbox = new CFClient::UI::VBox); 1438 $win->add (my $vbox = new CFClient::UI::VBox);
964 1439
965 $vbox->add (my $buttons = new CFClient::UI::HBox); 1440 $vbox->add (my $buttons = new CFClient::UI::HBox);
966 $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);
967 1443
968 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 => [
969 [intro => "Introduction"], 1448 [intro => "Introduction"],
970 [manual => "Manual"], 1449 [manual => "Main Manual"],
1450 [skill_help => "Skill Reference"],
1451 [command_help => "Command Reference"],
971 [command_help => "Commands"], 1452 [dmcommand_help => "DM Commands"],
972 [skill_help => "Skills"], 1453 [COPYING => "License Terms"],
973 ) { 1454 ],
974 my ($pod, $label) = @$_; 1455 on_changed => sub {
1456 my ($self, $pod) = @_;
975 1457
976 $buttons->add (new CFClient::UI::Button 1458 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
977 text => $label, 1459 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
978 on_activate => sub {
979 my $parser = new Pod::POM;
980 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
981 1460
982 $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#
983 1467
984 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1468 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
985 for @{ CFClient::pod_to_pango_list $pom }; 1469 for @$pom;
986 1470
987 $viewer->set_offset (0); 1471 $viewer->set_offset (0);
1472
988 }, 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 },
989 ); 1482 );
990 }
991
992 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
993 1483
994 $win 1484 $win
995} 1485}
996 1486
997sub sdl_init { 1487sub sdl_init {
… …
1027 if ($DEBUG_STATUS) { 1517 if ($DEBUG_STATUS) {
1028 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1518 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029 } else { 1519 } else {
1030 # create the widgets 1520 # create the widgets
1031 1521
1032 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1522 $DEBUG_STATUS = new CFClient::UI::Label
1523 padding => 0,
1524 z => 100,
1525 force_x => "max",
1526 force_y => 0;
1033 $DEBUG_STATUS->show; 1527 $DEBUG_STATUS->show;
1034 1528
1529 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1530
1035 $STATUSBOX = new CFClient::UI::Statusbox; 1531 $STATUSBOX = new CFClient::UI::Statusbox;
1036 $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]);
1037 1533
1038 (new CFClient::UI::Frame 1534 (new CFClient::UI::Frame
1039 bg => [0, 0, 0, 0.4], 1535 bg => [0, 0, 0, 0.4],
1040 req_y => -1, 1536 force_x => 0,
1537 force_y => "max",
1041 child => $STATUSBOX, 1538 child => $STATUSBOX,
1042 )->show; 1539 )->show;
1043 1540
1044 CFClient::UI::FancyFrame->new ( 1541 CFClient::UI::FancyFrame->new (
1542 title => "Map",
1543 name => "mapmap",
1544 x => 0,
1545 y => $FONTSIZE + 8,
1045 border_bg => [1, 1, 1, 192/255], 1546 border_bg => [1, 1, 1, 192/255],
1046 bg => [1, 1, 1, 0], 1547 bg => [1, 1, 1, 0],
1047 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1548 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1048 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1549 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049 ), 1550 ),
… …
1053 $MAPWIDGET->connect (activate_console => sub { 1554 $MAPWIDGET->connect (activate_console => sub {
1054 my ($mapwidget, $preset) = @_; 1555 my ($mapwidget, $preset) = @_;
1055 1556
1056 if ($CONSOLE) { 1557 if ($CONSOLE) {
1057 $CONSOLE->{input}->{auto_activated} = 1; 1558 $CONSOLE->{input}->{auto_activated} = 1;
1058 $CONSOLE->{input}->focus_in; 1559 $CONSOLE->{input}->grab_focus;
1059 1560
1060 if ($preset && $CONSOLE->{input}->get_text eq '') { 1561 if ($preset && $CONSOLE->{input}->get_text eq '') {
1061 $CONSOLE->{input}->set_text ($preset); 1562 $CONSOLE->{input}->set_text ($preset);
1062 } 1563 }
1063 } 1564 }
1064 }); 1565 });
1065 $MAPWIDGET->show; 1566 $MAPWIDGET->show;
1066 $MAPWIDGET->focus_in; 1567 $MAPWIDGET->grab_focus;
1067 1568
1068 $LOGVIEW = new CFClient::UI::TextView 1569 $LOGVIEW = new CFClient::UI::TextScroller
1069 expand => 1, 1570 expand => 1,
1070 font => $FONT_FIXED, 1571 font => $FONT_FIXED,
1071 fontsize => $::CFG->{log_fontsize}, 1572 fontsize => $::CFG->{log_fontsize},
1573 indent => -4,
1072 can_hover => 1, 1574 can_hover => 1,
1073 can_events => 1, 1575 can_events => 1,
1074 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.",
1075 ; 1577 ;
1076 1578
1077 $BUTTONBAR = new CFClient::UI::HBox; 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 ;
1078 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
1615 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1616
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1617 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1080 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.");
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1619
1082 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1083 $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,
1084 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.");
1085 1622
1086 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
1087 1624
1088 $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,
1089 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.");
1090 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1627 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1091 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 :). "
1629 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1092 1630
1093 $BUTTONBAR->add (new CFClient::UI::Button 1631 $BUTTONBAR->add (new CFClient::UI::Button
1094 text => "Save Config", 1632 text => "Save Config",
1095 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.",
1096 on_activate => sub { 1634 on_activate => sub {
1097 $::CFG->{layout} = CFClient::UI::get_layout; 1635 $::CFG->{layout} = CFClient::UI::get_layout;
1098 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1636 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099 status "Configuration Saved"; 1637 status "Configuration Saved";
1638 0
1100 }, 1639 },
1101 ); 1640 );
1102 1641
1103 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1642 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1104 tooltip => "View Documentation"); 1643 tooltip => "View Documentation");
1105 1644
1106 $BUTTONBAR->add (new CFClient::UI::Button 1645 $BUTTONBAR->add (new CFClient::UI::Button
1107 text => "Quit", 1646 text => "Quit",
1108 tooltip => "Terminates the program", 1647 tooltip => "Terminates the program",
… …
1110 if ($CONN) { 1649 if ($CONN) {
1111 open_quit_dialog; 1650 open_quit_dialog;
1112 } else { 1651 } else {
1113 exit; 1652 exit;
1114 } 1653 }
1654 0
1115 }, 1655 },
1116 ); 1656 );
1117 1657
1118 $BUTTONBAR->show; 1658 $BUTTONBAR->show;
1119 1659 $SETUP_DIALOG->show;
1120 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122 $SERVER_SETUP->show;
1123 } 1660 }
1661
1662 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1124} 1663}
1125 1664
1126sub video_shutdown { 1665sub video_shutdown {
1666 CFClient::OpenGL::shutdown;
1667
1127 undef $SDL_ACTIVE; 1668 undef $SDL_ACTIVE;
1128} 1669}
1129 1670
1130my @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#
1131my $bgmusic;#TODO#hack#d# 1672my $bgmusic;#TODO#hack#d#
… …
1195 1736
1196my %demo;#d# 1737my %demo;#d#
1197 1738
1198sub force_refresh { 1739sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1740 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1741 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1742
1202 $CFClient::UI::ROOT->draw; 1743 $CFClient::UI::ROOT->draw;
1203 1744
1204 $WANT_REFRESH = 0; 1745 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1746 $CAN_REFRESH = 0;
… …
1260}; 1801};
1261 1802
1262 CFClient::SDL_GL_SwapBuffers; 1803 CFClient::SDL_GL_SwapBuffers;
1263} 1804}
1264 1805
1265my $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 {
1266 $NOW = time; 1807 $NOW = time;
1267 1808
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1809 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 1810 for CFClient::SDL_PollEvent;
1270 1811
… …
1337############################################################################# 1878#############################################################################
1338 1879
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 1880$SIG{INT} = $SIG{TERM} = sub { exit };
1340 1881
1341{ 1882{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 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 };
1343 1888
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1889 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345 CFClient::UI::set_layout ($::CFG->{layout}); 1890 CFClient::UI::set_layout ($::CFG->{layout});
1346 1891
1347 my %DEF_CFG = ( 1892 my %DEF_CFG = (
1348 sdl_mode => 0, 1893 sdl_mode => 0,
1349 width => 640, 1894 width => 640,
1350 height => 480, 1895 height => 480,
1351 fullscreen => 0, 1896 fullscreen => 0,
1352 fast => 0, 1897 fast => 0,
1353 map_scale => 1, 1898 map_scale => 1,
1354 fow_enable => 1, 1899 fow_enable => 1,
1355 fow_intensity => 0.45, 1900 fow_intensity => 0.45,
1356 fow_smooth => 0, 1901 fow_smooth => 0,
1357 gui_fontsize => 1, 1902 gui_fontsize => 1,
1358 log_fontsize => 1, 1903 log_fontsize => 0.7,
1359 gauge_fontsize=> 1, 1904 gauge_fontsize => 1,
1360 gauge_size => 0.35, 1905 gauge_size => 0.35,
1361 stat_fontsize => 1, 1906 stat_fontsize => 0.7,
1362 mapsize => 100, 1907 mapsize => 100,
1363 host => "crossfire.schmorp.de",
1364 say_command => 'say', 1908 say_command => 'say',
1365 audio_enable => 1, 1909 audio_enable => 1,
1366 bgm_enable => 1, 1910 bgm_enable => 1,
1367 bgm_volume => 0.25, 1911 bgm_volume => 0.25,
1368 face_prefetch => 0, 1912 face_prefetch => 0,
1369 output_sync => 1, 1913 output_sync => 1,
1370 output_count => 1, 1914 output_count => 1,
1915 pickup => 0,
1916 default => "profile", # default profile
1917 );
1371 ); 1918
1372
1373 while (my ($k, $v) = each %DEF_CFG) { 1919 while (my ($k, $v) = each %DEF_CFG) {
1374 $CFG->{$k} = $v unless exists $CFG->{$k}; 1920 $CFG->{$k} = $v unless exists $CFG->{$k};
1375 } 1921 }
1922
1923 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1376 1924
1377 sdl_init; 1925 sdl_init;
1378 1926
1379 @SDL_MODES = reverse 1927 @SDL_MODES = reverse
1380 grep $_->[0] >= 640 && $_->[1] >= 480, 1928 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1422 video_init; 1970 video_init;
1423 audio_init; 1971 audio_init;
1424} 1972}
1425 1973
1426Event::loop; 1974Event::loop;
1975#CFClient::SDL_Quit;
1976#CFClient::_exit 0;
1427 1977
1428END { CFClient::SDL_Quit } 1978END { CFClient::SDL_Quit }
1429 1979
1430=head1 NAME 1980=head1 NAME
1431 1981
1432pclient - A Crossfire+ and Crossfire game client 1982cfplus - A Crossfire+ and Crossfire game client
1433 1983
1434=head1 SYNOPSIS 1984=head1 SYNOPSIS
1435 1985
1436Just run it - no commandline arguments are supported. 1986Just run it - no commandline arguments are supported.
1437 1987
1438=head1 USAGE 1988=head1 USAGE
1439 1989
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1990cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 1991fullscreen and interactively.
1442 1992
1993=head1 DEBUGGING
1994
1995
1996CFPLUS_DEBUG - environment variable
1997
1998 1 draw borders around widgets
1999 2 add low-level widget info to tooltips
2000 4 show fps
2001 8 suppress tooltips
2002
1443=head1 AUTHOR 2003=head1 AUTHOR
1444 2004
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2005Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 2006
1447 2007

Diff Legend

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