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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines