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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines