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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines