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

Diff Legend

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