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.5 by elmex, Thu May 25 18:48:45 2006 UTC vs.
Revision 1.74 by root, Sun Jun 18 17:13:12 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; 33use Crossfire::Protocol::Constants;
35 34
36use Compress::LZF; 35use Compress::LZF;
37 36
38use CFClient; 37use CFClient;
38use CFClient::OpenGL ();
39use CFClient::Protocol;
39use CFClient::UI; 40use CFClient::UI;
40use CFClient::MapWidget; 41use CFClient::MapWidget;
41 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
42$Event::DIED = sub { 45$Event::DIED = sub {
43 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
44 CFClient::error $_[1]; 48 CFClient::error $_[1];
45}; 49};
46 50
47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
48 52
… …
50 54
51my $MAX_FPS = 60; 55my $MAX_FPS = 60;
52my $MIN_FPS = 5; # unused as of yet 56my $MIN_FPS = 5; # unused as of yet
53 57
54our $META_SERVER = "crossfire.real-time.com:13326"; 58our $META_SERVER = "crossfire.real-time.com:13326";
55
56our $FACEMAP;
57our $TILECACHE;
58our $MAPCACHE;
59 59
60our $LAST_REFRESH; 60our $LAST_REFRESH;
61our $NOW; 61our $NOW;
62 62
63our $CFG; 63our $CFG;
… …
83our $LOGVIEW; 83our $LOGVIEW;
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY;
89our $SERVER_INFO;
88 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
89our $FLOORBOX; 99our $FLOORBOX;
90our $GAUGES; 100our $GAUGES;
91our $STATWIDS; 101our $STATWIDS;
92 102
93our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
99 109
100our $ALT_ENTER_MESSAGE; 110our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 111our $STATUSBOX;
102our $DEBUG_STATUS; 112our $DEBUG_STATUS;
103 113
104our $INVWIN; 114our $INV_WINDOW;
105our $INV; 115our $INV;
106our $INVR; 116our $INVR;
107our $INVR_LBL; 117our $INV_RIGHT_HB;
118
119our $BIND_EDITOR;
120
121our $PICKUP_CFG;
108 122
109sub status { 123sub status {
110 $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]);
111} 125}
112 126
113sub debug { 127sub debug {
114 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
115 my ($w, $h) = $DEBUG_STATUS->size_request; 129}
116 $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;
117} 319}
118 320
119sub start_game { 321sub start_game {
120 status "logging in..."; 322 status "logging in...";
121 323
324 $LOGIN_BUTTON->set_text ("Logout");
325 $SETUP_DIALOG->hide;
326
122 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;
123 328
124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 329 my ($host, $port) = split /:/, $CFG->{host};
330
125 $MAP = new CFClient::Map $mapsize, $mapsize; 331 $MAP = new CFClient::Map $mapsize, $mapsize;
126
127 my ($host, $port) = split /:/, $CFG->{host};
128 332
129 $CONN = eval { 333 $CONN = eval {
130 new conn 334 new CFClient::Protocol
131 host => $host, 335 host => $host,
132 port => $port || 13327, 336 port => $port || 13327,
133 user => $CFG->{user}, 337 user => $CFG->{user},
134 pass => $CFG->{password}, 338 pass => $CFG->{password},
135 mapw => $mapsize, 339 mapw => $mapsize,
136 maph => $mapsize, 340 maph => $mapsize,
137 ; 341
342 map_widget => $MAPWIDGET,
343 logview => $LOGVIEW,
344 statusbox => $STATUSBOX,
345 map => $MAP,
346 mapmap => $MAPMAP,
347 query => \&server_query,
348
349 sound_play => sub {
350 my ($x, $y, $soundnum, $type) = @_;
351
352 $SDL_MIXER
353 or return;
354
355 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
356 or return;
357
358 $chunk->play;
359 },
138 }; 360 };
139 361
140 if ($CONN) { 362 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh}; 363 CFClient::lowdelay fileno $CONN->{fh};
142 364
143 $LOGIN_BUTTON->set_text ("Logout");
144 status "login successful"; 365 status "login successful";
145
146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
149 } else { 366 } else {
150 status "unable to connect"; 367 status "unable to connect";
151 stop_game(); 368 stop_game();
152 } 369 }
153} 370}
154 371
155sub 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
156 return unless $CONN; 379 return unless $CONN;
157 380
158 status "connection closed"; 381 status "connection closed";
159 $LOGIN_BUTTON->set_text ("Login"); 382
383 destroy_query_dialog $CONN;
160 $CONN->destroy; 384 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify 385 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
165
166 undef $MAPCACHE;
167 undef $MAP;
168} 386}
169 387
170sub client_setup { 388sub graphics_setup {
171 my $dialog = new CFClient::UI::FancyFrame
172 title => "Client Setup",
173 child => (my $vbox = new CFClient::UI::VBox); 389 my $vbox = new CFClient::UI::VBox;
390
174 $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]);
175 392
176 $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");
177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 394 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
178 395
179 $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]);
180 $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");
181 398
182 $mode_slider->connect (changed => sub { 399 $mode_slider->connect (changed => sub {
183 my ($self, $value) = @_; 400 my ($self, $value) = @_;
184 401
… …
191 408
192 $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");
193 $table->add (1, $row++, new CFClient::UI::CheckBox 410 $table->add (1, $row++, new CFClient::UI::CheckBox
194 state => $CFG->{fullscreen}, 411 state => $CFG->{fullscreen},
195 tooltip => "Bring the client into fullscreen mode.", 412 tooltip => "Bring the client into fullscreen mode.",
196 connect_changed => sub { 413 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
197 my ($self, $value) = @_;
198 $CFG->{fullscreen} = $value;
199 }
200 ); 414 );
201 415
202 $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");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 417 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fast}, 418 state => $CFG->{fast},
205 tooltip => "Lower the visual quality considerably to speed up rendering.", 419 tooltip => "Lower the visual quality considerably to speed up rendering.",
206 connect_changed => sub { 420 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
207 my ($self, $value) = @_;
208 $CFG->{fast} = $value;
209 }
210 ); 421 );
211 422
212 $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");
213 $table->add (1, $row++, new CFClient::UI::Slider 424 $table->add (1, $row++, new CFClient::UI::Slider
214 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 425 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
215 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 426 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
216 connect_changed => sub { 427 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{map_scale} = 2 ** $value;
219 }
220 ); 428 );
221 429
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 431 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fow_enable}, 432 state => $CFG->{fow_enable},
225 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.",
226 connect_changed => sub { 434 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
227 my ($self, $value) = @_;
228 $CFG->{fow_enable} = $value;
229 }
230 ); 435 );
231 436
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 438 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 439 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
235 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.",
236 connect_changed => sub { 441 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{fow_intensity} = $value;
239 }
240 ); 442 );
241 443
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_smooth}, 446 state => $CFG->{fow_smooth},
245 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.",
246 connect_changed => sub { 448 on_changed => sub {
247 my ($self, $value) = @_; 449 my ($self, $value) = @_;
248 $CFG->{fow_smooth} = $value; 450 $CFG->{fow_smooth} = $value;
249 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::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
250 } 453 }
251 ); 454 );
252 455
253 $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");
254 $table->add (1, $row++, new CFClient::UI::Slider 457 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 458 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
256 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.",
257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 460 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
258 ); 461 );
259 462
260 $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");
261 $table->add (1, $row++, new CFClient::UI::Slider 464 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
263 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.",
264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 467 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
265 ); 468 );
266 469
267 $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");
268 471
269 $table->add (1, $row++, new CFClient::UI::Slider 472 $table->add (1, $row++, new CFClient::UI::Slider
270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 473 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
271 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.",
272 connect_changed => sub { 475 on_changed => sub {
273 $CFG->{stat_fontsize} = $_[1]; 476 $CFG->{stat_fontsize} = $_[1];
274 &set_stats_window_fontsize; 477 &set_stats_window_fontsize;
478 0
275 } 479 }
276 ); 480 );
277 481
278 $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");
279 $table->add (1, $row++, new CFClient::UI::Slider 483 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
281 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.",
282 connect_changed => sub { 486 on_changed => sub {
283 $CFG->{gauge_fontsize} = $_[1]; 487 $CFG->{gauge_fontsize} = $_[1];
284 &set_gauge_window_fontsize; 488 &set_gauge_window_fontsize;
489 0
285 } 490 }
286 ); 491 );
287 492
288 $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");
289 $table->add (1, $row++, new CFClient::UI::Slider 494 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_size}, 0.2, 0.8], 495 range => [$CFG->{gauge_size}, 0.2, 0.8],
291 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.",
292 connect_changed => sub { 497 on_changed => sub {
293 $CFG->{gauge_size} = $_[1]; 498 $CFG->{gauge_size} = $_[1];
294 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0
295 } 501 }
296 ); 502 );
297 503
298 $table->add (1, $row++, new CFClient::UI::Button 504 $table->add (1, $row++, new CFClient::UI::Button
299 expand => 1, align => 0, text => "Apply", 505 expand => 1, align => 0, text => "Apply",
300 tooltip => "Apply the video settings", 506 tooltip => "Apply the video settings",
301 connect_activate => sub { 507 on_activate => sub {
302 video_shutdown (); 508 video_shutdown ();
303 video_init (); 509 video_init ();
510 0
304 } 511 }
305 ); 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;
306 523
307 $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");
308 $table->add (1, $row++, new CFClient::UI::CheckBox 525 $table->add (1, $row++, new CFClient::UI::CheckBox
309 state => $CFG->{audio_enable}, 526 state => $CFG->{audio_enable},
310 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.",
311 connect_changed => sub { 528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
312 $CFG->{audio_enable} = $_[1];
313 }
314 ); 529 );
315# $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");
316# $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 {
317# $CFG->{effects_volume} = $_[1]; 532# $CFG->{effects_volume} = $_[1];
318# }); 533# });
319 $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");
320 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
321 $hbox->add (new CFClient::UI::CheckBox 536 $hbox->add (new CFClient::UI::CheckBox
322 expand => 1, state => $CFG->{bgm_enable}, 537 expand => 1, state => $CFG->{bgm_enable},
323 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.",
324 connect_changed => sub { 539 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
325 $CFG->{bgm_enable} = $_[1];
326 }
327 ); 540 );
328 $hbox->add (new CFClient::UI::Slider 541 $hbox->add (new CFClient::UI::Slider
329 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
330 tooltip => "The volume of the background music. Changes are instant.", 543 tooltip => "The volume of the background music. Changes are instant.",
331 connect_changed => sub { 544 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
332 $CFG->{bgm_volume} = $_[1];
333 CFClient::MixMusic::volume $_[1] * 128;
334 }
335 ); 545 );
336 546
337 $table->add (1, $row++, new CFClient::UI::Button 547 $table->add (1, $row++, new CFClient::UI::Button
338 expand => 1, align => 0, text => "Apply", 548 expand => 1, align => 0, text => "Apply",
339 tooltip => "Apply the audio settings", 549 tooltip => "Apply the audio settings",
340 connect_activate => sub { 550 on_activate => sub {
341 audio_shutdown (); 551 audio_shutdown ();
342 audio_init (); 552 audio_init ();
553 0
343 } 554 }
344 ); 555 );
345 556
346 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 557 $vbox
347 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
348 text => $CFG->{say_command},
349 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. "
350 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
351 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
352 connect_changed => sub {
353 my ($self, $value) = @_;
354 $CFG->{say_command} = $value;
355 }
356 );
357
358 $dialog
359} 558}
360 559
361sub set_stats_window_fontsize { 560sub set_stats_window_fontsize {
362 for (values %{$STATWIDS}) { 561 for (values %{$STATWIDS}) {
363 $_->set_fontsize ($::CFG->{stat_fontsize}); 562 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
372 571
373sub make_gauge_window { 572sub make_gauge_window {
374 my $gh = int $HEIGHT * $CFG->{gauge_size}; 573 my $gh = int $HEIGHT * $CFG->{gauge_size};
375 574
376 my $win = new CFClient::UI::Frame ( 575 my $win = new CFClient::UI::Frame (
377 req_y => -1, 576 force_x => 0,
577 force_y => "max",
378 user_w => $WIDTH, 578 force_w => $WIDTH,
379 user_h => $gh, 579 force_h => $gh,
380 ); 580 );
381 581
382 $win->add (my $hbox = new CFClient::UI::HBox 582 $win->add (my $hbox = new CFClient::UI::HBox
383 children => [ 583 children => [
384 (new CFClient::UI::HBox expand => 1), 584 (new CFClient::UI::HBox expand => 1),
… …
420 &set_gauge_window_fontsize; 620 &set_gauge_window_fontsize;
421 621
422 $win 622 $win
423} 623}
424 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
425sub make_stats_window { 653sub stats_window {
426 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 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;
427 660
428 $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);
429 $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,
430 can_hover => 1, can_events => 1, 663 can_hover => 1, can_events => 1,
431 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.");
… …
434 tooltip => "The map you are currently on (if supported by the server)."); 667 tooltip => "The map you are currently on (if supported by the server).");
435 668
436 $vb->add (my $hb0 = new CFClient::UI::HBox); 669 $vb->add (my $hb0 = new CFClient::UI::HBox);
437 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 670 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
438 can_hover => 1, can_events => 1, 671 can_hover => 1, can_events => 1,
439 tooltip => "This is the amount the Player weights."); 672 tooltip => "The weight of the player including all inventory items.");
440 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 673 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
441 can_hover => 1, can_events => 1, 674 can_hover => 1, can_events => 1,
442 tooltip => "The weight limit, you can't carry more than this."); 675 tooltip => "The weight limit: you cannot carry more than this.");
443 676
444 677
445 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 678 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
446 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 679 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
447 680
… …
530 update_stats_window ({}); 763 update_stats_window ({});
531 764
532 $tgw 765 $tgw
533} 766}
534 767
535sub formsep { 768sub formsep($) {
536 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 769 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
537} 770}
538 771
539sub update_stats_window { 772sub update_stats_window {
540 my ($stats) = @_; 773 my ($stats) = @_;
541 774
542 # i love text protocols!!! 775 # I love text protocols...
776
543 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 777 my $hp = $stats->{+CS_STAT_HP} * 1;
544 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 778 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
545 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 779 my $sp = $stats->{+CS_STAT_SP} * 1;
546 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 780 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
547 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 781 my $fo = $stats->{+CS_STAT_FOOD} * 1;
548 my $fo_m = 999; 782 my $fo_m = 999;
549 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 783 my $gr = $stats->{+CS_STAT_GRACE} * 1;
550 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 784 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
551 785
552 $GAUGES->{hp} ->set_value ($hp, $hp_m); 786 $GAUGES->{hp} ->set_value ($hp, $hp_m);
553 $GAUGES->{mana} ->set_value ($sp, $sp_m); 787 $GAUGES->{mana} ->set_value ($sp, $sp_m);
554 $GAUGES->{food} ->set_value ($fo, $fo_m); 788 $GAUGES->{food} ->set_value ($fo, $fo_m);
555 $GAUGES->{grace} ->set_value ($gr, $gr_m); 789 $GAUGES->{grace} ->set_value ($gr, $gr_m);
556 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 790 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
557 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 791 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
558 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 792 my $rng = $stats->{+CS_STAT_RANGE};
559 $rng =~ s/^Range: //; # thank you so much dear server 793 $rng =~ s/^Range: //; # thank you so much dear server
560 $GAUGES->{range} ->set_text ("Rng: " . $rng); 794 $GAUGES->{range} ->set_text ("Rng: " . $rng);
561 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 795 my $title = $stats->{+CS_STAT_TITLE};
562 $title =~ s/^Player: //; 796 $title =~ s/^Player: //;
563 $STATWIDS->{title} ->set_text ("Title: " . $title); 797 $STATWIDS->{title} ->set_text ("Title: " . $title);
564 798
565 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 799 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
566 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 800 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
567 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 801 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
568 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 802 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
569 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 803 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
570 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
571 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
572 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
573 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
574 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
575 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
576 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED}); 810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
577 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP}); 811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
578 812
579 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::CS_STAT_WEIGHT_LIM} / 1000); 813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
580 814
581 my %tbl = ( 815 my %tbl = (
582 phys => 100, 816 phys => CS_STAT_RES_PHYS,
583 magic => 101, 817 magic => CS_STAT_RES_MAG,
584 fire => 102, 818 fire => CS_STAT_RES_FIRE,
585 elec => 103, 819 elec => CS_STAT_RES_ELEC,
586 cold => 104, 820 cold => CS_STAT_RES_COLD,
587 conf => 105, 821 conf => CS_STAT_RES_CONF,
588 acid => 106, 822 acid => CS_STAT_RES_ACID,
589 drain => 107, 823 drain => CS_STAT_RES_DRAIN,
590 ghit => 108, 824 ghit => CS_STAT_RES_GHOSTHIT,
591 pois => 109, 825 pois => CS_STAT_RES_POISON,
592 slow => 110, 826 slow => CS_STAT_RES_SLOW,
593 para => 111, 827 para => CS_STAT_RES_PARA,
594 tund => 112, 828 tund => CS_STAT_TURN_UNDEAD,
595 fear => 113, 829 fear => CS_STAT_RES_FEAR,
596 depl => 113, 830 depl => CS_STAT_RES_DEPLETE,
597 deat => 115, 831 deat => CS_STAT_RES_DEATH,
598 holyw => 116, 832 holyw => CS_STAT_RES_HOLYWORD,
599 blind => 117 833 blind => CS_STAT_RES_BLIND,
600 ); 834 );
601 835
602 for (keys %tbl) {
603 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 836 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
604 } 837 for keys %tbl;
605
606}
607
608sub metaserver_dialog {
609 my $dialog = new CFClient::UI::FancyFrame
610 title => "Server List",
611 child => (my $vbox = new CFClient::UI::VBox);
612
613 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
614
615 $dialog
616} 838}
617 839
618my $METASERVER_ATIME; 840my $METASERVER_ATIME;
619 841
620sub update_metaserver { 842sub update_metaserver {
621 my ($HOST) = @_;
622
623 return if $METASERVER_ATIME > time; 843 return if $METASERVER_ATIME > time;
624 $METASERVER_ATIME = time + 60; 844 $METASERVER_ATIME = time + 60;
625 845
626 my $table = $METASERVER->{table}; 846 my $table = $METASERVER->{table};
627 $table->clear; 847 $table->clear;
… …
648 868
649 utf8::decode $buf if utf8::valid $buf; 869 utf8::decode $buf if utf8::valid $buf;
650 870
651 $table->clear; 871 $table->clear;
652 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 );
653 my @col = qw(Use #Users Host Uptime Version Description); 880 my @col = qw(#Users Host Uptime Version Description);
654 $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[$_])
655 for 0 .. $#col; 885 for 0 .. $#col;
656 886
657 my @align = qw(1 0 1 1 -1); 887 my @align = qw(1 0 1 1 -1);
658 888
659 my $y = 0; 889 my $y = 0;
660 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) {
… …
677 907
678 $m = [$users, $host, $uptime, $version, $desc]; 908 $m = [$users, $host, $uptime, $version, $desc];
679 909
680 $y++; 910 $y++;
681 911
682 $table->add (0, $y, new CFClient::UI::VBox children => [ 912 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
683 (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 {
684 $HOST->set_text ($CFG->{host} = $host); 917 $HOST_ENTRY->set_text ($CFG->{host} = $host);
918 $METASERVER->hide;
919 0
920 },
685 }), 921 ),
686 (new CFClient::UI::Empty expand => 1), 922 (new CFClient::UI::Empty expand => 1),
687 ]); 923 ]);
688 924
689 $table->add ($_ + 1, $y, new CFClient::UI::Label 925 $table->add ($_, $y, new CFClient::UI::Label
690 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)
691 for 0 .. $#$m; 933 for 0 .. $#$m;
692 } 934 }
693 } 935 }
694 }); 936 });
695} 937}
696 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
697sub server_setup { 961sub server_setup {
698 my $dialog = new CFClient::UI::FancyFrame
699 title => "Server Setup",
700 child => (my $vbox = new CFClient::UI::VBox); 962 my $vbox = new CFClient::UI::VBox;
701 963
702 $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]);
703 $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");
704 966
705 { 967 {
706 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 968 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
707 969
708 $vbox->add ( 970 $vbox->add (
709 my $HOST = new CFClient::UI::Entry 971 $HOST_ENTRY = new CFClient::UI::Entry
710 expand => 1, 972 expand => 1,
711 text => $CFG->{host}, 973 text => $CFG->{host},
712 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",
713 connect_changed => sub { 975 on_changed => sub {
714 my ($self, $value) = @_; 976 my ($self, $value) = @_;
715 $CFG->{host} = $value; 977 $CFG->{host} = $value;
978 0
716 } 979 }
717 ); 980 );
718 981
719 $METASERVER = metaserver_dialog; 982 $METASERVER = metaserver_dialog;
720 983
721 $vbox->add (new CFClient::UI::Flopper 984 $vbox->add (new CFClient::UI::Button
722 expand => 1, 985 expand => 1,
723 text => "Server List", 986 text => "Server List",
724 other => $METASERVER, 987 other => $METASERVER,
725 tooltip => "Show a list of available crossfire servers", 988 tooltip => "Show a list of available crossfire servers",
726 connect_open => sub { 989 on_activate => sub { $METASERVER->toggle_visibility; 0 },
727 update_metaserver $HOST; 990 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
728 }
729 ); 991 );
730 } 992 }
731 993
732 $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");
733 $table->add (1, 4, new CFClient::UI::Entry 995 $table->add (1, 4, new CFClient::UI::Entry
734 text => $CFG->{user}, 996 text => $CFG->{user},
735 tooltip => "The name of your character on the server", 997 tooltip => "The name of your character on the server",
736 connect_changed => sub { 998 on_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; 0 }
737 my ($self, $value) = @_;
738 $CFG->{user} = $value;
739 }
740 ); 999 );
741 1000
742 $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");
743 $table->add (1, 5, new CFClient::UI::Entry 1002 $table->add (1, 5, new CFClient::UI::Entry
744 text => $CFG->{password}, 1003 text => $CFG->{password},
745 hidden => 1, 1004 hidden => 1,
746 tooltip => "The password for your character", 1005 tooltip => "The password for your character",
747 connect_changed => sub { 1006 on_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; 0 }
748 my ($self, $value) = @_;
749 $CFG->{password} = $value;
750 }
751 ); 1007 );
752 1008
753 $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");
754 $table->add (1, 7, new CFClient::UI::Slider 1010 $table->add (1, 7, new CFClient::UI::Slider
755 req_w => 100, 1011 force_w => 100,
756 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1012 range => [$CFG->{mapsize}, 10, 100, 0, 1],
757 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. "
758 . "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, "
759 . "but you also increase bandwidth requirements and latency. " 1015 . "but you also increase bandwidth requirements and latency. "
760 . "This option is only used once at log-in.", 1016 . "This option is only used once at log-in.",
761 connect_changed => sub { 1017 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
762 my ($self, $value) = @_;
763
764 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
765 },
766 ); 1018 );
767 1019
768 $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");
769 $table->add (1, 8, new CFClient::UI::CheckBox 1021 $table->add (1, 8, new CFClient::UI::CheckBox
770 state => $CFG->{face_prefetch}, 1022 state => $CFG->{face_prefetch},
… …
773 . "This might increase or create lag, but increases the chances " 1025 . "This might increase or create lag, but increases the chances "
774 . "of faces being ready for display when you encounter them. " 1026 . "of faces being ready for display when you encounter them. "
775 . "It also uses up server bandwidth on every connect, " 1027 . "It also uses up server bandwidth on every connect, "
776 . "so only set it if you really need to prefetch images. " 1028 . "so only set it if you really need to prefetch images. "
777 . "This option can be set and unset any time.", 1029 . "This option can be set and unset any time.",
778 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1030 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
779 ); 1031 );
780 1032
781 $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");
782 $table->add (1, 9, new CFClient::UI::Entry 1034 $table->add (1, 9, new CFClient::UI::Entry
783 text => $CFG->{output_count}, 1035 text => $CFG->{output_count},
784 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.",
785 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1037 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
786 ); 1038 );
787 1039
788 $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");
789 $table->add (1, 10, new CFClient::UI::Entry 1041 $table->add (1, 10, new CFClient::UI::Entry
790 text => $CFG->{output_sync}, 1042 text => $CFG->{output_sync},
791 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.",
792 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1044 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
793 ); 1045 );
794 1046
795 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1047 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
796 expand => 1, 1048 expand => 1,
797 align => 0, 1049 align => 0,
798 text => "Login", 1050 text => "Login",
799 connect_activate => sub { 1051 on_activate => sub {
800 $CONN ? stop_game 1052 $CONN ? stop_game
801 : start_game; 1053 : start_game;
1054 0
802 }, 1055 },
803 ); 1056 );
804 1057
805 $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
806} 1081}
807 1082
808sub message_window { 1083sub message_window {
809 my $window = new CFClient::UI::FancyFrame 1084 my $window = new CFClient::UI::FancyFrame
1085 name => "message_window",
810 title => "Messages", 1086 title => "Messages",
811 border_bg => [1, 1, 1, 1], 1087 border_bg => [1, 1, 1, 1],
812 bg => [0, 0, 0, 0.75], 1088 bg => [0, 0, 0, 0.75],
813 user_w => int $::WIDTH / 3, 1089 x => "max",
1090 y => 0,
1091 force_w => $::WIDTH * 0.4,
814 user_h => int $::HEIGHT / 5, 1092 force_h => $::HEIGHT * 0.5,
815 child => (my $vbox = new CFClient::UI::VBox); 1093 child => (my $vbox = new CFClient::UI::VBox),
1094 has_close_button => 1;
816 1095
817 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
818 1097
819 $vbox->add (my $input = new CFClient::UI::Entry 1098 $vbox->add (my $input = new CFClient::UI::Entry
820 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> "
821 . "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>...). "
822 . "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). "
823 . "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.",
824 connect_focus_in => sub { 1103 on_focus_in => sub {
825 my ($input, $prev_focus) = @_; 1104 my ($input, $prev_focus) = @_;
826 1105
827 delete $input->{refocus_map}; 1106 delete $input->{refocus_map};
828 1107
829 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
830 $input->{refocus_map} = 1; 1109 $input->{refocus_map} = 1;
831 } 1110 }
832 delete $input->{auto_activated}; 1111 delete $input->{auto_activated};
1112
1113 0
833 }, 1114 },
834 connect_activate => sub { 1115 on_activate => sub {
835 my ($input, $text) = @_; 1116 my ($input, $text) = @_;
836 $input->set_text (''); 1117 $input->set_text ('');
837 1118
838 if ($text =~ /^\/(.*)/) { 1119 if ($text =~ /^\/(.*)/) {
839 $::CONN->user_send ($1); 1120 $::CONN->user_send ($1);
… …
843 } 1124 }
844 if ($input->{refocus_map}) { 1125 if ($input->{refocus_map}) {
845 delete $input->{refocus_map}; 1126 delete $input->{refocus_map};
846 $MAPWIDGET->focus_in 1127 $MAPWIDGET->focus_in
847 } 1128 }
1129
1130 0
848 }, 1131 },
849 connect_escape => sub { 1132 on_escape => sub {
850 $MAPWIDGET->focus_in 1133 $MAPWIDGET->grab_focus;
1134
1135 0
851 }, 1136 },
852 ); 1137 );
853 1138
854 $CONSOLE = { 1139 $CONSOLE = {
855 window => $window, 1140 window => $window,
856 input => $input 1141 input => $input,
857 }; 1142 };
858 1143
859 $window 1144 $window
860} 1145}
861 1146
862sub open_quit_dialog { 1147sub open_quit_dialog {
863 unless ($QUIT_DIALOG) { 1148 unless ($QUIT_DIALOG) {
864
865 $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 ;
866 1155
867 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1156 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
868 1157
869 $vb->add (new CFClient::UI::Label 1158 $vb->add (new CFClient::UI::Label
870 text => "You should find a savebed and apply it first!", 1159 text => "You should find a savebed and apply it first!",
… …
873 ); 1162 );
874 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1163 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
875 $hb->add (new CFClient::UI::Button 1164 $hb->add (new CFClient::UI::Button
876 text => "Ok", 1165 text => "Ok",
877 expand => 1, 1166 expand => 1,
878 connect_activate => sub { $QUIT_DIALOG->hide }, 1167 on_activate => sub { $QUIT_DIALOG->hide; 0 },
879 ); 1168 );
880 $hb->add (new CFClient::UI::Button 1169 $hb->add (new CFClient::UI::Button
881 text => "Quit anyway", 1170 text => "Quit anyway",
882 expand => 1, 1171 expand => 1,
883 connect_activate => sub { exit }, 1172 on_activate => sub { exit },
884 );
885
886 $QUIT_DIALOG->show_centered;
887 } else {
888 $QUIT_DIALOG->show_centered;
889 }
890}
891
892sub make_inventory_window {
893 my $invwin = new CFClient::UI::FancyFrame
894 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
895
896 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
897
898 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
899 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5);
900 $lbl->set_text ("Player");
901 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
902
903 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
904 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5);
905 $INVR_LBL->set_text ("Floor");
906 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
907
908 $invwin
909}
910
911sub make_help_window {
912 my $win = new CFClient::UI::FancyFrame
913 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
914
915 $win->add (my $vbox = new CFClient::UI::VBox);
916
917 $vbox->add (my $buttons = new CFClient::UI::HBox);
918 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
919
920 for (
921 [intro => "Introduction"],
922 [manual => "Manual"],
923 [command_help => "Commands"],
924 [skill_help => "Skills"],
925 ) {
926 my ($pod, $label) = @$_;
927
928 $buttons->add (new CFClient::UI::Button
929 text => $label,
930 connect_activate => sub {
931 my $parser = new Pod::POM;
932 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
933
934 $viewer->clear;
935
936 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
937 for @{ CFClient::pod_to_pango_list $pom };
938
939 $viewer->set_offset (0);
940 },
941 ); 1173 );
942 } 1174 }
943 1175
944 $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->{bindings}}) {
1312 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1313 my $cmds = $::CFG->{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->{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->{bindings}->{$mod}->{$sym},
1334 sub {
1335 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym};
1337 $::CFG->{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->{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 );
945 1461
946 $win 1462 $win
947} 1463}
948 1464
949sub sdl_init { 1465sub sdl_init {
… …
966 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1482 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
967 1483
968 $SDL_ACTIVE = 1; 1484 $SDL_ACTIVE = 1;
969 $LAST_REFRESH = time - 0.01; 1485 $LAST_REFRESH = time - 0.01;
970 1486
971 CFClient::gl_init; 1487 CFClient::OpenGL::init;
972 1488
973 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1489 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
974 1490
975 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1491 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
976 1492
… …
979 if ($DEBUG_STATUS) { 1495 if ($DEBUG_STATUS) {
980 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1496 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
981 } else { 1497 } else {
982 # create the widgets 1498 # create the widgets
983 1499
984 $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;
985 $DEBUG_STATUS->show; 1505 $DEBUG_STATUS->show;
986 1506
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1508
987 $STATUSBOX = new CFClient::UI::Statusbox; 1509 $STATUSBOX = new CFClient::UI::Statusbox;
988 $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]);
989 1511
990 (new CFClient::UI::Frame 1512 (new CFClient::UI::Frame
991 bg => [0, 0, 0, 0.4], 1513 bg => [0, 0, 0, 0.4],
992 req_y => -1, 1514 force_x => 0,
1515 force_y => "max",
993 child => $STATUSBOX, 1516 child => $STATUSBOX,
994 )->show; 1517 )->show;
995 1518
996 CFClient::UI::FancyFrame->new ( 1519 CFClient::UI::FancyFrame->new (
1520 title => "Map",
1521 name => "mapmap",
1522 x => 0,
1523 y => $FONTSIZE + 8,
997 border_bg => [1, 1, 1, 192/255], 1524 border_bg => [1, 1, 1, 192/255],
998 bg => [1, 1, 1, 0], 1525 bg => [1, 1, 1, 0],
999 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1526 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1000 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.",
1001 ), 1528 ),
… …
1005 $MAPWIDGET->connect (activate_console => sub { 1532 $MAPWIDGET->connect (activate_console => sub {
1006 my ($mapwidget, $preset) = @_; 1533 my ($mapwidget, $preset) = @_;
1007 1534
1008 if ($CONSOLE) { 1535 if ($CONSOLE) {
1009 $CONSOLE->{input}->{auto_activated} = 1; 1536 $CONSOLE->{input}->{auto_activated} = 1;
1010 $CONSOLE->{input}->focus_in; 1537 $CONSOLE->{input}->grab_focus;
1011 1538
1012 if ($preset && $CONSOLE->{input}->get_text eq '') { 1539 if ($preset && $CONSOLE->{input}->get_text eq '') {
1013 $CONSOLE->{input}->set_text ($preset); 1540 $CONSOLE->{input}->set_text ($preset);
1014 } 1541 }
1015 } 1542 }
1016 }); 1543 });
1017 $MAPWIDGET->show; 1544 $MAPWIDGET->show;
1018 $MAPWIDGET->focus_in; 1545 $MAPWIDGET->grab_focus;
1019 1546
1020 $LOGVIEW = new CFClient::UI::TextView 1547 $LOGVIEW = new CFClient::UI::TextScroller
1021 expand => 1, 1548 expand => 1,
1022 font => $FONT_FIXED, 1549 font => $FONT_FIXED,
1023 fontsize => $::CFG->{log_fontsize}, 1550 fontsize => $::CFG->{log_fontsize},
1551 indent => -4,
1024 can_hover => 1, 1552 can_hover => 1,
1025 can_events => 1, 1553 can_events => 1,
1026 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.",
1027 ; 1555 ;
1028 1556
1029 $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 ;
1030 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 bindings."
1581 . "There is a shortcut for making bindings: <b>Left 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 debuggign options. Do not ask.");
1590
1591 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1592
1031 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1593 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1032 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.");
1033 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1595
1034 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1035 $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,
1036 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.");
1037 1598
1038 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
1039 1600
1040 $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,
1041 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.");
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1043 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.");
1044 1606
1045 $BUTTONBAR->add (new CFClient::UI::Button 1607 $BUTTONBAR->add (new CFClient::UI::Button
1046 text => "Save Config", 1608 text => "Save Config",
1047 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.",
1048 connect_activate => sub { 1610 on_activate => sub {
1611 $::CFG->{layout} = CFClient::UI::get_layout;
1049 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1612 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1050 status "Configuration Saved"; 1613 status "Configuration Saved";
1614 0
1051 }, 1615 },
1052 ); 1616 );
1053 1617
1054 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1055 tooltip => "View Documentation"); 1619 tooltip => "View Documentation");
1056 1620
1057 $BUTTONBAR->add (new CFClient::UI::Button 1621 $BUTTONBAR->add (new CFClient::UI::Button
1058 text => "Quit", 1622 text => "Quit",
1059 tooltip => "Terminates the program", 1623 tooltip => "Terminates the program",
1060 connect_activate => sub { 1624 on_activate => sub {
1061 if ($CONN) { 1625 if ($CONN) {
1062 open_quit_dialog; 1626 open_quit_dialog;
1063 } else { 1627 } else {
1064 exit; 1628 exit;
1065 } 1629 }
1630 0
1066 }, 1631 },
1067 ); 1632 );
1068 1633
1069 $BUTTONBAR->show; 1634 $BUTTONBAR->show;
1070 1635 $SETUP_DIALOG->show;
1071 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1072
1073 # delay till geometry is constant
1074 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1075 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1076 my $widget = $GAUGES->{win};
1077 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1078 });
1079 force_refresh ();
1080 } 1636 }
1637
1638 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1081} 1639}
1082 1640
1083sub video_shutdown { 1641sub video_shutdown {
1642 CFClient::OpenGL::shutdown;
1643
1084 undef $SDL_ACTIVE; 1644 undef $SDL_ACTIVE;
1085} 1645}
1086 1646
1087my @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#
1088my $bgmusic;#TODO#hack#d# 1648my $bgmusic;#TODO#hack#d#
… …
1152 1712
1153my %demo;#d# 1713my %demo;#d#
1154 1714
1155sub force_refresh { 1715sub force_refresh {
1156 $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;
1157 debug sprintf "%3.2f", $fps; 1717 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1158 1718
1159 $CFClient::UI::ROOT->draw; 1719 $CFClient::UI::ROOT->draw;
1160 1720
1161 $WANT_REFRESH = 0; 1721 $WANT_REFRESH = 0;
1162 $CAN_REFRESH = 0; 1722 $CAN_REFRESH = 0;
… …
1217}; 1777};
1218 1778
1219 CFClient::SDL_GL_SwapBuffers; 1779 CFClient::SDL_GL_SwapBuffers;
1220} 1780}
1221 1781
1222my $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 {
1223 $NOW = time; 1783 $NOW = time;
1224 1784
1225 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1785 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1226 for CFClient::SDL_PollEvent; 1786 for CFClient::SDL_PollEvent;
1227 1787
… …
1245sub animation_stop { 1805sub animation_stop {
1246 my ($widget) = @_; 1806 my ($widget) = @_;
1247 delete $animate_object{$widget}; 1807 delete $animate_object{$widget};
1248} 1808}
1249 1809
1250@conn::ISA = Crossfire::Protocol::;
1251
1252sub conn::new {
1253 my $class = shift;
1254
1255 my $self = $class->Crossfire::Protocol::new (@_);
1256
1257 $MAPWIDGET->clr_commands;
1258
1259 my $parser = new Pod::POM;
1260 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1261
1262 for my $head2 ($pod->head2) {
1263 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1264 or next;
1265
1266 my $cmd = $1;
1267 my @args = split /\|/, $2;
1268 @args = (".*") unless @args;
1269
1270 my $text = CFClient::pod_to_pango $head2->content;
1271
1272 for my $arg (@args) {
1273 $arg = $arg eq ".*" ? "" : " $arg";
1274
1275 $MAPWIDGET->add_command ("$cmd$arg", $text);
1276 }
1277 }
1278
1279 $self->{noface} = new_from_file CFClient::Texture
1280 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1281
1282 $self
1283}
1284
1285sub conn::stats_update {
1286 my ($self, $stats) = @_;
1287
1288 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1289 my $diff = $exp - $self->{prev_exp};
1290 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1291 if exists $self->{prev_exp} && $diff;
1292 $self->{prev_exp} = $exp;
1293 }
1294
1295 update_stats_window ($stats);
1296}
1297
1298sub conn::user_send {
1299 my ($self, $command) = @_;
1300
1301 $self->send_command ($command);
1302 status $command;
1303}
1304
1305sub conn::map_scroll {
1306 my ($self, $dx, $dy) = @_;
1307
1308 $MAP->scroll ($dx, $dy);
1309}
1310
1311sub conn::feed_map1a {
1312 my ($self, $data) = @_;
1313
1314# $self->Crossfire::Protocol::feed_map1a ($data);
1315
1316 $MAP->map1a_update ($data);
1317 $MAPWIDGET->update;
1318}
1319
1320sub conn::flush_map {
1321 my ($self) = @_;
1322
1323 my $map_info = delete $self->{map_info}
1324 or return;
1325
1326 my ($hash, $x, $y, $w, $h) = @$map_info;
1327
1328 my $data = $MAP->get_rect ($x, $y, $w, $h);
1329 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
1330 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1331}
1332
1333sub conn::map_clear {
1334 my ($self) = @_;
1335
1336 $self->flush_map;
1337 delete $self->{neigh_map};
1338
1339 $MAP->clear;
1340}
1341
1342
1343sub conn::load_map($$$) {
1344 my ($self, $hash, $x, $y) = @_;
1345
1346 if (defined (my $data = $MAPCACHE->get ($hash))) {
1347 $data = Compress::LZF::decompress $data;
1348 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1349 for my $id ($MAP->set_rect ($x, $y, $data)) {
1350 my $data = $TILECACHE->get ($id)
1351 or next;
1352
1353 $self->set_texture ($id => $data);
1354 }
1355 }
1356}
1357
1358# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1359# (server resource,s latency, bandwidth), so this hack is warranted.
1360# the right fix is to make real tiled maps with an overview file
1361sub conn::send_mapinfo {
1362 my ($self, $data, $cb) = @_;
1363
1364 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1365 my ($wx, $wy) = ($1, $2);
1366
1367 if ($data =~ /^spatial ([1-4]+)$/) {
1368 my @dx = (0, 0, 1, 0, -1);
1369 my @dy = (0, -1, 0, 1, 0);
1370 my ($dx, $dy);
1371
1372 for (split //, $1) {
1373 $dx += $dx[$_];
1374 $dy += $dy[$_];
1375 }
1376
1377 $cb->(spatial => 15,
1378 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1379 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1380 50, 50,
1381 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1382 );
1383
1384 return;
1385 }
1386 }
1387
1388 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1389}
1390
1391# this method does a "flood fill" into every tile direction
1392# it assumes that tiles are arranged in a rectangular grid,
1393# i.e. a map is the same as the left of the right map etc.
1394# failure to comply are harmless and result in display errors
1395# at worst.
1396sub conn::flood_fill {
1397 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1398
1399 # the server does not allow map paths > 6
1400 return if 7 <= length $path;
1401
1402 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1403
1404 for (
1405 [1, 3, 0, -1],
1406 [2, 4, 1, 0],
1407 [3, 1, 0, 1],
1408 [4, 2, -1, 0],
1409 ) {
1410 my ($tile, $tile2, $dx, $dy) = @$_;
1411
1412 next if $block & (1 << $tile);
1413 my $block = $block | (1 << $tile2);
1414
1415 my $gx = $gx + $dx;
1416 my $gy = $gy + $dy;
1417
1418 next unless $flags & (1 << ($tile - 1));
1419 next if $self->{neigh_grid}{$gx, $gy}++;
1420
1421 my $neigh = $self->{neigh_map}{$hash} ||= [];
1422 if (my $info = $neigh->[$tile]) {
1423 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1424
1425 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1426 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1427
1428 } else {
1429 $self->send_mapinfo ("spatial $path$tile", sub {
1430 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1431
1432 return if $mode ne "spatial";
1433
1434 $x += $MAP->ox;
1435 $y += $MAP->oy;
1436
1437 $self->load_map ($hash, $x, $y)
1438 unless $self->{neigh_map}{$hash}[5]++;#d#
1439
1440 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1441
1442 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1443 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1444 });
1445 }
1446 }
1447}
1448
1449sub conn::map_change {
1450 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1451
1452 $self->flush_map;
1453
1454 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1455
1456 my $mapmapw = $MAPMAP->{w};
1457 my $mapmaph = $MAPMAP->{h};
1458
1459 $self->{neigh_rect} = [
1460 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1461 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1462 ];
1463
1464 delete $self->{neigh_grid};
1465
1466 $x += $ox;
1467 $y += $oy;
1468
1469 $self->{map_info} = [$hash, $x, $y, $w, $h];
1470
1471 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1472 $STATWIDS->{map}->set_text ("Map: " . $map);
1473
1474 $self->load_map ($hash, $x, $y);
1475 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1476}
1477
1478sub conn::face_find {
1479 my ($self, $facenum, $face) = @_;
1480
1481 my $hash = "$face->{chksum},$face->{name}";
1482
1483 my $id = $FACEMAP->get ($hash);
1484
1485 unless ($id) {
1486 # create new id for face
1487 # I love transactions
1488 for (1..100) {
1489 my $txn = $CFClient::DB_ENV->txn_begin;
1490 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1491 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1492 $id = ($id || 16) + 1;
1493 if ($FACEMAP->put (id => $id) == 0
1494 && $FACEMAP->put ($hash => $id) == 0) {
1495 $txn->txn_commit;
1496
1497 goto gotid;
1498 }
1499 }
1500 $txn->abort;
1501 }
1502
1503 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1504 }
1505
1506gotid:
1507 $face->{id} = $id;
1508 $MAP->set_face ($facenum => $id);
1509 $self->{faceid}[$facenum] = $id;#d#
1510
1511 my $face = $TILECACHE->get ($id);
1512
1513 if ($face) {
1514 #$self->face_prefetch;
1515 $face
1516 } else {
1517 my $tex = $self->{noface};
1518 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1519 undef
1520 };
1521}
1522
1523sub conn::face_update {
1524 my ($self, $facenum, $face) = @_;
1525
1526 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1527
1528 $self->set_texture ($face->{id} => delete $face->{image});
1529}
1530
1531sub conn::set_texture {
1532 my ($self, $id, $data) = @_;
1533
1534 $self->{texture}[$id] ||= do {
1535 my $tex =
1536 new_from_image CFClient::Texture
1537 $data, minify => 1, mipmap => 1;
1538
1539 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1540 $MAPWIDGET->update;
1541
1542 $tex
1543 };
1544}
1545
1546sub conn::sound_play {
1547 my ($self, $x, $y, $soundnum, $type) = @_;
1548
1549 $SDL_MIXER
1550 or return;
1551
1552 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1553 or return;
1554
1555 $chunk->play;
1556# warn "sound $x,$y,$soundnum,$type\n";#d#
1557}
1558
1559my $LAST_QUERY; # server is stupid, stupid, stupid
1560
1561sub conn::query {
1562 my ($self, $flags, $prompt) = @_;
1563
1564 $prompt = $LAST_QUERY unless length $prompt;
1565 $LAST_QUERY = $prompt;
1566
1567 my $dialog = new CFClient::UI::FancyFrame
1568 title => "Query",
1569 child => my $vbox = new CFClient::UI::VBox;
1570
1571 $vbox->add (new CFClient::UI::Label
1572 max_w => $::WIDTH * 0.4,
1573 ellipsise => 0,
1574 text => $prompt);
1575
1576 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1577 $vbox->add (my $hbox = new CFClient::HBox);
1578 $hbox->add (new CFClient::Button
1579 text => "No",
1580 connect_activate => sub {
1581 $self->send ("reply n");
1582 $dialog->destroy;
1583 $MAPWIDGET->focus_in;
1584 }
1585 );
1586 $hbox->add (new CFClient::Button
1587 text => "Yes",
1588 connect_activate => sub {
1589 $self->send ("reply y");
1590 $dialog->destroy;
1591 },
1592 );
1593
1594 $dialog->focus_in;
1595
1596 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1597 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1598 $vbox->add (my $entry = new CFClient::UI::Entry
1599 connect_changed => sub {
1600 $self->send ("reply $_[1]");
1601 $dialog->destroy;
1602 },
1603 );
1604
1605 $entry->focus_in;
1606
1607 } else {
1608 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1609
1610 $vbox->add (my $entry = new CFClient::UI::Entry
1611 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1612 connect_activate => sub {
1613 $self->send ("reply $_[1]");
1614 $dialog->destroy;
1615 },
1616 );
1617
1618 $entry->focus_in;
1619 }
1620
1621 $dialog->show_centered;
1622}
1623
1624sub conn::drawinfo {
1625 my ($self, $color, $text) = @_;
1626
1627 my @color = (
1628 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1629 [1.00, 1.00, 1.00],
1630 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1631 [1.00, 0.00, 0.00],
1632 [1.00, 0.54, 0.00],
1633 [0.11, 0.56, 1.00],
1634 [0.93, 0.46, 0.00],
1635 [0.18, 0.54, 0.34],
1636 [0.56, 0.73, 0.56],
1637 [0.80, 0.80, 0.80],
1638 [0.55, 0.41, 0.13],
1639 [0.99, 0.77, 0.26],
1640 [0.74, 0.65, 0.41],
1641 );
1642
1643 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1644
1645 $text = CFClient::UI::Label::escape $text;
1646 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1647 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1648
1649 $LOGVIEW->add_paragraph ($color[$color],
1650 join "\n", map "$time $_", split /\n/, $text);
1651
1652 $STATUSBOX->add ($text,
1653 group => $text,
1654 fg => $color[$color],
1655 timeout => 10,
1656 tooltip_font => $::FONT_FIXED,
1657 );
1658}
1659
1660sub conn::drawextinfo {
1661 my ($self, $color, $type, $subtype, $message) = @_;
1662
1663 $self->drawinfo ($color, $message);
1664}
1665
1666sub conn::spell_add {
1667 my ($self, $spell) = @_;
1668
1669 # TODO
1670 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1671 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1672 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1673}
1674
1675sub conn::spell_delete {
1676 my ($self, $spell) = @_;
1677}
1678
1679sub conn::addme_success {
1680 my ($self) = @_;
1681
1682 $self->send ("command output-sync $CFG->{output_sync}");
1683 $self->send ("command output-count $CFG->{output_count}");
1684
1685 my $parser = new Pod::POM;
1686 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1687
1688 my %skill_tooltip;
1689
1690 for my $head2 ($pod->head2) {
1691 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1692 }
1693
1694 for my $skill (values %{$self->{skill_info}}) {
1695 $MAPWIDGET->add_command ("ready_skill $skill",
1696 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1697 . $skill_tooltip{$skill});
1698 $MAPWIDGET->add_command ("use_skill $skill",
1699 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1700 . $skill_tooltip{$skill});
1701 }
1702}
1703
1704sub conn::eof {
1705 $MAPWIDGET->clr_commands;
1706
1707 stop_game;
1708}
1709
1710sub conn::image_info {
1711 my ($self, $numfaces) = @_;
1712
1713 $self->{num_faces} = $numfaces;
1714 $self->{face_prefetch} = [1 .. $numfaces];
1715 $self->face_prefetch;
1716}
1717
1718sub conn::face_prefetch {
1719 my ($self) = @_;
1720
1721 return unless $CFG->{face_prefetch};
1722
1723 if ($self->{num_faces}) {
1724 return if @{ $self->{send_queue} || [] };
1725 my $todo = @{ $self->{face_prefetch} }
1726 or return;
1727
1728 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1729
1730 $self->send ("requestinfo image_sums $face $face");
1731
1732 $STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1733 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1734 } elsif (!exists $self->{num_faces}) {
1735 $self->send ("requestinfo image_info");
1736
1737 $self->{num_faces} = 0;
1738
1739 $STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1740 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1741 }
1742}
1743
1744# check once/second for faces that need to be prefetched 1810# check once/second for faces that need to be prefetched
1745# this should, of course, only run on demand, but 1811# this should, of course, only run on demand, but
1746# SDL forces worse things on us.... 1812# SDL forces worse things on us....
1747 1813
1748Event->timer (after => 1, interval => 0.25, cb => sub { 1814Event->timer (after => 1, interval => 0.25, cb => sub {
1749 $CONN->face_prefetch 1815 $CONN->face_prefetch
1750 if $CONN; 1816 if $CONN;
1751}); 1817});
1752
1753sub update_floorbox {
1754 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1755 return unless $CONN;
1756
1757 $FLOORBOX->clear;
1758 $FLOORBOX->add (0, 1, new CFClient::UI::Empty expand => 1);
1759
1760 my $row;
1761 for (@{ $CONN->{container}{0} }) {
1762 if (++$row < 7) {
1763 local $_->{face_widget}; # hack to force recreation of widget
1764 local $_->{desc_widget}; # hack to force recreation of widget
1765 CFClient::Item::update_widgets $_;
1766
1767 $FLOORBOX->add (0, $row, $_->{face_widget});
1768 $FLOORBOX->add (1, $row, $_->{desc_widget});
1769 } else {
1770 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1771 last;
1772 }
1773 }
1774 });
1775
1776 $WANT_REFRESH++;
1777}
1778
1779sub set_opencont {
1780 my ($conn, $tag, $name) = @_;
1781 $conn->{open_container} = $tag;
1782 $INVR_LBL->set_text ($name);
1783 $INVR->set_items ($conn->{container}{$tag});
1784}
1785
1786sub update_container {
1787 my ($tag) = @_;
1788 $INVR->set_items ($::CONN->{container}{$CONN->{open_container}})
1789 if $tag == $CONN->{open_container};
1790}
1791
1792sub conn::container_add {
1793 my ($self, $tag, $items) = @_;
1794
1795 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1796
1797 if ($tag == 0) {
1798 update_floorbox;
1799 update_container (0);
1800 } elsif ($tag == $self->{player}{tag}) {
1801 $INV->set_items ($self->{container}{$self->{player}{tag}})
1802 } else {
1803 update_container ($tag);
1804 }
1805
1806 # $self-<{player}{tag} => player inv
1807 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1808}
1809
1810sub conn::container_clear {
1811 my ($self, $tag) = @_;
1812
1813 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1814
1815 if ($tag == 0) {
1816 update_floorbox;
1817 } elsif ($tag == $self->{player}{tag}) {
1818 $INV->set_items ($self->{container}{$tag})
1819 }
1820
1821# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1822}
1823
1824sub conn::item_delete {
1825 my ($self, @items) = @_;
1826
1827 for (@items) {
1828 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1829
1830 if ($_->{container} == 0) {
1831 update_floorbox;
1832 update_container ($_->{tag});
1833 } elsif ($_->{container} == $self->{player}{tag}) {
1834 $INV->set_items ($self->{container}{$self->{player}{tag}})
1835 } else {
1836 update_container ($_->{tag});
1837 }
1838 }
1839}
1840
1841sub conn::item_update {
1842 my ($self, $item) = @_;
1843
1844 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($CONN->{open_container})\n";
1845
1846 if ($item->{tag} == $self->{player}{tag}) {
1847 $STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
1848 return
1849 }
1850
1851 CFClient::Item::update_widgets $item;
1852
1853 if ($item->{tag} == $CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1854 set_opencont ($CONN, 0, "Floor");
1855
1856 } elsif ($item->{flags} & Crossfire::Protocol::F_OPEN) {
1857 set_opencont ($CONN, $item->{tag}, CFClient::Item::desc_string $item);
1858 } else {
1859 if ($item->{container} == 0) {
1860 update_floorbox;
1861 } elsif ($item->{container} == $self->{player}{tag}) {
1862 $INV->set_items ($self->{container}{$item->{container}})
1863 }
1864 }
1865}
1866 1818
1867%SDL_CB = ( 1819%SDL_CB = (
1868 CFClient::SDL_QUIT => sub { 1820 CFClient::SDL_QUIT => sub {
1869 Event::unloop -1; 1821 Event::unloop -1;
1870 }, 1822 },
… …
1902############################################################################# 1854#############################################################################
1903 1855
1904$SIG{INT} = $SIG{TERM} = sub { exit }; 1856$SIG{INT} = $SIG{TERM} = sub { exit };
1905 1857
1906{ 1858{
1907 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 };
1908 1864
1909 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1910 1866 CFClient::UI::set_layout ($::CFG->{layout});
1911 $TILECACHE = CFClient::db_table "tilecache";
1912 $FACEMAP = CFClient::db_table "facemap";
1913 1867
1914 my %DEF_CFG = ( 1868 my %DEF_CFG = (
1915 sdl_mode => 0, 1869 sdl_mode => 0,
1916 width => 640, 1870 width => 640,
1917 height => 480, 1871 height => 480,
… …
1920 map_scale => 1, 1874 map_scale => 1,
1921 fow_enable => 1, 1875 fow_enable => 1,
1922 fow_intensity => 0.45, 1876 fow_intensity => 0.45,
1923 fow_smooth => 0, 1877 fow_smooth => 0,
1924 gui_fontsize => 1, 1878 gui_fontsize => 1,
1925 log_fontsize => 1, 1879 log_fontsize => 0.7,
1926 gauge_fontsize=> 1, 1880 gauge_fontsize=> 1,
1927 gauge_size => 0.35, 1881 gauge_size => 0.35,
1928 stat_fontsize => 1, 1882 stat_fontsize => 0.7,
1929 mapsize => 100, 1883 mapsize => 100,
1930 host => "crossfire.schmorp.de", 1884 host => "crossfire.schmorp.de",
1931 say_command => 'say', 1885 say_command => 'say',
1932 audio_enable => 1, 1886 audio_enable => 1,
1933 bgm_enable => 1, 1887 bgm_enable => 1,
1934 bgm_volume => 0.25, 1888 bgm_volume => 0.25,
1935 face_prefetch => 0, 1889 face_prefetch => 0,
1936 output_sync => 1, 1890 output_sync => 1,
1937 output_count => 1, 1891 output_count => 1,
1892 pickup => 0,
1938 ); 1893 );
1939 1894
1940 while (my ($k, $v) = each %DEF_CFG) { 1895 while (my ($k, $v) = each %DEF_CFG) {
1941 $CFG->{$k} = $v unless exists $CFG->{$k}; 1896 $CFG->{$k} = $v unless exists $CFG->{$k};
1942 } 1897 }
… …
1989 video_init; 1944 video_init;
1990 audio_init; 1945 audio_init;
1991} 1946}
1992 1947
1993Event::loop; 1948Event::loop;
1949#CFClient::SDL_Quit;
1950#CFClient::_exit 0;
1994 1951
1995END { CFClient::SDL_Quit } 1952END { CFClient::SDL_Quit }
1996 1953
1997=head1 NAME 1954=head1 NAME
1998 1955
1999pclient - A Crossfire+ and Crossfire game client 1956cfplus - A Crossfire+ and Crossfire game client
2000 1957
2001=head1 SYNOPSIS 1958=head1 SYNOPSIS
2002 1959
2003Just run it - no commandline arguments are supported. 1960Just run it - no commandline arguments are supported.
2004 1961
2005=head1 USAGE 1962=head1 USAGE
2006 1963
2007Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1964cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
2008fullscreen and interactively. 1965fullscreen and interactively.
2009 1966
1967=head1 DEBUGGING
1968
1969
1970CFPLUS_DEBUG - environment variable
1971
1972 1 draw borders around widgets
1973 2 add low-level widget info to tooltips
1974 4 show fps
1975 8 suppress tooltips
1976
2010=head1 AUTHOR 1977=head1 AUTHOR
2011 1978
2012Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1979Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2013 1980
2014 1981

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines