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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines