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.24 by elmex, Mon May 29 19:30:28 2006 UTC vs.
Revision 1.78 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines