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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines