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.41 by root, Fri Jun 2 02:21:48 2006 UTC vs.
Revision 1.80 by root, Mon Jun 26 21:59:04 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines