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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines