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.20 by root, Sun May 28 00:40:52 2006 UTC vs.
Revision 1.76 by root, Tue Jun 20 08:49:40 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines