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.16 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.75 by root, Sun Jun 18 17:23:36 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines